gentoo resync : 24.07.2021

7326 files changed, 93769 insertions, 85679 deletions

diff --git a/Manifest b/Manifest
index 3e27fe4cc68e..a636c58f0a5a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29302 BLAKE2B ff0f87631ff38ba399234639b47cd1f7099491e676f22c991f1cac8c80dc28ba223d7abdcb0c925a25e5b2ed146b4e38590b2e8e49082f954bff855e669948a6 SHA512 40f520674f308439db41bee7a633c87dc87c4d0cb46e16101eaba3e614d896c73e3038b465447d554cb3ed8b26b55b0be48a4ccd96680c45859d46132aa598b6
-TIMESTAMP 2021-07-17T17:39:11Z
+MANIFEST Manifest.files.gz 29295 BLAKE2B 5125a0096d02401a44491d3b70db51377a64b17b0d424d0973eba9b7f4492b676b5da12c6ba163155d75353dec4f9e7a635504b34cbed5dd061ae4f564f66019 SHA512 4a926f80d0eaa1eaa5651cf81bb67eb58fce1c3ae1d13efa1eb02788e78d5f9126cf3c82becbe087472730155cb0ae6ef1e9ab88aa43c58df29ea70deaf75ebf
+TIMESTAMP 2021-07-24T00:39:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD7YSdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-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
+klBjWA//XDgQnJwoCZKgQeIuPj9+2hutBmaXvfxhiRtXsGXte+suIlVdo3sRehbK
+h4JRzBjMj0NnKAQfx9FZkteBYeWaIf/Ie2yyzqxzGg6+bcfsbGbo3d1hdWOUfXio
+xIwEChlcfNmACH7r5a9ALDNIR/P/rGG1J9KCW243hltM/bS/zRXQK7EcWjsrsbcY
+bP5nwFqQg/Vzx0V54fUAQyQpH43PWJfn8Y3OdcE8U7faLLe2p0+9n59SQxBJM+It
++MiLaGCF2LnM4xKxc3zWYxhbe2xdXyESaowArhJf8ZYhuDYAhOd4Ne58VBrjyRhy
+stt0V1fqxnDpG83uqG3/CU/REwEbd84WqKjsdiMkeTgWAI4OG4mKHaOjGy+TtaAz
+osEsi6iiDux9dmvwGBh+WUwza1f2ZCE+SXgLXtQWDUKv6NxRs96BpSBekcHe+dvt
+124LfQNAdgYaPpFZuhJEdPvpLZGSIPE7h/WX3yGfQHGzW2xoUsKxb1eq1zZUDy7/
+XhhGa68A3pEzIo95Q/Re45IdZv51BgCovaT3/arE2KTgWMIrd1MJCl33sSGHBr/P
++spfN8rqaZ3ZXLipCZ0PB5CJuzWNc7go6Whbq6Z9zKq5e0xuCOkDQjpCJ+Kx+om5
+RBknvgIdt2MfjUFza663E0U53R/nnGJ6uEnaKzSo6oAr/dXJAdY=
+=gLC9
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c6d3b830459f..00d431ca43b8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 3c4e8a8c1e8c..f24a9884bdbc 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/apache/Manifest b/acct-group/apache/Manifest
index a98c5b16f16f..53c266276fdd 100644
--- a/acct-group/apache/Manifest
+++ b/acct-group/apache/Manifest
@@ -1,2 +1,2 @@
 EBUILD apache-0-r1.ebuild 150 BLAKE2B 1d99b575345acf75601780f9b9e9f225c9e138fdb4dd10dadc35177b230d893c74629b2a95dd098bf7f33c2dd8d51860353ddf9c9773de9f69a2b888200a1bbc SHA512 9223eb4606ee8817523511eceba9483824c6dbdc8a8b7195ac63f9475d51195e5c6484982c01fdcaef13c8e78ac392f1a31f63831accce2f4b14fc7c8d5eb789
-MISC metadata.xml 365 BLAKE2B b8272226ef2f4f83ae43ddddb1e0cd175e7c5a6786b9bc003564a5c2e9453d402fac511ff64593342c3134346dc2d9dfce45c48ca706fe890e2f9eeb694be4a2 SHA512 f1c14be632ba1b1f22662defe020319bd6689fc94ed52965cd22f3d28f925177c1e952ebc4c3040935d63f436aa21631c97ddbff7535dcf5953a0f242e99855f
+MISC metadata.xml 253 BLAKE2B 94fe3d1893bed27716edc11cfd199511928fb7d99f1fb9018c799a2b9e0c01a1d6a4f60d4549a4d440c0a4ed3a6c8bbf284487446334d73a168b1b4300ed59f7 SHA512 e8bccbd0f14236187f130bf4ab0141fd6e83bb153b9733e2fcd153f52a83f3cf0dcd89faa5942256af4089dbac4525aa62919869dec9e3a2c9d9f48846cac79c
diff --git a/acct-group/apache/metadata.xml b/acct-group/apache/metadata.xml
index f93dbc1e6256..9aa67ce58465 100644
--- a/acct-group/apache/metadata.xml
+++ b/acct-group/apache/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
 	<maintainer type="project">
 		<email>apache-bugs@gentoo.org</email>
 		<name>Apache project</name>
diff --git a/acct-group/ftp/Manifest b/acct-group/ftp/Manifest
index 697f3ba1af38..0612c1b50dbe 100644
--- a/acct-group/ftp/Manifest
+++ b/acct-group/ftp/Manifest
@@ -1,2 +1,2 @@
 EBUILD ftp-0-r1.ebuild 199 BLAKE2B 8d79da68ef487e6242559a09d13d8ee34cda5dff027a42d564ca6f9eb4c669b40b859cdc88728b203e9580b4d57ad91e87536d96ed59fa07d5fabc651647aad3 SHA512 d808b4a94dfd995a5808aa62de045deed701c0265f44989336e6464ed7b990656a10819a7218a1a1b85cf0cd20935e096a9c04985ff9c409bd0b6ddc9374c4b8
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/acct-group/ftp/metadata.xml b/acct-group/ftp/metadata.xml
index 7a38bb900964..debde3ef6ae3 100644
--- a/acct-group/ftp/metadata.xml
+++ b/acct-group/ftp/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/acct-group/radicale/Manifest b/acct-group/radicale/Manifest
index cb3de23be618..d98b85ea122c 100644
--- a/acct-group/radicale/Manifest
+++ b/acct-group/radicale/Manifest
@@ -1,2 +1,2 @@
 EBUILD radicale-0-r1.ebuild 197 BLAKE2B 2c7f118a22b17a08262b34dcdb074c4336d26c66f8601fe691af03c5d72bc1e91083b13ec552bde26fbd625ffca5128e4332985250cd1ceab01ec6a520746ed4 SHA512 840478f0a3f9b114f821801b7c7cd088d6f69b53b2ab20f3986212e78649107d1b1c87ff6f285436c873e3f7bc725a44bc8e19cc2e9b9e87ed6f334d993a18a4
-MISC metadata.xml 395 BLAKE2B 3ad137c6a9e304d422d2ba144d103bf38282f59e11e062069853c18bdf69a92eb3d797c6983281765ccdb62a99e803ca2af4b761d14dd5bec18b313cae83be2a SHA512 68f8cec25688948425b31a72a62d870626e4a427e9fb6df5f55c83cdd1b6f3dbdddb0a4ff37a2a3a51ba2d1e55ecba0e5697cf67e15641f444b5d1fe69c11a2b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/radicale/metadata.xml b/acct-group/radicale/metadata.xml
index f8ffe025bba5..7a38bb900964 100644
--- a/acct-group/radicale/metadata.xml
+++ b/acct-group/radicale/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-group/redsocks/Manifest b/acct-group/redsocks/Manifest
index fa6e29afc4e9..2b68a90bff54 100644
--- a/acct-group/redsocks/Manifest
+++ b/acct-group/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0.ebuild 199 BLAKE2B 871091bf11f5ed6886ecc4653a098c76a77de2aae4a9aa932e15a5609f89c94782c3d4ac722522e3914be439bf2004cbff7aa1963a4b8b81def58640cbddcac6 SHA512 f5f4dcafebe6c270e863780cb3f0e62c103e2900eb4242ceb659565379de6b987b65a80f63e2a11f0fedd289bc8ecf09fd7b83ef0b7babce2ccd7a5b4eb19b02
+EBUILD redsocks-0-r1.ebuild 199 BLAKE2B 6ec5442a800d1f45261821439f30fcc7ea1f54507fbf2d114eb2b505346c265ebb21a8febbf5800a6f6e445d4d3626eba86e3706d17085e09c489cb9aa6ed323 SHA512 d5f088c8291c2e2955912f3ee05e0f69d86835ce760aa282b787b752ac41234c503176a0627f1cd7c9ab2ed2f22fb995f746a736fd942b41ab6be9f69054c172
 MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-group/redsocks/redsocks-0-r1.ebuild b/acct-group/redsocks/redsocks-0-r1.ebuild
new file mode 100644
index 000000000000..376e5708d210
--- /dev/null
+++ b/acct-group/redsocks/redsocks-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-proxy/redsocks"
+
+ACCT_GROUP_ID="154"
diff --git a/acct-group/redsocks/redsocks-0.ebuild b/acct-group/redsocks/redsocks-0.ebuild
deleted file mode 100644
index 49d81346469b..000000000000
--- a/acct-group/redsocks/redsocks-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-proxy/redsocks"
-
-ACCT_GROUP_ID="155"
diff --git a/acct-group/speech/Manifest b/acct-group/speech/Manifest
deleted file mode 100644
index efd1afc30eaf..000000000000
--- a/acct-group/speech/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5614581ab26a..000000000000
--- a/acct-group/speech/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>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
deleted file mode 100644
index 2910ead7862d..000000000000
--- a/acct-group/speech/speech-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 app-accessibility/eflite"
-
-ACCT_GROUP_ID="202"
diff --git a/acct-group/ulogd/Manifest b/acct-group/ulogd/Manifest
index 5914c30fe3a7..ca2e7a4a70bb 100644
--- a/acct-group/ulogd/Manifest
+++ b/acct-group/ulogd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ulogd-0.ebuild 181 BLAKE2B 97910a15b3d03ca8ac63d251489474e9c4f832f79f628d9235788b3a21e738162f36edb81132637fccd5ab12fc3710f275e1384e835d50b91c5c98d42c9c40c8 SHA512 a0c71601200d074d93be7622c12134d293bb876f2fb351b54d44d7a44549d296b1610918f07f114a473241846bfcbd55c83d1f7f22beb7bc361c671e12ea2522
-MISC metadata.xml 395 BLAKE2B 3ad137c6a9e304d422d2ba144d103bf38282f59e11e062069853c18bdf69a92eb3d797c6983281765ccdb62a99e803ca2af4b761d14dd5bec18b313cae83be2a SHA512 68f8cec25688948425b31a72a62d870626e4a427e9fb6df5f55c83cdd1b6f3dbdddb0a4ff37a2a3a51ba2d1e55ecba0e5697cf67e15641f444b5d1fe69c11a2b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/ulogd/metadata.xml b/acct-group/ulogd/metadata.xml
index f8ffe025bba5..7a38bb900964 100644
--- a/acct-group/ulogd/metadata.xml
+++ b/acct-group/ulogd/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 91d670d156ab..399acb08f6f6 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/apache/Manifest b/acct-user/apache/Manifest
index dd846a065177..6af8c945142a 100644
--- a/acct-user/apache/Manifest
+++ b/acct-user/apache/Manifest
@@ -1,2 +1,2 @@
 EBUILD apache-0-r1.ebuild 220 BLAKE2B 9d96dd1aa1e2ee8b310b0be39d22275287ebd79dc595fb669fff772cfda655a8c66f71128b183219b3dfb83fa670dea10e6f80b089a72148fc9ff5a574829980 SHA512 335a1ed35e5cad95756eed6784be93d66544c1c07b520cb94dcace8fd8f78bd847d5284c8ec8a9157b723e3743d6497bf26cc571a35d71cde69f2b85c6a631c3
-MISC metadata.xml 365 BLAKE2B b8272226ef2f4f83ae43ddddb1e0cd175e7c5a6786b9bc003564a5c2e9453d402fac511ff64593342c3134346dc2d9dfce45c48ca706fe890e2f9eeb694be4a2 SHA512 f1c14be632ba1b1f22662defe020319bd6689fc94ed52965cd22f3d28f925177c1e952ebc4c3040935d63f436aa21631c97ddbff7535dcf5953a0f242e99855f
+MISC metadata.xml 253 BLAKE2B 94fe3d1893bed27716edc11cfd199511928fb7d99f1fb9018c799a2b9e0c01a1d6a4f60d4549a4d440c0a4ed3a6c8bbf284487446334d73a168b1b4300ed59f7 SHA512 e8bccbd0f14236187f130bf4ab0141fd6e83bb153b9733e2fcd153f52a83f3cf0dcd89faa5942256af4089dbac4525aa62919869dec9e3a2c9d9f48846cac79c
diff --git a/acct-user/apache/metadata.xml b/acct-user/apache/metadata.xml
index f93dbc1e6256..9aa67ce58465 100644
--- a/acct-user/apache/metadata.xml
+++ b/acct-user/apache/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
 	<maintainer type="project">
 		<email>apache-bugs@gentoo.org</email>
 		<name>Apache project</name>
diff --git a/acct-user/axtls/Manifest b/acct-user/axtls/Manifest
new file mode 100644
index 000000000000..6f090b265339
--- /dev/null
+++ b/acct-user/axtls/Manifest
@@ -0,0 +1,2 @@
+EBUILD axtls-0.ebuild 241 BLAKE2B e47fdd0d85f9cbe95dac87da2c96b763d30c7fdf2ff688cbbf0b6926fe2345af5aaa515ec13b369ad3719aa7457ff438f81f08192daded8b811f2b45fef1cb3a SHA512 071889146eaf37f3f369e51beac236f17c25691f9be6b2382b12e940b070d1d18c7691cc8b19af34e1de3a7ce95c56c25b519a011118aa7570abac204a24ed30
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-user/axtls/axtls-0.ebuild b/acct-user/axtls/axtls-0.ebuild
new file mode 100644
index 000000000000..b85720579f78
--- /dev/null
+++ b/acct-user/axtls/axtls-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-libs/axtls"
+
+ACCT_USER_GROUPS=( "axtls" )
+ACCT_USER_ID="147"
+
+acct-user_add_deps
diff --git a/acct-user/axtls/metadata.xml b/acct-user/axtls/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/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-user/beanstalk/Manifest b/acct-user/beanstalk/Manifest
new file mode 100644
index 000000000000..425b2592127a
--- /dev/null
+++ b/acct-user/beanstalk/Manifest
@@ -0,0 +1,2 @@
+EBUILD beanstalk-0.ebuild 287 BLAKE2B eaea570b667375d0042bca642de7cd9332e37c2ad9a53709101b23de080f321f5ee13924c174622a741d55d98a7e245e2d9c66b43787b3562d92704c0f61cc19 SHA512 3c54a024500abe620f3e388be9e8ca4ad49af888fcba2e7278da187eefa9619321ed5c514e8f24f50606cbb921f4b8e3c54390644f798f069b1821ba1f7177af
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/beanstalk/beanstalk-0.ebuild b/acct-user/beanstalk/beanstalk-0.ebuild
new file mode 100644
index 000000000000..a17083ef609d
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-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 app-misc/beanstalkd"
+
+ACCT_USER_GROUPS=( "beanstalk" )
+ACCT_USER_HOME="/var/lib/beanstalkd"
+ACCT_USER_ID="137"
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/metadata.xml b/acct-user/beanstalk/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/acct-user/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-user/bitflu/Manifest b/acct-user/bitflu/Manifest
new file mode 100644
index 000000000000..f355daf034dc
--- /dev/null
+++ b/acct-user/bitflu/Manifest
@@ -0,0 +1,2 @@
+EBUILD bitflu-0.ebuild 275 BLAKE2B 45daee39f14de027bacee36ce1f5ab92616a45d650cfeab10fae52edae276759886d19dceaf8921041f330bd4da5303ba14960ae7c3352a7ef8ef06631c809b7 SHA512 23bec2ee900585a68e08b357f0aba2555fc6e9e23a21f88ece12b0741589f6e8a36e47bc5a2cc1385949aa547b663fa5870491c5d43c398524e6ad278c75622f
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-user/bitflu/bitflu-0.ebuild b/acct-user/bitflu/bitflu-0.ebuild
new file mode 100644
index 000000000000..11ea87038ad9
--- /dev/null
+++ b/acct-user/bitflu/bitflu-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-p2p/bitflu"
+
+ACCT_USER_GROUPS=( "bitflu" )
+ACCT_USER_HOME="/var/lib/bitflu"
+ACCT_USER_ID="148"
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/metadata.xml b/acct-user/bitflu/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/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-user/burrow_exporter/Manifest b/acct-user/burrow_exporter/Manifest
new file mode 100644
index 000000000000..81429d0e79ff
--- /dev/null
+++ b/acct-user/burrow_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD burrow_exporter-0.ebuild 258 BLAKE2B d741e0319cc8724b36a1a04f714c2a15c1e11d594e6676b402bea602209d632e1333e96608b4bc487b7feae818eacf136c6b0c156c980946ac91e1de6cbe9e84 SHA512 e4ee3cb6dc12c6930d01847963b7b5fb24542f5c67e6daeadfb17761781e9327765cb016e1b99ad4d8aa269c80ee037c5863e02806d94cd7b311ea1c4716b9e7
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/burrow_exporter/burrow_exporter-0.ebuild b/acct-user/burrow_exporter/burrow_exporter-0.ebuild
new file mode 100644
index 000000000000..d1e4dc7bf8d8
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0.ebuild
@@ -0,0 +1,12 @@
+# 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-metrics/burrow_exporter"
+
+ACCT_USER_ID=96
+ACCT_USER_GROUPS=( burrow_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/burrow_exporter/metadata.xml b/acct-user/burrow_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/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-user/cron/Manifest b/acct-user/cron/Manifest
new file mode 100644
index 000000000000..5599b5d74a7b
--- /dev/null
+++ b/acct-user/cron/Manifest
@@ -0,0 +1,2 @@
+EBUILD cron-0.ebuild 278 BLAKE2B bd0a67bf0888b6496cf504d77631bd326da673cbc42ddd1f317e32f873682bb95a5eb49eaf4becbfd23208ef4a7a3db01b929bff42dbb0d3043c9c881d666f71 SHA512 d34b4c070a53484b36f1fe73060a1779c1ab981c54b223de75d5226abba14ae1ad608a077c7457f1d1e3dbd22cb54b4cd461a5db82182d7bb3d6c2f078937edb
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-user/cron/cron-0.ebuild b/acct-user/cron/cron-0.ebuild
new file mode 100644
index 000000000000..7ec64484762e
--- /dev/null
+++ b/acct-user/cron/cron-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 sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+
+acct-user_add_deps
diff --git a/acct-user/cron/metadata.xml b/acct-user/cron/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/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-user/dbskkd/Manifest b/acct-user/dbskkd/Manifest
new file mode 100644
index 000000000000..f7d4c10302dc
--- /dev/null
+++ b/acct-user/dbskkd/Manifest
@@ -0,0 +1,2 @@
+EBUILD dbskkd-0.ebuild 247 BLAKE2B 380cb585f14520f3c37a00c85010e0f67ff6f0d7f02e0ebcb6f09f1ad4e2f3f35c9d8860a48516d364f1fd936c8d62701d9325c2d24766c9d2e9423ce570d65f SHA512 25899e2b8fdba85b33e7584e41d16605df724f6e8756ea1b4256e87920a2a6392fc02723f00bf62b66a5fdb2b720091d2b649080a99046e0ee41d71fa11202dd
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/acct-user/dbskkd/dbskkd-0.ebuild b/acct-user/dbskkd/dbskkd-0.ebuild
new file mode 100644
index 000000000000..07abb14a7d7e
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-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 app-i18n/dbskkd-cdb"
+
+ACCT_USER_GROUPS=( "dbskkd" )
+ACCT_USER_ID="146"
+
+acct-user_add_deps
diff --git a/acct-user/dbskkd/metadata.xml b/acct-user/dbskkd/metadata.xml
new file mode 100644
index 000000000000..6f2ca22da233
--- /dev/null
+++ b/acct-user/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-user/elasticsearch_exporter/Manifest b/acct-user/elasticsearch_exporter/Manifest
new file mode 100644
index 000000000000..7fe1891ce9be
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD elasticsearch_exporter-0.ebuild 265 BLAKE2B 0240a2a8bd3e8ae12742c1348c5bdf6ec7501f765aaf35f75f3185823b0e0d76cb08269167ba8d4d1a6a58f61722e21dbb8e400913bbbb6a3e872dad02e23f9b SHA512 97d296f17e58e98a4d66e7c175fd8a7fef3d9ea54fc39d5ac9a3155241629e44d43eb8042da25448e4f177be909834bce06d4f06e7218c6a6927263c4e34e91f
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
new file mode 100644
index 000000000000..4ec1c4d775a3
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
@@ -0,0 +1,12 @@
+# 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-metrics/burrow_exporter"
+
+ACCT_USER_ID=98
+ACCT_USER_GROUPS=( elasticsearch_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/metadata.xml b/acct-user/elasticsearch_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/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-user/fluentd/Manifest b/acct-user/fluentd/Manifest
new file mode 100644
index 000000000000..818f68243e0f
--- /dev/null
+++ b/acct-user/fluentd/Manifest
@@ -0,0 +1,2 @@
+EBUILD fluentd-0.ebuild 240 BLAKE2B e45a25cd13776fa36a3d0f3da67d48b210921bebf811ff9a472ec24a10e832ef2df8e46a81fa4c0270beaa63f4216918ad578d791f32d7c39f2b4df27ef61208 SHA512 a900cdc79b79f452fe42ca7c3e81d4a01c34e284af2d89c322dd9c111689efa94c4b74e2e40950c60a1f6ffca82dd5503f17c7dd18a1886f2f8c2bcbdb99cb62
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/fluentd/fluentd-0.ebuild b/acct-user/fluentd/fluentd-0.ebuild
new file mode 100644
index 000000000000..34104243827d
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0.ebuild
@@ -0,0 +1,12 @@
+# 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-admin/fluentd"
+
+ACCT_USER_ID=93
+ACCT_USER_GROUPS=( fluentd )
+
+acct-user_add_deps
diff --git a/acct-user/fluentd/metadata.xml b/acct-user/fluentd/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/fluentd/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-user/foldingathome/Manifest b/acct-user/foldingathome/Manifest
new file mode 100644
index 000000000000..7d795e1d7f7e
--- /dev/null
+++ b/acct-user/foldingathome/Manifest
@@ -0,0 +1,2 @@
+EBUILD foldingathome-0.ebuild 304 BLAKE2B 277939ab7f0c4c702bf3d0e02d763e227bc30ca90fc21693a74c4df98a02085f4cf6f6659a0d9a9bcd1d86f37c3b7cd2c183628808d9edda4ac4d7ca98dacad6 SHA512 f42f202c2d9e04ca1c30278e65b3aac591632a25bf9697c182f6af0a1205aa291642410d2c93e8b83adbd95ae6b24a0b1df7926e9322fa02670b7008e71b9ab7
+MISC metadata.xml 261 BLAKE2B 3768c926bca545090342a947ba83e706a8954c51b99a5e7b3476ba5198cd326fe1c3b8efb51dfd6be1800682556b8ceea065e388981463ab32f3d687951872f3 SHA512 537da0d3aa2741ebe4442d5dd9b53409decfc9d12ca8e5af8e737c4deb2910c884207e2d441025d19469816100889f04c11038bdffd6a1a15c6217495445090a
diff --git a/acct-user/foldingathome/foldingathome-0.ebuild b/acct-user/foldingathome/foldingathome-0.ebuild
new file mode 100644
index 000000000000..a09b52cd1831
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-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 sci-biology/foldingathome"
+
+ACCT_USER_GROUPS=( "foldingathome" "video" )
+ACCT_USER_HOME="/opt/foldingathome"
+ACCT_USER_ID="128"
+
+acct-user_add_deps
diff --git a/acct-user/foldingathome/metadata.xml b/acct-user/foldingathome/metadata.xml
new file mode 100644
index 000000000000..8417d1580d40
--- /dev/null
+++ b/acct-user/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-user/ftp/Manifest b/acct-user/ftp/Manifest
index 9e038e5552b8..d303b2d4de00 100644
--- a/acct-user/ftp/Manifest
+++ b/acct-user/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r1.ebuild 297 BLAKE2B 882a7a410d4651f77a987a0e180682a7e360f5ccd3a48cf9ce469c5f63afc2176f6746952df9fcd2d3689b2ca99b69f727f9b365ca4c7a80bce8db3955a5a8b6 SHA512 d5692734d15cb21f5636bb9cea69a1498948ef8512e073758a45941da4405bd7683fbe4912bf5e4d019d98c92c574c746012d325f87a0ce98bf12000874ce40f
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD ftp-0-r2.ebuild 283 BLAKE2B d8d60873311e858178a8bfc957d3ea15a18a86481b8ee6f368727ff880927c3594c7558a0bab3d504d5814c4b13b82683138abaf1f1921ef7e7ddaa77dbd3477 SHA512 ce36684fd79dbde270b142bd56849a7e664288e3082fdff512c4d14476d4e05240bdc78dcd160dcdc4533e01325454e390ff0f96716065e3cd616498687f9c23
+MISC metadata.xml 274 BLAKE2B c59fed5aad018cd55f4f85487a90e3d8d78837bbbbb80b0ac62869cf194cfc95be0f1f7ae156442c023d95496718fb9d3d18ce27892cfb1b27b3dae6a55e305f SHA512 8e2d70309bb9f0df147669de9f9a92aa27d350cb39c932370a72f2a601e62a19c076aaf4778268b43ef527649973033b0983a3707f0da79ece964ae339aff6f9
diff --git a/acct-user/ftp/ftp-0-r1.ebuild b/acct-user/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index de40a1fdbe1d..000000000000
--- a/acct-user/ftp/ftp-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="File Transfer Protocol server user"
-ACCT_USER_ID=21
-ACCT_USER_HOME=/home/ftp
-ACCT_USER_HOME_OWNER=root:ftp
-ACCT_USER_GROUPS=( ftp )
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r2.ebuild b/acct-user/ftp/ftp-0-r2.ebuild
new file mode 100644
index 000000000000..b514d0c81496
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="File Transfer Protocol (FTP) server user"
+
+ACCT_USER_GROUPS=( "ftp" )
+ACCT_USER_HOME="/var/lib/ftp"
+ACCT_USER_ID="21"
+
+acct-user_add_deps
diff --git a/acct-user/ftp/metadata.xml b/acct-user/ftp/metadata.xml
index 7a38bb900964..debde3ef6ae3 100644
--- a/acct-user/ftp/metadata.xml
+++ b/acct-user/ftp/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/acct-user/gauth/Manifest b/acct-user/gauth/Manifest
new file mode 100644
index 000000000000..bd8143d41177
--- /dev/null
+++ b/acct-user/gauth/Manifest
@@ -0,0 +1,2 @@
+EBUILD gauth-0.ebuild 265 BLAKE2B 31e996d6834ac1cde40a25cfd702d816d74385df3a5cbc1f3b5d819e342f0e456d60ea14357108d84f5bb2ffddb964d0c6cabd61bd70ef3b3a4df25f2d22ff5b SHA512 fb7856d8798e71462cf1157c1f621c26dffcaba73012b4986e2245d4a97a8823f23ce286437f8ff033cefb025bd7ada1de1aa7ad1deaae8b714bea07ace767f0
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/acct-user/gauth/gauth-0.ebuild b/acct-user/gauth/gauth-0.ebuild
new file mode 100644
index 000000000000..97ad122a12bb
--- /dev/null
+++ b/acct-user/gauth/gauth-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
+
+ACCT_USER_GROUPS=( "gauth" )
+ACCT_USER_ID="138"
+
+acct-user_add_deps
diff --git a/acct-user/gauth/metadata.xml b/acct-user/gauth/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/acct-user/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-user/gopherd/Manifest b/acct-user/gopherd/Manifest
new file mode 100644
index 000000000000..d02587d4da57
--- /dev/null
+++ b/acct-user/gopherd/Manifest
@@ -0,0 +1,2 @@
+EBUILD gopherd-0.ebuild 276 BLAKE2B 6a223e50bc59ce6e9c804b3a9bdad43da7608e6ff127ee45b32304d5943de1d322bafb6664f804279780bbcf67de1591a4016504ab175b65a722fabb5bbfa148 SHA512 ba112e01d723978f42d1b408c4e75fd06e00af52f7cd32af74209c4d6efe98e7e1c488404c228d5c064da423684a6a1c5878ec2a98bc4ccd4e2d62a7dbe59c73
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/acct-user/gopherd/gopherd-0.ebuild b/acct-user/gopherd/gopherd-0.ebuild
new file mode 100644
index 000000000000..fe62a2eccb04
--- /dev/null
+++ b/acct-user/gopherd/gopherd-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-misc/geomyidae"
+
+ACCT_USER_GROUPS=( "gopherd" )
+ACCT_USER_HOME="/var/gopher"
+ACCT_USER_ID="132"
+
+acct-user_add_deps
diff --git a/acct-user/gopherd/metadata.xml b/acct-user/gopherd/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/acct-user/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-user/grok_exporter/Manifest b/acct-user/grok_exporter/Manifest
new file mode 100644
index 000000000000..a0a3f7623872
--- /dev/null
+++ b/acct-user/grok_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD grok_exporter-0.ebuild 255 BLAKE2B 31069c2ac77954eabd35cf8e33ddfcb6652cbcfccf8da5d592355ef296ff66958c97df5bd347986f476d8de36409149e3f8ea484c920015d7aa9b2a5dd9593fb SHA512 55937de55bd412846a4698c892403ecee1905921b6370fd7727b128ebe45b38af09c97962187f6d6050ab5142a5292a2479b1ddeca0a6fdd1c9d1bbace91505c
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/grok_exporter/grok_exporter-0.ebuild b/acct-user/grok_exporter/grok_exporter-0.ebuild
new file mode 100644
index 000000000000..c58147fb8bc5
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0.ebuild
@@ -0,0 +1,12 @@
+# 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-metrics/grok_exporter"
+
+ACCT_USER_ID=104
+ACCT_USER_GROUPS=( grok_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/metadata.xml b/acct-user/grok_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/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-user/h2o/Manifest b/acct-user/h2o/Manifest
new file mode 100644
index 000000000000..475b5a42acce
--- /dev/null
+++ b/acct-user/h2o/Manifest
@@ -0,0 +1,2 @@
+EBUILD h2o-0.ebuild 240 BLAKE2B 1fec3cbc69c51a521455776426cd3e672eb84e43a2a1feae998702558425b2f85a5d5c8a3e7948a76298ff7da082fd838fbbd696970f5d55932ad64396f972de SHA512 9f9db91d65ff1707372dd5470a4d4a4b6ba9991d1567cf0c0e82f9886c0b8b87612c75839e6668ab5bff295afb7e7fc6427295ac80a8de61eeca2e7c322ab566
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/acct-user/h2o/h2o-0.ebuild b/acct-user/h2o/h2o-0.ebuild
new file mode 100644
index 000000000000..356f1e56ec29
--- /dev/null
+++ b/acct-user/h2o/h2o-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 www-servers/h2o"
+
+ACCT_USER_GROUPS=( "h2o" )
+ACCT_USER_ID="141"
+
+acct-user_add_deps
diff --git a/acct-user/h2o/metadata.xml b/acct-user/h2o/metadata.xml
new file mode 100644
index 000000000000..7ffc4339bc56
--- /dev/null
+++ b/acct-user/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-user/hacluster/Manifest b/acct-user/hacluster/Manifest
new file mode 100644
index 000000000000..36932437c82e
--- /dev/null
+++ b/acct-user/hacluster/Manifest
@@ -0,0 +1,2 @@
+EBUILD hacluster-0.ebuild 290 BLAKE2B f7a2214a320f111d7b47cee7796eb955961cf79fe86f65f2ccc36d85c6ed6d041f475712d5b16393a1e5be0a1f9b55264eac176119787ee6443a063ed3f1f6dd SHA512 9aa8700f061a9229c0e3179cf8403321d62aa8bb1bc02f076db2f21fb9cfec40cfc50a9b469d5762a0057da53717be306468bd5fd1a02a1da52eae5665d21284
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-user/hacluster/hacluster-0.ebuild b/acct-user/hacluster/hacluster-0.ebuild
new file mode 100644
index 000000000000..7558b70e8c0d
--- /dev/null
+++ b/acct-user/hacluster/hacluster-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 sys-cluster/cluster-glue"
+
+ACCT_USER_GROUPS=( "haclient" )
+ACCT_USER_HOME="/var/lib/heartbeat"
+ACCT_USER_ID="304"
+
+acct-user_add_deps
diff --git a/acct-user/hacluster/metadata.xml b/acct-user/hacluster/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-user/hacluster/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-user/icecast/Manifest b/acct-user/icecast/Manifest
new file mode 100644
index 000000000000..0a4dd5f6f56d
--- /dev/null
+++ b/acct-user/icecast/Manifest
@@ -0,0 +1,2 @@
+EBUILD icecast-0.ebuild 245 BLAKE2B 8b430097e23b9528d17caa20148d04d8b084d1c07419c5f4c3a9dd845c11fb4b4fd2024fc639e0c0cc53430bf42d546c90fcf92a52dae44dab9ea254ab54afef SHA512 6e3b41e667d7b0b538ecd7a6ce77e8b696d7a87155f25c4c63e37470f54befc978d40f5dd4687d010f4d04da7b8541ad3a03e13528a0ae8321f7b23a26e119e3
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/acct-user/icecast/icecast-0.ebuild b/acct-user/icecast/icecast-0.ebuild
new file mode 100644
index 000000000000..50f822213b0b
--- /dev/null
+++ b/acct-user/icecast/icecast-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/icecast"
+
+ACCT_USER_GROUPS=( "icecast" )
+ACCT_USER_ID="131"
+
+acct-user_add_deps
diff --git a/acct-user/icecast/metadata.xml b/acct-user/icecast/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-user/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-user/icecream/Manifest b/acct-user/icecream/Manifest
new file mode 100644
index 000000000000..323da86470c2
--- /dev/null
+++ b/acct-user/icecream/Manifest
@@ -0,0 +1,2 @@
+EBUILD icecream-0.ebuild 285 BLAKE2B 19535fce6d34682586f64ec1998fbc85f7ae3b3eff8dced88a578a3da5120d9afc813415e65e1d06ed1965a0569bb0848c60345130a87bdaf0b4c23e023abecd SHA512 79a420440950c92c2c3e4f4a625c8f7ae899965dd513b21bc4678b9523990ff67226392efb75cde225c0b558d364252c9fdd3041055d675913ccbcfb187ef801
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-user/icecream/icecream-0.ebuild b/acct-user/icecream/icecream-0.ebuild
new file mode 100644
index 000000000000..267a068e5776
--- /dev/null
+++ b/acct-user/icecream/icecream-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 sys-devel/icecream"
+
+ACCT_USER_GROUPS=( "icecream" )
+ACCT_USER_HOME="/var/cache/icecream"
+ACCT_USER_ID="145"
+
+acct-user_add_deps
diff --git a/acct-user/icecream/metadata.xml b/acct-user/icecream/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-user/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-user/monkeyd/Manifest b/acct-user/monkeyd/Manifest
new file mode 100644
index 000000000000..eb21b499495f
--- /dev/null
+++ b/acct-user/monkeyd/Manifest
@@ -0,0 +1,2 @@
+EBUILD monkeyd-0.ebuild 310 BLAKE2B 3408231a1f46ad33dfae79549ba592efbd84044edd817d14d59f9d4b0f235dba36da046ff5e88c3b0676ca42decb0eb59f815c32f4ef30330300e7ec7dd89a65 SHA512 14493c8b57edf791d541d9ba854a9963b7df7c573b4b04c2668c55b4dc16ccb3f330494010bb6950caebf268aec29ed6d12487203507acd6b61ed843a6b86a7c
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-user/monkeyd/metadata.xml b/acct-user/monkeyd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/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-user/monkeyd/monkeyd-0.ebuild b/acct-user/monkeyd/monkeyd-0.ebuild
new file mode 100644
index 000000000000..55cb3b5ff5d2
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-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 www-servers/monkeyd"
+
+ACCT_USER_GROUPS=( "monkeyd" )
+ACCT_USER_HOME="/var/tmp/monkeyd"
+ACCT_USER_HOME_PERMS="0770"
+ACCT_USER_ID="149"
+
+acct-user_add_deps
diff --git a/acct-user/munge/Manifest b/acct-user/munge/Manifest
new file mode 100644
index 000000000000..0942d7d158d9
--- /dev/null
+++ b/acct-user/munge/Manifest
@@ -0,0 +1,2 @@
+EBUILD munge-0.ebuild 273 BLAKE2B a0ef6e47b41a87865bcf3480c9543b84d0cabe79ce444e02e1cbabebe555db2fcf4a2854074f0f34b2d56e3055e009c812ee3342df4a531915a7ea6ac62b0cd6 SHA512 f69b6f4a45d2d851a04defa6191675a3eba9b1b088f08cd8b60af5cf1b9baa0a72c87448b523be6c5b5fe43d6792304ebbe2cd51058670d6db00b79aeb307e2a
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-user/munge/metadata.xml b/acct-user/munge/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-user/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-user/munge/munge-0.ebuild b/acct-user/munge/munge-0.ebuild
new file mode 100644
index 000000000000..fa2e7d4fe227
--- /dev/null
+++ b/acct-user/munge/munge-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 sys-auth/munge"
+
+ACCT_USER_GROUPS=( "munge" )
+ACCT_USER_HOME="/var/lib/munge"
+ACCT_USER_ID="144"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/Manifest b/acct-user/nm-openconnect/Manifest
new file mode 100644
index 000000000000..59734a4dbb93
--- /dev/null
+++ b/acct-user/nm-openconnect/Manifest
@@ -0,0 +1,2 @@
+EBUILD nm-openconnect-0.ebuild 270 BLAKE2B 6468b44cb44f674c7f06d568eec9d992b90eff7033495524dffac2078672accb76745637219cbfd85c1f417a3c233308f03c2af2af75b8ff4324acd989c6174d SHA512 410388cafd2571b943435a9f63546934db760e8919067566b7b5799cce29c5ace24e935dcc58019a3d390ed7f15603f11c5fd0cd6bba0f7fca526befaa1df971
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/nm-openconnect/metadata.xml b/acct-user/nm-openconnect/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-user/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-user/nm-openconnect/nm-openconnect-0.ebuild b/acct-user/nm-openconnect/nm-openconnect-0.ebuild
new file mode 100644
index 000000000000..aee4002155c4
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-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-vpn/networkmanager-openconnect"
+
+ACCT_USER_GROUPS=( "nm-openconnect" )
+ACCT_USER_ID="142"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openvpn/Manifest b/acct-user/nm-openvpn/Manifest
new file mode 100644
index 000000000000..a4d091fec542
--- /dev/null
+++ b/acct-user/nm-openvpn/Manifest
@@ -0,0 +1,2 @@
+EBUILD nm-openvpn-0.ebuild 262 BLAKE2B 841d3e5ae6d16a47463d3e7d1d7b946aeccc379daaa1a905e2ef4ce80218d27be320311254b56d1f0b2b407e89fc9402381354ccd8f690fb2c60cc463a1a0828 SHA512 3af825a6e17f5b840c5291152464747e55d7c1f0e436b8dc1002b868b42e1b9f1ad56d3de486db34d2fc8ded11a0d047de80f01018331aadb00b05332dd94d55
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-user/nm-openvpn/metadata.xml b/acct-user/nm-openvpn/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-user/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-user/nm-openvpn/nm-openvpn-0.ebuild b/acct-user/nm-openvpn/nm-openvpn-0.ebuild
new file mode 100644
index 000000000000..6a7cef1e2ce4
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-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-vpn/networkmanager-openvpn"
+
+ACCT_USER_GROUPS=( "nm-openvpn" )
+ACCT_USER_ID="143"
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/Manifest b/acct-user/pushgateway/Manifest
new file mode 100644
index 000000000000..25a10e4d77ba
--- /dev/null
+++ b/acct-user/pushgateway/Manifest
@@ -0,0 +1,2 @@
+EBUILD pushgateway-0.ebuild 256 BLAKE2B a49fb3d243d4c603afd7880665dbaf61c2f1c6663a5df00c07f339b31688629b87bec0ec7c2fd4a9991700293870776fe135c3e1f7eb9efd465cb5ba32d94df2 SHA512 16c349b3300a241657fd314c24fe5207145299e48893afe36a4059f5c15dd31965a9ff2dbc1ce873ac33c6d5629c61efff42d9e39c4d561519ef95609d98bfc7
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-user/pushgateway/metadata.xml b/acct-user/pushgateway/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-user/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-user/pushgateway/pushgateway-0.ebuild b/acct-user/pushgateway/pushgateway-0.ebuild
new file mode 100644
index 000000000000..dfd5dad5e837
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-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 app-metrics/pushgateway"
+
+ACCT_USER_GROUPS=( "pushgateway" )
+ACCT_USER_ID="288"
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/Manifest b/acct-user/rabbitmq/Manifest
new file mode 100644
index 000000000000..cc73b7a4d938
--- /dev/null
+++ b/acct-user/rabbitmq/Manifest
@@ -0,0 +1,2 @@
+EBUILD rabbitmq-0.ebuild 317 BLAKE2B f1c1a2dcadf76d82630a02b448fa1ea3b25c29f65901e91d440b1dfe2168782689cd212a05784933f9fcbc1a97a21fa3f95398a298ab31369388b1f8f7c7a863 SHA512 6d095af0f7fc2ae35101130aacac3f59ec426bf91f3c88469db7abec21225cdaac1e4525ed684d63d6fb89cf37191111333160968a0dbb9796f57437723c802b
+MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/acct-user/rabbitmq/metadata.xml b/acct-user/rabbitmq/metadata.xml
new file mode 100644
index 000000000000..69bc0ccc3d1f
--- /dev/null
+++ b/acct-user/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-user/rabbitmq/rabbitmq-0.ebuild b/acct-user/rabbitmq/rabbitmq-0.ebuild
new file mode 100644
index 000000000000..23f7f618a8fc
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-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 net-misc/rabbitmq-server"
+
+ACCT_USER_GROUPS=( "rabbitmq" )
+ACCT_USER_HOME="/var/lib/rabbitmq"
+ACCT_USER_HOME_PERMS="0750"
+ACCT_USER_ID="121"
+
+acct-user_add_deps
diff --git a/acct-user/radicale/Manifest b/acct-user/radicale/Manifest
index 8a61028de803..b0984d6b0f6a 100644
--- a/acct-user/radicale/Manifest
+++ b/acct-user/radicale/Manifest
@@ -1,2 +1,2 @@
 EBUILD radicale-0-r1.ebuild 240 BLAKE2B 0c7a5a7e3e12839f5d8c6c0148b904202459c7f68b69d1549b22126a97df469fbd2a04002e202c73b1e15461ae2bb6d2b95827ca288c4b2fdd782225a8b001d1 SHA512 1b908048b7110daa8accb9779caf328f4d094c404e5a650913ea453e4f5f62a0a16a4f562075e801e3eb51f2631bf4721cc0eec15f0ebaf5eff64482268fe8ee
-MISC metadata.xml 395 BLAKE2B 3ad137c6a9e304d422d2ba144d103bf38282f59e11e062069853c18bdf69a92eb3d797c6983281765ccdb62a99e803ca2af4b761d14dd5bec18b313cae83be2a SHA512 68f8cec25688948425b31a72a62d870626e4a427e9fb6df5f55c83cdd1b6f3dbdddb0a4ff37a2a3a51ba2d1e55ecba0e5697cf67e15641f444b5d1fe69c11a2b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/radicale/metadata.xml b/acct-user/radicale/metadata.xml
index f8ffe025bba5..7a38bb900964 100644
--- a/acct-user/radicale/metadata.xml
+++ b/acct-user/radicale/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/rbot/Manifest b/acct-user/rbot/Manifest
new file mode 100644
index 000000000000..7641a397ff9d
--- /dev/null
+++ b/acct-user/rbot/Manifest
@@ -0,0 +1,2 @@
+EBUILD rbot-0.ebuild 269 BLAKE2B 8e10224f68393f76eb342d4a932335db70ccf6bab68d36985fed46b666e59c842b8be290629ef9e3ea4e22f561a2304726bc1fbda5600349e6f3008605145317 SHA512 8b7d57a2f138ffe0cc88d8a4dc3136b8259b1c30c0eb2d4e0b8425656fd44316dcb40b31ecb33f49a19dd24946d017ee356a6993c31cc382b2e13dfe67942196
+MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/acct-user/rbot/metadata.xml b/acct-user/rbot/metadata.xml
new file mode 100644
index 000000000000..eb1e47f2edfb
--- /dev/null
+++ b/acct-user/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-user/rbot/rbot-0.ebuild b/acct-user/rbot/rbot-0.ebuild
new file mode 100644
index 000000000000..c4e767ac30a0
--- /dev/null
+++ b/acct-user/rbot/rbot-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-irc/rbot"
+
+ACCT_USER_GROUPS=( "rbot" )
+ACCT_USER_HOME="/var/lib/rbot"
+ACCT_USER_ID="129"
+
+acct-user_add_deps
diff --git a/acct-user/redsocks/Manifest b/acct-user/redsocks/Manifest
index c28c45214398..b7180450f470 100644
--- a/acct-user/redsocks/Manifest
+++ b/acct-user/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0.ebuild 248 BLAKE2B 0fd52aea14d5f4c4ab852d8c2138b9805b56bc2031f236ac0ac26fb7f65e7f6ab440baf46248d9c5d1295474a5634b769a00ba9dbfd6b46f0420ab88d12300e5 SHA512 dc102441032879b9d75cdc9bfbccb621913d44fc5f688ceed82f8da9f60d7ebf5ab92154ab0d77559901bd39ca0bff85af02efafbde0427c0491d1c29acd3054
+EBUILD redsocks-0-r1.ebuild 248 BLAKE2B dd8af09bacb87f34440451d88c41c27ad5cb0b0abc761e14eeaa31c0905fb784c133af4756b34f909ed8c644402a65f3af192367abc21a27c2b5aaad73b16cbc SHA512 99759876fdfe7e4e8ce0f68afc1388551cfe1ea1e46a0de924226dd5e0ffcae5e5afc87e580b318d4e49a3fe6b7c1211cad4cf8268dc6f58439d5d3b6f8645e2
 MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-user/redsocks/redsocks-0-r1.ebuild b/acct-user/redsocks/redsocks-0-r1.ebuild
new file mode 100644
index 000000000000..b59a8084d4d4
--- /dev/null
+++ b/acct-user/redsocks/redsocks-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-proxy/redsocks"
+
+ACCT_USER_GROUPS=( "redsocks" )
+ACCT_USER_ID="154"
+
+acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0.ebuild b/acct-user/redsocks/redsocks-0.ebuild
deleted file mode 100644
index 05a1acdcd320..000000000000
--- a/acct-user/redsocks/redsocks-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-proxy/redsocks"
-
-ACCT_USER_GROUPS=( "redsocks" )
-ACCT_USER_ID="155"
-
-acct-user_add_deps
diff --git a/acct-user/reg/Manifest b/acct-user/reg/Manifest
new file mode 100644
index 000000000000..2e5d9bbb5349
--- /dev/null
+++ b/acct-user/reg/Manifest
@@ -0,0 +1,2 @@
+EBUILD reg-0.ebuild 264 BLAKE2B bfb9e0ab960734d7c9c8b924e699b89e1080453662dbb19ac2349be50e720acf4191c97488d92b4ea31f5f97d3999d76b740e5b3f79df4dbad171c3c55a5ecbf SHA512 2f5e33c3fa88bf2480093c2bb18f400fa0f3ebed916033f7a610b514e06334218c7f14e15312276c671171c37b21936cdd9c19d54e12b8cd7f11d6dbb8b8cf5f
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/reg/metadata.xml b/acct-user/reg/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/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-user/reg/reg-0.ebuild b/acct-user/reg/reg-0.ebuild
new file mode 100644
index 000000000000..8dbc96cdd96d
--- /dev/null
+++ b/acct-user/reg/reg-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 app-emulation/reg"
+
+ACCT_USER_ID=94
+ACCT_USER_GROUPS=( reg )
+ACCT_USER_HOME=/var/lib/reg
+
+acct-user_add_deps
diff --git a/acct-user/registry/Manifest b/acct-user/registry/Manifest
new file mode 100644
index 000000000000..ef379107142b
--- /dev/null
+++ b/acct-user/registry/Manifest
@@ -0,0 +1,2 @@
+EBUILD registry-0.ebuild 259 BLAKE2B 1b74a888c4a198116cf7976d27597ffae9b87df8637aa6789df2e1e26c03631fcfc23ac215721128ad5730c8959f3ec82cc0d9ca5270b67c531e7dc5133fa842 SHA512 4d35586e0eab5e067a876a1e977c39b76a8f5363ec3bb222eb917c4607a823e0947dcf39229489076b8d6d5fcf992b70d0dca8ddb25e02dd3dc53eb5a95cafae
+MISC metadata.xml 218 BLAKE2B f63c4372636935e7256d36ac161834b70e06a230bb93dda9861c41e6851132374566392a61846230a1eb2fd83b9538d06d79bbcc5a46aef706499020d3eefd15 SHA512 af3366d437ebdd44a0ef73c5b166e55c5443423447f72b0de88bc3cf6e8f23ffb823ef10ad6051a01a05ac73ae6e87cec58064b582854bf34120bbd755d859eb
diff --git a/acct-user/registry/metadata.xml b/acct-user/registry/metadata.xml
new file mode 100644
index 000000000000..9a7ba2ff3c46
--- /dev/null
+++ b/acct-user/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-user/registry/registry-0.ebuild b/acct-user/registry/registry-0.ebuild
new file mode 100644
index 000000000000..93323d5b3713
--- /dev/null
+++ b/acct-user/registry/registry-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 app-emulation/docker-registry"
+
+ACCT_USER_GROUPS=( "registry" )
+ACCT_USER_ID="295"
+
+acct-user_add_deps
diff --git a/acct-user/ros/Manifest b/acct-user/ros/Manifest
new file mode 100644
index 000000000000..2d73283383d4
--- /dev/null
+++ b/acct-user/ros/Manifest
@@ -0,0 +1,2 @@
+EBUILD ros-0.ebuild 269 BLAKE2B fdc4f9d3cccdfd391f8f1930bcd54c155ca4b8437305077df387087c5a94af1d5cb68febf5cefccc43a1753573cae802e27457373e4ab5eef6823168a75464b9 SHA512 9275c99874ea453efabbcb79e44445f43fb696467f0614c99f969298e5ac128fff1e09f808a05dd8d58b33667d37afa13362836c1348fb63db542ced47e96836
+MISC metadata.xml 249 BLAKE2B 05e1e70021900498f37045733d9cf72175655cc72ef45d5cc5593c6fe6c04bf8a1895a6b40470e31ba15254dbf2c0e71dca9da3e1a7e7a0c76ffea90ca518f82 SHA512 f6c1880cb315572548c1cea0233124f8dfb99091c9dff06484f02847e4a6ab4bbecd627f2d561ef3d666c99c240195031294d170024fd2549dec228b7058bb71
diff --git a/acct-user/ros/metadata.xml b/acct-user/ros/metadata.xml
new file mode 100644
index 000000000000..74ced8bea005
--- /dev/null
+++ b/acct-user/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-user/ros/ros-0.ebuild b/acct-user/ros/ros-0.ebuild
new file mode 100644
index 000000000000..78fb0313969b
--- /dev/null
+++ b/acct-user/ros/ros-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 dev-ros/roslaunch"
+
+ACCT_USER_GROUPS=( "ros" )
+ACCT_USER_HOME="/home/ros"
+ACCT_USER_ID="130"
+
+acct-user_add_deps
diff --git a/acct-user/subsonic/Manifest b/acct-user/subsonic/Manifest
new file mode 100644
index 000000000000..b51ecc208dbd
--- /dev/null
+++ b/acct-user/subsonic/Manifest
@@ -0,0 +1,2 @@
+EBUILD subsonic-0.ebuild 289 BLAKE2B 8688d4f05adf1115b5ddb59dad30c39fc7a45549819280a3309b9007fd24a0209a17d918dc90cd4b8b8e0336231682db5e5605701acb66a4514d17897b07c25a SHA512 5c4639de09d9c93b85cb43de9f28598fb522896bc71e594a16ba3331c3d5524e7077b39855d7dd287eecad88be539bcbbf6d8c89ed1074371bf966cf4c24ce19
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/acct-user/subsonic/metadata.xml b/acct-user/subsonic/metadata.xml
new file mode 100644
index 000000000000..76f45cdee0f4
--- /dev/null
+++ b/acct-user/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-user/subsonic/subsonic-0.ebuild b/acct-user/subsonic/subsonic-0.ebuild
new file mode 100644
index 000000000000..e5a5b6d412ec
--- /dev/null
+++ b/acct-user/subsonic/subsonic-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 media-sound/subsonic-bin"
+
+ACCT_USER_GROUPS=( "subsonic" )
+ACCT_USER_HOME="/var/lib/subsonic"
+ACCT_USER_ID="126"
+
+acct-user_add_deps
diff --git a/acct-user/thttpd/Manifest b/acct-user/thttpd/Manifest
new file mode 100644
index 000000000000..0ff68945b399
--- /dev/null
+++ b/acct-user/thttpd/Manifest
@@ -0,0 +1,2 @@
+EBUILD thttpd-0.ebuild 246 BLAKE2B 7c68fec86f532966eb754503f62cfa1bed197681336afcec1865fe7a9b46840983d94902f0e66610dc968dbbdfa9224cd6daab7d3bfdffae4472a69dfba1ebb4 SHA512 e73e97b870bafd17058090152d080c9eefd4c5e8e62ffdddd46839894b2e8944c0adadafbf75951de301dd3781e49eba563e708eb811d41a4855e5d56afec9e1
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-user/thttpd/metadata.xml b/acct-user/thttpd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/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-user/thttpd/thttpd-0.ebuild b/acct-user/thttpd/thttpd-0.ebuild
new file mode 100644
index 000000000000..4dcafd47f24b
--- /dev/null
+++ b/acct-user/thttpd/thttpd-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 www-servers/thttpd"
+
+ACCT_USER_GROUPS=( "thttpd" )
+ACCT_USER_ID="155"
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/Manifest b/acct-user/ulogd/Manifest
index 2f4ce9db7d45..6f19af034c72 100644
--- a/acct-user/ulogd/Manifest
+++ b/acct-user/ulogd/Manifest
@@ -1,2 +1,2 @@
 EBUILD ulogd-0.ebuild 225 BLAKE2B c0b96b744ca1d4a23f702aa29ce86406674f5557fbc924998902c21bffc7f848b15787b1ffa5ce7feecf31e680789b9e05200ec552b4d49ae67985fbfe39807c SHA512 4c92cf2a31900ba4ed4d1841dc3a5a965e83411cbef582becb1ee8f94e9ba415ec24c38860a2da958406a7bfd6bd0cd3c58615198b255cf582446b9c5052700e
-MISC metadata.xml 395 BLAKE2B 3ad137c6a9e304d422d2ba144d103bf38282f59e11e062069853c18bdf69a92eb3d797c6983281765ccdb62a99e803ca2af4b761d14dd5bec18b313cae83be2a SHA512 68f8cec25688948425b31a72a62d870626e4a427e9fb6df5f55c83cdd1b6f3dbdddb0a4ff37a2a3a51ba2d1e55ecba0e5697cf67e15641f444b5d1fe69c11a2b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/ulogd/metadata.xml b/acct-user/ulogd/metadata.xml
index f8ffe025bba5..7a38bb900964 100644
--- a/acct-user/ulogd/metadata.xml
+++ b/acct-user/ulogd/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/uwsgi_exporter/Manifest b/acct-user/uwsgi_exporter/Manifest
new file mode 100644
index 000000000000..705e6352a92f
--- /dev/null
+++ b/acct-user/uwsgi_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD uwsgi_exporter-0.ebuild 262 BLAKE2B 22587220b370c6dee95583d3a4a227ea9fe0264d61ea24777d5acab159e8623a7e28dd37498975d01310e35fe0f74a0b588f9736ef17ac90311ac97acfc0a84c SHA512 df57d00697dd1e64d3115b9c3706beb21f7f8a09e00a8c8e95e354c595cc59dddde85ce94a3f2e32e3dd5f49ecde1b0ff7f1c3e3560b16e3d9421f422d3fdaba
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-user/uwsgi_exporter/metadata.xml b/acct-user/uwsgi_exporter/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-user/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-user/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
new file mode 100644
index 000000000000..616326db2f4b
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-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 app-metrics/uwsgi_exporter"
+
+ACCT_USER_GROUPS=( "uwsgi_exporter" )
+ACCT_USER_ID="289"
+
+acct-user_add_deps
diff --git a/acct-user/vacation/Manifest b/acct-user/vacation/Manifest
new file mode 100644
index 000000000000..288d5389ad49
--- /dev/null
+++ b/acct-user/vacation/Manifest
@@ -0,0 +1,2 @@
+EBUILD vacation-0.ebuild 251 BLAKE2B 2f90a12abd0d44bed2e78a576042011a79643349551285e00f08f14bcd3622ea26a8023633b838deeced25e0e0f88d6b3fc4502b786261afb5e06b75b3c9b6d0 SHA512 ff302e688ee57f27d223c42c5d69a27ffd6ed288740c290e7398088aef8148ea75680bf97b06bae1e6278db126cb8bd152b4033b5d928b1ab06231ea342adb3a
+MISC metadata.xml 388 BLAKE2B cbeddd9c86ad8377993831213c30e3d6070f9371ad9900a76207e264908e2ba907fa51ccbee72cec226f532c01f15c5d9b267ce6b7738ad2ed79d9f35dbe744b SHA512 a7c6478fb356e985fe02e29c1133a77fd3e3faf56ee11f94d7bbcef01eadb4329cd66e0e2eadc88da221c1153b96805ebee7b04642fc515ca9eb993f7dfafee5
diff --git a/acct-user/vacation/metadata.xml b/acct-user/vacation/metadata.xml
new file mode 100644
index 000000000000..0deb5ccf6202
--- /dev/null
+++ b/acct-user/vacation/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/acct-user/vacation/vacation-0.ebuild b/acct-user/vacation/vacation-0.ebuild
new file mode 100644
index 000000000000..318ff1bf4acb
--- /dev/null
+++ b/acct-user/vacation/vacation-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 www-apps/postfixadmin"
+
+ACCT_USER_GROUPS=( "vacation" )
+ACCT_USER_ID="125"
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ec1ea15b839a..71c24cc6edf8 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 4738f4b571be..d89cb1a980d4 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,3 @@
 DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b
-EBUILD orca-40.0.ebuild 1596 BLAKE2B ccbd51fe9f25ce4f23f1abbb96cce99c5196d4daff9890ccbc1cf2b870197d6b16d821d6e7150a2fef714ae930f47e2cd0065c2b598ef2e62b97c8bfa5270c6b SHA512 04ecf87baf989cd16260f7c08f1ef740aa8983c46437123facaf7667caafe76b61e333257230e54cca121c5e8ecc35b07a99648ae0d56b9de1df7ccefde8b569
+EBUILD orca-40.0.ebuild 1554 BLAKE2B 5acffbb4c7175a01e0a694a8a43dd2c65b0c77744751680f7cae4158964da15289a979afc9aee9a36cdc92745393e23cb6bc54cf4449ac701f8bd20026977153 SHA512 0727bf8591fa63634a4326cc4ad054325726d679afa3c978ed02e3044a5e11f65f790b8d28c60453b3948dc238e948c197c3d7131bd0fb9cfd7f6e798f4f6b4b
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-40.0.ebuild b/app-accessibility/orca/orca-40.0.ebuild
index 77a3754d3af5..64f62b0d74a3 100644
--- a/app-accessibility/orca/orca-40.0.ebuild
+++ b/app-accessibility/orca/orca-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome2 python-single-r1
@@ -25,22 +25,22 @@ DEPEND="${PYTHON_DEPS}
 	media-libs/gstreamer:1.0[introspection]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
 	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
 	')
 	braille? (
 		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_USEDEP}]
 		')
 	)
 "
 RDEPEND="${DEPEND}
 	dev-libs/atk[introspection]
 	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
 	')
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 174a25f5ecbf..1ce7aff3eebf 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 05db82fbd9c6..a65464af398d 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,6 +2,6 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
 DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e
-EBUILD abrt-2.14.2.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
-EBUILD abrt-2.14.5.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
+EBUILD abrt-2.14.2.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
+EBUILD abrt-2.14.5.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
 MISC metadata.xml 327 BLAKE2B 856e3ab03170c985b08a7c11282af63794b0447b04d221803badcb19a9145adaa91d7637a6fe864618c469d2dfa7796bb39a3ef5ab2116eb7861f2793961dd0b SHA512 4ab7758c443c8c34f579d9b89e9b2c8aeeaf2b83f8bef397d1d56e24779708e761324eea26c0ef69283c9a018b7e7f82492a534683509040facefa382d9a3acb
diff --git a/app-admin/abrt/abrt-2.14.2.ebuild b/app-admin/abrt/abrt-2.14.2.ebuild
index 16a5250da01e..6756dd1e66a6 100644
--- a/app-admin/abrt/abrt-2.14.2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -41,15 +41,15 @@ RDEPEND="${DEPEND}
 	sys-apps/util-linux
 	>=sys-devel/gdb-7
 	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_USEDEP}]
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			dev-python/argh[${PYTHON_USEDEP}]
+			dev-python/humanize[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)
 	app-text/asciidoc
 	app-text/xmlto
diff --git a/app-admin/abrt/abrt-2.14.5.ebuild b/app-admin/abrt/abrt-2.14.5.ebuild
index 16a5250da01e..6756dd1e66a6 100644
--- a/app-admin/abrt/abrt-2.14.5.ebuild
+++ b/app-admin/abrt/abrt-2.14.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -41,15 +41,15 @@ RDEPEND="${DEPEND}
 	sys-apps/util-linux
 	>=sys-devel/gdb-7
 	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_USEDEP}]
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			dev-python/argh[${PYTHON_USEDEP}]
+			dev-python/humanize[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)
 	app-text/asciidoc
 	app-text/xmlto
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 37fa90bdb337..ec6d029f7a23 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -2,9 +2,11 @@ DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cb
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
 DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
 DIST ansible-core-2.11.2.tar.gz 7081783 BLAKE2B 64a2e02c4e44e72383bfb291efcde07a85ae553418e27687fbc12acdc45608e9b89e9f64943ad7f98a6de094f61765ac3e89fa84e66ed634e764a5f9581c6bd5 SHA512 8b4a8e329be9375d3226f8b992223198913226527278c14ccec01d8e7c546cca847cf7d2415440be995d236bdd88640c0dd6f740e91ca748de2d1c5b7b52c921
+DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65
 EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
 EBUILD ansible-base-2.10.9.ebuild 1630 BLAKE2B 1893c43eb9482e3899c4695a6378f85f945fb71ae968845672a6f806be576d5746ef505b0ef63c87b49e4e7a406d772353846ae923c363844d2fe2dc66b5a33b SHA512 66db0cdc15878cc5378a8b63644b7e143fad646342d763c83b8a58de3cc117093495f8a5945daffb93b3219beaa47a0c1564c8fba14611c5a1054789ac8dc99b
 EBUILD ansible-base-2.11.1.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 EBUILD ansible-base-2.11.2.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
+EBUILD ansible-base-2.11.3.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 EBUILD ansible-base-9999.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.11.3.ebuild b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
new file mode 100644
index 000000000000..459607c5a037
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 8d25cd743e4f..da36483eada2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
 DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0
+DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a
 EBUILD ansible-2.10.7.ebuild 1480 BLAKE2B b69ca1d077f02df2047cc868fbf47a1d7b5fb254e5d3b1df1b338185817d62e754d9a7ec1dbd7142a70693b05e39cdb521e8857602ff1cf8687ed42047ba0a0f SHA512 b7c2c77bfed222420589930162c334b2ddc5ee5db2cf5476886bc6197025d25b57459b01e7988b74a11b7fafb11e1f1f9914d306ea3dba7eeccc176aa464c14f
 EBUILD ansible-4.1.0.ebuild 607 BLAKE2B 36fcaac434ab8c234eb47fae029ce81d50424677d39e3efadd3b8b44af7831ccf0fee49c748881fee8c26655eb0431710eb65620e8284c0a3369160e46957d77 SHA512 fa3b300013afc4409b08c815e12842497abfd5a3745a4da7cd1e70d55f7aefbefdabe0203e5647b161a587c2e5066e86aace9fd1b10c584b774c35c719985d7f
+EBUILD ansible-4.3.0.ebuild 697 BLAKE2B ea53fc76991ee7470e5fbf667e49d0dd58a476ea06fd39aed5af1e26e4b5fba44e18d14d0e753668b12149fbf82123eabb1ab754e0adb5c80b449732fd5eb4d1 SHA512 2492cb5fcc3ab10e275ece25748b4c90ae5587fbfb3f3055b26d24b94753839fe33a21107fed237f3ffff0611e97970405397228b5249fb41d6107c0a6d89a14
 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-4.3.0.ebuild b/app-admin/ansible/ansible-4.3.0.ebuild
new file mode 100644
index 000000000000..45a02aba0ec9
--- /dev/null
+++ b/app-admin/ansible/ansible-4.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.11.1
+	<app-admin/ansible-base-2.12"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 66feb79c0f1f..365fbe278fb9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,8 +3,16 @@ DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece
 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
+DIST awscli-1.20.2.tar.gz 2029411 BLAKE2B dad47f749af3c1e7bbeb291eb92889c7dc9bdc9e81ddb1fd3769897f94ba549123589a2ef8a34b88d8370cc6bb5ad45cc7b9fa06ec474620303a78ec3d64100e SHA512 6384a02a7bd3a8ea38cf46725daa25e7656e12c1f3f6465043efc223a82c605dbc916a26debc214ff6d364e81013e729acac424ccccc535785e8a3b68cfce2f6
+DIST awscli-1.20.3.tar.gz 2029411 BLAKE2B 6d8573709072ea3955696de0c65a32610446737a216f6c5dd4ecae4cffcb48ecac531cfc598517c037066d066cf0de01510c0740949450ad3a5925af79bd8c16 SHA512 2324800964de8b1af4ae39dcee15e8fc2bd5e11a239c245590a86fac6574d80b290fb9d967df82d6fdd412cd8b783fd209780e5e58846a16302fa13c6f3b93fb
+DIST awscli-1.20.4.tar.gz 2043470 BLAKE2B 58722fe4277a7950665913e8b9ae99de8017cfe8c4974a3524f917533499e830d2eea2ac0994022796b979869468b5f3a767727b4384f78e325e423ed003b1b3 SHA512 3066438ac58eb2afb83ae6fef516e09965ceea1e97897e4f5b5760046f28a2f822b16b90c0a9ee6a58c6cdabbfb2f0ce044caf41396093188290e2a7c1e8c4f3
+DIST awscli-1.20.5.tar.gz 2043880 BLAKE2B f4b833baf883479ed63e09de998b41e0e0e88006d4779b0be86396bafdb559cd8b158f30f012045f699b7c374a2e6584534534fd778ac7669016d23b06534080 SHA512 598163c27dce2ee166fd1d27cbca62c14c807118df99951963665a064fb71ba795726ef3ea46cc51bd2a51f256364c66edb88d1cdd8f319b2025c0cecfe9f6ca
 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
+EBUILD awscli-1.20.2.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.3.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.4.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.5.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.2.ebuild b/app-admin/awscli/awscli-1.20.2.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.3.ebuild b/app-admin/awscli/awscli-1.20.3.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.4.ebuild b/app-admin/awscli/awscli-1.20.4.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.5.ebuild b/app-admin/awscli/awscli-1.20.5.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.5.ebuild
@@ -0,0 +1,58 @@
+# 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/calamares/Manifest b/app-admin/calamares/Manifest
index a475a6df5996..14adee7e846d 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,5 +1,5 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
-EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B b371e28a165c6c80dee19e5b8e4076bcd70e399d76b43b8210dfe69aa6d6c1f29d48f858594482dbb1ea28c0d19571da907f22a082966d3fd9e0333431daa19f SHA512 484a41c3789eceac69e3aeaa1882a6585ce060411522f7a8d6f2604301d7b4c37636eb015bc6ca1e3383c044a9bcc9f77ffa12c64551f5af39978b96b44d0ca6
+EBUILD calamares-3.2.32.1.ebuild 2169 BLAKE2B 81cee92fa9be1c9d11916a4fe06a0cd60c0faa1e7aecdbd37169d749e042e4500cc3dab28b1527ba7ee6938039322ce4823dc29cb1827971b02c3466ebde65d1 SHA512 52063da86aafca435a91754127e122f541279efb70b6bedc0c99f79366d424a8cea8fc2219600231610f134c62c921dc420c689e7eebf70fea96d654db7de8f6
 EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
 MISC metadata.xml 858 BLAKE2B b66d7a5fa62cc1a83bba80a4d166e3985fb0bae043b5fbf03328e2c838543ae072322aa376751da8ee3912e8c8cdfb9e5aec8ee4700346543464a117d57933f9 SHA512 b333853647f132719762811ecf38e8a9dd3794dee3b944d3771204849f8ebe60f179759c5c9bfed4ed358174921c16b45c175a7598074814342225134f0bb700
diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
index b6050726915a..2f6bd1c64399 100644
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit ecm python-single-r1
 
@@ -24,8 +24,8 @@ BDEPEND="
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/yaml-cpp:=
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index e8468c1c41b8..b9f727832202 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,3 +1,3 @@
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.3.2.ebuild 1022 BLAKE2B a6bf02a0947a549edfd287df0777761c0a79bc8e383abb2cd092cb6d5593c779302f20dc1f3f165de409893a7d0b3f3c4025a6fd5fcacd569f9100f127a67151 SHA512 43b6dc6ced38bcfa3746b174a2c8bb71df7c70e34ed6a3c266a202c37453eaddca0a8c07bbd4a51d960a4362b967b740506bdc1d33017222755aa0a4926eba81
+EBUILD haskell-updater-1.3.2.ebuild 1018 BLAKE2B 02f9034fd1cc3fbc6046093cfb621fe6d757c176b28115355ae443374b72596ceff0adeccad70384ef68b69045c49d3cb30920e278d7b98a2f6c8218438f2515 SHA512 ce6d9d60a4ca56ef0602e6b791f7b861dfbd422ad050f400e3cf811b18c1457776fa4f30af4d8945d3f462892959bd1bd941746da51ce6a6b05e2f02d8c0bce3
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
index 544312532d31..52affb69bb08 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-CABAL_FEATURES="bin nocabaldep"
+CABAL_FEATURES="nocabaldep"
 inherit haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index bf150a9aa683..abb3babf45d2 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -6,7 +6,7 @@ AUX lnav-0.9.0-bug786456.patch 12401 BLAKE2B 698644b7b573dd15e3c91125ad80f6794be
 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-r1.ebuild 1127 BLAKE2B 3db56f6846bedb38d6605cebd74c21d210bd1293c71e707a05f00b1ee6bd5fdd330fc137de8090f15a20394ba31374e288bf28e9b7d8b13284fa550cc1da4cfa SHA512 0b536153247f3ab9e6d017ad3a21cfef41f8cee76efa7da19293162984b7ec8b8ad6e2bd9c49a6e729f6cb6e42b0df2c195d844290d7d38bd678d156be0a356d
-EBUILD lnav-0.9.0.ebuild 944 BLAKE2B dc46210b028568171b31b40b3531a24ae7ca2e2aa9f80e1c9538a10ae80e77973b628c5389cf644feb1358152ff2b4f38e0e2fe5c3d898fa8c8f4b4139697e82 SHA512 8d243ec4fafae0bc1c1558b0a9c980874d47bdeeaf3451e0e8647d5825f09647254d76d02e29d71f323f45d63df1b45d42864f2e41cbdc45124bc988c615ad42
+EBUILD lnav-0.8.5-r1.ebuild 771 BLAKE2B 609d5809483dfc348a4979ed7760e804bf3b12f7391c4ef54e3df7062a33deccbaa538f72d1ba743cff7d1ffa7c582b5415bd6b7d0e4829348ef959a44f7d19b SHA512 9e17a7aa378d23baeb26c55c74e947b868f60fbcbacda28795add54ed6f83d5f6e12f5562b5bb01e45e9be62d82e7071d6d8f944296c863ae90de893404e2ef4
+EBUILD lnav-0.9.0-r2.ebuild 946 BLAKE2B 2588e27c8d698fc0f225327433a9a740d46f5137399586bf66466d99ec3d710e04b57c46e6da12fb1478ca962633456cdf5d46d3b8452190dd8e7580dd652e48 SHA512 b38de5ff9bf039a45ef8ab9e2444a9395650b99a684b8c80cce8eea58f5686fae55d19bca9c595541d0801c7706d0a8028bbdbeae075ffed5c2288d2096347eb
+EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
 MISC metadata.xml 780 BLAKE2B 2cef44f3fda69ccc20f16a7f75cac035bfec429767dc12966c6729fa1b0b72ac66333d3f3ab7341f7b1b2a0fdd8f533577a04fcf15df7f268ca0a99f8c0acb07 SHA512 b9a91a8dfb2f0f528fb89fc6ea20867792baccdb12386dd8e92f4462b16869b51a796ed44f3f44faa41f8745db18d2c1fe5dd0df82aad6f40486b47b37a8a6e2
diff --git a/app-admin/lnav/lnav-0.8.5-r1.ebuild b/app-admin/lnav/lnav-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..2e91e591669e
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.5-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 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
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/lnav-0.8.5.ebuild b/app-admin/lnav/lnav-0.8.5.ebuild
deleted file mode 100644
index d981f24a9e9f..000000000000
--- a/app-admin/lnav/lnav-0.8.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 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
-	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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.9.0-r1.ebuild b/app-admin/lnav/lnav-0.9.0-r1.ebuild
deleted file mode 100644
index 1a6b79c93526..000000000000
--- a/app-admin/lnav/lnav-0.9.0-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 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-r2.ebuild b/app-admin/lnav/lnav-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..6849f2beec08
--- /dev/null
+++ b/app-admin/lnav/lnav-0.9.0-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="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:=[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
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/lnav-0.9.0-r3.ebuild b/app-admin/lnav/lnav-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..46fd2ba10a93
--- /dev/null
+++ b/app-admin/lnav/lnav-0.9.0-r3.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:=[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
deleted file mode 100644
index bc2f04f49352..000000000000
--- a/app-admin/lnav/lnav-0.9.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
-
-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
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 0614f598ce56..48d163a86b83 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -4,5 +4,5 @@ AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe
 DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe
 EBUILD logrotate-3.18.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
-EBUILD logrotate-3.18.1.ebuild 2435 BLAKE2B e123c58fc13c28cf2dd1c12a25a60935785021d42cba32eb435d784997d33263a47a07d5530717ab22ceb4b41ec04aefa8c8cf301b8fbdbd88880a804f8d73d5 SHA512 4087f14f7b2676e1f7182efb9189a50b6b14b3fa8871b3e70b533c1c001970c499ca61b18fe1f4a6ea6d31cffacd75cd9973917b7c410b7738692b3ccdec53b3
+EBUILD logrotate-3.18.1.ebuild 2432 BLAKE2B 04125968e369f364b20461a771339c3bea718beb935ba10cfdf0532e66fd55ffd92e132fb9677c48d92b4b4fa6b91e970d69f2e1ad63f1d9c74ea6a1fd6fc3d3 SHA512 ca7a8fcc929b7f48b1d4224bbd016a23eaf1dcacf4aff31adce052f2fb6018603d39c3801866089d8866011715ff114b5113673e812dfb7972f66d9eccd43c8a
 MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791
diff --git a/app-admin/logrotate/logrotate-3.18.1.ebuild b/app-admin/logrotate/logrotate-3.18.1.ebuild
index d49a3017aaba..78f3396cdb33 100644
--- a/app-admin/logrotate/logrotate-3.18.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="acl +cron selinux"
 
 DEPEND="
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fba530ccb6df..8d043fa5ca45 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,7 +3,9 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
 DIST mcelog-177.tar.gz 315474 BLAKE2B 8c6920b01ba836460067f322a17e5a69c2a9a447127ae583ddd151f3cd290aca039a63e95601789cd71c4ef75d4213e39918e08b600aeda3e06bb800119209c5 SHA512 b73d103c7b326e6aa2cb22a05b7df29e24f5b8f9e564a9d2d05627e0af80ee581d62b422e35a68cf3e43a3e1aaf905cccb08a65286c9f77c8c8c2ac41e880fbf
+DIST mcelog-178.tar.gz 315460 BLAKE2B 65d424f70c615a694dfb18a0d7049965280141858a2c527fbe1db806d675785a0edba161dd6ac4bf6660e1bb2334d394f98bc85058c17d79b2c25106297ae95e SHA512 f024908c877b489148e23bbb8b34d587d1b88e13e43bb401b4594eafb577a24a4b478fd4aa7e221d2d9e633b509b641123418dc36a52425193083d26d2ca60bb
 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
+EBUILD mcelog-178.ebuild 1160 BLAKE2B 09d326e4b1e37b94cd1b31d9632a375632e9297315e82ae91c33af8915e93ce8f96ef173afc074632b8fef2d44320307743362d463e62b8c36e91416aa13a1ec SHA512 d11bb734c6474a25246a0e74ad4be087990a34e68bd8a91a894798aa4d379f03c63e8e061d6408a32fb53b473e736e3fef1497f6941cc87e96ec4f36f2dc23e4
 MISC metadata.xml 537 BLAKE2B 565ccc3c3b497c157bad02578153aa33529089d8147f70d1e8efd88531ff3b5e615c7733780e6b991b1e7adc3a15c37d79076185141c0f5942958cdab89d84ca SHA512 e63aa74914714bbc4419369a567180acbcb40e162b3d0fa3998ee36e898982401a59f82bc4a848906b8f12de5e87f48114d7c1c1e0dfffe6e656af491c92af25
diff --git a/app-admin/mcelog/mcelog-178.ebuild b/app-admin/mcelog/mcelog-178.ebuild
new file mode 100644
index 000000000000..2ed1d04cc6aa
--- /dev/null
+++ b/app-admin/mcelog/mcelog-178.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/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 0babc34cacb2..a71e5ecfcb33 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,4 +1,6 @@
 AUX openrc-settingsd-1.0.1-remove-bashisms.patch 2670 BLAKE2B 06b61db1c40ae4a99b5fd46c3f83eecb8428c5bef150be1f7d6b0e25ab4667cae40a4664720586540a7d180218e5b4e23ad4fafeaaadce112a9566e412c4f9a3 SHA512 c4715aa4bdf35011400d02971d2739db347aeed96bbffe42c56a47714a0554c69137fa4b239b0b8ad3eed118d1da2af8c26bd4eaf8e39fa19176c85ed9c289fa
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
+DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7
 EBUILD openrc-settingsd-1.0.1-r1.ebuild 1459 BLAKE2B c6c15c6f92b560645982b0558585f7cdff35957e8eb7bb7b090fef2d30f7b0582c9dff2a547e1fbdd52eb2c3aff0684c8f8b32d3399a94be7127d5dbd8cc076f SHA512 a0a81314af123503b312cac28b6e2d4394ad1d1ae2f5c35f4f505919c3d278620a907ec111565c8f04021483cbba4bcd5648598f3dd2fb6e5f38f1d1d63e197a
+EBUILD openrc-settingsd-1.1.0.ebuild 1473 BLAKE2B fcbcc46ddaceba2870a1408e908a3f991e348a240fd12ab7352d75fe80ba575638fa359a54de606e2f5f3c42ad9ec8080ebb024f47ce0b10306b9e3a1fb7b004 SHA512 281592aab7ae5f570f469b3903d29f15bcd61192d59734e1f5127a6d6e57ab41e3f0d84d58ac03aed0b2c39e2ab4d5854c868b6b734087949286b1007603587c
 MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
new file mode 100644
index 000000000000..7a0eee93c891
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd/"
+SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.30:2
+	dev-libs/libdaemon:0=
+	sys-apps/dbus
+	sys-apps/openrc:=
+	sys-auth/polkit
+"
+RDEPEND="
+	${DEPEND}
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die
+}
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}
diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
index 1e15dfe5a463..bc819a012013 100644
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@@ -1,6 +1,4 @@
-DIST sagan-rules-06172014.tar.gz 273531 BLAKE2B f78a2203013c3ca4d0f33421b750a6f03f7929193f122df5504b6919ecbc24302bf10a2c65390ebaf6d7f6c4e12a1ef8e2c4d457bd2dd14cd79a7f0313a2c6a5 SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23
 DIST sagan-rules-20210208.tar.gz 461258 BLAKE2B bdb9cffa0c3e0a2750c86c32f75cb571cafa7ae51099ca79210a76134e599222b11520d45ea58ecbaebe7b32700d2935f089f69405fa7f3493d7bbb2f5d1abf6 SHA512 d6609c31e262c78b5ef609a602e406b79df80b27b8908b665598bfe18482461e0a5ebcdc4fe26e91be41eacd4e885c1ca28eaf6f4fe2b647726c7db9a09ce277
-EBUILD sagan-rules-20140617.ebuild 550 BLAKE2B 96583666ae4e4c01ed92e0e835ad819a2965b8fd69220abbd61de592b02548ce88c25dfa7c6c15e32094a339b65aa72669490e1d5b889afdd47b60448f69985a SHA512 b560a5422eb9559f85e057f6681b1d9cdda344a07cd07d59c5f2374c51ada996428070accf8144b79cf740f75878f6e23dab56597552c495e151cc64ac942737
-EBUILD sagan-rules-20210208.ebuild 526 BLAKE2B 7b4472e4fc2385ff353d8dbc9ad6a00f8f606d42817ab0b0717bbceee559942c914e3db47af6ef65fdd6885c62bffd2401f1836d754415214dd35bfe7a2250e4 SHA512 d0c902eef86371dfc76615e2ce167cf021160873ef8a1ce63773ae45970ef2e5949fffc5d0333f5fb1705c9b44fcadc6e7c5538828a481704c46606b8bc5de4e
-EBUILD sagan-rules-99999999.ebuild 466 BLAKE2B caa866e1f8082ccd01ef9ed0bae57b8de08730d7b25f5ea80526b1d4d7e4b95b02316bdbc2d64d5a73119a7b79c33daea1b1cf7c1c1bd1787824aba8ae6efda5 SHA512 4f409bc7a7f18fd51fbb65305d6e7bd1c929a0cebb668d3e97eeba64fce4e4e18e832d8c1be320141a9f1a011e13ba2bbdbaadfa44168a9f21d5cc5dd9458275
-MISC metadata.xml 368 BLAKE2B c966c44e4f04e4c75eb880239ea4a6aacdfb924709eca5fb766df68a1b19afc8f4c814865da1d9d852ae837ebbfdc4661e5d29d3b00b9cfea108213daa2cf2cc SHA512 1d910f985e6137f07e6bb906bb105a92cee1643b6a4dfe9b8bf2ad115d124c457912e38df87d625da5591665260ea941c6576229aa2d5e19f09077c1a7c5e743
+EBUILD sagan-rules-20210208.ebuild 480 BLAKE2B fa5b9360b56cb9d69b499ce763ab81c563036d9a896522bbbf8f41eaf2ae158d98e239904189c0492fde628c0fc4719acc09232a507414be2640ce8584ce3d39 SHA512 75a77d96aafbc576245b9861e9d0ad839bde5d6a8d4c1bea62c2e07cc37c5b12e94b2bd68843f60cd643e4e85f0b4fea5d424dbaf5142a41e32de4f1cc40d412
+EBUILD sagan-rules-99999999.ebuild 436 BLAKE2B 063e82561a51b04e562f0e8977b32b07bc2e15b7ba9c9c2d3bd563a8302880d37304e6231c55f20ec9f642716b95e1344d3d12bacd9612febfc517388636ab32 SHA512 7471c2767e1a8e8000a73435a6383270af915ffa7ea1d41e9dbdd11f37d6535b5e4beac679c745ba5fd9241584d9d0338216a573c9f30a1894b8fe42dbda83af
+MISC metadata.xml 255 BLAKE2B f898e4768ff2233e024d15ccbf459bbd853ddd110479645fa1b570e7f46a3c18362971f9c8d42005f16c9355501eefb834fadfb0096477ebf10e0bef26e76158 SHA512 f5d550b10ee9cfa17f07420a6bd1375aa4f114930f734f6c166b8a67fa16beeba3dcb58031b694258eff98c256baa3ba5ff186a0eaa047d16eda5e2f0c5831f4
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index a138c09bf20a..985506754f84 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan-rules</remote-id>
 	</upstream>
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
deleted file mode 100644
index f96f36790f2e..000000000000
--- a/app-admin/sagan-rules/sagan-rules-20140617.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Rules for Sagan log analyzer"
-HOMEPAGE="http://sagan.softwink.com/"
-SRC_URI="http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lognorm"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-PDEPEND="app-admin/sagan"
-
-S=${WORKDIR}/rules
-
-src_install() {
-	insinto /etc/sagan-rules
-	doins *.config
-	doins *rules
-	doins *map
-	if use lognorm ; then
-		doins *normalize.rulebase
-	fi
-}
diff --git a/app-admin/sagan-rules/sagan-rules-20210208.ebuild b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
index 6535027cd0d5..2bfc68a94370 100644
--- a/app-admin/sagan-rules/sagan-rules-20210208.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
@@ -10,8 +10,7 @@ S="${WORKDIR}/rules"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lognorm"
+KEYWORDS="amd64 x86"
 
 PDEPEND="app-admin/sagan"
 
@@ -20,7 +19,5 @@ src_install() {
 	doins *.config
 	doins *rules
 	doins *map
-	if use lognorm ; then
-		doins normalization.rulebase
-	fi
+	doins normalization.rulebase
 }
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index 85ac82618c67..6506abadf616 100644
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit git-r3
 
+EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
+
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
-EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+lognorm"
 
 PDEPEND="app-admin/sagan"
 
@@ -19,7 +19,6 @@ src_install() {
 	insinto /etc/sagan-rules
 	doins *.config
 	doins *rules
-	if use lognorm; then
-		doins normalization.rulebase
-	fi
+	doins *map
+	doins normalization.rulebase
 }
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 9b4086b3e747..d73a80f70e15 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,12 +1,8 @@
-AUX sagan-1.0.0-liblognorm-json-c.patch 2472 BLAKE2B dc04f9949709523c3516d7b9693bba7aca5ff354c9c40df30fa16d668c3e08bb79f49f97806bc3659022ffb9a499f9ea843022c68045ffc2d43dcf7ac5e7ba42 SHA512 15308ca18901a9f6ca069f2067d83199b7461a6fcdfc54f171796ebf4578c2ccf19ecf2737aae0e03a21927f959aac1688e5c0e319b3dcf30a2dde4643b53ea5
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
-AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 AUX sagan.logrotate 239 BLAKE2B d3feae0843f34cc66ae930b694924a5a79ad580356c338e5f7473530a4fdd3bbadf4a849c749481dd281940b7116f4778bec55436b966df5ffdea0fc26ae9c2f SHA512 20111f2d1131c58fbd2b11e9c0946e53f100a09042d1c2e7a0204647523afe581da5f3777ce215e7da37d9ed9fa99663e31733d7d4df0cff31ebaea37a816b2e
 AUX sagan.service 277 BLAKE2B 524e83a05a0a7e8f83585add01f3365f573dbb0d1dc773ab68b42078267cad1d45f3cf872dfdf2048f8639d1c6edfdf94d5b7c31d7f5760f86430e7b84db6ee4 SHA512 ba8efb9e7f42f15789d63bc7ae0a4c77391ae14c1bb44924634f9fb63c8f2b44d920bce564d60e10816f605c3e6ef572438ca637c9853a350d551462a502a723
 AUX sagan.tmpfiles 32 BLAKE2B c00a177b7ea9df47a878783f3372f6d9709ea50e6c8bdde81f7d84bd01ecae1b084cf26ac4d5eeb891034fad29fc67802c557d495d312deb4fb3425a112bfe2f SHA512 7c65575415eaabdad9864f9af14042def57d9de24b4306037f78eda00b4c4d7de5a3b4849a316ee7519a239db2848cf94fb862a23c4b126575d200903389df22
-DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
 DIST sagan-2.0.1.tar.gz 487936 BLAKE2B 84a137bb0001c6758979d17cf67442262f732f7d49ce397183c0c226d6135e2c3cd8362452ef6b893e75a9cf5e874256d88f740b94df0dfa39587fc771ad4f8d SHA512 0cc288b67f641346bb0dbfcac2682c8c2b09e3e508b94dd5b2d5a81c2a80c7989f1d54725041210511877bd6b2338e8b0fdcae01f7084d39d48abef073d1fe64
-EBUILD sagan-1.0.0_rc3-r1.ebuild 2237 BLAKE2B d911a530d495310f1e98294063d5a181cd391fde4c5385f0f79c206c75caf735d3a1edb7f14c9cee86d8248b601dcadc7c229dce09f010e06e8e15bb55fc892a SHA512 c26f4a6bdb8c8f51b4b98e202f25351e202ad57f350ad7eda2d6982dc109aebfaa06bdd10cd4818fbb1f8ae12b7a1efba5b962cb67de0a130937fbaf2cd4ba6d
-EBUILD sagan-2.0.1-r4.ebuild 3219 BLAKE2B 2fa76b99db74c9b4e74ad01f8b0dcf40d186c55cd8345910045b67723db4d84403e765e28312c0ff2ceb708a2a3713f4ab0dd6e91e20bb8a74a96c18fbde1a02 SHA512 e31b945927f06265217a76c3f597f9e15d841602c3eb1e5bfa53afdeb3ff57e8032f91042a4cd9a9ed5efa020ad0f9b5bf0c35aaee903ae399447127f0024bfe
-MISC metadata.xml 805 BLAKE2B fe11cb2f2a1d73d2c8da9ef9df8abe1974e4e8ac95a0c91e3eca63828a3db2f8872c43961af2b279a942e299c1b2bc7a1ecd781b3051d92775339b2653c27ee0 SHA512 9a85b9166631c8522f4939876af5a9094f1637659d1ffce0c72707415a9433e0075cc240e2222e101640e21e9fc6f514c37d347915831254edf8e08e7239042d
+EBUILD sagan-2.0.1-r5.ebuild 3175 BLAKE2B 468db3eac3ac60b1b8987dbfbf2be71615995d1f5a7e4eebf540f70f2f92b73bed5fa97bf715831ab891c3e2095d1cd110e4a41c5c84c7a87d4c3c9207456643 SHA512 657806dda8e3cc565bc6cdc942e9d0edcc58e5da94a20a14a5b360e37ee9b2c1713039a8547c22ecf376875ce4331052654de6add33197ca31375f444239c677
+MISC metadata.xml 592 BLAKE2B dc7dff5c573af3496c1edadbde487e16db5af058d3b09d9ffd09b5044726e3c65ab6b84b4de2a009a7d04bab7942003e9fb5e093c41ec9ae68286b36ad12be61 SHA512 6f401f45231af2a53173626339d906113e9fc3bbccde3e72ef2ed0bafe35110861e689a3a8c8862fa671013da0e97a0375d2a1b4165e954b8afcb34e6d91cd8f
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
deleted file mode 100644
index a1b3fb290f50..000000000000
--- a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
-        fi
- 
- if test "$LOGNORM" = "yes"; then
--       AC_MSG_RESULT([------- liblognorm support is enabled -------])
--       AC_CHECK_HEADER([liblognorm.h])
--       AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag.])]) 
--       AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag.)) ],)
--       fi
-+	AC_MSG_RESULT([------- liblognorm support is enabled -------])
-+
-+	PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
-+	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
-+	PKG_CHECK_MODULES([JSON_C], [json-c],, [
-+		PKG_CHECK_MODULES([JSON_C], [json],,)
-+	])
-+	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
-+fi
- 
- if test "$LIBPCAP" = "yes"; then
-        AC_MSG_RESULT([------- libpcap support is enabled -------])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
- 
- bin_PROGRAMS = sagan
- 
-+sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
-+sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
-+
- sagan_SOURCES = sagan.c \
- sagan-classifications.c \
- sagan-config.c \
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
deleted file mode 100644
index 99f1f24e3bfa..000000000000
--- a/app-admin/sagan/files/sagan.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/sagan/sagan.pid"
-command="/usr/bin/sagan"
-command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
-
-depend() {
-      use logger mysql postgresql
-      need localmount
-}
-
-start_pre() {
-    checkpath -d -o sagan /var/run/sagan
-    checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
-}
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 4a81536f6250..69fe306ea6a4 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -4,11 +4,9 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
-		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
 		<flag name="redis">Add support for the Redis database via <pkg>dev-libs/hiredis</pkg></flag>
 		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
-		<flag name="snort">Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan</remote-id>
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
deleted file mode 100644
index 959ab0672dc9..000000000000
--- a/app-admin/sagan/sagan-1.0.0_rc3-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 autotools flag-o-matic user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
-S="${WORKDIR}/sagan-1.0.0RC3/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	app-admin/sagan-rules[lognorm?]
-	dev-libs/libpcre
-	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/json-c:=
-		dev-libs/libee
-		dev-libs/libestr
-	)
-	libdnet? ( dev-libs/libdnet )
-	pcap? ( net-libs/libpcap )
-	smtp? ( net-libs/libesmtp )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-"
-DEPEND="${RDEPEND}"
-
-# Package no longer logs directly to a database
-# and relies on Unified2 format to accomplish it
-RDEPEND="${RDEPEND} mysql? ( net-analyzer/barnyard2[mysql] )"
-
-REQUIRED_USE="mysql? ( libdnet )"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch
-)
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fcommon
-
-	local myeconfargs=(
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		$(use_enable geoip)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log || die
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die
-
-	newinitd "${FILESDIR}"/sagan.init-r1 sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	docinto examples
-	dodoc -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-2.0.1-r4.ebuild b/app-admin/sagan/sagan-2.0.1-r4.ebuild
deleted file mode 100644
index 6cd0b6adfd46..000000000000
--- a/app-admin/sagan/sagan-2.0.1-r4.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 autotools flag-o-matic tmpfiles systemd
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="https://sagan.quadrantsec.com/"
-SRC_URI="https://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="geoip +libdnet +lognorm mysql redis +pcap smtp"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	acct-group/sagan
-	acct-user/sagan
-	app-admin/sagan-rules[lognorm?]
-	dev-libs/libpcre
-	dev-libs/libyaml
-	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/libfastjson:=
-		dev-libs/libestr
-	)
-	redis? ( dev-libs/hiredis )
-	pcap? ( net-libs/libpcap )
-	smtp? ( net-libs/libesmtp )
-"
-
-# Package no longer logs directly to a database
-# and relies on Unified2 format to accomplish it
-RDEPEND="
-	${DEPEND}
-	mysql? ( net-analyzer/barnyard2[mysql] )
-"
-
-REQUIRED_USE="mysql? ( libdnet )"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fcommon
-
-	# TODO: poke at strstr logic and enable/disable CPU_FLAGS_X86_*
-	# accordingly?
-	# Note that not all of these are used:
-	# https://github.com/quadrantsec/sagan/blob/main/m4/ax_ext.m4
-	local myeconfargs=(
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable redis)
-		$(use_enable pcap libpcap)
-		$(use_enable geoip)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# No need to create this at build/install time
-	rm -r "${ED}"/var/run/ || die
-
-	# Fix paths in config file
-	sed -i \
-		-e "s:/usr/local/:${EPREFIX}/:" \
-		-e "s:/var/run/sagan:${EPREFIX}/run/sagan:" \
-		"${ED}"/etc/sagan.yaml || die
-
-	diropts -g sagan -o sagan -m 750
-	# bug #775902
-	keepdir /var/sagan/{,fifo}
-	keepdir /var/log/sagan/{,stats}
-
-	fowners sagan:sagan /var/log/sagan/{,stats}
-
-	touch "${ED}"/var/log/sagan/sagan.log || die
-	fowners sagan:sagan /var/log/sagan/sagan.log || die
-
-	newinitd "${FILESDIR}"/sagan.init-r1 sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	systemd_dounit "${FILESDIR}"/sagan.service
-	newtmpfiles "${FILESDIR}"/sagan.tmpfiles sagan.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/sagan.logrotate sagan
-
-	docinto examples
-	dodoc -r extra/*
-}
-
-pkg_preinst() {
-	# bug #775902 revealed that we need 750 on /var/log/sagan or e.g.
-	# logrotate will fail. Let's inform the user to fix up permissions
-	# in such a case.
-	#  (fperms won't modify the live filesystem.)
-	HAD_BROKEN_PERMS=0
-
-	if has_version "<app-admin/sagan-2.0.1-r4" ; then
-		HAD_BROKEN_PERMS=1
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process sagan.conf
-
-	if [[ "${HAD_BROKEN_PERMS}" -eq 1 ]] ; then
-		ewarn "Please fix the permissions on ${EPREFIX}/var/log/sagan:"
-		ewarn "e.g. chmod 750 ${EPREFIX}/var/log/sagan"
-		ewarn "See bug #775902"
-	fi
-
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-2.0.1-r5.ebuild b/app-admin/sagan/sagan-2.0.1-r5.ebuild
new file mode 100644
index 000000000000..77ee263296c7
--- /dev/null
+++ b/app-admin/sagan/sagan-2.0.1-r5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic tmpfiles systemd
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="https://sagan.quadrantsec.com/"
+SRC_URI="https://sagan.quadrantsec.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="geoip +libdnet mysql redis +pcap smtp"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	acct-group/sagan
+	acct-user/sagan
+	app-admin/sagan-rules
+	dev-libs/libestr
+	dev-libs/libfastjson:=
+	dev-libs/liblognorm
+	dev-libs/libpcre
+	dev-libs/libyaml
+	geoip? ( dev-libs/geoip )
+	redis? ( dev-libs/hiredis )
+	pcap? ( net-libs/libpcap )
+	smtp? ( net-libs/libesmtp )
+"
+
+# Package no longer logs directly to a database
+# and relies on Unified2 format to accomplish it
+RDEPEND="
+	${DEPEND}
+	mysql? ( net-analyzer/barnyard2[mysql] )
+"
+
+REQUIRED_USE="mysql? ( libdnet )"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fcommon
+
+	# TODO: poke at strstr logic and enable/disable CPU_FLAGS_X86_*
+	# accordingly?
+	# Note that not all of these are used:
+	# https://github.com/quadrantsec/sagan/blob/main/m4/ax_ext.m4
+	local myeconfargs=(
+		--enable-lognorm
+		$(use_enable smtp esmtp)
+		$(use_enable redis)
+		$(use_enable pcap libpcap)
+		$(use_enable geoip)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# No need to create this at build/install time
+	rm -r "${ED}"/var/run/ || die
+
+	# Fix paths in config file
+	sed -i \
+		-e "s:/usr/local/:${EPREFIX}/:" \
+		-e "s:/var/run/sagan:${EPREFIX}/run/sagan:" \
+		"${ED}"/etc/sagan.yaml || die
+
+	diropts -g sagan -o sagan -m 750
+	# bug #775902
+	keepdir /var/sagan/{,fifo}
+	keepdir /var/log/sagan/{,stats}
+
+	fowners sagan:sagan /var/log/sagan/{,stats}
+
+	touch "${ED}"/var/log/sagan/sagan.log || die
+	fowners sagan:sagan /var/log/sagan/sagan.log || die
+
+	newinitd "${FILESDIR}"/sagan.init-r1 sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	systemd_dounit "${FILESDIR}"/sagan.service
+	newtmpfiles "${FILESDIR}"/sagan.tmpfiles sagan.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/sagan.logrotate sagan
+
+	docinto examples
+	dodoc -r extra/*
+}
+
+pkg_preinst() {
+	# bug #775902 revealed that we need 750 on /var/log/sagan or e.g.
+	# logrotate will fail. Let's inform the user to fix up permissions
+	# in such a case.
+	#  (fperms won't modify the live filesystem.)
+	HAD_BROKEN_PERMS=0
+
+	if has_version "<app-admin/sagan-2.0.1-r4" ; then
+		HAD_BROKEN_PERMS=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process sagan.conf
+
+	if [[ "${HAD_BROKEN_PERMS}" -eq 1 ]] ; then
+		ewarn "Please fix the permissions on ${EPREFIX}/var/log/sagan:"
+		ewarn "e.g. chmod 750 ${EPREFIX}/var/log/sagan"
+		ewarn "See bug #775902"
+	fi
+
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index c4cc6ec048be..6c97c0b86ae4 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.7p1.tar.gz 4197591 BLAKE2B fff3eab8b4de6276135229c5fe12e7eced98af988b7686600e6a63b8615f6357ab2c5f95ef6f1872534476c4398a28c4f468ffc316e0cff7d4b32e6068aa97d4 SHA512 bc85d9de1566de24883375edd1c4cd24b1f24437bb16d181bfa3c9c94cead220c69ad00d6727560ca195765ced970e95d69b9ce01dbea448de39afac9a902fb4
 EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262
-EBUILD sudo-1.9.7_p1-r1.ebuild 6679 BLAKE2B 7f549173042dedae316d4b9d0fc76dbb14d659c8633188abc4a0c40d5a8e0a9035184267ba8b3e964729a5e40673b8c7633f97adf5eeab5f9507438fa59c9a57 SHA512 9f92a6dbe26990ecb27c55539d09d875b87373139aa20fe2c39795addacdb852c959416ede36734ca4ce3b0e353558fb6ddeb69840a2c6783e3e339a7c0a448f
-EBUILD sudo-9999.ebuild 6733 BLAKE2B 46f131886f02d8f028f1ef3fb9e832bd1f070dec0796fbd34f21813fe0b0e9b653b3f5e6af50d5fc1d10ca4cd8b638e0408c2a4a796ebf68d9abe8363db041d3 SHA512 6b1db30bc2b57ba72f68c2785de5dc856d5062aa90034b27b3ca3a9b40215e9493ebe46830b796b76968cdeeae774e7fd50dd2997a1ee5dd9274787fe93fb344
+EBUILD sudo-1.9.7_p1-r1.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e
+EBUILD sudo-9999.ebuild 6740 BLAKE2B 8b9f2a5fa1e912a46f3ce6af924fa9b13c01a917c0d34874992413a9af0873c4db96bdf537fc92e20d6af433bbf0569bcdfa68ecf694e51c4343743d96b60608 SHA512 94d95b089753f5ce476a5d26dddd4e095fa98410c3f1f90048a75206b285544c9c3d1f94fbccbe966cdc98d508a5f4fe236845b19cecbc8ad02c5b26910aa213
 MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
diff --git a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
index 7f613e4fb615..82fffc77e5e4 100644
--- a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 3351bd020d3a..c99d6029f0b1 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index d6a91cbc4d3f..965bfd213671 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,3 @@
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
-EBUILD system-config-printer-1.5.15.ebuild 1942 BLAKE2B 466e1c61ee073d76ee62706cb036d9d06ba3a5c5558e7d9146651617406deabe23430302eb2309424234c1a889b96cdd956d13d4a0ebd2aff61d8f9b5364402b SHA512 5157020f628fe7859f370ecf4b6673d7c62501416a0d95b571a0061d42f3f9dae0d151481c1e6da9e3f51289387d60a3f250b2d71a541ac94e254df451412ccb
+EBUILD system-config-printer-1.5.15.ebuild 1904 BLAKE2B 0b0c859a98a981a229e19dd89e961a894f4be78d391aeed5158a1eeb230bfd966e1284060bcf50af0763a9d3b5a36a5ab2ff1456b6a76f810590150fe5dcda59 SHA512 708507b00e3fe96ec85c55a5bd9c2c2475048575684fec7a87f0e46714ca70ba82f8964eee370e7ccd6683883af42b7be93954fb9bfb43d54fa16eca5c03f098
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
index e2494d75ec08..5bc31accd637 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 inherit python-single-r1 systemd xdg
 
@@ -44,12 +44,12 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycups[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
 	')
 	gnome-keyring? ( app-crypt/libsecret[introspection] )
 	policykit? ( net-print/cups-pk-helper )
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 1857424683ef..4a9fdc161eab 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -4,4 +4,4 @@ AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd03
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
 EBUILD ulogd-2.0.7-r2.ebuild 3178 BLAKE2B 6e0e62cd8ec982001c973a78da705f229d7bca57878c3a96cba2f2ac86ccd53da3fafece16d0993c1bb931e670c50b7106c74778e7d22b669be17804eeb420d2 SHA512 2dfa6f9b8992537f343770c447574beb1eccd23bec5e294711f25f324507f154224ae1ec98494470d1d04c7b231d3460dd199b046855f068277707d46b411c74
-MISC metadata.xml 1135 BLAKE2B 55b1207d68b757368a794f88678a36cac409b00c71e441db520f57435663dd41e75b381310350ed7023d50413a504ebdf81f8af157fbfa318003023f32be4d4e SHA512 00172540261e4f7e06b8afe70a5a4b21bc0833f12a83ecff675fae82f35dcc36f86d84fc744e3ec5d7055a4e97c512ef5fd6a39ca97ab5450c768612df0dee81
+MISC metadata.xml 907 BLAKE2B db3e8f8baa571251c26d3b7c860b5fcd5019d5987f8932e4a65197811f5ca36dc4220e5c9deb3b42ded8b0c26f5cfeac76f85d4bb1ff35d0818021127f699ccb SHA512 0dcb4e1c7261bf298e0c0a89fffbfff2e497f66f9215d2cb0b488e460a224f8128648d907cc1ad09c2a2209a917e1f7ac4b97efce62b53cfc6e71068400aa56e
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 7c43c19ee247..b155d9e37204 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="json">Build JSON output plugin to save packets in JSON file format</flag>
 		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format</flag>
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 0ef86ecde0d8..804adcae3686 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index d7e34d2a85b2..a49f4381c3cb 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -17,6 +17,6 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
 DIST clamav-0.103.3.tar.gz 13389239 BLAKE2B 1846cceed39fbd48fcf973d05a57901cf6f9ccdbb4d7eae501e712d84ab4d0a662e4477696aa6a1446116db85a89603428d7092a55e18f7acb805016d3cd5431 SHA512 c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f
 EBUILD clamav-0.103.2.ebuild 7297 BLAKE2B 40c860b711dab3cceca4f854e660a1303166deefe0da4a0eb7e6461ad040ec4196484376c2f5d86808ed64c96cf33d1ace904611f99764b6d839e988b6c7a9a9 SHA512 0c638901b57bc9bf7afd3eac018f3a9dc0cb0a93829f8ebdc29f172bd67507073e7fe61240fecc30b0eeab4b36da98f93f8f79c7a7d4da4913c208c48a9ba3eb
-EBUILD clamav-0.103.3-r1.ebuild 7306 BLAKE2B 07bee5cf33a8ba38754095ec9e11d0ebf050dc10e7cd162ecd22c2f153691b5b1898cdc3847997e811f5e4c0e0776f2efe2aa5f08a75152a7e3662b92d23a605 SHA512 7c14bd2f5daefe7180110ddf88e0dd8c8da6440f747b61d35df23e5685a5332bbebc09cebea8dd93710ffa3eab62195f4f09f0b55365c3e6056011eca2493a67
+EBUILD clamav-0.103.3-r1.ebuild 7313 BLAKE2B 449bf4e1eba2a78308ea0c1a9f7050e9b57fd0787c253e4e2630485f8d3e9fd3ff02c693ded75b594814e5b63b9f530f781f92571941dbabf6e40336790bb72b SHA512 07a8305d39793f5d9197025391cd25b1ef8f6d5318f99621dc98f9e733c7c994130bf4811a20da2b1ca9c160ac2c4d4fe052d83e76b331d1b0c090bc978ef50e
 EBUILD clamav-0.103.3.ebuild 7303 BLAKE2B 2e3e460a6c20e7ce2d09ca65b0555cedf4afadc3e4f902ae807fe532bc6f61e07d0bb8e26203fbaef13fd865660d30ef83cd9f1c875609d1ddfbf52c1c9b11a1 SHA512 0f11faddec0d91f6511bc82dbd5ad3c0fd4c1b5c86530cbf9a1774389334fee95c31c874b90cac555322bd062b16e045ae64cb481fb6de5d3b9b2684a392f484
 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892
diff --git a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
index 5fcae6ee66c1..95b7377cd083 100644
--- a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c998f2393a6d..18c659df5abc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 3d2f9c234726..ed6f6e336e32 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,7 +1,5 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
-DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
 DIST lrzip-0.641.tar.gz 262761 BLAKE2B 5a81d9ca8b40c141c90488e9ffcd1dfd5bef3fe7cf9b02c00b9382cd902ef8cd891401f21c9cdd5d5750daf639c05a1e6f1f010fcbf42a9cdaa4f11921fac783 SHA512 cb14dda15485faa24cb840dd94ecd4741bd47464770ae8b27f97b5c263d8a32e40ceb17b288f0f70426598ef2acf84b091593fc8cf7a0f2db0abde88d09a301f
-EBUILD lrzip-0.631_p20190619.ebuild 1171 BLAKE2B b9c10629ea1ab82c589dd57ea939652afd22166f870438a7afc08b72d72b3e1d0b70af788dd24db7906f4804b9509e86065331fe053bd7085da8d767c1da7280 SHA512 d772a9acf5490b0be1eff06aedc8fcd4ab659e5be3ee9c1b6a4320d4799157472fe684aa8f4f4f0b017771c2d69b6e487d82572b37f8ffad1ef51e672ae1c9e2
-EBUILD lrzip-0.641.ebuild 1106 BLAKE2B 050248374266fceaa6b6e5de500045cc468575c79d4999534205863e34c2d0918772cab601c1ff190ebf5294d9466a3d4008420563eb15b7bce042474a2dbd88 SHA512 e01da5824d1e250419178fa308e14fa5124c9156629feddf2cb4ba4ccf6e8ef330d1a58d8d1d2eca47450a0eb7bf49a78b6ea596bb60c350444c79877ce2e3e9
+EBUILD lrzip-0.641-r1.ebuild 1102 BLAKE2B 53f2f6facbb851b90f8387c2667470923cce8b7e92842825aa74e42a119725fb5e9653417144d0721db309e8fe7759b2c835241dcb7fbc5df0f136aaedd2f5fa SHA512 ef64f229456b7a1db15ecc5f64040065c53e40f58445328c5e8e3e470ef699b2630d7249c2426c1d82005544611e5edd319748bb2f21393a8fe29fb96f7b0db7
 MISC metadata.xml 607 BLAKE2B df5e2e425d0046a6cb9d66536d6295fe454b057948e2605c69309d72acde8ecc4bc7ff2d68ac705ec4960eb4cad8603e33d7c7060404743173b50eef4da621f9 SHA512 e02e533237ee5737b2ad1e134fdf48e3c1350e4c2e1541f27ad465608ede575976fab666d136eb5314bda99bc5e1d2f55d7cb7b90c6cb744e407d6c7704bd158
diff --git a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
deleted file mode 100644
index 7afb90831e9e..000000000000
--- a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_COMMIT="b9220181288c5c9920ff00f00005b31a9e40e387"
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="https://github.com/ckolivas/lrzip/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/lzo
-	 app-arch/bzip2
-	 sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	virtual/perl-Pod-Parser"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	"${FILESDIR}"/${PN}-0.631-solaris.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
-	rm -f "${ED}"/usr/bin/lrz
-	rm -f "${ED}"/usr/share/man/man1/lrz.*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-arch/lrzip/lrzip-0.641-r1.ebuild b/app-arch/lrzip/lrzip-0.641-r1.ebuild
new file mode 100644
index 000000000000..6c8ec1c9d02f
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.641-r1.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
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/lzo
+	app-arch/lz4
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	dev-perl/Pod-Parser
+	x86? ( dev-lang/nasm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	"${FILESDIR}"/${PN}-0.631-solaris.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz || die
+	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lrzip/lrzip-0.641.ebuild b/app-arch/lrzip/lrzip-0.641.ebuild
deleted file mode 100644
index a89029b177fa..000000000000
--- a/app-arch/lrzip/lrzip-0.641.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 autotools
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/lzo
-	app-arch/lz4
-	sys-libs/zlib
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-Pod-Parser
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	"${FILESDIR}"/${PN}-0.631-solaris.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
-	rm -f "${ED}"/usr/bin/lrz || die
-	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index a60e7b3d9ea9..02a496e3765a 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -1,7 +1,5 @@
-DIST par2cmdline-0.7.3.tar.bz2 3129759 BLAKE2B 4206c1ec4b41e58044b29d1ae0fe7c2cb9611b87aee2186105cc3f6f1afb5a22540ae31b837edd6a8a4b852000081bc52a16e88c6951326504f219edbd2f0b0a SHA512 85fe91f2e7cc1888171390f82fe2d12279e65eab17b3a6db209998aed316c5ea9dd5e63004cf975cbe460c1ef27860af31160e8757921c4027e27997dcd8be8a
-DIST par2cmdline-0.7.4.tar.bz2 3129835 BLAKE2B 5cdc03a71d3db04928eb818037f66e4d624ee7479f1b942982b095e24a4a17c6fd5aebd032b4ba81b23f15b80ee4727b027746edbe9d1b4390cc327f469e5c5c SHA512 20f99556b4dae2e4467d781a96adab8d9f9a42dd43707de788b268eeea2bf59d92847e3c4faf413ea3de361360ef1236e97343ee8b625c9c2cd65ec9546e61ec
 DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
-EBUILD par2cmdline-0.7.3.ebuild 768 BLAKE2B 884c01c68cf08b345dee94c4db74f15648f01d5b14c6e211937dc6d79b5c64ca28feda23179bf148c73fd65eed1a4ac3fa7215b155ccac202afe1db86ae6b1a9 SHA512 e98ad86ee881a190855fdaf263cda584e7de277960d31b3b7bf0d80c8944adf5ba6c6a7d916168e7a158c9daf344136d0ea34b0d2395c1932f8bfb07401bf918
-EBUILD par2cmdline-0.7.4.ebuild 771 BLAKE2B ad2587cbd4c09fdf2d1df8dd4ddabc7c6cd0597d177cbd92e89156b2500ae206afb7d6904f303f86d42aee526bd569d64796bc3887cda343d94c5d2c184d5b78 SHA512 d3d19f715cfe3a06f2f7506eb6998f37ecfeffc7d0f244ec266915631c4a6df7ceddfb9ff2fad1ac6cc9d9e22079e16a0a70da784de587e4828eabdb527758e5
+DIST par2cmdline-0.8.1.tar.bz2 3213343 BLAKE2B 4778fd32012c61739e04a4e564eaedf48527c04b0d83c5467c34808913e81cd5459a6a5bfabe79ca74f520761ebd3592e80b714f3ef45cc98866da919757a176 SHA512 b33ee654bd14269afb02d48175abf183281270c3e0dad9ffcaa0aa69c4271715a85e550d6d56fe5460ebfe9a37dc53b7d2210cd79a6f55d3921dc5dd5972c846
 EBUILD par2cmdline-0.8.0.ebuild 768 BLAKE2B 884c01c68cf08b345dee94c4db74f15648f01d5b14c6e211937dc6d79b5c64ca28feda23179bf148c73fd65eed1a4ac3fa7215b155ccac202afe1db86ae6b1a9 SHA512 e98ad86ee881a190855fdaf263cda584e7de277960d31b3b7bf0d80c8944adf5ba6c6a7d916168e7a158c9daf344136d0ea34b0d2395c1932f8bfb07401bf918
+EBUILD par2cmdline-0.8.1.ebuild 771 BLAKE2B c965175e9ede9c6049449ca8d13c58b566cedd344f751ae804d7d12c9408103ffb6bb06a3d1107e33d550543e85193d21bfc662fe1707653bfa249e076e8101a SHA512 e46c456b7e44f3891a9dc343d8365cd15114ddc4cad03c781927650253954dcbedf08d75717208d96cee8c305574fda9ccc07b4001d1c69614a8f41d7f728a22
 MISC metadata.xml 312 BLAKE2B 866807207b8dcb08229ab359bf221a77d9ea691eadf983bb99c2852b1b56fb43eac8a34eaa5776e96debc394f8eaa99ac6d215a730def6d2a5d1f672c74e7237 SHA512 575b9efb72218bc82100ef9d466711207c1e24b6ca81f9d31414cb90456d5161b0ffcefbbef16371f3095968463e0fe6528879d1f782b6c7336d16e29d1f9e77
diff --git a/app-arch/par2cmdline/par2cmdline-0.7.3.ebuild b/app-arch/par2cmdline/par2cmdline-0.7.3.ebuild
deleted file mode 100644
index 9432c3b8930f..000000000000
--- a/app-arch/par2cmdline/par2cmdline-0.7.3.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PAR-2.0 file verification and repair tool"
-HOMEPAGE="https://github.com/Parchive/par2cmdline"
-SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="openmp"
-
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_test() {
-	# test22 fails when run in parallel
-	emake -j1 check
-}
diff --git a/app-arch/par2cmdline/par2cmdline-0.7.4.ebuild b/app-arch/par2cmdline/par2cmdline-0.7.4.ebuild
deleted file mode 100644
index c5dd21a0fd2a..000000000000
--- a/app-arch/par2cmdline/par2cmdline-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=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PAR-2.0 file verification and repair tool"
-HOMEPAGE="https://github.com/Parchive/par2cmdline"
-SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="openmp"
-
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_test() {
-	# test22 fails when run in parallel
-	emake -j1 check
-}
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
new file mode 100644
index 000000000000..02437534f1d5
--- /dev/null
+++ b/app-arch/par2cmdline/par2cmdline-0.8.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 toolchain-funcs
+
+DESCRIPTION="A PAR-2.0 file verification and repair tool"
+HOMEPAGE="https://github.com/Parchive/par2cmdline"
+SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="openmp"
+
+DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_test() {
+	# test22 fails when run in parallel
+	emake -j1 check
+}
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 8b9fa7dca346..adf525f88e87 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -2,4 +2,4 @@ DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee83
 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
+MISC metadata.xml 560 BLAKE2B c67b84a07053cdaf559efc91a45eabf2fd9702b95335cfa00d7b2933692c1cb5380434013305ac68ea71d8091a88a75046bbd06018b6b6cef8213b1e8d20a650 SHA512 2d3058c159158aa808f4242463e55207b09236305a02abf762c1730291438d61d787b4b6a24b6746b83695e73a31255215519e7c7a9bda61cf90d3d14efe0f43
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
index b591ed9e0496..5266f11f41fe 100644
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="fuse">Use fuse libraries</flag>
 		<flag name="iso">Install app-cdr/cdrtools in order to prepare iso images</flag>
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index e34da484194c..460bc1362837 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,5 +1,5 @@
 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 zstd-1.4.9.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
-EBUILD zstd-1.5.0.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
+EBUILD zstd-1.5.0.ebuild 1675 BLAKE2B c5db040bed77446a213471fc32b804d516cf3795757eb71debd4a2931a9407895f8325fbd5e35d406b86e588f2f954eea3c7c82d328daebd35f35f4008268f94 SHA512 990a9fecd08be1869368ffa41e286e2cb07f83cbceb0341088c56a6a082107077f1aa48891a94d2ec41691400167fb5272dd44d08da45c1d2be9eb1f208c4a60
 MISC metadata.xml 409 BLAKE2B c955efa52a6bb0508c7a648281351c4eb37c8d0381b71317948fb33fcf49acd837ebaa86a66d46c561ec86b97a914f64795ea424ee2f9fc06ae13a5e00343ac8 SHA512 d3a660c20edfc5f404dd02df9819178e7501483db8a548b434cd6f19d9634352b80a6118d5bb5bd27496f0d1a7d5e1aa9adbbc21f1604bfa3f78aa99a252d1b6
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index a7b21ee6fe57..801af9e179ba 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 908b372aa5b2..dd24ebe6c2cb 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 2d5ad779bc47..a8104ef2e483 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,5 +1,5 @@
 AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
 DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e
-EBUILD backintime-1.2.1.ebuild 1614 BLAKE2B 748d8e38c2650e0d21855d393146062127fce565d05e6c5d44a2f4b191234c53f8716b2af5788282986f2ab4f25a15de05935642a757527ee35ee45d72d6831d SHA512 3e2cdd8721890d04ec4935567f3974166d5587cf89830e5d205c88a8d45b17b2328e4cec647df3b41fc4e2f9a96b47da5383758a88dfd2736d6473b0f0c86fe0
-EBUILD backintime-9999.ebuild 1594 BLAKE2B ccc82db38cfe8f43741cc59fafb426e1934242e88a5933edc6a2bd9b75ba29607054173a81e4172a7da7b0c7ccbcc5f6410b08a773580943ea0f5f7c583180a3 SHA512 ce13ad7c31a4abcd9c68dba041ffdf547b4e3774f6aebac53d21b27136fc24cbfd4a3748ccaad0fa4d44766dd230af813b7cfa046a58abb100ae02b438b973e6
+EBUILD backintime-1.2.1.ebuild 1602 BLAKE2B c1616f90555a470bb735b68d8726aa40bf41275038d715adc030c9f8838e6c2f20e2ca2dd47833709274afa77795cbd1f2eb233b8bee01f4009ac48153289b88 SHA512 7f4ddec92cdd68f51e489b0cd3850d4ff7fbce94e3afb82c8c10f53bf9fea895f46bfb275467f7d67f07a843b23e56d9060ebae7a2bcfeca0466b389082a7b7b
+EBUILD backintime-9999.ebuild 1582 BLAKE2B 884c5239e5676a8f363cf2f639b956814a855a02e2a156ffbe7b9b2f436e4a5ad844a13765b4f6e9d9dc2ce86959e8db1ba649164295c7849f47187fe089814c SHA512 db62b3596a09bfa38aa9b89627ed38aae14e6c593a2be20cdc468ca2a688fe1670903eed11229e3604dcc690901ded92cc1f5d8d5ef81e984a98eccaaffb11e9
 MISC metadata.xml 640 BLAKE2B 1f3990bb871e2158d4b1213caffc46fc83766619a6ad3e6c24f014ab62318e5140d91eb56e4806d34a2daed1e1a066f08b1205deb5c2aba7d60e6f90a7d193ea SHA512 d38c67f79e8a2a61314283bbd4c23979657dfdd4208f3d09d0a714251dd49c5420b1bc50c1817837541034df6b0c43e3a20bea625d5e67f488c027855456bdb6
diff --git a/app-backup/backintime/backintime-1.2.1.ebuild b/app-backup/backintime/backintime-1.2.1.ebuild
index 0e7b38a816ac..0e634555fd04 100644
--- a/app-backup/backintime/backintime-1.2.1.ebuild
+++ b/app-backup/backintime/backintime-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1 xdg
 
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
 	')
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 2a7c8c7061a2..606f837db53d 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1 git-r3 xdg
 
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
 	')
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 72226dafeeb3..e2951b560cf5 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -3,6 +3,6 @@ DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d8
 DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
 EBUILD borgbackup-1.1.15.ebuild 891 BLAKE2B fd7e6dc50e0ca6cfd0773115bae0888f23b8f54b6a0772f8bb1457fae9b991c1a0ed18c7f353a779771b1a46affbccecb06b2d74eea6ec2f649a934baa7a15d4 SHA512 6d7e21a3af4a26e7a3ffca6b317a0c509e9cfc94ab042c3698a634a4576aef02269642ac485de4cd23b6d8bcb22ccddfd36eccaa827111af8b7056b549b7c96a
 EBUILD borgbackup-1.1.16.ebuild 893 BLAKE2B 1abe061f0005516b4a28fc5e9b116c8c84c63cb0433fcbe5b9c8cec57fde4153959a6708af600a6a934cd882b35aff8425ef627548acb51c04292a782b77abaf SHA512 5581b6d662431756c2eac76b5281085387f82d77f30a633db73c7dd80edfe1629d2a854bdaf7d4a56add593cddb90eeb96c33fb3af83f651f9bd39290e239892
-EBUILD borgbackup-1.1.17.ebuild 893 BLAKE2B 782ea7c0ff09d89d9746bbdd73b1a6242e584befd3924ef7022056cc07454fd15c4916b5f41feb7b01023aef842cb298f820e712fccd2bbbf49b36be720948ba SHA512 3586419ea7e774c5f5949ad141cbc07812e22891b4160e9e3cdbc42347548334acf02f98b089be158235290b5ef4761f6e39af1a9f7de313c1dadd39be334a8a
+EBUILD borgbackup-1.1.17.ebuild 900 BLAKE2B ec6893d9f579d00ebbca76bda8f4a7d650f4a0a0c6ca8290ef115238120bf4969302f96e5d297e9a2ea0e08d721e4c63a2ccfe8cf1764f3f3e8d9e9d3c36adc2 SHA512 26ae6a0fd2773349b85abb984b872059d535f4bd53492f31dbe91642366a9773a48f4b37a19314ee398d205dc276e933a11175d70c98a526308b321e4fe95ad1
 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
index 534844c68647..e9e83574cbf0 100644
--- a/app-backup/borgbackup/borgbackup-1.1.17.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..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 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index d607886bba69..0cd2ae76c08f 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -3,5 +3,5 @@ AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e
 DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
 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.15.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
+EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.15.ebuild b/app-backup/borgmatic/borgmatic-1.5.15.ebuild
index 06c3a588685e..55397ae435f9 100644
--- a/app-backup/borgmatic/borgmatic-1.5.15.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 # Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
 RESTRICT="test"
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 21c9b28e47b5..cf8e3c6020ba 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,3 +1,3 @@
 DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
 EBUILD duply-2.3.1.ebuild 540 BLAKE2B ce16e342ddf3c9f30c9803f59cb9e981e6481c79e3f223d73af37ecf57fc36643124ab84d076667b1b769e8688bdba64b57c2bf53da854263d348c75ad26eda9 SHA512 681bd875e939295b2df0ecd3da8e84a7707c0f7b89e97a63c8ed63d6688f0f4182e45f93a267fae5ee4b3062a6209b28be5faabd7c81276e53edb86b33c6da7d
-MISC metadata.xml 474 BLAKE2B a4ac0dbf3e29853bc40b8c718a01409def4f6a956f4bb6cfe1657e79c71f09e11258dc2cc0b7443375af70cafcb31211200837d188b3833ea136b25e54234e03 SHA512 1f89f05c042d63ce2851246e68039293ddfc85de6a3a16b36c6de54abe7297326b03d9668dfbd7666ea0d5091975b83abb01a077254f279d76f4739760392e86
+MISC metadata.xml 246 BLAKE2B 5fe4110a207ff9d824dd08a21aefff5cbae8781a097e45ef86c596ef69865ae9e1e71131da82301383ee87415359af9d950774c99afd5802128b9710a6d9bd82 SHA512 81c8daf59240f10724d08fee9fb2381957c626b615fff98811bf1a8a5ef1d31e9fd3c3b8ebd48c79991bef6a865677cdbbb3cb0b14ba2c05297bf125d7960440
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
index f790d0c43e4c..0a9bdd8d4253 100644
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">ftplicity</remote-id>
 	</upstream>
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 822b00ccaeef..cde0f1002d66 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -7,5 +7,5 @@ DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18
 DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
 EBUILD snapper-0.8.15-r2.ebuild 2050 BLAKE2B 9aa6d6f8b72f680edf08ada7a87850e734a445c2b780403564bf3f1f1b51bebc1d2c02c195dc2ae1dd5214299fa8ff094a2a0e8f6549c053001b970f68d39e3b SHA512 8916ebc3ba6f3bd30a053b5e41d60de1057868f6e102151d0bd137b0af31acebcabfb7fd0922b451edbae4f38b75494a6db481c977eb50f2ab997ee0b141f403
 EBUILD snapper-0.8.16-r1.ebuild 2060 BLAKE2B 08c83366000f96267a5ac13ae7950c3471aa6ced6e88b394340f6c3555d7ebdeb9197a7102c3613d228c1bf7b10e967aa457f8e961c5a24a9c24c751b3ce43d8 SHA512 e295e6a70bc9e0834da1220538d93d2fc78bbdc98bdebddc10b1a272c89d9e5dccb3a6952e49173fd039353d709898cbad07af17e26be4974d3b56f23b1dab89
-EBUILD snapper-0.9.0-r1.ebuild 2052 BLAKE2B da1431bf7aca8db21acd79ecb38e6067fff0b74ca6e64a982756f029de1a90666c7b2c543cdf6b892d5c8147dee7971b8fc6c03fdad1f6edb7c9544d4aae7b25 SHA512 b7a842a9881b5e541b90d577569c98e8201f765101d874b95139cacb7581c6197fbcc01a65711ba95a1c5117383294bf645b217557a8e144996bfdf1e66d7548
+EBUILD snapper-0.9.0-r1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
 MISC metadata.xml 1330 BLAKE2B cf72d6a7fc0ae542f465e6e916ae284710f057cee8492bbb2c3f3ce833bbc633e4ed53dd996b231bf26343898b344c37322582c18dbf01e23d068b80fccf5875 SHA512 3086569ba74f6b163619718fe08974856634dde997fcc2a8152f7cc1ba1a5c5638869869806d723f65249725fb61d84d3fe64f2b3b58c8b5e05a1524cb464915
diff --git a/app-backup/snapper/snapper-0.9.0-r1.ebuild b/app-backup/snapper/snapper-0.9.0-r1.ebuild
index 246797227f51..3f1b02d77735 100644
--- a/app-backup/snapper/snapper-0.9.0-r1.ebuild
+++ b/app-backup/snapper/snapper-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 02797ac59db3..018fee1e8cf1 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 3f26882e2a7f..4c2fc02a30a0 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -3,4 +3,4 @@ DIST siege-4.0.9.tar.gz 525804 BLAKE2B d857df05f40a0ac26a8abdd54e7de374125dde4c1
 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
+MISC metadata.xml 627 BLAKE2B d43e5e0ad81fca703445acac8e1635211451853b9d2b17821f6639e82813c8dc929c7b5e40cfeff728e66778f1f4fa6292f30faf7109b50aaaa9da0dda355ad4 SHA512 ba04af10a151753dea1bfbcd1ee70ec17611f66a24718ebe9c9620b384bb1e89f97dcd030c375a0dc7c8714b61ac52313b1aebb76071e64d41963517703bd64f
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index a29b53a23697..52e7091e5b29 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Siege is an http load testing and benchmarking utility. It was designed to let
 		web developers measure their code under duress, to see how it will stand up to load on the internet.
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 4f24af20f477..81ef4c25deb9 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 3f3106af088f..f910097cb36b 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,5 +1,5 @@
 DIST cdemu-client-3.2.4.tar.bz2 44284 BLAKE2B c57fe09bef7112933a93fac9944eaff957e01692ec1ddec7fd443aa780f8b3d85d0bd640611337d896843de3ab00d09e093c293776a52afa85f781bdde7f4250 SHA512 2e10cb345e261ddaa6da68ee626770ed65749b1ea64c2bbbf0f3a2e96184c2906834886754e87e3161c3056473e5ee0dc20672ce7cb48232e6bef1c93cb80550
 DIST cdemu-client-3.2.5.tar.xz 41596 BLAKE2B 5b3e5a16f9daa0ab2c670a8cba54af380894e668c87a64a5e2126777d6725420d9bb7f41290ca69eba12e20db97b00cc74aea3df9694ef331e7a571b913820b1 SHA512 d143705607507503cd7828f02e7a0fbe5d33f15e28ce61f453567d8635ed863c5b508ed2b1964f034d846ecdea752bd3dfb565350174db3e06cf7d29c2f828bf
-EBUILD cdemu-3.2.4.ebuild 1148 BLAKE2B 2cd75916330a18dbee969689c64280a8513677ef30939a53dc9991ab03f9fe9ecfdebfd9109fae72073b2dfebd07b0e021a9bffdcfc0682f5f33f5ea5edeb3a5 SHA512 519f6cbffec8f58cd8d9bdcc796fc982a0f5440a177929487f1935ac05bb8ac95f0387fac5392543fde04b2f3e780bfb725bcac9743bb5b240eea931fed91038
-EBUILD cdemu-3.2.5.ebuild 1280 BLAKE2B ed0e6800b15618b765cdf17d952e264b9af3ef04516e0be9c55d76e55cd976179d48f07ff6583a7c3567faa6eba2739e8d7e236432a7722a1f46abf0660a68f6 SHA512 53b888f56dcf9811113d701990da33f039c40b494a9377ec4a72353fd066263f927a9ef1cfdf53b986ce93ef3b69a45f0c56623b3a27bc3ee496f4a370561d71
+EBUILD cdemu-3.2.4.ebuild 1138 BLAKE2B e3caa0228db29ddf52558edf3ad3515ca65448781d9261a0fc52bb22bdef0422c28f3fd972d75791c0c6aacdd1e023f3867b072a10aab94081c6b322047c0e82 SHA512 e5fc828e8bf3fdbafeed4d3d81558aac3db9d866d4ffec65ac88346eb4e1facafc272be29089118edd7235aae228a6d7cab78abff71487f321acdb488d73973a
+EBUILD cdemu-3.2.5.ebuild 1274 BLAKE2B fa1ea6ddb47130434120c2b1037806c02411d02d5e4bf97599f7a0bad97fe3cf8c47db5bf82e0e8620e1e58d66fce2ada5dadfe71062f9f5443b3f0791f54806 SHA512 81aca1e47e74d0f7af7b1cef06dabddc3f28e53061dce02b0c5ca481fb8f98d5183a71f43f213404be13c94db11d2e35c79836940bf616f53b04dcadadea03fc
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.4.ebuild b/app-cdr/cdemu/cdemu-3.2.4.ebuild
index 5a356756ead0..17ee2d607be7 100644
--- a/app-cdr/cdemu/cdemu-3.2.4.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit bash-completion-r1 cmake python-single-r1 xdg-utils
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
 BDEPEND="${PYTHON_DEPS}
diff --git a/app-cdr/cdemu/cdemu-3.2.5.ebuild b/app-cdr/cdemu/cdemu-3.2.5.ebuild
index 35a46b90f6ed..0206fc3d15ee 100644
--- a/app-cdr/cdemu/cdemu-3.2.5.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 cmake python-single-r1 xdg-utils
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
 BDEPEND="${PYTHON_DEPS}
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 33776894cd52..8d13bccb84bb 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,5 +1,5 @@
 AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 772 BLAKE2B 4b06ec3921e5325cc14cc9927d4eeeaaf6306a12a073497387aa27010a349463d6c59f655ea9fd3699b8533bc4647a3b68c13359f7eafce0b7ad749a30864a15 SHA512 4ad309ca6f42f8ee3381b62be47b6536999bdd5fa83d52929d8144c2b64186ef4754d86163052538503b9905f5902c65e51bb90bd56b5feac6e40554afe184fb
-EBUILD cdw-9999.ebuild 849 BLAKE2B 1b3cec67333b8b9e3d252bb73e61bd3e29ded12e9e40ddb218a5a9776449ece9b199815408b0d5a257fc6c6e7c54b09f12e79dbe923397a235df39374a9f8e10 SHA512 69640a53715ab78d789874dc59eda68a433f39ed134da645fcf78e60a3b03e0007c3e38ceeb36e3aabd9f0c203cc12af8ac59b3bbcd3c067a9631e7a9cc86757
+EBUILD cdw-0.8.1-r2.ebuild 774 BLAKE2B 55bafa9d6d2aa16d2f8a250a61659e68272e2ca7fd7e96780abac0709e0144b17e007b4ce2304a7e799e7b2205aeceb5fd99a3f306a68e13a7483708218d749c SHA512 8490c46381b42eb65f4a4e819e755895fe74de87e7371a2bb6086a5f56fedfc7759d6abb530faafdbdf99e42db0c8eb35ce579074da6a510daf42def49a860ae
+EBUILD cdw-9999.ebuild 851 BLAKE2B c8094c8750aa52c71926819757cd03af62859ef6cac965e0afc39e3f208af357e736c8a7ded1fb2905bb38d3ae3fa14a91336eabc68bc1d55580667e4f19b849 SHA512 d6ab2c7e5008ceebf32c543ac6587a31f2d573d30edce06387ea9e6d62625f89f279db75c1896e8cf4640793f262555e5a7046e803c28812e04788eeffa31327
 MISC metadata.xml 476 BLAKE2B 37ecd4660e4f625f24214e7475616787265a19c2799e727834201fc9f4ab7d369a33d5e554e37daa4052c2250abd237edcc42fcf965a26a7827e1fa3cd85e23c SHA512 93c7458dd0ece6cc43f8cfed098a22d32e5032aaf92d48fa92f6be2c01f3a2c74f0edba1adcc035ed87e7a5d06be31197827432ea37e3df4ff70c7e8f17bb5d1
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
deleted file mode 100644
index a059a13f7d59..000000000000
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
-HOMEPAGE="http://cdw.sourceforge.net"
-SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio:=[-minimal]
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
diff --git a/app-cdr/cdw/cdw-0.8.1-r2.ebuild b/app-cdr/cdw/cdw-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..045f963648c3
--- /dev/null
+++ b/app-cdr/cdw/cdw-0.8.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://cdw.sourceforge.net"
+SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	app-cdr/cdrtools
+	app-cdr/dvd+rw-tools
+	dev-libs/libburn
+	dev-libs/libcdio:=[-minimal]
+	sys-libs/ncurses:=[unicode(+)]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 0c9539fc86eb..9ab78c1a200f 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio:=[-minimal]
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 884678d5b4f6..7707811b6d70 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,5 @@
 DIST gcdemu-3.2.4.tar.bz2 52209 BLAKE2B 620b1ea8616cf0d7f80954dd00ad1442b55fedafc5ff27ad5aa917e69a803a9629ccadb33ec3fdb2371c464bd484a15e85e00036dee5a67283fbf7e8d64e252c SHA512 920ab87a0b200f3f3983ff878871265084787f1468c042352c319ff3a37131547cc1e981801eefaee1e419ec306b026f7a18da165a17e3ddc6a92998a42e7b41
 DIST gcdemu-3.2.5.tar.xz 47960 BLAKE2B 8e45fe31461120b33080b9e40bd1def1c4ddfe562a9ca60814c66fbe073325d867692bd367e89e8281e34955eb232c37d8908a8962f5aa4587000b28c296d32b SHA512 d7e7b6ee1677213d858fca18103dd6d06e5de3f6c65fd16f19925b14ef50c73ebd0cbee3cb5c65aa5a59be3da1865f3e87b5e7c1a5921c496ae083727365e10b
-EBUILD gcdemu-3.2.4.ebuild 1183 BLAKE2B c074d8aea4b77a06bbd688216333b7364c9fc9e7ce6fb966792d825c7c3c7b25f354a38af74d319b37dd7ad5d21f001a475e6373d56df4e6ceff2687a0bf0e91 SHA512 57ed9764e6c13e78239a8dd9f1219bfd02a4a909d9b6a2fe171a6fb4248a4f195fe93d58f3dfa46f4341d4ca07e9ca90101664a007a6a7506f6f378593d8db62
-EBUILD gcdemu-3.2.5.ebuild 1183 BLAKE2B 9a3a6ac3c6b418234d837862a68e4daaad65b46fd39c0ed062631a03da9c9b250f197a1ffbe1b24bb9144944d02ab40c4fb80b3e0a7a115a5c38103860c67fb4 SHA512 793dbf59bcbb1a8da754513abf8affc6d30f00e0dca4a93edfd633e35c3654c065bde65634a6f1c32f56f626ff870e2ca8d97da346dcece39e7e2007d543199b
+EBUILD gcdemu-3.2.4.ebuild 1173 BLAKE2B 0a113778e89d608bdc489c9f9d6e608e14aa9e90fd600fd44b39066c02088216a942fedadb820fef0dce6a559f1d58f80efa85295232d6328375212809de899e SHA512 32e6571448d61723d289681a779a7b991746e1abcbe1d19de5deb8ff716187d298bc63867f732877f32457c8cc950ee0bb9c1e4cee46314a4c902aaf151ccbc5
+EBUILD gcdemu-3.2.5.ebuild 1177 BLAKE2B bde0c349d4ef424a0a72352e408d683f68718a6638f8704a256669f9597b03ea02f4da56afaaacb7eaac680f883bc8eeb78e37af00edd826641b825064996d87 SHA512 024b67e05d74d64334922465c6805cfde729b451d9fb3f2f702f0bb8c7266c7668317496c4836e0ce43039e4c36698db499b18953d7ad1651efdcc24c768fd3e
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild b/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
index 1acd6707799c..c8e31090fcf8 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake gnome2-utils python-single-r1 xdg-utils
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	app-cdr/cdemu-daemon:0/7
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/librsvg:2
 	x11-libs/gdk-pixbuf[introspection]
diff --git a/app-cdr/gcdemu/gcdemu-3.2.5.ebuild b/app-cdr/gcdemu/gcdemu-3.2.5.ebuild
index 8652dfaf6c9b..f350948a1151 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.5.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake gnome2-utils python-single-r1 xdg-utils
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	app-cdr/cdemu-daemon:0/7
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/librsvg:2
 	x11-libs/gdk-pixbuf[introspection]
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ed5f018956e0..d847da2d024d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index fd066b87f712..83a16023fd5f 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,5 +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-1.0.3-r1.ebuild 629 BLAKE2B 9c039002d35373dd51758947e1d0099133ac9526dc17336d20178b163d48285334c4aed303dd9e2f80eba64cbb60476e55fef5924362b9ab3f939909b19b711f SHA512 96652e399e0f3a90d167de821a50a8a25b4aa24544111d09b233f5bebb166e5f36c9737d43e256ffc2d198afee8b35fa5b19c5c274bf826fe19b933291b29e62
+EBUILD libmd-1.0.3.ebuild 569 BLAKE2B ef6a422b79c190f2978630ae8d881767b6588a87919488926c600a80ad8280b76195e2398b307258f7c83bb2b8b64d00df27faaa926fddb63a7de57d754ea35d SHA512 9d292bfcef77327e85d6a36038492f2d0c3a89c47d2640278d92557722bd74423a0a0c41223145640bca49db5c02e41e13a0a74c96ae440375da482b564d79fb
 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
index eedd72789dfb..b6ab06313260 100644
--- a/app-crypt/libmd/libmd-1.0.3-r1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
index cc6cfe8082cd..d32fbc8f2771 100644
--- a/app-crypt/libmd/libmd-1.0.3.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 00b61c468e36..9f193602884f 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d
 DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
-EBUILD libscrypt-1.21.ebuild 712 BLAKE2B fba4c8b0c2cd35200287dc2fc10f92e0a1b9e9843dca8784a7d5c17429389d650321aa537b4dd331674a73b7a0ebf17158d5abfbdbca6bab0652ab1bff670f14 SHA512 1d57b76f432e1460f3259be098a1eece5d758d856423b94eed30efd9a8632124079de29948e11225f0ec8262c4f7958488a740f626aac2aab9a3c6f658f6998d
+EBUILD libscrypt-1.21.ebuild 719 BLAKE2B 7582b84a50894c3d8b0ba6e66cad06429b37e8a823310224e244207a6228473891d270517c7c3dc251f0a333a4417676a8b4a993b6c4e222b40518d93ccdd6fb SHA512 0bd3bdb3c7d53f8672cc848e45e073268e29752f6833812f75fb81d4c1539a2f0872bfb382f1bb7e6ae2f2f88cffb39ab474d84aa753421fab3fc6d96780a4ad
 MISC metadata.xml 345 BLAKE2B affc5819c29d3b72ccc6a15e4d0b01bbff5bd3fdbe617c1b90dbd3af812127731d9981bab6a5ddd4a66cb1dcbb6bfa91b692cae1e5daf8247b84f25aa9bc01c1 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index efe99521fd08..b883b47b9bcc 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 2473e5056739..b666f938c10f 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,5 @@
 DIST nwipe-0.30.tar.gz 6358657 BLAKE2B 69fdcfaacb32aacc27b375a793bff5b7014979c8097ef3b48c2c307e4bc3a828de7c01b6a58e46346dc58a1b4beee4a408074706175098c364dff7ecf67771d3 SHA512 b6d86d78dafbe6c5e27b00b183673dc77dedcf849ecd169b616c90bcda5180bc10fe072580c13f027abaa5fd840e73034ac75af75fe1cf6eb0756273bf46975f
+DIST nwipe-0.31.tar.gz 6360907 BLAKE2B 4e58cb24c16014044268f2abf32133221a94570986b6cee6c1df8be72dbb65a6c8a3e238918b44db873f3501fa217a4926a0ca6e401fe4e7ec1dd0c9b0c4a5e9 SHA512 1a7c30faff69a840f29097d86d9c2551843ad03afbd8c049ae61a836eb5a19934db02e2fde83427859280a2299f996c40510b7ffa22836f49b8da94aabe911f7
 EBUILD nwipe-0.30.ebuild 542 BLAKE2B 58bf4c9fb2f0280e34e8c626377f9ac49b06a94565f2bd7f75c4ed2af75040e09f1db8ce8ce894ebf0d07e4852e92fb5c89740410c37fd49f17b806e612ee0a8 SHA512 a625f460573dacd84cf11b97d87294b63753063383333183b977136d4001d4dee6f61778e337068488038e4725706aaff14070ff5882395dc214038c4d6a8f5e
+EBUILD nwipe-0.31.ebuild 543 BLAKE2B 93c78b4e4699828792ec38679c9fb2eb3e4b490b97bf376d5c6cfee9757db180663e24ecf4821117fa37806bf80669c3fc135d5e66ef713d0dd4a4bb98d1c693 SHA512 9535dad33c09a2fefad2f6b661f8bb6e34a8e67c23b8e26f8418ff43d30cec40f593e8a3acb629289943fc58216e8d147bcf86e8a16636aeaf21ab367884a0e8
 MISC metadata.xml 488 BLAKE2B 43eb76db498081845651cc0d94746f2cfbc9deb831a0e220e60122d527439d2dcf63ce183f3f39a7592ec14aebe97d4042f78c1492b75e60bdd6d0e66d8fe442 SHA512 46ef396b60d3e2f9b1ac11f68335ac3de5a5b894939902fe98f3c66547a539569e1b6055a7eae80dbba708c999926ea7f4041560e866786365db27785477553f
diff --git a/app-crypt/nwipe/nwipe-0.31.ebuild b/app-crypt/nwipe/nwipe-0.31.ebuild
new file mode 100644
index 000000000000..b5a3312a3fe0
--- /dev/null
+++ b/app-crypt/nwipe/nwipe-0.31.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Securely erase disks using a variety of recognized methods"
+HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/"
+SRC_URI="https://github.com/martijnvanbrummelen/nwipe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-block/parted
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index be12f10bf46d..502bea4267de 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST yubikey-manager-qt-1.1.5.tar.gz 16066508 BLAKE2B cd15950c68cacc3e2904a5e1fbb3a2d98544084717f379202ccfe70082b0971959178730afb9ddbbfa20f436ef8d7cdf820df1e88539f99ce77913f60228af0f SHA512 b019a7cdebd741cd536a18670795f83c7e010e221b4f9c82dcd3c57b0c4bce878865c6605f10c962f4bd5e926c285a894ea97d2925ba091847ece5ffa7ce5bb6
 DIST yubikey-manager-qt-1.2.2.tar.gz 17311287 BLAKE2B 115dbf18ce0bfd48a1b172153d9770a3bde754b1dbef55ee1ec9480128305b9fb0d52af23906a6f6040df71cc4d3d4be216615fc3807395f7e7be1615a5568da SHA512 dbac2d51b198ab15051790e080ad92aaef4b0d44596ad136115469e7bf038d6b56d1bfa78a69d1fda3644543f9762051767b8a1fd46a80f2f62ecf836f7df3d8
-EBUILD yubikey-manager-qt-1.1.5.ebuild 1482 BLAKE2B ef6a4e9604b3b7d9f86e019b9a1cce9c93259fd4b4e2332dca7ebc64d6a4dc9c0228c31584fd4b0e5346bf21b02846f1156e31b3d2ff344e883997abbf314e08 SHA512 c6d558b98f125fbeeccf0ffd3553b7a36f90956558b9b14c5842519b97dc4f14083e84dc05222d602ea101106cad515228b8f3e82075d2a00740379d9b12a98c
-EBUILD yubikey-manager-qt-1.2.2.ebuild 1418 BLAKE2B 239b5e71f825e75280e157648b95350e433a56d69c58e50e0e5687ecd9a33b995ac9ad45e1f0aedc07c22b66d3f8ca4c553ed56826d92e278a4a6076f9b909d8 SHA512 a4371ee94e1b4cf5272c88a6dc0ffdad3ec347458501b15e32b93b95bd840af4c29004452cd039917e5698f947f92c0aeb9872c61caf66b88376bc4767da22aa
+EBUILD yubikey-manager-qt-1.1.5.ebuild 1462 BLAKE2B e97ad56302714c398f04a62780af428952b27b5aac252f460483fe9924125234d4a5b35d445fee4f2103e55dedd5795b20d764ed9b98dca8cbf7087e787bd8ec SHA512 789aeb6cf6bef43dd58e217b759a124432d6a7abf882fd66a4a0262ba07c85fa54f488b2324529967a914cf95c7dd743400c2db24ec05e3bb609ece1a2fd3a10
+EBUILD yubikey-manager-qt-1.2.2.ebuild 1404 BLAKE2B fbcde0488a57a420ce53ef489d951a8f54c81f60556378ca518e76fcc7767c10ab491e15cba42eb0f20d1bd889bb420008d1d09cd1ab1821dada35ec2fa7553f SHA512 ba8b2e124571ba95cd9ded09e6f64a7160c7d84eb14c926321127652eb4fa57eb1d97aff2cf619618d57204d8ea3467e39199933e6daf96f5d23dbf48c44e1c3
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
index d56aa22bd7e2..7454fa78fae8 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit qmake-utils python-single-r1 desktop
 
@@ -18,9 +18,9 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
-		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+		<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
 	')
 	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
 	dev-qt/qtcore:5
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
index 2e4e7d2727c9..d1c17259b065 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit qmake-utils python-single-r1 desktop
 
@@ -18,8 +18,8 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
 	')
 	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
 	dev-qt/qtcore:5
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index cc559f1459ee..b98f6fc44f87 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-it/Manifest b/app-dicts/myspell-it/Manifest
index 5c1fb9b4c71f..e4d3929a5912 100644
--- a/app-dicts/myspell-it/Manifest
+++ b/app-dicts/myspell-it/Manifest
@@ -2,4 +2,4 @@ DIST Dizionari.IT_20081129.oxt 1433036 BLAKE2B 0e0aa03fafa34957a00b054070de67aec
 DIST myspell-it-20150925.oxt 1373663 BLAKE2B 89748d0dceca6a8f3aba7b76913693ac248f2a5c925e04b76e50f23edebd6b0194da72646837e806882ce6258784d5dfb6c212046f13315479603d953d95b769 SHA512 b48a5ac075b9a20b0370235cb4fc225c91a67e6311eb9e7a96b008ad5e64e56af3daf4b192d38d5892e8d23d5f6e0c962e35f8cfec11a97ed8708e29796e09d3
 EBUILD myspell-it-20081129-r2.ebuild 763 BLAKE2B b82fed87679986ca4ee15134e27f16a68f8595a0354c0b9bc822c5a81742ddd21b8fd35460580200db45a63afcd2e1cb371046d7f7c2930de316be2a3c6192dd SHA512 ae80fc0d5157ba64b1376db82b178f3ac1ee65b66d0e6d901272f46fa6793fdd0ca2e7e326e1d40c2eb48ad65aeecac56c7c063a7578b61aa33aab3440fcda07
 EBUILD myspell-it-20150925.ebuild 978 BLAKE2B deb63e34d45140aee1d56effea13a0523189db7d8abdab733eada668bf299234cd14892ee01c1723b6e4be80e0893bce902f08a41c7da45f624636d87b4cce3c SHA512 cd6639d2b5a49e19e872ade852e87792d6bb2d1b31e3825ebc2e6b1eb6c60d5ed205bbf8abedc77555340a7373430a50aa4cf0e3d7136dd71264e2ae2bfb4030
-MISC metadata.xml 419 BLAKE2B 9e24986fc80d347b16ecd455ce0dc903d774057d3826651d425836995df01b958506a3c40a29a335a9c033a5d9af333fe41c40e05f6159a300bb085fabfa6ea5 SHA512 8a3be64102820d281cd1bb366c3239fa06170a7fda5a374209a00ad0ab0217cf4b52ef6fe70415ce8aca43e316711495001c6a7e399b3fb33693444401b430a0
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/app-dicts/myspell-it/metadata.xml b/app-dicts/myspell-it/metadata.xml
index 3b426a4e97d4..3c58a0219fbe 100644
--- a/app-dicts/myspell-it/metadata.xml
+++ b/app-dicts/myspell-it/metadata.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/ydpdict/Manifest b/app-dicts/ydpdict/Manifest
index a1fcb1cd7833..c13a736666b3 100644
--- a/app-dicts/ydpdict/Manifest
+++ b/app-dicts/ydpdict/Manifest
@@ -1,4 +1,4 @@
 AUX ydpdict-1.0.3-tinfo.patch 322 BLAKE2B bfde4da1cb49749e8023f7c8ce56dad45b9ee39e974eb59df41e40a4770debdc8f47f4ae03bba41739bdbfbde5ba90315f454e3fa8f5cf8cee668ffbb109e0d5 SHA512 70e0b4b528dabcf9889eaff2909e11a8481ece94ff50d90c7c53e1b5f655f3954bbf694446ee3cf4fa2ac21b1c329d627412337f17da2e8a0a1ba73a45304857
 DIST ydpdict-1.0.3.tar.gz 185721 BLAKE2B 1db80dc20dd6d71c4b7fed2051bbfae1021fd1ea15ca1f993e8e095912fbcc8d599d8f480143d185fd11c6a1414d7f29ae67a9f5cffda624b434d198cddc5c68 SHA512 ca50c485f10aa4c4691a27a474a5ae814be3bb183b4927728f14de67af1e11a281e5272fc5777d6573e69dd00d3da2223b78d729132764338c92489f20eb17e8
-EBUILD ydpdict-1.0.3.ebuild 1116 BLAKE2B 34bb12d938e9b3cce645a252f365bb031eed77fbda956fad6992071c279e9b5136e482482fcbe76830442c69a735935af5ce56e0c3a73435ee66a7c2d8e44c02 SHA512 5e94cfbe909680f6c04d64e7f30ab80376c80e13c690f8c6c01630e5b45f7fe37a9b6c090103e332cc3692f2d60288b04aa60ab3d1bff0b9db6a415360506916
+EBUILD ydpdict-1.0.3-r1.ebuild 1121 BLAKE2B 6354b7c70264bdaf49e82beea5cc4988a2a864ee1ab4dfcec8f971f52938207e7259e2e6a06cb4d4c4f31f8b1185be17086f49e816ca3565c904585a50b4f690 SHA512 10de9cebb29fe14aeda6bec748a043cc1e7b6bd9ba6ea19c43050b9a1280198c3d165c3c326acf9281f20a76c7d3689f416eae29d8046c01a3ddedb0d591db14
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild b/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..16c2253d2d5c
--- /dev/null
+++ b/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Interface for the Collins Dictionary"
+HOMEPAGE="https://github.com/wojtekka/ydpdict"
+SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ao"
+
+RDEPEND="
+	app-dicts/libydpdict
+	sys-libs/ncurses:=[unicode(+)]
+	ao? ( media-libs/libao )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DOCS=(
+	README.md
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.3-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ao libao)
+}
+
+src_install() {
+	dodir "/etc"
+	default
+}
+
+pkg_postinst() {
+	echo
+	elog "Note that to use this program you'll need the original Collins Dictionary"
+	elog "datafiles (dict100.*, dict101.*). These can be found in the Dabasase/"
+	elog "directory of the Windows version of the Collins dictionary. Once you obtain"
+	elog "the files, put them into /usr/share/ydpdict"
+	elog
+	elog "Some configuration options can be set in /etc/ydpdict.conf"
+	echo
+}
diff --git a/app-dicts/ydpdict/ydpdict-1.0.3.ebuild b/app-dicts/ydpdict/ydpdict-1.0.3.ebuild
deleted file mode 100644
index cd2a73ad78b0..000000000000
--- a/app-dicts/ydpdict/ydpdict-1.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Interface for the Collins Dictionary"
-HOMEPAGE="https://github.com/wojtekka/ydpdict"
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ao"
-
-RDEPEND="
-	app-dicts/libydpdict
-	sys-libs/ncurses[unicode]
-	ao? ( media-libs/libao )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DOCS=(
-	README.md
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.3-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ao libao)
-}
-
-src_install() {
-	dodir "/etc"
-	default
-}
-
-pkg_postinst() {
-	echo
-	elog "Note that to use this program you'll need the original Collins Dictionary"
-	elog "datafiles (dict100.*, dict101.*). These can be found in the Dabasase/"
-	elog "directory of the Windows version of the Collins dictionary. Once you obtain"
-	elog "the files, put them into /usr/share/ydpdict"
-	elog
-	elog "Some configuration options can be set in /etc/ydpdict.conf"
-	echo
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 5fb3c215d7ac..5bba620361eb 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index c1aa167dbc4b..8249af97f211 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,3 +1,3 @@
 DIST cppman-0.5.1.tar.gz 3596049 BLAKE2B 0189da1413720c00c89a0685b83231aaf0c54e19c84ede164e892e7f8855b7b1ceb1baee11866fd99d150e9c031ccea88bcecdda816fb8e53d58b918a000e04a SHA512 3248d9795d3a379f13e43d5e0753f62a0412dcf3760b8dec6a176f08cb71c4983065c7d27eb15ffed4cc77264e66a3f7d9fe5757a8c7a582741751bcfd1b2fd6
-EBUILD cppman-0.5.1.ebuild 847 BLAKE2B 2942b7d2fc7ad598402babf23adefb4044ec258bf8024fb5fa82e06193efbcc97b8bfe1cb1b12c85432ca412a2d1843bdfdf675d49c39a654011a3cc99c4e504 SHA512 9a16c578d744efd64e728c830e6b8ec36c22a677d21b45f724ae628d2bb2fbf0e0f8ed518689a23d7f5104e84ab2d890ee66207e2e965ff5bf83241109658fbd
+EBUILD cppman-0.5.1.ebuild 833 BLAKE2B fb766c5b6ef4540d1ffb85a16efe86ea0b078de81a3c08f797548a6c9831e36073c792bb6740922f38effd37d3cda6ffdb729763a2000f8a74765b91b0285a89 SHA512 03e7885580f371f1b0c5d1f70479e8be42d1dcce802dde83b85d0d0d3eea3e41db74bec1b34d626b33049149cc51e07bc36f9811aac4d156b10cfb20a2ee849d
 MISC metadata.xml 247 BLAKE2B 148c9e33fb017ba732238f97b907dea241253a0c2269768c46e97f10986c070bf0e92e245ec191eefd3be9fd9f1136f22ed4fb25ed34e2bc021eb85753bff0fb SHA512 a7441e08046bb46527b0a4dfe0d80884f4c126a75ecb8ff6fe429988022f8cec46dc216cda1373d57132f86532b1289ad8db0696e962d4fdae1abffc2a38e18c
diff --git a/app-doc/cppman/cppman-0.5.1.ebuild b/app-doc/cppman/cppman-0.5.1.ebuild
index 7b96802bb1db..ec877b7bff5c 100644
--- a/app-doc/cppman/cppman-0.5.1.ebuild
+++ b/app-doc/cppman/cppman-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 
 DISTUTILS_SINGLE_IMPL=true
@@ -21,8 +21,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 RDEPEND="
 	sys-apps/groff
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 76fcce90e15d..77bd5d68c89f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index da94243dc029..39b50b129981 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1,3 +1,4 @@
 DIST diakonos-0.9.4.tar.bz2 102282 BLAKE2B f8625d87924815e816c2f5a07e5c1d35df4df6126531caf5c98a9fdcb20eb9543c028363344a3c20f2f8a0335fa9d071b168640d9bd4738b1d51737bcc548c12 SHA512 8aab6173c40b9a182853977ed7631c391a10d3339918fa96866da8c9fa8e36e40f1c5093465c734a9ce36a69c5d994d6b2d1c0306f1e57bff708fd7a64a62db7
+EBUILD diakonos-0.9.4-r1.ebuild 744 BLAKE2B 85acdf84654350292a5dc643285cb3255b0b135b5af24fdc988891f2348090d7145a23dbdd9130175bcc5f44d98fe6341286e810e3eb1d2465948bd5e96d28fa SHA512 eeba1065e75cf26a8699fb18a60618a23ed5cca6c7333e7ee3831e424254363152a1553ccb3aa4f388f10947124c8e4d61c6c0b73f0c35abf04268bb8bbad754
 EBUILD diakonos-0.9.4.ebuild 751 BLAKE2B c92192b54dd5789f6fdfb1aebbbccb7b21a6dcea061ca9f464a18d4c17b47cba13ce701ecba6c9f9dc3b30566d738da0de4b2859bae9b1673a98483cad47f1d1 SHA512 4ab68a494917f902cf1a8e53c53cdc00b06b59a2f00e5897540a80400aa17e963db6832ba6e4e4c651bf6eeb5aa5d2be984fe4b2eae3853902d25c408dd13070
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/diakonos/diakonos-0.9.4-r1.ebuild b/app-editors/diakonos/diakonos-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..8ad31aa4fdc0
--- /dev/null
+++ b/app-editors/diakonos/diakonos-0.9.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-ng
+
+DESCRIPTION="A Linux editor for the masses"
+HOMEPAGE="http://diakonos.pist0s.ca"
+SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/curses"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/bacon )"
+
+each_ruby_install() {
+	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed"
+}
+
+all_ruby_install() {
+	if use doc; then
+		rake docs || die
+		dodoc -r doc/*
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b961ee444dc9..20425d5c7252 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,14 +10,13 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af SHA512 b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-EBUILD emacs-18.59-r13.ebuild 4380 BLAKE2B 455969fb936c99bd04f5f5e85116e86edeb38b7bf29ba4765c6ef2333c756b612d57c57914b1571f9cf3222bb4d751e551c8e48d3ce2735799d0bcd30d8d9e4e SHA512 8f0c2e4ec5d73099619f78c734e6a048b9404b94a090ecb4babe7933caf55b92f632da7aa0f2b6ebf2862ce7a2d017b4cfd360be8c9b05617bc01ea2cdbcd2bc
-EBUILD emacs-23.4-r20.ebuild 11080 BLAKE2B 6306ed041c826846f116f40bb2b98f3be3d8f1ddfc1506083125ee2214ea8ceb3d5ed9d036c247f45ddd6e7326e6f9c5de93752890a05f272f67708d25291509 SHA512 679adade4cfe01cc2bf9936ed2bc657344019618109b74048575c53d135482afe4bcef637f85779a8bf92c152000e1e9432576704319f394c2281fcd83ad3d53
-EBUILD emacs-24.5-r10.ebuild 10831 BLAKE2B 87325c00c3115e3b3c8c0c6722538382a5bb0913e66bf17dfd4aa90447859c475e4189d6ef9f9dd5281c08200d3c6a0017a5df5d0b9f2046cd5b1a807ef5d975 SHA512 5480f9ec1d7c96cceabb2be9842561a24fb687adad5846a317c5c63a653707c6f6ea704853257aeb893ad0c91280199abbb6b821cfd2a073c2ca92cdd948d294
-EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460fb47fca1f9aaae8a869742e1ce711cf0817fdfa03d9820b44ecbb2bf055cd23743acefeee6466a5c805fa01b53f SHA512 579a75ccbc660faf0ecfe2d28e339e50e1d24412ecb36b47c5d6196b66d615feecdf12557dd9973d8a79124681ca982ee248e17dce39836cd33bc15b6da520cd
-EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
+EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a172c16c718623de60a3c7bf77762eb59e4e5e37f97ea84d3e9623277c83a9364d2af6bf5118b3143d3391da5fe7 SHA512 0527e11b681a053438c89d1576f3ea5967f7892fb79885d126aff1d38d4321d55c317a331cd48aee3464ce9f5a391439ff1dba8e47ac334ec2cc8645fb41b3f4
+EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
+EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
+EBUILD emacs-25.3-r10.ebuild 11127 BLAKE2B d337f00dadd09db93bfe37fa0bd69318cd92395bfbe1edb88a4c9319b69b50067d2f008f1a9196e03c8ce99d520f5d0d8c6771775082383741c3e4401a4b5700 SHA512 757d7b8c68613e9a2e3283e2369aa31c38455ccf7e65da760bbc34f97f2e514f476762cf2d217cfbc7a3c7602e0fba62ac4c3a0c127427178bd822d0f69cac1c
+EBUILD emacs-26.3-r5.ebuild 11739 BLAKE2B 4dbb06bd2883c8030414558c0f42cc0fa56cad2a9c1cf865ed69002825df5b4873fb697b5490ac183ab5f8398c5ccb2b9aaac0fc5b5eac00248ef2a960397044 SHA512 0447abdb36d3a97f9247ba545bb2c35d692740cdcb33e9e73af71d795b514bbaaf8ea35a806ee3f1df4a48b5b1bb6cac3e264b4e6ac06bb7b4616bee92b0ed09
 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-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
+EBUILD emacs-27.2-r3.ebuild 14416 BLAKE2B 44040748fe6ce026c2f92c4122306bb800c7d91137c855675981039e8fa17d26a620f5620554fa37f31feadcdb2038b2636cfe0cac314440424db006074f5af7 SHA512 552db85e54deea9a8450754978e34ea882577a5efe9b8861b76bfd380b1e6e9ebf0e38a8a54ae06808026d3089cbcdbac8e08665c4133f5e853f48230a9dacd3
+EBUILD emacs-27.2.9999.ebuild 14283 BLAKE2B 12dbe5a161e22524bb4d02d0d659b62a8f1940a9a6382b898e6e23c268112f583938225b4f94c8ccbe2bf2e7b70356539a8623eea12e58ce5d2ee272fea16a20 SHA512 1e70761bb0b13dd24515f0e7e9e0e1676d80ff5bf7bd0138d8cc7518a8ae1b20907ba7b12c27b904ec871576a634ee265cd894a7c2e2235c7d7101c16b0f6dbb
+EBUILD emacs-28.0.9999.ebuild 14448 BLAKE2B 88fc7d442c04c87045b2715fe72845289acbaae4e5586965fb58353e48c30950090b6550e75781f9d1c3ffe135bf97d504409e7247ad933a0866bf4e53627901 SHA512 646f9df3bd50ced09b21d28b045c7bd88f6b7dfaf7c341100d4a7c8696de1235c7b410ae559378824a150896eb17b2d420fdaaa32552b3047e6d1de0a4231fa7
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
deleted file mode 100644
index 105fc78984d1..000000000000
--- a/app-editors/emacs/emacs-18.59-r13.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
-
-inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz"
-
-LICENSE="GPL-1+ GPL-2+ BSD HPND"
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32 gui"
-
-RDEPEND="sys-libs/ncurses:0=
-	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
-	)
-	gui? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
-	gui? (
-		x11-base/xorg-proto
-		x11-misc/xbitmaps
-	)"
-
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig"
-
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
-
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
-		src/ymakefile || die
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if use abi_x86_x32; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			else
-				arch=intel386
-				multilib_toolchain_setup x86
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
-	# adding all those missing prototypes.
-	strip-flags
-	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
-	append-ldflags $(test-flags -no-pie)	#639562
-	replace-flags -O[3-9] -O2
-}
-
-src_compile() {
-	addpredict /var/lib/emacs/lock		#nowarn
-	emake --jobs=1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild b/app-editors/emacs/emacs-18.59-r14.ebuild
new file mode 100644
index 000000000000..053a862305ea
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="The extensible self-documenting text editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz"
+
+LICENSE="GPL-1+ GPL-2+ BSD HPND"
+SLOT="18"
+KEYWORDS="amd64 x86"
+IUSE="abi_x86_x32 gui"
+
+RDEPEND="sys-libs/ncurses:0=
+	amd64? (
+		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
+		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
+	)
+	gui? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}
+	gui? (
+		x11-base/xorg-proto
+		x11-misc/xbitmaps
+	)"
+
+BDEPEND="virtual/pkgconfig"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
+		src/ymakefile || die
+}
+
+src_configure() {
+	# autoconf? What's autoconf? We are living in 1992. ;-)
+	local arch
+	case ${ARCH} in
+		amd64)
+			if use abi_x86_x32; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			else
+				arch=intel386
+				multilib_toolchain_setup x86
+			fi
+			;;
+		x86) arch=intel386 ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
+	use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	sed -e "${cmd}" src/config.h-dist >src/config.h || die
+
+	cat <<-END >src/paths.h
+		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
+		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
+		#define PATH_LOCK "/var/lib/emacs/lock/"
+		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
+	END
+
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
+		src/s-linux.h || die
+
+	# -O3 and -finline-functions cause segmentation faults at run time.
+	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
+	# adding all those missing prototypes.
+	strip-flags
+	filter-flags -finline-functions -fpie
+	append-flags -Wno-implicit
+	append-ldflags $(test-flags -no-pie)	#639562
+	replace-flags -O[3-9] -O2
+}
+
+src_compile() {
+	addpredict /var/lib/emacs/lock		#nowarn
+	emake --jobs=1 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
+		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local basedir="/usr/share/emacs/${PV}" i
+
+	dodir ${basedir}
+	dodir /usr/share/man/man1
+	emake --jobs=1 \
+		LIBDIR="${D}"${basedir} \
+		BINDIR="${D}"/usr/bin \
+		MANDIR="${D}"/usr/share/man/man1 \
+		install
+
+	rmdir "${D}"${basedir}/lock || die
+	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
+		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
+	fperms -R go-w ${basedir}
+
+	# remove duplicate DOC file
+	rm "${D}"${basedir}/etc/DOC || die
+
+	# move executables to the correct place
+	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
+	for i in etags ctags emacsclient; do
+		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	dodir /usr/libexec/emacs/${PV}
+	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
+		yow env server
+	do
+		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
+		dosym -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+	done
+	for i in test-distrib make-docfile; do
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	# move man page
+	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
+
+	# move Info files
+	dodir /usr/share/info
+	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
+	dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
+	docompress -x /usr/share/info
+
+	# move Info dir to avoid collisions with the dir file generated by portage
+	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
+
+	dodir /var/lib/emacs
+	diropts -m0777
+	keepdir /var/lib/emacs/lock
+
+	dodoc README PROBLEMS
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d "${D}"/usr/share/info ]]; then
+		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
deleted file mode 100644
index 834facf26043..000000000000
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		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 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXext
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# 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%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	mv configure.in configure.ac || die
-	eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstrict-aliasing -pie
-	append-flags $(test-flags -fno-strict-aliasing)
-	append-ldflags $(test-flags -no-pie)	#639568
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	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 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)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=gtk"
-			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
-	fi
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser=":gamestat" \
-		--without-hesiod \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)" \
-		RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
-		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# 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}"/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
-
-	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}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die
-	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
-
-	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
-	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-23.4-r21.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild
new file mode 100644
index 000000000000..e491036d0785
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
+
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common[games?,gui(-)?]
+	net-libs/liblockfile
+	sys-libs/ncurses:0=
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		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 )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXext
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# 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%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing -pie
+	append-flags $(test-flags -fno-strict-aliasing)
+	append-ldflags $(test-flags -no-pie)	#639568
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf+=" --with-sound"
+	else
+		myconf+=" $(use_with sound)"
+	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 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)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=gtk"
+			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
+	fi
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser=":gamestat" \
+		--without-hesiod \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cq" \
+		RANLIB="$(tc-getRANLIB)" \
+		RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+		|| die "moving emacs man page failed"
+	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+			|| die "moving ${m} man page failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
+	# 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}"/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
+
+	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}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die
+	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
+
+	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
+	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-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
deleted file mode 100644
index 5720b4449dcb..000000000000
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ /dev/null
@@ -1,347 +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 readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		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
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# 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%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-	append-ldflags $(test-flags -no-pie)	#639570
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	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 m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			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"
-			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
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# 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}"/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 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
-
-	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 Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-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-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild
new file mode 100644
index 000000000000..3f9cc7860442
--- /dev/null
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -0,0 +1,347 @@
+# 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
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common[games?,gui(-)?]
+	net-libs/liblockfile
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		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
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:3 )
+		!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="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# 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%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+	touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+	append-ldflags $(test-flags -no-pie)	#639570
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
+	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 m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			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"
+			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
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--without-hesiod \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
+	# 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}"/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 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
+
+	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 Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	readme.gentoo_create_doc
+}
+
+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-25.3-r10.ebuild b/app-editors/emacs/emacs-25.3-r10.ebuild
new file mode 100644
index 000000000000..301dd19e48aa
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r10.ebuild
@@ -0,0 +1,356 @@
+# 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
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common[games?,gui(-)?]
+	net-libs/liblockfile
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	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 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:3 )
+		!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="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# 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%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+	touch src/stamp-h.in || die
+}
+
+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
+
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
+	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 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"
+			myconf+=" --without-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
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--without-hesiod \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || 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 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
+	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-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
deleted file mode 100644
index 0995daeae65c..000000000000
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ /dev/null
@@ -1,356 +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 readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	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 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# 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%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-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
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	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 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"
-			myconf+=" --without-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
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || 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 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
-	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-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
deleted file mode 100644
index 17aae4994de7..000000000000
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ /dev/null
@@ -1,375 +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 readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg 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"
-
-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 )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	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 )
-			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="app-eselect/eselect-emacs
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# 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%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	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 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
-
-	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) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(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() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-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
-	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-26.3-r5.ebuild b/app-editors/emacs/emacs-26.3-r5.ebuild
new file mode 100644
index 000000000000..276dd16e17fc
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3-r5.ebuild
@@ -0,0 +1,374 @@
+# 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
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg 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"
+
+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 )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	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 )
+			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="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# 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%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	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 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
+
+	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) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(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() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+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
+	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-r2.ebuild b/app-editors/emacs/emacs-27.2-r2.ebuild
deleted file mode 100644
index c86c316c8f2d..000000000000
--- a/app-editors/emacs/emacs-27.2-r2.ebuild
+++ /dev/null
@@ -1,446 +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 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="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	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-r3.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild
index 0245ab3cc2db..413825937aaf 100644
--- a/app-editors/emacs/emacs-27.2-r3.ebuild
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -36,7 +36,7 @@ else
 	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"
+	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"
@@ -132,12 +132,11 @@ 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"
 
+RDEPEND+=" ${IDEPEND}
+	!app-editors/emacs-vcs:27"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index 6e936382b210..d3ca04ad9dd8 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -129,12 +129,11 @@ 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"
 
+RDEPEND+=" ${IDEPEND}
+	!app-editors/emacs-vcs:27"
+
 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 f5a41b7f06e7..9050791f1d9d 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -122,11 +122,10 @@ BDEPEND="sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
-
 IDEPEND="app-eselect/eselect-emacs"
 
+RDEPEND+=" ${IDEPEND}"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
new file mode 100644
index 000000000000..a81502217027
--- /dev/null
+++ b/app-editors/featherpad/Manifest
@@ -0,0 +1,3 @@
+DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91
+EBUILD featherpad-0.18.0.ebuild 636 BLAKE2B e5b1a37e4cc813f7f502f39468a97046f143c753a8b285c32b6ac9ea820fdd6dd36c3e731d09658a94a88c1ea3f7b103258a1d6423d31cf9b56543d9c028c549 SHA512 07330a8f3d99a19145711256bc3372af4fe52ef5ce42f379d0c1d2a52a09886c2c12d022faf9656da82afff682c5e3ba8934219d3bcd18c6797e34e2a1a4f5da
+MISC metadata.xml 679 BLAKE2B d9eb7067d7febb55c25297bff56c1e053366d580b6c3b4ca25d59f61b7cea8027e8cca38f5a933f2f8eaa2ce73d5647e81f251cd24022242f25934c60ece1b74 SHA512 7ad579712dac1fa5db103e617523731400f4fc75287fb0118e801f4a28e8444ea05e9ff3e30ba1694b5cf451965359235693d8cc50f99482b1e0413fc184d956
diff --git a/app-editors/featherpad/featherpad-0.18.0.ebuild b/app-editors/featherpad/featherpad-0.18.0.ebuild
new file mode 100644
index 000000000000..6c98ead81b19
--- /dev/null
+++ b/app-editors/featherpad/featherpad-0.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-text/hunspell
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/FeatherPad-${PV}"
diff --git a/app-editors/featherpad/metadata.xml b/app-editors/featherpad/metadata.xml
new file mode 100644
index 000000000000..3fd6253bfc08
--- /dev/null
+++ b/app-editors/featherpad/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" proxied="yes">
+		<email>hansfn@gmail.com</email>
+		<name>Hans Fredrik Nordhaug</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		FeatherPad (by Pedram Pourang, a.k.a. Tsu Jan) is a lightweight Qt
+		plain-text editor for Linux. It is independent of any desktop
+		environment.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">tsujan/FeatherPad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 08670fe3744c..504a9cce7e44 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-40.1.ebuild 2713 BLAKE2B 4f49a0f7cab96c1a74b932270dd944622d729d0960796711fcb3ee63e02535eb1ed942b86e549034a08248b3fe5718a5125768e1db664e6ab34babe9a08375b2 SHA512 b1397ebf9a587d12985bc980055462f66f0dd852a07de0c97589ca0f9e3b93023440433d647d08d778cb6912295984f112b317c99b51fc3d56445c744d398041
+EBUILD gedit-plugins-40.1.ebuild 2695 BLAKE2B ee992e1c12e00cfac023232d931807af1bb3ab31d9c705e4d04f915d2b6aff31e73cb646086b534a8cdf49b39b39538fb08ef4ecf12783e58d5fed6cefc64c6c SHA512 82a7ab9742e53665f280fa27be86ed695ddabccf91298022456aad45eeaf96abaac7528ca9ec8500214f41a23a0631c1069b7f719e31ae79535c661439f204f5
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
index a9af27aa40eb..266db95b91a9 100644
--- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
@@ -36,9 +36,9 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
 			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		')
 		>=x11-libs/gtk+-3.9:3[introspection]
 		>=x11-libs/gtksourceview-4.0.2:4[introspection]
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 2d27f513d9c8..142e2bbe5914 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,3 @@
-DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
 DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
-EBUILD gummi-0.8.1.ebuild 941 BLAKE2B cda4a2712cef8c8bcb7dbc532bda5520cdcaecc584adea637b09f254529c0b9d4d46fa2a11d165737ab573f0731c1e3ebd621f17073d642ba0c21af23136c49e SHA512 97240093be39eaa34879ed464538699a14b714775708fe60987cd58756f0acdd65cd87a0bf2a88c31bc70226626ef8e897b9e0ee566d00adcf90dac95d4940b8
-EBUILD gummi-0.8.2.ebuild 935 BLAKE2B 541a1e261622aa409da60e840bfff94de6624b5474c832f935bf378b8e9eb6216d854e602670649cb7de93f1084f77d008dbe2b695683b212c65d727585a6a3f SHA512 f8f766b95288b5a619ce887e58452087e01a3101fac0f1a9a274c792a7fc1b6ea3fea4b76afb2a023c1d6c393731a3c3786042f8c812aeaba1e1a1e5f63de7c4
+EBUILD gummi-0.8.2.ebuild 933 BLAKE2B cc47d40263a8735d2587da09aaf011da249aef3cac9dc37b3144359ba82ec5b24814b1643c94cb0dfa4204ad7479287fe4219ea75c260fa8254d80ceaf260be9 SHA512 4a9becb0cff5ffaac6b76a8f92a244f07d374cb077c124ff595e9c0f0ce770db1d1a8d55817605b048538abaad16284ba9f142c58d88d2eeeb176f80e6fd82ed
 MISC metadata.xml 615 BLAKE2B ee2552450c4e9e8edc7e3dec38bcafedf30ab2b42b8358cce7c7a38e3a37bd907734406ee12a79f176100e9208c7480e6c980633416e3c4cff1ecb638e840673 SHA512 c96879b8ac00c1aafad177a55ecd524a502519f1cee5c1d036d260bb11e12b492d3e798b8f94572666e4aff45dd4233bef4ceb8a34bac523f3e36c78bdb4fddd
diff --git a/app-editors/gummi/gummi-0.8.1.ebuild b/app-editors/gummi/gummi-0.8.1.ebuild
deleted file mode 100644
index 9c76d97c37cf..000000000000
--- a/app-editors/gummi/gummi-0.8.1.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 xdg-utils
-
-DESCRIPTION="Simple LaTeX editor for GTK+ users"
-HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/gtkspell:3
-	app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Gummi supports spell-checking through gtkspell. Support for"
-	elog "additional languages can be added by installing myspell-**-"
-	elog "packages for your language of choice."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/gummi/gummi-0.8.2.ebuild b/app-editors/gummi/gummi-0.8.2.ebuild
index 9e9ee99f8505..1fa127ba4ab1 100644
--- a/app-editors/gummi/gummi-0.8.2.ebuild
+++ b/app-editors/gummi/gummi-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	app-text/gtkspell:3
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index a0a9f7820d00..1c96675674e2 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,5 +1,5 @@
 AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
 AUX kakoune-2020.01.16-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
 DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16_p20200601.ebuild 1048 BLAKE2B b9d2da90932008b085d2e38aa1f84ad2c241bb35dc7ae6f89a23b3e4b1531b6ee9361d9ce80aefd39a38e860549f8678494f9b9b0712e611230aa04c5d4690ad SHA512 e91618763b8509d0b964bafc4e46109811af02a81c80ae710da2d9e27c52ca7a285ff933d017c3aa32d59dd0ad0c95ea3e7246378a7cc37fed19267bbbc56d2b
+EBUILD kakoune-2020.01.16_p20200601-r1.ebuild 1050 BLAKE2B 384beddd1657e9bcc14e82ce2fb59121a2de1325a9a4f81929b9ac7680bc88e4b471b339f64179a305a4a9da616c4a5f754b5e2df24de93ddf8069772fdb6d33 SHA512 de19599681da7055ae22699bf9305cc8916d853160d949ddc7ebc30581e94d27c3f2e1324457dd0baae51a31f5f3d7fe8716734f420119696d94f7a1b7e44c73
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
new file mode 100644
index 000000000000..21dafc2dd2c7
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/kakoune-${MY_COMMIT}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+)
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
deleted file mode 100644
index 20c792e1d588..000000000000
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
-DESCRIPTION="Modal editor inspired by vim"
-HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=[unicode]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
-	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
-)
-
-src_prepare() {
-	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C src all
-}
-
-src_test() {
-	emake -C src test
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
-
-	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
-	doman doc/kak.1
-}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index b547dce0a391..f471d76b4148 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,8 @@
 DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
 DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
 DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
-EBUILD nano-5.6.1.ebuild 2281 BLAKE2B 66004fd9d399d494ed8e5479bcd128ac09b0c812688670d5df47674e915ad670d2284828f929dc5bb1828d83ab792dcb714ec3ac3348b7d78dd82c0633c108e4 SHA512 dfff336508b7e82993aa6a07acec467b2422354847595699af9b55464e630bb46495c71c5e297b1b8d59e492122836175814313598d39ecaa30eff1c8452c84a
-EBUILD nano-5.7.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
-EBUILD nano-5.8.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
-EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-5.6.1-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d
+EBUILD nano-5.7-r2.ebuild 2292 BLAKE2B ee26fc996ba74fe65598ca1b0228c4ad714d0328c716d7d6990addefb4676526f2d0e5d1e08d92707b249e27240abe4caf7be2ebe39d3fbdf30029bf45174318 SHA512 14aa6253f4a00597d0c504cc2a950e90915761c6a992d8ee8aff08ee680123bba10df6c5ad1c55de69e6bf856fe57e0f2d0605725deae5d8683b013d89fee73c
+EBUILD nano-5.8-r2.ebuild 2292 BLAKE2B ee26fc996ba74fe65598ca1b0228c4ad714d0328c716d7d6990addefb4676526f2d0e5d1e08d92707b249e27240abe4caf7be2ebe39d3fbdf30029bf45174318 SHA512 14aa6253f4a00597d0c504cc2a950e90915761c6a992d8ee8aff08ee680123bba10df6c5ad1c55de69e6bf856fe57e0f2d0605725deae5d8683b013d89fee73c
+EBUILD nano-9999.ebuild 2292 BLAKE2B ee26fc996ba74fe65598ca1b0228c4ad714d0328c716d7d6990addefb4676526f2d0e5d1e08d92707b249e27240abe4caf7be2ebe39d3fbdf30029bf45174318 SHA512 14aa6253f4a00597d0c504cc2a950e90915761c6a992d8ee8aff08ee680123bba10df6c5ad1c55de69e6bf856fe57e0f2d0605725deae5d8683b013d89fee73c
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.6.1-r2.ebuild b/app-editors/nano/nano-5.6.1-r2.ebuild
new file mode 100644
index 000000000000..64cdf0ed0eba
--- /dev/null
+++ b/app-editors/nano/nano-5.6.1-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	sys-libs/ncurses:=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	magic? ( !minimal )
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
deleted file mode 100644
index e1d933b0f49f..000000000000
--- a/app-editors/nano/nano-5.6.1.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
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.7-r2.ebuild b/app-editors/nano/nano-5.7-r2.ebuild
new file mode 100644
index 000000000000..7a309f7cb09d
--- /dev/null
+++ b/app-editors/nano/nano-5.7-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	sys-libs/ncurses:=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	magic? ( !minimal )
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-5.7.ebuild b/app-editors/nano/nano-5.7.ebuild
deleted file mode 100644
index aaa4c8829842..000000000000
--- a/app-editors/nano/nano-5.7.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
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.8-r2.ebuild b/app-editors/nano/nano-5.8-r2.ebuild
new file mode 100644
index 000000000000..7a309f7cb09d
--- /dev/null
+++ b/app-editors/nano/nano-5.8-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	sys-libs/ncurses:=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	magic? ( !minimal )
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-5.8.ebuild b/app-editors/nano/nano-5.8.ebuild
deleted file mode 100644
index aaa4c8829842..000000000000
--- a/app-editors/nano/nano-5.8.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
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index aaa4c8829842..7a309f7cb09d 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -20,8 +20,9 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
 
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
+LIB_DEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	sys-libs/ncurses:=[static-libs(+)]
 	magic? ( sys-apps/file[static-libs(+)] )
 	nls? ( virtual/libintl )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 6f253a2ec16f..fc72cbad543d 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -3,4 +3,4 @@ DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcb
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
 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
+MISC metadata.xml 297 BLAKE2B 72eea8c8e47bb1ab0685d2bde28c8252ce63c0fb398b57e7bc318c4f1aeee7d30297cff5549b7bf39449c89b8dfb3aede8af4667b906f638036ad46efe0b7038 SHA512 d3fcb84a70c8549b09983749c7de6f1bc9e9733d57dddc705e7691129ed85923ec2b0dd9c393bdaf8766ce86523e2d0deb141ef5c3cd2aa1cad5a5f4deb0b8ba
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index 99efc308a05e..649a8288e502 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">retext-project/retext</remote-id>
 		<remote-id type="pypi">ReText</remote-id>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3de184f84c12..b06c2ec871ea 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 118c1e5d12ba..eb707fe0369a 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -1,4 +1,6 @@
 AUX 50apel-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
+DIST apel-10.8_p20201106.tar.gz 69188 BLAKE2B e0107968349fe73325503a61fbc9ada83d657f2ca66a39ae2ea833543277f536d22371e371e17dc4307380e738491e20ec0b7b52a35207f49e37fa65c66f3ab1 SHA512 fb14570d6d4f2346d386ae0012cfb9149ddf9ade8b4dc75507e6cef848d12ef65f80bd7d1dc26815031aee00461d67d4a86fe29e30d5d542756e725425634c77
 EBUILD apel-10.8_p20190407.ebuild 1103 BLAKE2B dd978f08c9b9bbb7469dc9b7b753d8d05ef860b803efbf1c393d2370d85ce271117f5ad3bd9ee20aa04dcdebce2c5558e0c5ef4f0874364a4524d71acdcb166e SHA512 a3b9ab568b86dd51f5d2f2455539ff0df43e5f659064808793b43721e38241148224da573a12b21dc79407891b0a07e301277189cc595ce43c2935ff4f23f88f
+EBUILD apel-10.8_p20201106.ebuild 1005 BLAKE2B d43b2b760d74e4c6f440b49805783dc305c579a46f9f5f1001723c8a0736416d6a7694aa48860b6c264ea1a0fc7d2953a16af20908c89e663cd43b4ad6402fcc SHA512 29f155312d3100ebf561a093cc0f9ff517de14ebfde73f8715740617bc82d68e68ee3c0c046ddcd7ab8c33bef606c105266204e6a99aa1cb04478ed101521c9f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20201106.ebuild b/app-emacs/apel/apel-10.8_p20201106.ebuild
new file mode 100644
index 000000000000..85482a6ff306
--- /dev/null
+++ b/app-emacs/apel/apel-10.8_p20201106.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
+HOMEPAGE="https://github.com/wanderlust/apel"
+GITHUB_SHA1="4e3269b6e702db2dba48cf560563ac883e81e3bf"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+SITEFILE="50apel-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	cat <<-EOF >>APEL-CFG || die
+	(setq APEL_PREFIX "apel")
+	(setq EMU_PREFIX "apel")
+	EOF
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" \
+		install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog* README*
+}
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 9a098aa595bf..aa9a95f644da 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1,4 +1,6 @@
 AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
+DIST flim-1.14.9_p20210529.tar.gz 146081 BLAKE2B b5326cb67f4e1387fe5a9f0cc9360feca81bf61de18ae75b325e072e70a3f4b70a1bda148a2ab8ac9c3b872bc5ed96b53b61d0de427abfb21eb8e3dba1235701 SHA512 47a55606add53da7f399d87befc834dbbe4b52b1f3011d24d3dfd3ec7a7010ffebc2aa666e38f5878735b2ee43dfe46eec548dba3535521440c8bcd1bd08a17d
 EBUILD flim-1.14.9_p20190526.ebuild 939 BLAKE2B a2cc523e803ce3e1a0d88e4f5105d83f2552bbb08098848ceca512a76876578287f0daf7c02e9b4b720fe9561b6bd9f51330ecbb8c2d731e78e3fc640dd449dc SHA512 17cf24ad7990ba1086bd0323352105b158775b0808be8f8f40767b72ddfa542dbd4f51948c3e62c06b030b0a18d97a2573c62dd4054ca389cb5c7e33bfe18da7
+EBUILD flim-1.14.9_p20210529.ebuild 942 BLAKE2B d5a164e630579d16306322884c96ca2a262f8805973d259ceeb781b8193a8d5c536eeb19d51f8c456463ef10e5b03498bd71123ee7ea0f27eea5744b3d6ce01a SHA512 b94e80dd3cbb6adff727bec673e23b5854bda1929d55ad7298ac170c6a6f6685c49f8533091c8b7c87a5ff2718393776c4327905837f92a13ed40477e743c2f2
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20210529.ebuild b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
new file mode 100644
index 000000000000..7dabe9f475b3
--- /dev/null
+++ b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A library to provide basic features about message representation or encoding"
+HOMEPAGE="https://github.com/wanderlust/flim"
+GITHUB_SHA1="02735dede6603987e8309a76d0bc7a9ff9a5a227"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND=">=app-emacs/apel-10.8"
+DEPEND="${RDEPEND}"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc FLIM-API.en NEWS VERSION README* ChangeLog*
+}
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 45f31383769c..4d679f9a3d5c 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -1,5 +1,8 @@
 AUX 65semi-gentoo.el 60 BLAKE2B 19bc99330e4583e19060bba3722f73da5a5e232e0e60673ba21c3b02dd3429098685313380f788bbce5a23c98618f2adc22115a1b47abe2969c25db3d8b6716a SHA512 a8441acdfac8f82dfa65e796e39dd77ce5ff7569e0deb930d31c7c90ce7ccd4be138f51a4866a1036ea6234c6419e548a5df74fc932cb5b588dd99acc2c2d314
+AUX semi-1.14.7_p20210613-info.patch 624 BLAKE2B 031ea810144a2e64ad5488cc4e417e72fbc1a0ea3621ea79b91396a6746135c7d08663a22726f690b03ee64abfdfd9d3a7627d6b3ce778693e9f548fb5278d93 SHA512 4ae846151448a6d3a77b1f38707beb62f7507a60e4497d8e927c7f5c350c33adb112317b10618bbcde2478a2144c8cc8d1e843707230a4db7932f61704ef6fba
 AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089ce8bbdf9d05fad0872ae2c3e1978c6c60663539d427f863f225cb11d604de80c0fe5d2f0bfb4898365 SHA512 d3e3700f8bc19e48d7a5ec419d7a1f5e5683fe18e6097b52d47f73dee47624b095e3dae4a064b023a6ad2cf5d84705aefa04f94ff85aa9a854c1d9cf3dc7f052
 DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
+DIST semi-1.14.7_p20210613.tar.gz 150809 BLAKE2B 6e91f3c28fbadd3ad0ac7856305d7acb5354df33cfb182924712023e5c7b5dce14176af9a5e5f44e345c60d5ec014e813151ee185a5115d6d4faa8d93d9e63b7 SHA512 aa89900f7f06d76301e109c267e7e3c4d97c7f1e1f075db147fa0a9e91aadef93a58522c7a35f5cca2fb5ba4c05397b98cbb4791f3a8e72242b3dbe7f03c29ad
 EBUILD semi-1.14.7_p20190517.ebuild 1256 BLAKE2B 49ed1c01ac577f35bbc8cfb2f45b627bda0644e07c7781ba0e0dfbd55de6b8ffe77cf6259701ce9c50aae18cfc36fa1ddea4d979c1a5bb13bc74aa9d01e25028 SHA512 ef34a089f3e911b6dc43c700ee7d5b596ca817d4997dbbaec3ca792bbfccffc875a328767abea3285b2379c64332b5e06f4be331f1c75df003b65febef5b353e
+EBUILD semi-1.14.7_p20210613.ebuild 1302 BLAKE2B 623fa85d3b6a4ba1224e2221dde4be021b9e6ddc673d39bfc6e91a614070cd6b6d3d02451f554cf811b1347ec740517e69a12d51566dc78ca3b152f63dea9b39 SHA512 46232c9a97223e24bf57e46c6b27e559b6090e2804da34292aee1919b2c8b3f22c8569cd0ac98fb0001f96725a2b851c057fba0a358fbe15add4d14a2183dc3c
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch b/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch
new file mode 100644
index 000000000000..4321cc360d2b
--- /dev/null
+++ b/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch
@@ -0,0 +1,28 @@
+--- a/mime-ui-en.texi
++++ b/mime-ui-en.texi
+@@ -14,6 +14,11 @@
+ @author Kazuhiro Ito
+ @subtitle 2020/09/17
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-en: (mime-ui-en).  MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI-EPG 1.14 Manual
+ 
+--- a/mime-ui-ja.texi
++++ b/mime-ui-ja.texi
+@@ -15,6 +15,11 @@
+ @author 伊藤 和�
+ @subtitle 2020/09/17
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-ja: (mime-ui-ja).  MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI-EPG 1.14 説明書
+ 
diff --git a/app-emacs/semi/semi-1.14.7_p20210613.ebuild b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
new file mode 100644
index 000000000000..2deaf91f17e8
--- /dev/null
+++ b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A library to provide MIME feature for GNU Emacs"
+HOMEPAGE="https://github.com/wanderlust/semi"
+GITHUB_SHA1="509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+RDEPEND=">=app-emacs/apel-10.8
+	>=app-emacs/flim-1.14.9"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/${PN}-1.14.7_p20210613-info.patch"
+SITEFILE="65${PN}-gentoo.el"
+
+src_compile() {
+	emake
+
+	${EMACS} ${EMACSFLAGS} --visit mime-ui-en.texi -f texi2info || die
+	if use l10n_ja; then
+		${EMACS} ${EMACSFLAGS} \
+			--eval "(set-default-coding-systems 'iso-2022-jp)" \
+			--visit mime-ui-ja.texi -f texi2info || die
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo mime-ui-en.info
+	dodoc README.en ChangeLog* VERSION NEWS
+	if use l10n_ja; then
+		doinfo mime-ui-ja.info
+		dodoc README.ja
+	fi
+}
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 52a7052e38fd..0f3bbd614116 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,6 +1,6 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
-DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
 DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
-EBUILD wanderlust-2.15.9_p20180814.ebuild 1342 BLAKE2B b2dc8a086ed0cb920657e95d0a838ffe3cd57dfbb0f532943bd1348b1d8f0824cad29d28b28f5381ab0dadfc50c03321927611f2767f7698cdf425ce530abdad SHA512 e49d6a2da7eca330d40154abb3ffbbf0a6b923cfe6914e85a010a6c9afb03358a0cf4ccf2a70ce629efc2153132a858b856854676f411604891ac3dc566579d4
+DIST wanderlust-2.15.9_p20210629.tar.gz 1177023 BLAKE2B 7af02d833bfa7a2fdb52adc6ee25e43cb5b9ebd79c32685af033e3f24d3f1f9c758940b9fe7ade1295691a774e0530569b0f0567aae57a54d7da30e70f57eb93 SHA512 60cd4be070fde9f24f42ddc6ca5d5d290eddf2c0fa9b584eace50bc569f2ed3003be8f75f26a5ef8cffad4ed059118163bb4ea289d95ee58b445c4d8f34b487e
 EBUILD wanderlust-2.15.9_p20190623.ebuild 1373 BLAKE2B 81925ac4fb0588b1c790f648dc4804ca30da61a38f8822508c94eefebdbc39e1bf6075dcefbead7916ea89ef1d061d5a62a91fe83f82d09fdc81978f0265cee0 SHA512 784f76bd82988061017f6cb4213fa2a4f8716befd109ab4a6215149d61e17677c206ea788a78f07f7ebdcb48eb25773bccb99df70269dca446c9d72afecc0666
+EBUILD wanderlust-2.15.9_p20210629.ebuild 1392 BLAKE2B 0a7ae26f8f7fc99479158707d62dba830bde4d982b369c01cd255eada2e9c53ed9043b26d9a42c687693532337cc7e2b5bc83c7016587992f4a5e1790e3f88b5 SHA512 ab6f2c0f7ab1c4be1b22b1ad6e8fcdafe9e7d9565ccb2f37024fab4dffaece90c8c989978a7130f33051ad3c4d42746accc3e25d8c444defdec2ef1965479a3e
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
deleted file mode 100644
index 033aa93c445a..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="https://github.com/wanderlust/wanderlust"
-GITHUB_SHA1="395826e99b84051396d503392f52462b6cb683a5"
-SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
-S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bbdb ssl l10n_ja"
-
-DEPEND=">=app-emacs/apel-10.6
-	app-emacs/flim
-	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	local lang="\"en\""
-	use l10n_ja && lang="${lang} \"ja\""
-	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
-	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
-}
-
-src_compile() {
-	emake
-	emake info
-}
-
-src_install() {
-	emake \
-		LISPDIR="${ED}${SITELISP}" \
-		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
-
-	insinto "${SITEETC}/wl/samples/en"
-	doins samples/en/*
-	doinfo doc/wl*.info
-	dodoc BUGS ChangeLog INSTALL NEWS README.md
-
-	if use l10n_ja; then
-		insinto "${SITEETC}/wl/samples/ja"
-		doins samples/ja/*
-		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
-	fi
-}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
new file mode 100644
index 000000000000..036441e2b356
--- /dev/null
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Yet Another Message Interface on Emacsen"
+HOMEPAGE="https://github.com/wanderlust/wanderlust"
+GITHUB_SHA1="769699d60aa033049804083b459ee562b82db77e"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bbdb ssl l10n_ja"
+
+RDEPEND=">=app-emacs/apel-10.8
+	>=app-emacs/flim-1.14.9
+	>=app-emacs/semi-1.14.7
+	bbdb? ( app-emacs/bbdb )"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	local lang="\"en\""
+	use l10n_ja && lang="${lang} \"ja\""
+	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
+	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
+}
+
+src_compile() {
+	emake
+	emake info
+}
+
+src_install() {
+	emake \
+		LISPDIR="${ED}${SITELISP}" \
+		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
+
+	insinto "${SITEETC}/wl/samples/en"
+	doins samples/en/*
+	doinfo doc/wl*.info
+	dodoc BUGS ChangeLog* INSTALL NEWS README.md
+
+	if use l10n_ja; then
+		insinto "${SITEETC}/wl/samples/ja"
+		doins samples/ja/*
+		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja.md
+	fi
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index ab3f613cf9aa..8b230870c821 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index 76d13285646a..829aff9c7016 100644
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,4 +1,6 @@
+AUX aqemu-0.9.2-docs.patch 537 BLAKE2B 5a96b909a29e78aaac8cd71551aa0f5223ef7e4782d365308241a71c59d9e4e8e2acd2e9cdc72d95e876d5ec5dcdae054716b0ed23bf66d5879b2263c691b5c5 SHA512 df50688b5abb1225ce48eb6a1626030869a0d42b701c72ca325e71073d35aad5fda56e97939e5a41f5d3da0af57d89e8c2535845d4c5f0f3eb898f294dc5bef8
+AUX aqemu-0.9.2-include.patch 202 BLAKE2B 1f189a225adbda7e1b9e9e89820e1966c35c8b0f40bc1df0caf89117988c6ddfc4060a2cfeeffc082775b7f11be15fb3aecac623806a9a4d9567aee2746aa9ed SHA512 adb3a92fbfeb8bb5025fd1b3b7587af2b390d111cb42bd48f031b2d5eebebd132a03a84a7026bf0bb17fa627ed49558ef5237e6472d8558f3ba3fff82ab52dad
 AUX aqemu-0.9.2-qtbindir.patch 514 BLAKE2B 9d6245d1745248db021cf9883bf9f8a00223ba781a2ba9bbc6561e4fb7239aa6c2baab7a1324edbbf157d68a829116ecc07b24bb13d714321ce145de447b9bb6 SHA512 f85e6c2487dfef86470773949f6796af9efdf066d9871ac4cdfddd064c85fbf893574e602ab2c6cd1198dc9eb76f0722b5a85ec046b2dca2275a24799418c996
 DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba
-EBUILD aqemu-0.9.2.ebuild 811 BLAKE2B 3be9c78f0da01b561c6174997b9c153174f3591ca568b04101cdc7b9d6ac7e18e6827b0ab5797bf4a337387347261f09d59d829ff51984ed39bedd55e49e3b69 SHA512 01cdd4070f7ac34365bc44e5bb7c5c27ce1d16f268901369d8e60fdf646f6162d52a1787511da2cbb90e6849a9cb20b1be917b161dbc18f65a3e045bc3b719b8
+EBUILD aqemu-0.9.2-r1.ebuild 891 BLAKE2B c33021b00ad21604f8559c16d011da11fc58bce8bbf031e6610f445acc19242ec675df97a9eab9e012c4d28a7998cababffe3de0efc9d2f64a2cfcc58091fe90 SHA512 8c65a9956bfe81b400f26ad6d6107ce65c1d5a9042659ed413899da2fbb5a868f6e1bc0188b8c2a50e9f85634a079774ac3824afa034d00a2e48117c886f41bc
 MISC metadata.xml 298 BLAKE2B c9dd2d8f5a8f0bb97f45ce35d3f1ef7cc6d6220b7bda1f58e3e2e6e7fe3e4c30569b873504878deba139aeeac37159c1ac2cbe75bb7789b042a31d8d766a40e5 SHA512 ca482ea94b7f8249f4174cd9c932a25d14e0632cc861520ca83091c774fa85af4ed58cb61aeab4054880c4beb2fab369ba439d8302d22b0ce5fdcdf2d018a21b
diff --git a/app-emulation/aqemu/aqemu-0.9.2-r1.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..d7880171c93e
--- /dev/null
+++ b/app-emulation/aqemu/aqemu-0.9.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
+HOMEPAGE="https://sourceforge.net/projects/aqemu"
+SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="vnc"
+
+RDEPEND="
+	app-emulation/qemu
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	vnc? ( net-libs/libvncserver )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
+	"${FILESDIR}/${PN}-0.9.2-include.patch"
+	"${FILESDIR}/${PN}-0.9.2-docs.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN_PAGE_COMPRESSOR=OFF
+		-DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
deleted file mode 100644
index 86008228bc21..000000000000
--- a/app-emulation/aqemu/aqemu-0.9.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
-
-inherit cmake
-
-DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
-HOMEPAGE="https://sourceforge.net/projects/aqemu"
-SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vnc"
-
-RDEPEND="
-	app-emulation/qemu
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	vnc? ( net-libs/libvncserver )
-"
-DEPEND="${RDEPEND}"
-
-#DOCS=( AUTHORS CHANGELOG README TODO )
-PATCHES=( "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAN_PAGE_COMPRESSOR=""
-		-DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
new file mode 100644
index 000000000000..e3fab7fbf209
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -273,9 +273,9 @@ MACRO( create_docs _sources )
+ 	ENDFOREACH( curFile )
+ ENDMACRO( create_docs )
+ 
+-CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
+-ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
+-INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
++#CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
++#ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
++#INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
+ 
+ # Build RCC files (GUI icons)
+ MACRO( pack_icons _sources )
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
new file mode 100644
index 000000000000..98a14068a7cd
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
@@ -0,0 +1,10 @@
+--- a/src/docopt/docopt_value.h
++++ b/src/docopt/docopt_value.h
+@@ -13,6 +13,7 @@
+ #include <vector>
+ #include <functional> // std::hash
+ #include <iosfwd>
++#include <stdexcept>
+ 
+ namespace docopt {
+ 
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 8853634eeaac..7a4096aa786c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,7 +1,11 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
+DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
+DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
 EBUILD containerd-1.4.6.ebuild 1957 BLAKE2B 37e70d8fb5f2f719762719547696196619185ad50c471d53123e8d85c5fefa5d66f7cfaa1b7eaba1ffed382e6b907057e82ebd755b19a47033e9f261f1d79b64 SHA512 65f9428b86d7ac0720e4354a0d200c15a7305d3042e99919bd773001efbaa4b413d8930a11137a7277584bbde7c8e0f6a1ce54eee4ec8a74639b97486a1a0bdf
+EBUILD containerd-1.4.8.ebuild 1954 BLAKE2B 78c0cdc4e78642e3b22ad38d0977f9d4608dc4038e5a0f61eeb8ad144834ee9d7393b9663a2fbd53764402fdd5b3b5ff6625c623f73bccaec36dd5ece398e3df SHA512 5a1a9ce1360846f1fc02e84dabe5e686a1e8d7e7e053e12a70554b27d5162ed6e4ddfe4aa941f8d3a54bae255f9675454c055dc9e827eba30a81a709b28b6d6e
 EBUILD containerd-1.5.2.ebuild 1821 BLAKE2B a2ec9993e78a72e2331a51087f6c6e727a5eb9b4a1168316b9c640424a182624feb0d918beeff2ceb707f4cd3356062ec73e66a809641be5db2e29d86fa9a124 SHA512 92f10036925446ad3bc9a90386c34bb96d3ccf52a1747a8c36e156e0f008beaff2f0d1c592288fbc6f9a1edb871d1b6f94bfc82aa9860ca060e02697c35cc0a7
+EBUILD containerd-1.5.4.ebuild 1944 BLAKE2B d48f24de2088c4d8e71fbaa716f7ab8c9450924e8029e7d9bf5a892643b47ca63275332b1a5a904d439e4f53abc27b48b082d05898b897c0a5087465df49681e SHA512 6f9a892e1a7eb49ecd22006f751c0dee929644ba65edb1836176ea03e9b1e783420cef4b370d9b29a78db5ebc69f434cb337244d59047e7a579a915d562a6fda
 MISC metadata.xml 1143 BLAKE2B 2e3705605579b406365f0faca9238c1cfa1047ebbbe04686281d6b161aeb9bd947641116a755070fff9aa01dd8010ee36d570075a1ac7e87e29c727c2b06be7c SHA512 bddfb97b70466a3ff7442a1249708680b960456e6d1058dea59f09a34bcdf262c7b13430ec0fd3a16b0f060d48ffeda569c8ae4d9d9dbca93e4af2ee13ec1a1e
diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild b/app-emulation/containerd/containerd-1.4.8.ebuild
new file mode 100644
index 000000000000..39f3e5aaf19f
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2
+EGO_PN="github.com/containerd/${PN}"
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-emulation/runc-1.0.0
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+		-e "s/-s -w//" \
+		Makefile || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+	)
+
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	export GOFLAGS="-v -x -mod=vendor"
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( README.md PLUGINS.md docs/. )
+	einstalldocs
+}
diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild b/app-emulation/containerd/containerd-1.5.4.ebuild
new file mode 100644
index 000000000000..2ba359035848
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.5.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-emulation/runc-1.0.0
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		GO_BUILD_FLAGS="-mod vendor"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	GOFLAGS="-v -x -mod=vendor" emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index 1bd331a1cb51..70212b3d5402 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -1,5 +1,5 @@
 DIST crun-0.18.tar.gz 1394857 BLAKE2B db4f0407aaf5e4c5b9069ad5ae6a76308665d91559d92bf370b964e0914f337a84af896f1c1e00184ef4b0625bd1c0f1e2fc3295074c7f5524c5359ce54ba6b4 SHA512 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46
 DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994
 EBUILD crun-0.18.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113
-EBUILD crun-0.19.1.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113
+EBUILD crun-0.19.1.ebuild 1391 BLAKE2B 12467ff7c6a8537132ed36cdb5113258c51c60242cb575429725d51759724b6eb3c4ab8915e21ae85e77aa2371c8897763087915c7906fa85719b377796394e2 SHA512 201aee36f5243014988103b8ae3f29e600cd10fdd68f413aa4b1eba371cd30646d73367de1a23e7a9ead4b41b3e1facc44a2f62f730489582c02a79b6cbdae51
 MISC metadata.xml 1299 BLAKE2B cfa5ced999f15c2aabb6633865fb8bc2f2dc7c2d2b4fa61780de40f975c8a00ad87d7c1251517f7a50b01c3413d2afbe8bca2114ce9eb74d0437285ee6d19d91 SHA512 0f2109b828550df8807736022598f3fa36128ff5224aa61cbb4001689c344b670c124bb85805cdedf8b2e7173b4cc6bc29d7d46ef95f7c9f03c4a9b6e1c93493
diff --git a/app-emulation/crun/crun-0.19.1.ebuild b/app-emulation/crun/crun-0.19.1.ebuild
index bc97b2bddb13..36091c997004 100644
--- a/app-emulation/crun/crun-0.19.1.ebuild
+++ b/app-emulation/crun/crun-0.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
 IUSE="+bpf +caps criu +seccomp systemd static-libs"
 
 DEPEND="
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index b2683248d33a..177188d6afee 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -16,5 +16,5 @@ EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be
 EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd
 EBUILD docker-compose-1.29.0.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
 EBUILD docker-compose-1.29.1.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
-EBUILD docker-compose-1.29.2.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
+EBUILD docker-compose-1.29.2.ebuild 2101 BLAKE2B 321441c284627fb092af9b0d75c3a9faf34f4fb368afdbd90b3735603798acb25f9e664d5e28a7bce84ea27c38adf456ae1b53d067d39007caa4978a4c346b6c SHA512 2fcc39f7d27a0b06d3d7c97ba1b20e519d89014bb891b3634e2023c3efa54b0db633d7131f5c9d4a5c863d4dfdd074d6cd3209b56f76cd9a7b0a96eefd83d265
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
index 0d5c1a457def..8e60fe4c7510 100644
--- a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index 9689a4dbb252..27682cd9a3d3 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -4,5 +4,5 @@ AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8
 AUX registry.logrotated 89 BLAKE2B c16fab4c6a3c4fd9f48370ae30505408a49e07c2a7ea7fc119717efcd840ad489c92855e27a5546219b3cdeb257642eb65abc2d544859295688925ae2e94ecb3 SHA512 f824b33a1fa38802a8aa79599843b0ea065603799823352e9515c50bfc61c43a03e9eb5327f9c687b8c3864fc633ad1a46bff9e91f4c54a46a09e67d2f6f833b
 AUX registry.service 323 BLAKE2B 1be481d08a283793d10ef870fc299e1c284087878e67ec54f44e662c616127bc411fdde19659cf7acd69787054c624c5c5206434c36b4e5a0fcceaf79c2e78f0 SHA512 67d2b69c1fc497774e3171628fa73b9b9521e19c76414e32721994f2ba614bd3c6896c578c9d9b8af0ad4972b9da0c504ef787a7585a550be4bfe1bd40eafc15
 DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
-EBUILD docker-registry-2.7.1.ebuild 1490 BLAKE2B 5bed77a7d89bacec35ffd08b0c582df8a64f48d373b6f756263484acd5959a04b033815787d5095d78e12dad5b68d08b70ba7571815f2d772cddd16fd1cac7f5 SHA512 eb4c39ae5b02508846c19948ac7331abb5223defaecf0ee817f6b7e3d844d13eca370c63b37780807a0150b20bfa9860707f8050b18332390280789d9f2aa852
+EBUILD docker-registry-2.7.1-r1.ebuild 1463 BLAKE2B 21bbb8b8842540b479e22f7b7e5ce6c2c0f4f4c5ac37a64718c87c6abdef2a550b97ed495d35360d92d9545fe003656366713b27eff9b217859f83aaf834d48c SHA512 da38b17318bc05a0de3980dc1e4815dee8b459dab435993ac2b94c75a1fecfbbcd855c04809627e5d08b477a8bfe381425bdb9f85c6ff5558316e44b65fed80b
 MISC metadata.xml 310 BLAKE2B b7a4e4e347c4b262857668fb0bba20e1efce6abc449cf3614538b34f03c897ce78e637db513a66e8e5ff9b1262df44d864aa41904ef7e86eee384bdafbb014cb SHA512 bcf043907e7e2ad9ef21a4b02b4aeb0f50bd17b1e5315653b2339036d4775bde661d711d4e84536f657c7bf9247ef446f1c95abdf14699620e44a104c9e1fe0a
diff --git a/app-emulation/docker-registry/docker-registry-2.7.1-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..78708f327413
--- /dev/null
+++ b/app-emulation/docker-registry/docker-registry-2.7.1-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 golang-vcs-snapshot systemd
+
+EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
+EGO_PN="github.com/docker/distribution"
+
+DESCRIPTION="Docker Registry 2.0"
+HOMEPAGE="https://github.com/docker/distribution"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+DEPEND="
+	acct-group/registry
+	acct-user/registry
+"
+RDEPEND="${DEPEND}"
+
+SVCNAME="registry"
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
+	sed -e "s/git describe.*/echo ${PV})/" \
+		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
+		-e "s/-s -w/-w/" \
+		-i Makefile || die
+	popd || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
+	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
+}
+
+src_install() {
+	exeinto /usr/libexec/${PN}
+	doexe src/${EGO_PN}/bin/*
+	insinto /etc/docker/registry
+	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
+	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
+	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
+	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
+	keepdir /var/log/${SVCNAME}
+	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
+}
diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
deleted file mode 100644
index 76e7bd12811a..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="amd64 ~arm64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
-	sed -i -e "s/git describe.*/echo ${PV})/"\
-		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/"\
-		-e "s/-s -w/-w/" Makefile || die
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe src/${EGO_PN}/bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index aed5dcc94fe0..d76d887263f3 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,4 +1,4 @@
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.5.tar.gz 9633819 BLAKE2B 8ce627302244bbd7d174f28c0dad345699942429c1109a7408c88412f6bb0e3e5d765e6c51abf2b95837a83261023b4f9c58d65892e58043889be8dc5e4cb759 SHA512 1a6700c56a14edce86ffbefee7494117af067da8b1dbc22937a36641ccb90927a3bbb011d15a891388bf08378aa623e00a2d45dbc49e822a5a569e110843add5
-EBUILD fs-uae-launcher-3.0.5.ebuild 2081 BLAKE2B 0fb73cc83ca48acc4a6035876ada673c36f4f47b84a01167825ba34de0407ee8ce990bc413a67ec19869aa04ca675c8b409c135bd64a8b1f2fe1d27b1825e1d4 SHA512 a55428787228e4185f207b88df2edf3a9b39fed1ddf47950c9c38e91ae0bff288e679f5206c274cc8dbbf619532ac5190b49d6042f8bff56837100d6c0442ece
+EBUILD fs-uae-launcher-3.0.5.ebuild 2055 BLAKE2B d6bf506e21a0e22afa5517fef2d6af211c283c9cebbba267d2d4567a1b3ea0a899e1d0ffe6b482191efb032c9b960b18e661dce94a226ad219e2bbcbf22432e5 SHA512 ae1c722b35a0f4be42010a8bb09ae19d692a490106752c8ac8450ec3c2f8c8ddaacc5a5d3cd97036f84627539d14af50b02f0e3f6f0999310475081fc0c8abda
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
index 76303d3e0ae1..915e269763e7 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -20,10 +20,10 @@ IUSE="lha"
 RDEPEND="
 	app-emulation/fs-uae
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,gui,network,opengl,widgets]
-		dev-python/pyopengl[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		lha? ( dev-python/python-lhafile[${PYTHON_MULTI_USEDEP}] )
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
+		dev-python/pyopengl[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 899f065143cd..cb8a6b8141f7 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -4,7 +4,7 @@ AUX 0.7-no-libwine.patch 1098 BLAKE2B dc71eade0bfaf6f491dda64ddf42ca7e9b37ff57d6
 AUX 0.8-cross-files.patch 1076 BLAKE2B 6130a4c6d537e50c384a3be89800987e568f907dba5c985e8173726810fa79d7fc17d90d7347628aaaffcfe0f5b9bfdbb69fae41591b05676934020ea7e209ff SHA512 0f8b7dda5ebef6aff34264f5ab3c6efc793702c6439601c49d5fd0989447b19126ab0bb23b0a383b6f93e5c3aa1117afa63a78d5f9c193aab6fe290f35488f48
 DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
 DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c SHA512 3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c
-EBUILD gallium-nine-standalone-0.7.ebuild 2808 BLAKE2B 815632c7118b6e7fe2f537323bed4abfb5b537f06afdb3d9cb512f8b6c56d29a42ec15f2b681b01b39cd8ec9f5c1293f7e535216a6ebdfaa75d9cccf37003b80 SHA512 1b85687d70e017d50f6ecad4f96c189de95cc72e5e0242bce5f0c90eefc1565c8ba11e3c2693ce1793a768e1a8a224d3984514aa39426e2124e3ef93e112e7df
-EBUILD gallium-nine-standalone-0.8.ebuild 2281 BLAKE2B 22661d7720ad4b4a3b1f0b2f31557f46f549ee4ab0d1259471831d39e43ddd4f7a56794ca5f13a4c9049deb598eaa5e058d3f57facd9e4b6d8f0e47f5fb2a46f SHA512 862e691b9998f8557d794d50281cd4f2c84bfd3f6af4bca59a55403fb6b01c184300243a75e3d76bb1f1c9420f0fcd03acfab7816140a96765e8fe88ad418a59
-EBUILD gallium-nine-standalone-9999.ebuild 2281 BLAKE2B 22661d7720ad4b4a3b1f0b2f31557f46f549ee4ab0d1259471831d39e43ddd4f7a56794ca5f13a4c9049deb598eaa5e058d3f57facd9e4b6d8f0e47f5fb2a46f SHA512 862e691b9998f8557d794d50281cd4f2c84bfd3f6af4bca59a55403fb6b01c184300243a75e3d76bb1f1c9420f0fcd03acfab7816140a96765e8fe88ad418a59
+EBUILD gallium-nine-standalone-0.7-r1.ebuild 2803 BLAKE2B 6c21f39763b699609aaa9386945c29455e896bfd601dc40605709b63a218c25048bac16e24a24a8efa294c4c19ae144ab8d847c83632e33c1459aa2a638d0479 SHA512 9c3e9d9a4705a120bebfb8aef27944b242c05d1a635b18ed4d1aead938886d04e4d6832b8d2a1ed87cc9f799e705576ec42afca14bbfaf7b3a12104a283d2e0e
+EBUILD gallium-nine-standalone-0.8-r1.ebuild 2276 BLAKE2B 8eb1d9be3294d08b013fad50a483ff4dae3451f2289e96ac3b558047fd4547b02e1925fa3f0fd6f36e0ad5554f00354f8334ae1b3a39fef312f1e52740890dd1 SHA512 70271396f4424b4f4263c904c4a71169876dc9d441ede0184f63d92bfc6c8f8a9802bd465a665dbdbd123f3c7579ce308908fc6830c8c19387a6d6ef10865630
+EBUILD gallium-nine-standalone-9999.ebuild 2276 BLAKE2B 8eb1d9be3294d08b013fad50a483ff4dae3451f2289e96ac3b558047fd4547b02e1925fa3f0fd6f36e0ad5554f00354f8334ae1b3a39fef312f1e52740890dd1 SHA512 70271396f4424b4f4263c904c4a71169876dc9d441ede0184f63d92bfc6c8f8a9802bd465a665dbdbd123f3c7579ce308908fc6830c8c19387a6d6ef10865630
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
new file mode 100644
index 000000000000..1529b6ac411d
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson-multilib toolchain-funcs
+
+MY_PN="wine-nine-standalone"
+DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
+HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+# We don't put Wine in RDEPEND because you can also use this with
+# Steam's Proton.
+
+RDEPEND="
+	media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	virtual/wine[${MULTILIB_USEDEP}]
+	>=dev-util/meson-0.50.1
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.7-no-libwine.patch
+	"${FILESDIR}"/0.7-cross-files.patch
+	"${FILESDIR}"/0.3-nine-dll-path.patch
+)
+
+bits() {
+	if [[ ${ABI} = amd64 ]]; then
+		echo 64
+	else
+		echo 32
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
+	# create the Meson cross files. We improve on that here but also
+	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
+	# partly to allow d3d9-nine.dll to be loaded from a location outside
+	# WINEPREFIX. This avoids the need for the nine-install.sh script,
+	# which doesn't play well with our multi-Wine environment.
+	bootstrap_nine() {
+		local file=tools/cross-wine$(bits)
+		local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+
+		sed \
+			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
+			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
+			${file}.in > ${file} || die
+	}
+
+	multilib_foreach_abi bootstrap_nine
+}
+
+multilib_src_configure() {
+	# We override bindir because otherwise the 32-bit exe is overwritten
+	# by the 64-bit exe and we need both of them.
+	local emesonargs=(
+		--cross-file "${S}/tools/cross-wine$(bits)"
+		--bindir "$(get_libdir)"
+		-Ddistro-independent=false
+		-Ddri2=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	local bits=$(bits)
+
+	einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
+	einfo
+	einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
+	einfo "  wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
+
+	if use abi_x86_64 && use abi_x86_32; then
+		einfo
+		einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
+		einfo "  wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
+	fi
+}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
deleted file mode 100644
index ca5620c08868..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.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 meson-multilib toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-# We don't put Wine in RDEPEND because you can also use this with
-# Steam's Proton.
-
-RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	virtual/wine[${MULTILIB_USEDEP}]
-	>=dev-util/meson-0.50.1
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.7-no-libwine.patch
-	"${FILESDIR}"/0.7-cross-files.patch
-	"${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
-	if [[ ${ABI} = amd64 ]]; then
-		echo 64
-	else
-		echo 32
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
-	# create the Meson cross files. We improve on that here but also
-	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
-	# partly to allow d3d9-nine.dll to be loaded from a location outside
-	# WINEPREFIX. This avoids the need for the nine-install.sh script,
-	# which doesn't play well with our multi-Wine environment.
-	bootstrap_nine() {
-		local file=tools/cross-wine$(bits)
-		local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
-
-		sed \
-			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
-			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
-			${file}.in > ${file} || die
-	}
-
-	multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
-	# We override bindir because otherwise the 32-bit exe is overwritten
-	# by the 64-bit exe and we need both of them.
-	local emesonargs=(
-		--cross-file "${S}/tools/cross-wine$(bits)"
-		--bindir "$(get_libdir)"
-		-Ddistro-independent=false
-		-Ddri2=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	local bits=$(bits)
-
-	einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
-	einfo
-	einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
-	einfo "  wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
-
-	if use abi_x86_64 && use abi_x86_32; then
-		einfo
-		einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
-		einfo "  wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
-	fi
-}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
new file mode 100644
index 000000000000..d9a079e97a24
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-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 meson-multilib toolchain-funcs
+
+MY_PN="wine-nine-standalone"
+DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
+HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+# We don't put Wine in RDEPEND because you can also use this with
+# Steam's Proton.
+
+RDEPEND="
+	media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	virtual/wine[${MULTILIB_USEDEP}]
+	>=dev-util/meson-0.50.1
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.8-cross-files.patch
+	"${FILESDIR}"/0.3-nine-dll-path.patch
+)
+
+bits() {
+	if [[ ${ABI} = amd64 ]]; then
+		echo 64
+	else
+		echo 32
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
+	# create the Meson cross files. We improve on that here but also
+	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
+	# partly to allow d3d9-nine.dll to be loaded from a location outside
+	# WINEPREFIX. This avoids the need for the nine-install.sh script,
+	# which doesn't play well with our multi-Wine environment.
+	bootstrap_nine() {
+		local file=tools/cross-wine$(bits)
+		local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+
+		sed \
+			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
+			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
+			${file}.in > ${file} || die
+	}
+
+	multilib_foreach_abi bootstrap_nine
+}
+
+multilib_src_configure() {
+	# We override bindir because otherwise the 32-bit exe is overwritten
+	# by the 64-bit exe and we need both of them.
+	local emesonargs=(
+		--cross-file "${S}/tools/cross-wine$(bits)"
+		--bindir "$(get_libdir)"
+		-Ddistro-independent=false
+		-Ddri2=false
+	)
+	meson_src_configure
+}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild
deleted file mode 100644
index d995a9f7258f..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.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 meson-multilib toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-# We don't put Wine in RDEPEND because you can also use this with
-# Steam's Proton.
-
-RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	virtual/wine[${MULTILIB_USEDEP}]
-	>=dev-util/meson-0.50.1
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.8-cross-files.patch
-	"${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
-	if [[ ${ABI} = amd64 ]]; then
-		echo 64
-	else
-		echo 32
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
-	# create the Meson cross files. We improve on that here but also
-	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
-	# partly to allow d3d9-nine.dll to be loaded from a location outside
-	# WINEPREFIX. This avoids the need for the nine-install.sh script,
-	# which doesn't play well with our multi-Wine environment.
-	bootstrap_nine() {
-		local file=tools/cross-wine$(bits)
-		local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
-
-		sed \
-			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
-			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
-			${file}.in > ${file} || die
-	}
-
-	multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
-	# We override bindir because otherwise the 32-bit exe is overwritten
-	# by the 64-bit exe and we need both of them.
-	local emesonargs=(
-		--cross-file "${S}/tools/cross-wine$(bits)"
-		--bindir "$(get_libdir)"
-		-Ddistro-independent=false
-		-Ddri2=false
-	)
-	meson_src_configure
-}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index d995a9f7258f..d9a079e97a24 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index cc23b83fe773..ae9de6f9e84d 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -3,10 +3,10 @@ AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea
 AUX lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch 3529 BLAKE2B 6a9ac29e1c38643383df135981a3893e8bea631af85271499f687614a3c779d5a2adfee7d20ca3eca5358ac8b123ee1c969af9d41b1d5bc85749a91937f1845d SHA512 62640563ec638b9a2c9e66c533a604585d8289b7f71362b70fb1110ec2e840b68758cc217b1953d181cd34e1b8881bb24ff7fca6d2c3145ac2b973d157d1a979
 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4
 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb
-DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43 SHA512 98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
-DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7 SHA512 baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
+DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005 SHA512 ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
+DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0 SHA512 dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
 DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975 SHA512 4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84
 DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856 SHA512 4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944
-EBUILD lxc-4.0.6.ebuild 4641 BLAKE2B 7344c4c288841bf83d9e55cf80487927fe5faa329d9eddbf6ca9009fe16aaf26957d7e5fb5dd61735b20bc1b93a81cfc3a06b52d53ecff51c869a280add09ca0 SHA512 9882e81775f6c5b3fa0075ce3c0b143419b4b11e838f16160d2466e19c82c5bd20fee58a25a64d72f613e08719339cdf47a15ff5e801d260e5cbd664f841ffd8
+EBUILD lxc-4.0.10.ebuild 4697 BLAKE2B cf3926f29ee78c56bed8b3df5fd5f922ac6d1de0b52dcd60e2c44a2052c55984681df3a3bed411c0d218a257a9f3eed6e9fabcf0d77384e1e6faae97bdf8f13e SHA512 1f7decdd9c28a395853a9a9803da3107b53f3a11b70d5cf9eec3499d190440371a2004368dccda264bf3fe25348d13da3a3cc94f221bb37d11aa719375cfec9a
 EBUILD lxc-4.0.9-r1.ebuild 4745 BLAKE2B 24c899647ef171da052c4ba0a6b670896105a882560acdb63b21041ae253d44605cee6c624fd5ef2c65b29d215e6a8c1eb06b2cde4c5f5ba20a1c67e07024264 SHA512 3d58635170c9977b332336abd4efa8bef78263216fe186a29f8d405264421d668d6f2d82bc08d899987a8e42d289d8a7563c26b86d125992f92e33296730dd38
 MISC metadata.xml 620 BLAKE2B 459aa85a0e432faff7d0a2a1e61d536bde2e07e057ce8da642e07582219605643740f1241f83d19335a96de568841234bc2505273570bafbd187bb51da64a674 SHA512 303ca453f18cdbeef118e6a452b1a0e56d2466cba47fec8d021c1b8e4a9998ba743a729fdadc71e27e98f1fe12f43d17d76820986aeb93f286e74565c1a852f6
diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild b/app-emulation/lxc/lxc-4.0.10.ebuild
new file mode 100644
index 000000000000..a2fdef119319
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.10.ebuild
@@ -0,0 +1,173 @@
+# 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 flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc man pam seccomp selinux +ssl +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+	acct-user/lxc
+	app-misc/pax-utils
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4
+	apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+	man? ( app-text/docbook-sgml-utils )
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+	~CGROUPS
+	~CGROUP_CPUACCT
+	~CGROUP_DEVICE
+	~CGROUP_FREEZER
+
+	~CGROUP_SCHED
+	~CPUSETS
+	~IPC_NS
+	~MACVLAN
+
+	~MEMCG
+	~NAMESPACES
+	~NET_NS
+	~PID_NS
+
+	~POSIX_MQUEUE
+	~USER_NS
+	~UTS_NS
+	~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		--bindir=/usr/bin
+		--localstatedir=/var
+		--sbindir=/usr/bin
+
+		--with-config-path=/var/lib/lxc
+		--with-distro=gentoo
+		--with-init-script=systemd
+		--with-rootfs-path=/var/lib/lxc/rootfs
+		--with-runtime-path=/run
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+		--disable-coverity-build
+		--disable-dlog
+		--disable-fuzzers
+		--disable-mutex-debugging
+		--disable-no-undefined
+		--disable-rpath
+		--disable-sanitizers
+		--disable-tests
+		--disable-werror
+
+		--enable-bash
+		--enable-commands
+		--enable-memfd-rexec
+		--enable-thread-safety
+
+		$(use_enable apparmor)
+		$(use_enable caps capabilities)
+		$(use_enable doc api-docs)
+		$(use_enable doc examples)
+		$(use_enable man doc)
+		$(use_enable pam)
+		$(use_enable seccomp)
+		$(use_enable selinux)
+		$(use_enable ssl openssl)
+		$(use_enable tools)
+
+		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
+
+	DOC_CONTENTS="
+		For openrc, there is an init script provided with the package.
+		You should only need to symlink /etc/init.d/lxc to
+		/etc/init.d/lxc.configname to start the container defined in
+		/etc/lxc/configname.conf.
+
+		Correspondingly, for systemd a service file lxc@.service is installed.
+		Enable and start lxc@configname in order to start the container defined
+		in /etc/lxc/configname.conf."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	elog "Please run 'lxc-checkconfig' to see optional kernel features."
+	elog
+	optfeature "automatic template scripts" app-emulation/lxc-templates
+	optfeature "Debian-based distribution container image support" dev-util/debootstrap
+	optfeature "snapshot & restore functionality" sys-process/criu
+}
diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild b/app-emulation/lxc/lxc-4.0.6.ebuild
deleted file mode 100644
index e22cf583db24..000000000000
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ /dev/null
@@ -1,172 +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 flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig"
-
-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=
-	)"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4
-	apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
-	man? ( app-text/docbook-sgml-utils )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-	~CGROUPS
-	~CGROUP_CPUACCT
-	~CGROUP_DEVICE
-	~CGROUP_FREEZER
-
-	~CGROUP_SCHED
-	~CPUSETS
-	~IPC_NS
-	~MACVLAN
-
-	~MEMCG
-	~NAMESPACES
-	~NET_NS
-	~PID_NS
-
-	~POSIX_MQUEUE
-	~USER_NS
-	~UTS_NS
-	~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		--bindir=/usr/bin
-		--localstatedir=/var
-		--sbindir=/usr/bin
-
-		--with-config-path=/var/lib/lxc
-		--with-distro=gentoo
-		--with-init-script=systemd
-		--with-rootfs-path=/var/lib/lxc/rootfs
-		--with-runtime-path=/run
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-		--disable-asan
-		--disable-coverity-build
-		--disable-dlog
-		--disable-mutex-debugging
-		--disable-rpath
-		--disable-tests
-		--disable-ubsan
-		--disable-werror
-
-		--enable-bash
-		--enable-commands
-		--enable-memfd-rexec
-		--enable-seccomp
-		--enable-thread-safety
-
-		$(use_enable apparmor)
-		$(use_enable caps capabilities)
-		$(use_enable doc api-docs)
-		$(use_enable examples)
-		$(use_enable man doc)
-		$(use_enable pam)
-		$(use_enable selinux)
-		$(use_enable ssl openssl)
-		$(use_enable tools)
-
-		$(use_with pam pamdir $(getpam_mod_dir))
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
-
-	DOC_CONTENTS="
-		For openrc, there is an init script provided with the package.
-		You should only need to symlink /etc/init.d/lxc to
-		/etc/init.d/lxc.configname to start the container defined in
-		/etc/lxc/configname.conf.
-
-		Correspondingly, for systemd a service file lxc@.service is installed.
-		Enable and start lxc@configname in order to start the container defined
-		in /etc/lxc/configname.conf."
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	elog "Please run 'lxc-checkconfig' to see optional kernel features."
-	elog
-	optfeature "automatic template scripts" app-emulation/lxc-templates
-	optfeature "Debian-based distribution container image support" dev-util/debootstrap
-	optfeature "snapshot & restore functionality" sys-process/criu
-}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index a9ff4ea108cc..9a2a6c80e7a8 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -4,10 +4,10 @@ AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42
 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
 AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db
 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
-DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0 SHA512 8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211
-DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0 SHA512 b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946
 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
+DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
+DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
 EBUILD lxd-4.0.6-r1.ebuild 4147 BLAKE2B dd59abefccdae966cd5b4f02e2a81df39c82208dd4a82dc4e73878bff92c468be8ae07431930e54213e5b5e678ea28320fcce1704d4987c9a2ee3cfe6c988607 SHA512 ab448cf187f384e96f3d763a273905f2dadc6e59a83084c7dd6559f9ae4a561ba14406c93ad40c8327dd21e5f3bb9ac740b9e0b7ea7daa550a3dfc7c0a082350
+EBUILD lxd-4.0.7.ebuild 4191 BLAKE2B 13f3df56f9e0d95af716f79eeaa6b81d23a702db43d6ff607b837796b2c5a04e142b2985ada4193c5b5b52dbf97978db9ba6be8e37b51efc607171d855c8cf22 SHA512 8fccb8c9964be62c3fac76e99c31cb0923c1c4ec50b351402cf73d585362c15cf5fa8d9324bd05c4cd69a6a4da5464287e8f168c2f8cfab531f7ab672c866a06
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.5.ebuild b/app-emulation/lxd/lxd-4.0.5.ebuild
deleted file mode 100644
index 0fc73099a8df..000000000000
--- a/app-emulation/lxd/lxd-4.0.5.ebuild
+++ /dev/null
@@ -1,152 +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."
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-agent lxd-benchmark lxd-p2c 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"
-
-	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.7.ebuild b/app-emulation/lxd/lxd-4.0.7.ebuild
new file mode 100644
index 000000000000..75f17a0dac7b
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.7.ebuild
@@ -0,0 +1,163 @@
+# 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[lz4]
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	acct-group/lxd
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:*
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+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
+	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	# Needs to be built statically
+	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
+	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+	export GO111MODULE=off
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	cd "${S}" || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+	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/nemu/Manifest b/app-emulation/nemu/Manifest
index 34a211ada923..546cc9d5dcaf 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,5 +1,3 @@
-DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a
 DIST nemu-2.5.0.tar.gz 108742 BLAKE2B e68cbf50d56983873656d8e3428cb3ffaa09cafc9cbc8e545d72bf9dfb61e64a06bdc41c3f50011c4c488017efe33afe9fa1d634aae6e9151c45a7d3971c60db SHA512 081199413c41e545d23704091760c4a10b8dcdb21d9d0e6add1e549fa33bdd988490034767e08dee681eee6d06899104b8282cafc4578e06a0eabc505325bbdc
-EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba
-EBUILD nemu-2.5.0.ebuild 2124 BLAKE2B 5d6cfc96e820326c333fd9a32c157325d9ee3795248e04bb1978d452e5ad681e0725ff5e62d7eb92eae1c297e8b0f299b80fd7616ef2ebb3d58ca07aef2782c8 SHA512 4aaf9cfa65661c3755f164857e47687e72e0524c73bf5ac06fd16856d9cfc9dd3325971de9aeffcbd69c666be198a74f86a177144bd74999769b4639a9aaa9c4
+EBUILD nemu-2.5.0-r1.ebuild 2128 BLAKE2B 16efbc3dffcf30c86a40164315f4cf4402137751f13d1f679355cd803fcdcc1356244fbd263460f16856ae43b1b3b3e90968233a7dc2e5f705a17c69574e18a3 SHA512 64923f3158df1587ed6752cbf8a463fe0b4ab49037aa720a6a353c7c6653f915d68312db0292dd0eab17a0773a5fb568e40c3ef34c7defd5feac603cc649407c
 MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/nemu-2.2.1.ebuild b/app-emulation/nemu/nemu-2.2.1.ebuild
deleted file mode 100644
index 7b191e31dc57..000000000000
--- a/app-emulation/nemu/nemu-2.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/"
-SRC_URI="https://lib.void.so/src/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug network-map +ovf savevm spice +vnc-client"
-
-RDEPEND="app-emulation/qemu[vnc,virtfs,spice?]
-	dev-db/sqlite:3=
-	sys-libs/ncurses:0=[unicode]
-	virtual/libusb:1
-	virtual/libudev:=
-	network-map? ( media-gfx/graphviz )
-	ovf? (
-
-	dev-libs/libxml2:2
-	app-arch/libarchive
-
-	)
-	vnc-client? ( net-misc/tigervnc )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="sys-devel/gettext"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-
-			check_extra_config
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNM_DEBUG=$(usex debug)
-		-DNM_WITH_NETWORK_MAP=$(usex network-map)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-		-DNM_WITH_SPICE=$(usex spice)
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
-	if use savevm; then
-		elog ""
-		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
-		elog "Get this patch from nEMU repository"
-	fi
-}
diff --git a/app-emulation/nemu/nemu-2.5.0-r1.ebuild b/app-emulation/nemu/nemu-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..30d137f15fd9
--- /dev/null
+++ b/app-emulation/nemu/nemu-2.5.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+MY_PV="${PV/_rc/-RC}"
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://github.com/nemuTUI/nemu"
+SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus network-map +ovf +savevm spice +vnc-client"
+
+RDEPEND="
+	app-emulation/qemu[vnc,virtfs,spice?]
+	dev-db/sqlite:3=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libusb:1
+	virtual/libudev:=
+	dbus? ( sys-apps/dbus )
+	network-map? ( media-gfx/graphviz[svg] )
+	ovf? (
+		dev-libs/libxml2:2
+		app-arch/libarchive:=
+	)
+	spice? ( app-emulation/virt-viewer )
+	vnc-client? ( net-misc/tigervnc )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+S="${WORKDIR}/${PN}-${MY_PV}/"
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+			check_extra_config
+		fi
+	fi
+}
+
+src_configure() {
+	# -DNM_USE_UTF: Enable unicode unconditionally. We already
+	#                depended on ncurses[unicode].
+	# -DNM_WITH_QEMU: Do not embbed qemu.
+	local mycmakeargs=(
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_USE_UTF=on
+		-DNM_WITH_DBUS=$(usex dbus)
+		-DNM_WITH_NETWORK_MAP=$(usex network-map)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_WITH_QEMU=off
+		-DNM_WITH_SPICE=$(usex spice)
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /etc/udev/rules.d"
+	elog "Afterwards reboot or reload udev with"
+	elog "udevadm control --reload-rules && udevadm trigger"
+}
diff --git a/app-emulation/nemu/nemu-2.5.0.ebuild b/app-emulation/nemu/nemu-2.5.0.ebuild
deleted file mode 100644
index a9bc2ac75bbe..000000000000
--- a/app-emulation/nemu/nemu-2.5.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-MY_PV="${PV/_rc/-RC}"
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://github.com/nemuTUI/nemu"
-SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus network-map +ovf +savevm spice +vnc-client"
-
-RDEPEND="
-	app-emulation/qemu[vnc,virtfs,spice?]
-	dev-db/sqlite:3=
-	sys-libs/ncurses:0=[unicode]
-	virtual/libusb:1
-	virtual/libudev:=
-	dbus? ( sys-apps/dbus )
-	network-map? ( media-gfx/graphviz[svg] )
-	ovf? (
-		dev-libs/libxml2:2
-		app-arch/libarchive
-	)
-	spice? ( app-emulation/virt-viewer )
-	vnc-client? ( net-misc/tigervnc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-S="${WORKDIR}/${PN}-${MY_PV}/"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-			check_extra_config
-		fi
-	fi
-}
-
-src_configure() {
-	# -DNM_USE_UTF: Enable unicode unconditionally. We already
-	#                depended on ncurses[unicode].
-	# -DNM_WITH_QEMU: Do not embbed qemu.
-	local mycmakeargs=(
-		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-		-DNM_USE_UTF=on
-		-DNM_WITH_DBUS=$(usex dbus)
-		-DNM_WITH_NETWORK_MAP=$(usex network-map)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-		-DNM_WITH_QEMU=off
-		-DNM_WITH_SPICE=$(usex spice)
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /etc/udev/rules.d"
-	elog "Afterwards reboot or reload udev with"
-	elog "udevadm control --reload-rules && udevadm trigger"
-}
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 949072d91cb6..ac2cbb191125 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,4 @@
 AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad
-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 1443 BLAKE2B a64ee0e8679859aa818b2c34e42dadfe9eb194c6f97d526cbc4dec8ff0121598f8fcb9e9a006d694318cfffa4f8040f25dd664c576bdcc7383669c5eb7d71dd4 SHA512 382d6f5fd98f523cf954763c5cb61bc39668af84eff511e38fe867d50d10b1971dbeb047137ecc5ed44f0a0a94eb62db78f38d86841bbb430dc7c657acce5ca2
 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/protontricks-1.5.0.ebuild b/app-emulation/protontricks/protontricks-1.5.0.ebuild
deleted file mode 100644
index 9db87c7635ec..000000000000
--- a/app-emulation/protontricks/protontricks-1.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_no-setuptools-scm.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
-}
-
-pkg_postinst() {
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7a527fd6a388..020314705fee 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,7 +9,7 @@ AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b7
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
-EBUILD qemu-6.0.0-r50.ebuild 25762 BLAKE2B 53ef776802cf9bee1b5135a6880ca26b7796ae6a318edeb25418aad8a1cfcbaa01be9acab1fe1a352739c8454a6eee62df97a804e2f95b912c845722cdd92bfe SHA512 a51f14d2a1a3c3965100f6065974be78e896953ddbb439a0cd2ec3d9287488958278da22350a02df2de8c4992238ac119bbfbedbe2e758cdbebb0d881763f3b0
-EBUILD qemu-6.0.0.ebuild 25694 BLAKE2B fb2859e611b739ac19531dc564cdfe0d7f556d0e0e4016d2a4f269616d9d5bcce48a037cda2693c3f7d498feb51ee8f61d183522c2382539bc4922ee13a46d7e SHA512 42b67957323f32ceab63af451522d7294309f2c848702ac32c116d8362367bfd91af45a9897376675251441e0c02ea92204c0b732731eac5daf86a9e9b758dde
-EBUILD qemu-9999.ebuild 25724 BLAKE2B b73478c7cf02b970a867ad300cc8a71a7691d87f1a251108e7d34bfe261d2cea909f29c68f00ddba38ba3019a4e8b70872094002ba18f51e019fb2baf8dc0595 SHA512 3cef1341ddf9145cd19f2d519ec1bf9401416ac45656a35e08068a15f5be36037b30999e1182c9b94b3172f3bbddbc8fe47f27bcb7ebf875b7810d45a91e2e0b
+EBUILD qemu-6.0.0-r2.ebuild 25695 BLAKE2B f0617808f53a084e1a3f9a7a8b2e81c015a9f8164f2a22d6abb2e9658def2112e5ebf76b034871ac8c950b50578347df28aab1250e38f246be98953a3f3351fb SHA512 01d3d4f26149b3821fc7948aafd4715e4921dad8bbd593dbff602c4ebd3b68875f83810f1d7b806dedf08057063ae6437eabdfb4ad23d93eabeb99e492247ae6
+EBUILD qemu-6.0.0-r52.ebuild 25763 BLAKE2B a2d0c8774081713d1a3b3042a3f81b8a19fc15cabd4a7614af068628629443edebff1c0ac80ed6fa07a12472e4b251358ce3cef895d8e82f6e99d0de48d28802 SHA512 7244351f30b9e52926d69fbe81b305733826327864b361ec0f8dc347a3a1639a33c90148febca72d5e1be18c0bdc3b57f25acbbfd049b3a455db19125f6c1002
+EBUILD qemu-9999.ebuild 25725 BLAKE2B 92b669324e09cf5d5d9e7de8589558b5afdf17f3a934cb25502b8ac595ea3bf9f5216e23d8a4e49edf4fd6c211231bdd37d1eb9a26f64b177777602c85391e10 SHA512 edbe8a6b1619459c51198be8515f6a44ac93496465a18ebf4508625a99b8ee1ee2127a877e638b8c856503bbbfadfc243b6b177123681da7b0941a4197b06650
 MISC metadata.xml 4403 BLAKE2B d8794248d1fc44363d107d2a0148a14d27de016fd4b311fa7feaf9125e35678c390f2ff07d35a48d3c224fe56ab467eb2c4a8cae4fc65f8c2aad98c62205a645 SHA512 f2b8daaa06e80b7f19915c794d3c010122d8578061d471564b1fd73df3a567bb4937b733058205346441a7d487a7f8eb03c3238a22d60a48b5e9cd02569d7e9e
diff --git a/app-emulation/qemu/qemu-6.0.0-r2.ebuild b/app-emulation/qemu/qemu-6.0.0-r2.ebuild
new file mode 100644
index 000000000000..6b82204f2794
--- /dev/null
+++ b/app-emulation/qemu/qemu-6.0.0-r2.ebuild
@@ -0,0 +1,910 @@
+# 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="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="5.2.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1
+inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_SUBMODULES=(
+		meson
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://download.qemu.org/${P}.tar.xz"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg kernel_linux
+	kernel_FreeBSD lzo multipath
+	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	xfs zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	lm32
+	moxie
+	rx
+	tricore
+	unicore32
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64abi32
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	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 )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+SEABIOS_VERSION="1.14.0"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-202008[binary]
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe[qemu]
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-strings.patch
+	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
+	"${FILESDIR}"/${PN}-6.0.0-make.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable nls gettext)
+		$(use_enable plugins)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_notuser jemalloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser vhost-user-fs)
+		$(conf_tools vhost-user-fs virtiofsd)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-6.0.0-r50.ebuild b/app-emulation/qemu/qemu-6.0.0-r50.ebuild
deleted file mode 100644
index 2a7669c87e9f..000000000000
--- a/app-emulation/qemu/qemu-6.0.0-r50.ebuild
+++ /dev/null
@@ -1,911 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="6.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		meson
-		tests/fp/berkeley-softfloat-3
-		tests/fp/berkeley-testfloat-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo multipath
-	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	lm32
-	moxie
-	rx
-	tricore
-	unicore32
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64abi32
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	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 )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202105"
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-5.2.0-strings.patch
-	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-	"${FILESDIR}"/${PN}-6.0.0-make.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable nls gettext)
-		$(use_enable plugins)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_tools vhost-user-fs virtiofsd)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-6.0.0-r52.ebuild b/app-emulation/qemu/qemu-6.0.0-r52.ebuild
new file mode 100644
index 000000000000..43f93745ed87
--- /dev/null
+++ b/app-emulation/qemu/qemu-6.0.0-r52.ebuild
@@ -0,0 +1,911 @@
+# 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="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="6.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1
+inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_SUBMODULES=(
+		meson
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://download.qemu.org/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg kernel_linux
+	kernel_FreeBSD lzo multipath
+	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	xfs zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	lm32
+	moxie
+	rx
+	tricore
+	unicore32
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64abi32
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	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 )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202105"
+SEABIOS_VERSION="1.14.0"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+		sys-firmware/ipxe[qemu]
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-strings.patch
+	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
+	"${FILESDIR}"/${PN}-6.0.0-make.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable nls gettext)
+		$(use_enable plugins)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_notuser jemalloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser vhost-user-fs)
+		$(conf_tools vhost-user-fs virtiofsd)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild
deleted file mode 100644
index e6d5023d4167..000000000000
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ /dev/null
@@ -1,910 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="5.2.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		meson
-		tests/fp/berkeley-softfloat-3
-		tests/fp/berkeley-testfloat-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo multipath
-	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	lm32
-	moxie
-	rx
-	tricore
-	unicore32
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64abi32
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	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 )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-202008[binary]
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-5.2.0-strings.patch
-	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-	"${FILESDIR}"/${PN}-6.0.0-make.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable nls gettext)
-		$(use_enable plugins)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_tools vhost-user-fs virtiofsd)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index a391504d0ba5..3c10cc9beb9f 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -173,8 +173,8 @@ SOFTMMU_TOOLS_DEPEND="
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	multipath? ( sys-fs/multipath-tools )
 	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
 	)
 	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 5ffaa9be9895..f0717b179012 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,3 +1,5 @@
+DIST runc-1.0.0.tar.gz 2366170 BLAKE2B 1b6455cd45bc51b92c12b3293037446da62957d441124e9b76fd44ce92329e0eb2fde2ef71c6519fc4d58bcbd4ef580f64d71753a6fc06f3f6e347de170bd9c3 SHA512 8ddad1e031237c07b6cab5cfe5bdb7b11bf98d5d1064ec06845f36da073fe65a0facc6a28ba5daff71cdcb50cfd5d1cd25e97385b4eddb35b287113c2771365c
 DIST runc-1.0.0_rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+EBUILD runc-1.0.0.ebuild 1763 BLAKE2B 3668d81820cffc91f50655bce5a47fbbe1b81fd868beee3dd336e509b0bb9b53b7e187d47568e28d57cc2bb9348e50021280720a363d531193975669f1b0a181 SHA512 28ff218a2bb1382ce4882d723bbef0f69a2e9b86819fd23b119f1cd5789ed34841ea55a22609eb40154974fed1b4d9aee6e83b124543baaf4a2d5b7097f6bf11
 EBUILD runc-1.0.0_rc95.ebuild 1761 BLAKE2B 68ac242be9ab60d62b86e6ef9ca26838716697aa30a39dddc008035081bbab704d5a7b0c81a4adb1c3a04728efe9dbc58c664e35af6952c3be8cdb45d9369740 SHA512 70ed74518c4f115007f7cdbcaed871edede44bbcf87f5676e8eb29c10c4ea8b77a00eb23a09c0e7e30560d672a72030e417cb8f8a6b790c5c6dc145aeb0b4f89
 MISC metadata.xml 821 BLAKE2B eb8ae2aafcc540623838afc1ecdb8bab0b60ca1d836dcb4e0ee247219301f6c68e1f25430898f9533b71a5e23ea6c97fe2bad9ab1e375e0488c3084b51437b97 SHA512 15a4ac8303dd81200f74dc8d508fed2997ccb87b3fa5e61757025d0e659422713a6b6eadc00544ccadc902a4b56bc5312c156e75cd098711e240a1ed789c3360
diff --git a/app-emulation/runc/runc-1.0.0.ebuild b/app-emulation/runc/runc-1.0.0.ebuild
new file mode 100644
index 000000000000..6941c018dc9e
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.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 go-module linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT=84113eef6fc27af1b01b3181f31bbaf708715301
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor hardened +kmem +seccomp test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index ae602bb220cd..c0ea777feee0 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,8 +1,8 @@
 DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
 DIST virt-manager-3.1.0.tar.gz 2848420 BLAKE2B 729a16ee419cfc9f118e4a59336e961f17f38908ab3aaa3598c83bff3e8bca75b150f0f38b021c5ccb839a7c43e87f071859f68c2a81425715e236e14d0a7929 SHA512 185e34d8ebb2f9755bf9732bdafdbe9d0924d8c3b69758947252cce5deeac2042f473ba63673eea2bf36beb1f216a856938650f86e2c86eb5618e8f8522df53d
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
-EBUILD virt-manager-2.2.1-r3.ebuild 2369 BLAKE2B d429198a0d3b4e629b28bc43de33950e6a2e236cc732d641e9d05d9c48da1c3f3da629f06e3c451d357c9cd933bebc5950ca55aa3f6889e05775d2020e86a220 SHA512 49831cfc41641f24cc19306d829246bef0d80138ead3a29f4a311f775f88da4ee50ea40f14c05ba1751b5e7042d4ea4f8831d222ebdd5a9b100a38e5cd55cb30
-EBUILD virt-manager-3.1.0.ebuild 2426 BLAKE2B 0cddadea64ff30d4e262095c5fc0c3623c6f25a9a16a280aa594a62b437d20cbfb9cc4e12f498d55ef8f2e29eefa4a242daddcb04a267f169f38cc9770d007ca SHA512 09787a65b161d8b81e36e2210cdd0a3932013891d2dc86d97411d02734f8b0ed7c3936b69f88eaf80aef4d4035d5730c2fc73b87ddde0681c243d7cc548fc654
-EBUILD virt-manager-3.2.0.ebuild 2410 BLAKE2B 2fd0693f3f03309ddd7f037852471a37e6cc8acae79e32323530985f06823fede5685da70a9cabc8db345ed3d9f05f8f1334a931353e665fbe0d9687aa82ba3f SHA512 34d89c7de927bda0a3c92f4977ffade32d85f261696264a180f9602a665ae6581bc0033406ff45a39f1329a1734e496e3e6da003e6f332090cc66ad5038b03d4
-EBUILD virt-manager-9999.ebuild 2448 BLAKE2B a4056d023c698cc5a892cba5aab6506382bd1a1f6b59bd26984e1fe08d379e6388b782a3f323fb655d687937ce6349a8b9fec2710b931fb41ded2bb692fc820b SHA512 b6e969fc2e48c9dc7f82e5a12db3092fc519f892f3b9b9b091f068710332be9d42b5a47e40503db1edf1a3b10df467dd19edaf2b45ad176bd679f850a93fbe21
+EBUILD virt-manager-2.2.1-r3.ebuild 2341 BLAKE2B a50426622743d3e21508c2dcebdd769e82bde419ca62a307951b106bc2fddd2a5fc9ba17e008909df90b91a4cd790f20791288865f4002ac54d17a6b6ee6c747 SHA512 b885bf0ff82234b087289dab5bf9131cef3300f02419f6683a622a765d311b4448170d7935cdc8c20b9de9d7aec0cf104202a858b63b08f250c78744fb8066c4
+EBUILD virt-manager-3.1.0.ebuild 2394 BLAKE2B 464dad98c7445fdbf6f57733a022d04064959ffd75a1f937f221f299638ca71cd360ea4451ca2e9186498d2dbab0e38d09255f74ca17cfd84fce131b5d45547e SHA512 e422eaeeba7cbcbabed620fbce812ea9101a48f5de7590f410d9897e220aa8d98e35f224bd8df9da57f67cf672651d3b45098d70e0022b0e3784f6a94d640c03
+EBUILD virt-manager-3.2.0.ebuild 2378 BLAKE2B e0e6da24c093d65b8d04b39c0b282b1122c3caa8ea996e5303139780ff218dbc762a660e3ca39d3fcfa21d90f157d780de55a47c68053909944a23d1753d8ef8 SHA512 f9aefdc808577bd20d94fcadb8f07ccb1056f09688c09546913715ebe6b07e14feba47d10c55b35f69c4664792d4d2ccd0e5e89718aefc2270e63512a79db3e1
+EBUILD virt-manager-9999.ebuild 2410 BLAKE2B f6a02ff58c635ed3951815ea4bf9903b079a5d580461bd4bf4196fa32e52452e7e947dfa4eb8d24d259cf1ad03227c8d3c0a624cd4ca418481760d75a1402d54 SHA512 2fbd09d9389834b7dc5a9e819f44e2810c0ea967ea424dde82c9cfa76e9033cdb8972123d362fed393198bf172cf6435da9cf29c38c800c93199a97250c50217
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
index e0ce6f6fc762..a5da10c5d597 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -30,10 +30,10 @@ RDEPEND="!app-emulation/virtinst
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
diff --git a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild b/app-emulation/virt-manager/virt-manager-3.1.0.ebuild
index 7b57165eb531..cec598a0ff27 100644
--- a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -30,11 +30,11 @@ RDEPEND="!app-emulation/virtinst
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
diff --git a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
index ddd942dd7b23..8529c5b317cb 100644
--- a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -29,11 +29,11 @@ RDEPEND="${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/libvirt-python-6.10.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 3e4593a1f8a9..18fe7b6fb023 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -30,12 +30,12 @@ RDEPEND="${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/libvirt-python-6.10.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/tqdm[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index f4efd75ebfc5..020922799d4c 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,6 +1,8 @@
+DIST virt-viewer-10.0.tar.xz 256372 BLAKE2B 3368164c2f770f8aa963e0fb93e713249b05d31600747b68197864a40bf6fdb221ad44abb8ea5465706543241bd5898353cadf2a3e0917455383283722fdfd4f SHA512 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
 DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
 DIST virt-viewer-9.0.tar.gz 1176991 BLAKE2B bc4df73575195888b769dddd8de5c0eda9daa257902f3f3ce8099f9096d0cd9be28547c8671decb70e83e5f0de71633793886bfe78bd9ab5f360dc9759afcc5b SHA512 a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
+EBUILD virt-viewer-10.0.ebuild 1056 BLAKE2B be70282a9c98d2b5f9c82a7e16f5e08de95d0e02eb58f66ec9b9b50434499fb15377eb3913f6026eb060a2a738aff5dcb02470c253a29abfaeb894fd4516c303 SHA512 cd7f098f5aa49a10fc4e246f4fb64605113e4f83211c54671f6868983709a2407d96df917473fcf15b4c92c0978472bf5d36b709149d708626643a991c83f4e5
 EBUILD virt-viewer-7.0.ebuild 913 BLAKE2B 0b6dfcfe940c93c9d1cb2feaa5b2b67b710fe35b75dde82066b4f133ce060933742aea8dc437f394a1492d1ff579ad13f0f45acfebb5db80ed665aafdc050be1 SHA512 3d219e4c9aab912f6fdd0fe4b0fce8d7959d103305069629ce95a5baea8209b707e5bb51eeb87e2fc6f85178acdb8bc811baa9293bb6a256ac6ce8a4d9b4d47c
 EBUILD virt-viewer-8.0.ebuild 965 BLAKE2B fe006b764e6e1abfc9bcc915d92d9dc91d037e4b2a1dcf5dfc618a62fd65061445227da84aca0f8ab84ca28a1528fe063c37b39c5a4840b99532898f54f239a9 SHA512 4997e3c64b34953399b1369758741ff69cab3874b4a07f1378ec2ed7d2ee8439af45b614c073adf438b25e35ea9b1a388d222da54a803b6af49f533cc7de99b8
 EBUILD virt-viewer-9.0.ebuild 967 BLAKE2B c59e0871ce13171ab889f9950cdba14516163c22ae2fbf26f8e4fd16e07d320244c043070bb43f165b17e9f3f75f6e35adadf1c51339d1d560aa7bcd0fcf1de9 SHA512 1c87a447c14f88d73b50ef2614a4b95d417b7af4053de7b67511e6b439d15eda63955d61cf83618fc85efa5613740cae5c8eda2fe48efb5cb60dadc84ce30b49
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0.ebuild
new file mode 100644
index 000000000000..f6be72fe3118
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="https://virt-manager.org/"
+SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libvirt sasl +spice +vnc"
+
+RDEPEND=">=dev-libs/libxml2-2.6
+	x11-libs/gtk+:3
+	libvirt? (
+		>=app-emulation/libvirt-0.10.0[sasl?]
+		app-emulation/libvirt-glib
+	)
+	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature libvirt libvirt)
+		$(meson_feature vnc vnc)
+		$(meson_feature spice spice)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 598b2f619d54..ddf005995384 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,7 +1,5 @@
-DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19
-DIST VBoxGuestAdditions_6.1.20.iso 61018112 BLAKE2B feb6a292b05e861a90fdc5db80bc15e9df593a365a866a31ab7afce704511463012c18d76dc928dc5ecd0d2a23bc518c37ad9cdc8b4b72397af3ddd4b3eb97d8 SHA512 122bd5d31ab5cac2fe0582d1d541b5e9d0e8e544e1b3c5afb2b2e2c8b26fbfa964d15053ccc256575753d31206bffc09380dabc79d93946b0e56b743d82e40fe
 DIST VBoxGuestAdditions_6.1.22.iso 61020160 BLAKE2B e6b79942ed905654ac98323fe5c960afe7467e4ee9da168f7a7b4856a001fa973418e979da57b6e75eedd801bd71f15700ac62a2dfac28b660b36b11287fab57 SHA512 826a4b7d714d1dcb3e7c5c3c95e2a47d2fef728172f2db0e9c983150d7cc335ca7ffd2c87c09e1ca3d0fb1342f4c6c03993f5fc8cff19f28e1f519dec0f3f96b
-EBUILD virtualbox-additions-6.1.18.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
-EBUILD virtualbox-additions-6.1.20.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
-EBUILD virtualbox-additions-6.1.22.ebuild 778 BLAKE2B 34dc0e7631b7bd202a0ea7d7a18fd83f045d867cbd2533dfa333292f22d4378765672be9166ccf1aafdf075d58f3e48617dc9132ef5d34d413f867445e8cc9cc SHA512 0186ea39d7c27c7ea8826e59548d3287cc59225daff2350358d12e233af40f352d004a82edeeb17be5762a405b956f04c369472794749fe170345f7421779154
+DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b8671066154133795e8e4f50ac82e927e82e05594c520b155f29f7f19373e5846c36a1e3f6e5d2f5d17db1cebc1996c4d1737d5b45862 SHA512 8753558fcf467805bff801be43281597ef6738f90f8f7a62f6acbba2753e57f44bc72cb66411f0a0f413135026ddf683b0330b49ccad77676ec67b7bf3faf06e
+EBUILD virtualbox-additions-6.1.22.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
+EBUILD virtualbox-additions-6.1.24.ebuild 778 BLAKE2B 9224a26ec47d48f16e8e73333c7d87505d179c5435ad172226fa58017c6c3b5dc593dcbcbcd3174466f2f27f97ca09830478ccb13fa477be88fb2308ef2607a2 SHA512 7d80ce8e63384ca88fcde9dc3aa7f5ebbd21d527df271def115f5a700f4367a842b153d5dfc21f1ae193545f05563cbfe054d536fa9fbd7f5453e80e7b76c91f
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild
deleted file mode 100644
index 5f7f607a912a..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.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
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild
deleted file mode 100644
index 5f7f607a912a..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.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
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
index b6488481acda..5f7f607a912a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
new file mode 100644
index 000000000000..eaf1cf6fc9eb
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 2b767a7fe0ef..3fe83662ef11 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,7 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.tar.gz 11132930 BLAKE2B a26e05d9869a52187b379b24ed556c6296772d1360b6f7d61afe17c2818351b5ee2256398e0d53a16d2b6014540f343f7f13539c3d5529f079ac363b48ea0d6e SHA512 85cd8327860c253ce2f871dd1138d18d97b8706f64a3dafaaf340a43d8f44f7ee696a1f845761e7c8d6dcf11c7afd1618798194482b6e09cbe7e2657d980116a
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz 11133865 BLAKE2B f0db84695d94d914afd22086ced2a2ca73f860a0bc91bc11744e2cc4a3203584b06f7c855053e33c5f775bc7f6db08b7400f5eeea89566b9146dd144ccf1a2f9 SHA512 71dc1a82b9b88f615ecc7172df344042366a9303115cf44685ea96e3e729b8280edd36377b207fdbbf8adb388d1ec9b21c3ee709cf44aeb52d6811b26fa69a80
-EBUILD virtualbox-extpack-oracle-6.1.18.142142.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
-EBUILD virtualbox-extpack-oracle-6.1.20.143896.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
-EBUILD virtualbox-extpack-oracle-6.1.22.144080.ebuild 1084 BLAKE2B 1a44253aa5a7e89afaf6a416954707c672931710d21320092f0ac6f350cf94d61b88880e1b3061885312b6a3ffd90976f2cc1003c8445b26fb689e71f42a0a62 SHA512 ed161efc95a9d02ed8e20e7affa26e2f8b10d225dc7162a034a6ac98f71874f78fe13477c0ac0bbe11e174c5befeb8ba9728078824646734915722066d5a8ba9
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc35eb8ab1a58492ca3b67b63885ffa1ad3ed3a51a9e7e8c522845b082c420fb39a31a379ee56b45c9b02452acc5be4d72c5a5d9bddaa428bf7c9a3a086 SHA512 e2af2213e99c8c35a3090f5e36d05b1ef27c920cd31a2bf97b0368a89f27a5e2d0e0e0dced5e4e7bacda50fe4b57738924f13a933f5307ff2c8c4015ecc030ae
+EBUILD virtualbox-extpack-oracle-6.1.22.144080.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
+EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1070 BLAKE2B 213b49c6213be21d5f5da9e0ecfb7fb43b0af9525ca9052660036c8fb2bdfd0153afce75e903fa178c7fb09a67e3d270bc9b054d4b1c2889727e5bcfe26e00cc SHA512 e2f3cf167a0a8781d8a4a7e8aeee4fb626e04db82203bc6f0202efb93d80c0e726bf5fc2fadefbaeebd82174859db4fcc4fcdf749d23256b15d31d44bb480ece
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild
deleted file mode 100644
index 54db34dd7a15..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild
deleted file mode 100644
index 54db34dd7a15..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild
index 5e6035fc8003..54db34dd7a15 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
new file mode 100644
index 000000000000..0634acf398dd
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+#VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index a73abae610e8..d10120b4fe2f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,11 +5,11 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
 DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
+DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-guest-additions-6.1.18-r1.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
 EBUILD virtualbox-guest-additions-6.1.20.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
-EBUILD virtualbox-guest-additions-6.1.22.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e
+EBUILD virtualbox-guest-additions-6.1.22.ebuild 6206 BLAKE2B ea540bc820358581e7d95aeadb13ad2fda156b0735b4a33676a163c1dbaae235db82907cf08ac833700fd297e57fecfe775bc1036f323fc04c2cb279ccf807f8 SHA512 f1ef13f8dd2d890e729c797375b5e8662fe776d008f78008668114e7467ef0fe98b277bd12e3a67a685d66c13ed38731e6dc7590722440acbe7541fcccf67965
+EBUILD virtualbox-guest-additions-6.1.24.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild
deleted file mode 100644
index 87c84047ba44..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" emake \
-	VBOX_BUILD_PUBLISHER=_Gentoo \
-	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-	TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild
index d767c7658ddd..08e344b84659 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
new file mode 100644
index 000000000000..d767c7658ddd
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd toolchain-funcs
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+	eend
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" emake \
+	VBOX_BUILD_PUBLISHER=_Gentoo \
+	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+	TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 1ea8e81548dd..47d2f3a752e9 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,13 +1,9 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
-AUX virtualbox-modules-6.1.18-binutils-2.36.patch 1930 BLAKE2B 8cdb1564f9ac3bcfd7b73a7e991a3594ee53338692f54c83522ef6c5a7ce14207d6e57290c75a37004025518ecc998332a25216aab6044381628c5f02d580e22 SHA512 a1b6cc713b9ec92095e82450546678ff06a2099757cfed8c2b8257c04a50ea1016eafc69241efc1bf17cad506036615f5943c50fb8e162df113e9495548f6925
-AUX virtualbox-modules-6.1.18-linux-5.11.patch 425 BLAKE2B b81f2c577732c51f92b524271e44f6c9763b8fd91b78e7eba977905e7e92ce6de931c05cf97d7502eaeece29c89fa3e29a419a9203b81b7ca245e11c144e2413 SHA512 896c1313c43d7917d58fcf227ac43ec6a1f1369ad5271e6184226347da680f4c0e97aea30c882b455964e7c08b342703f7d4b688cda743ad6249931256807b7a
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
-DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
-DIST vbox-kernel-module-src-6.1.20.tar.xz 672188 BLAKE2B 0b2ef1e02ce6f55211703946dc53df0fe949a94bac2caf050d31a78e674c2934d5cfaf788da2246000d1dc99218a572cb02272a1a92f4df913fcf7635b65a98b SHA512 4fdc16258ec03c720c81b62c680addcbde8257a58a94b3bca8eefd378c126833d84f7f4fa7bb76fcd7c761983f8626d121b2d31d761f608ca7cce6a689ec0469
 DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c745a72329065df2cc22918d03edefdf546d8e4ff0a36404ce98f1012faaacc301cd2c507b055db69b9125f91ad87fa5fde14d3abe0 SHA512 b50d7699db8909ea4e9126715152336a2c46e06f9fc24b5ef0624e7d26de1c83b2a57b0387dab0a46a9e50f9906126cfdcae4f290599de88a980adaff7fba180
-EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B 62f3f2198aae186e8a0206a9e7521bb42f7bf9936e9020f94c89ba70b7f6407c4fe76f6357c7e7739636b2bf0464ada470b08b21aafb6d6d7d41586146b4543a SHA512 70b57918797c9287cc23988bd84be82a86713344364124f1ce7bcbe5f24e1844ba038ef8919c02e4f31902e184723905da12ae006153b5f75e6c33326c0f2b22
-EBUILD virtualbox-modules-6.1.20.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
-EBUILD virtualbox-modules-6.1.22.ebuild 1434 BLAKE2B f799d32f49be7d6d343ab002f2b6d1f6d6ce17ca1f4973d5b375499b4f42dba23b8f467f807f6edc27bf534db2bbb671ab6984d32fdb9a0e42d9b7345491410a SHA512 c075093ff44a6d31d049a3182131ad084066b657cd4cbd15af9d4948944543231e9c67a12f96ae760b2fab953498c3bfe2cd5761a0292e2be3fa5dedd8187d18
+DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce00e416fa3822cbec3f00691651acd53b7c7bda8b43d3669195cececa83f1fc50a792e417adcd709d859497da143c4d93a2b414912 SHA512 220d57ab33a41464cd9e506d38390e60b9e67ca8262b1a13732f3d40820e038365c129eb7144f1932b8c2d3fdcea828de3070dd927788015301bf4aa59c1cc48
+EBUILD virtualbox-modules-6.1.22.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
+EBUILD virtualbox-modules-6.1.24.ebuild 1434 BLAKE2B f799d32f49be7d6d343ab002f2b6d1f6d6ce17ca1f4973d5b375499b4f42dba23b8f467f807f6edc27bf534db2bbb671ab6984d32fdb9a0e42d9b7345491410a SHA512 c075093ff44a6d31d049a3182131ad084066b657cd4cbd15af9d4948944543231e9c67a12f96ae760b2fab953498c3bfe2cd5761a0292e2be3fa5dedd8187d18
 MISC metadata.xml 352 BLAKE2B c8715abe9ff5c699ae15dd0906ac10eb7f750cb00092994d174a2a6a3315aff2601781a5392058087706dcf744614fa32cd950c7fa19dd896f7617f735089a0f SHA512 4e57c8aee47fe806315d0d138c81ac919197ed0a6dbf4273994228ceae32e06791e1951e9599bdfbdb6e2f329f74cbb08ce9d69ad3e6264668872dca3e4371f9
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
deleted file mode 100644
index 2eaeb1ea3380..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
-+++ virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
-@@ -1472,29 +1472,32 @@
- __asm__("\
-         .section .text                                                  \n\
-                                                                         \n\
--        .p2align 2,,3                                                   \n\
-+        .p2align 4                                                      \n\
-         .global SUPR0TracerFireProbe                                    \n\
-+        .type   SUPR0TracerFireProbe, @function                         \n\
- SUPR0TracerFireProbe:                                                   \n\
- ");
- # if   defined(RT_ARCH_AMD64)
--__asm__(" \
--            movq    g_pfnSupdrvProbeFireKernel(%rip), %rax                  \n\
-+__asm__("\
-+            movq    g_pfnSupdrvProbeFireKernel(%rip), %rax              \n\
-             jmp     *%rax \n\
- ");
- # elif defined(RT_ARCH_X86)
- __asm__("\
--            movl    g_pfnSupdrvProbeFireKernel, %eax                        \n\
-+            movl    g_pfnSupdrvProbeFireKernel, %eax                    \n\
-             jmp     *%eax \n\
- ");
- # else
- #  error "Which arch is this?"
- # endif
- __asm__("\
-+        .size SUPR0TracerFireProbe, . - SUPR0TracerFireProbe            \n\
-                                                                         \n\
-         .type supdrvTracerProbeFireStub,@function                       \n\
-         .global supdrvTracerProbeFireStub                               \n\
- supdrvTracerProbeFireStub:                                              \n\
-         ret                                                             \n\
-+        .size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub  \n\
-                                                                         \n\
-         .previous                                                       \n\
- ");
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch
deleted file mode 100644
index 844e37e9fda7..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes build with kernel 5.11.
-
-Bug: https://www.virtualbox.org/ticket/20198
-Bug: https://bugs.gentoo.org/762994
-From: jospezial@gmx.de
-
---- a/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ b/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -38,6 +38,7 @@
- #include <linux/nsproxy.h>
- #endif
- #include <linux/netdevice.h>
-+#include <linux/ethtool.h>
- #include <linux/etherdevice.h>
- #include <linux/rtnetlink.h>
- #include <linux/miscdevice.h>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
deleted file mode 100644
index 9e446e585c66..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="pax-kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-PATCHES=(
-	"${FILESDIR}/${P}-linux-5.11.patch" #762994
-	"${FILESDIR}/${P}-binutils-2.36.patch"
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax-kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
deleted file mode 100644
index ac30ee8cc037..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="pax-kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax-kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
index 0a6e70d58259..ac30ee8cc037 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
new file mode 100644
index 000000000000..0a6e70d58259
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 0e3e1167f213..43443d5846b1 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -8,11 +8,9 @@ AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0df
 AUX virtualbox-6.1.20-lsilogicsas_crash_fix.patch 1941 BLAKE2B 05bff13ff8f9ef08bf8a9cc2c051ad89c507aa770172c6ffd5247723e28adb0e8683fde123613b6c7703f299d41636c81f8ad9b499069cbb22c424fb6e8bdff4 SHA512 ffb4648b36afcc251be9c944911660769d266ea83be8de2ceac9462af13d10689987a2a30de15407414856775ad3eb5226f39c2c598b61568b2e40ed80b8c2a0
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
-DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
+DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.18.ebuild 14498 BLAKE2B 3b747913519f4125ca902cc409015751929384cf12e4a07cf20700abc57a35e93a8d59429136dde18c62bcaca8c575c52b01a5818bf49f9042f77e22aa6ea5c6 SHA512 69a281c9930bd8241f495fda76bea675087525bc9b50c0f5a8884ea658e264daae18a084511df1d8f371f4029f0e9bbaefa579ab2e8b1b11b51b7bf243f921ea
-EBUILD virtualbox-6.1.20-r1.ebuild 14423 BLAKE2B 5e9602cc0f0738f1fddad0e3a664abc36459c8732765f3ef60af59eb4ec93a8f12a2b7ab455d57b718d1d6e003acac1f26183a8414a720d4a8cf54a7f128c737 SHA512 38da2bf9f762e7f40ba7986ca594a61e4ecbcd1b9ebaef67354c4939d268bb390411d629b0bae29f994f58569a17685c4109583660e7589cd36aac107e69cfe1
-EBUILD virtualbox-6.1.22.ebuild 14363 BLAKE2B c0f9760a9b272fae7fd7bbc0b3879f0869be119773f64ee0a0efb48f3b0d5d478fdcbabf50f56084e613f8717f7c46ed9af6ce8d37e4d38e2cb04b31e797770b SHA512 724ee41630dd9d7247d682bddcfc278219048a9574a4afa9eb61a93ea8a2d21b60e3486b44378dd0bc1d086a5980886735b501fb2305ad2ac618a6adfab3d955
+EBUILD virtualbox-6.1.22.ebuild 14362 BLAKE2B 9573907516a31073da15e80b8b40c8947063eaee9ed67e2c46665097b88e0dc9bc8d5be2f804b62f6e347caae910fc35fd7fac98d30ecfe9f2c15bb8a7450177 SHA512 dca9ddb099f17bfb2e77f407cfbcc3aa1464d49d3312d1a8be4bc971d1bf896e8bc1a675103dc4f4cecd99d77bc0aba7035dfb0d6059a6e6f64b3b8fda5d9c8b
+EBUILD virtualbox-6.1.24.ebuild 14363 BLAKE2B c0f9760a9b272fae7fd7bbc0b3879f0869be119773f64ee0a0efb48f3b0d5d478fdcbabf50f56084e613f8717f7c46ed9af6ce8d37e4d38e2cb04b31e797770b SHA512 724ee41630dd9d7247d682bddcfc278219048a9574a4afa9eb61a93ea8a2d21b60e3486b44378dd0bc1d086a5980886735b501fb2305ad2ac618a6adfab3d955
 MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3
diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
deleted file mode 100644
index f504873a619e..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
+++ /dev/null
@@ -1,511 +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 desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${CDEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		VBOX_WITH_VBOXIMGMOUNT=1 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
deleted file mode 100644
index 29d68e769cd2..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
+++ /dev/null
@@ -1,506 +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 desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${CDEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.8 )
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-lsilogicsas_crash_fix.patch"
-)
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	default
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		VBOX_WITH_VBOXIMGMOUNT=1 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
index 0749d1ebaa9f..325ffdbc6afc 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
new file mode 100644
index 000000000000..0749d1ebaa9f
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( media-libs/libglvnd[X] )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+DEPEND="
+	${CDEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jdk-1.8 )
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( >=virtual/jre-1.6 )
+"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	default
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		VBOX_WITH_VBOXIMGMOUNT=1 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index de666664be77..ffe2d7631c98 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,14 +3,14 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
 DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
-DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
+DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
 DIST wine-staging-6.10.tar.gz 9673740 BLAKE2B 3ec1dcc96dcf583f061408b7bdf4adf14fddf6bf0dcefbb9a060a63de7ea87c3df0a5a76c14e01b248c9b21c1ed25379867f9e4d392b251f56deb93a78b2752a SHA512 9ba4fb7451f675fd9ad3e872adada708e9e7e8875f69567d9f2bef2cc8024667112538a385769eac2fd4b3c157266488458e76a1abc92d0a76109ca032103bcf
 DIST wine-staging-6.11.tar.gz 9672754 BLAKE2B a2d77fcfe198f9c474bb754b02c3e279faec73a30678b899aeaab53cba38b74bf43724d5b1f3d46dfa7a502b0ce637d5908dea09b386009acb937d1033445d99 SHA512 b9b6f206d7a37699887a9bd65c30b9d2fc333b507461dbd532fe17db881db1e79ef5620ce2421cdde8548411924fabba0f98123342f30c8d93a019b3a2125303
 DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d63471980794238862fab23f06433ecb6adbdd204de49b61f33e7600020d9b3156889709bcd58810f2f332ee890cbb17bd03 SHA512 d92f4e8e3cc81e9ede21135f35679d1b2de07bf75f4fd3878551cae74cdf5165c62573fd9e143458535565e21e8888f7f61cc413fdcef24f8958ac2de366a10a
-DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
+DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c
 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 21984 BLAKE2B b685531dc6e0df7ff9cffedec50a5fc6d2fdd50d8a62c16a5164c1c3c73c23a83a8fa116bc02a2b76c037fbafbbe7e738fb19d93a38dcd2d5743c353fbff8b36 SHA512 a509f03f95b6eebe03eb44ab5b55471722d373f51e27818d6aa565791f0286ecd485b50f12428449b449c5f1716d276b40b55f63d2cdef9226238f0674becefe
-EBUILD wine-staging-6.9.ebuild 21988 BLAKE2B 7f8b7431a69b618ef9202c270d34bc8981555fe27cb29d7447ed447e7d6c42844544bc721bb9439f61b56adad9ffba6c6817d5191cd6991e39e60699839d2dfc SHA512 d0b5e90ff86627bc8e45fe351ac558c8e05e2486b5d4d49187ddee2292d9132541e3bf1341650b4a23c6b0ca1fd1aff1ba566c108491f4e3e3c54fb8cf768d58
+EBUILD wine-staging-6.13.ebuild 21980 BLAKE2B 19bf674ecb65c7ae1eaec7144f1327535ceabe9a958bbc3d11dbd2e0c32cde1f0190a9eee1d00889d16c15f1910b77fcabb6a56ed9655023b5f2af97bf22a241 SHA512 4422d16ffd2a83281f65b33686eeccee0a3fee965f68eb5376bada3abba862efae60a350b15b633b450ebe988f9a84d84a2346c184632c135c73ab9dac81498c
 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/wine-staging-6.13.ebuild b/app-emulation/wine-staging/wine-staging-6.13.ebuild
new file mode 100644
index 000000000000..7285c2bf12d9
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-6.13.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+MY_PN="${PN%%-*}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	MINOR_V=$(ver_cut 2)
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.2.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		wine_build_environment_check || die
+
+		# Verify OSS support
+		if use oss && ! use kernel_FreeBSD; then
+			if ! has_version ">=media-sound/oss-4"; then
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+				eerror
+				die
+			fi
+		fi
+
+		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target i686-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+
+		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target x86_64-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${MY_PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${MY_PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gcrypt)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+
+		if ! use mingw; then
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+			}
+		else
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+			}
+		fi
+
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${PN}-${MY_PV} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-6.9.ebuild b/app-emulation/wine-staging/wine-staging-6.9.ebuild
deleted file mode 100644
index a651f85047fd..000000000000
--- a/app-emulation/wine-staging/wine-staging-6.9.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	MINOR_V=$(ver_cut 2)
-	if [[ ${MINOR_V} != "0" ]] ; then
-		MINOR_V="x"
-	fi
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		wine_build_environment_check || die
-
-		# Verify OSS support
-		if use oss && ! use kernel_FreeBSD; then
-			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from a"
-				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-				eerror
-				die
-			fi
-		fi
-
-		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target i686-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-
-		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target x86_64-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${MY_PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${MY_PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# 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
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${PN}-${MY_PV} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 5640b2ec087a..f0f321b9b0b8 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,12 +5,12 @@ DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb4421
 DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
-DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
+DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
 EBUILD wine-vanilla-6.0.1.ebuild 18915 BLAKE2B ecc7a573b29dbd2b9a95cfc04201af9e26868dd7c0177ab93d4b13c2e3800b5f6761c70ee0aabdee11511bf1e4b227e56f3dfdeddff33bd160380e216a823dc4 SHA512 fb92632c69f74e62afa08b6711d27ee550bd038db39c82a693d2f4918e997c05062514cefd345e780bf2de3daab9b60b946d14edc5d40b95a9948f99bddca061
 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 18951 BLAKE2B b39bc16766b5c193b0e5d456c9a3ed98f6ce7b0ec871d2f121cf8a68db7e80113d3f1aee647d988c011b772bf20ccacef11c96d6c570ef7d11f0158b4c599c99 SHA512 cc501e8b8840054a9e771c30c7fe46085f01447b38209f92b7c3763c4ccdece9526d98460cebd07e9cfacbc33435418333f1425aa4da2448b35c717f64719f06
-EBUILD wine-vanilla-6.9.ebuild 18884 BLAKE2B fb3768dde30b6e027b3528cda40b5c9b8917cad36538581025c77340c92ce09a40a07db339a37eef833cf1ba3062396bad4f3da7c1f474416d9c15c774363343 SHA512 e4d61af0bd111d056af52130102c66b0ddde02490777c7140c15452bc0cdf43d6d88480842d0f4b1c5dcb8ceae5f84109d7e5a1df160cf04f33d1a8bb3e3cf08
+EBUILD wine-vanilla-6.13.ebuild 18951 BLAKE2B b39bc16766b5c193b0e5d456c9a3ed98f6ce7b0ec871d2f121cf8a68db7e80113d3f1aee647d988c011b772bf20ccacef11c96d6c570ef7d11f0158b4c599c99 SHA512 cc501e8b8840054a9e771c30c7fe46085f01447b38209f92b7c3763c4ccdece9526d98460cebd07e9cfacbc33435418333f1425aa4da2448b35c717f64719f06
 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/wine-vanilla-6.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
new file mode 100644
index 000000000000..e725ccf27b97
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.2.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${FILESDIR}/wine-vanilla-6.12-winegcc-equals-args.patch" #800809
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+
+	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target i686-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+
+	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target x86_64-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+
+		if ! use mingw; then
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+			}
+		else
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+			}
+		fi
+
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
deleted file mode 100644
index 205ec3604bbc..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-
-	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target i686-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-
-	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target x86_64-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index fb0302693cee..5577f4d57c94 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -25,6 +25,6 @@ DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e00572
 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-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
-EBUILD xen-tools-4.14.2-r1.ebuild 16912 BLAKE2B d10c3a4781ab7b5d459d086c103231c2b62dc17952cc6a60872488bc392d728c5476f87235292febf4ee3ae3fcdc0858624d0560749c3f4c253b784499e5c3c0 SHA512 54c40a7e8b588b666e110311c5e248cc3751c02f8815a51e2d922c602379d1626a29c965ed1464beeecb534728a1092e0b9c71ae90e87ccad4aa6a01138f662e
-EBUILD xen-tools-4.15.0-r2.ebuild 17101 BLAKE2B 2b1543f54f21226d068620f6cb61cb2de89d90a5ea1a5708d1a4900175d02837c6f778b6e2946750f3b077dcc92dfa62bd9ac861f0e70c7566a3c51e29403348 SHA512 fb9548e1c484d271acb8d5bd7f0215febe1c912923f727ef818ba5bd67b9150f3f510252c5f8b3f2060e4409bedcc676bb81f47a763356cc9fda5d1d66b9cb9b
+EBUILD xen-tools-4.14.2-r1.ebuild 16894 BLAKE2B 7ca989c17e00354912ae4470e99f0e9c669c4bf94c463c709d5616968cb1c18467ff884c307ba51af3864983e2e2b4e2a7233a7f7e2368e8dac0cff6c795ebe1 SHA512 1a863617ca7dda05ad950d7f3f85d2e502c602b31966483472fedc04ed6074962ef10cf137e15c50311167ba87e56318d540d05af4baf2ad680c22f883094d47
+EBUILD xen-tools-4.15.0-r2.ebuild 17083 BLAKE2B b0e87f450797d82cac0577d0153520242f3360251ab0bd9a96ff40fa272f310b545933a31b313cef03d33667c7de4f1e5cad9d0a5f273d3ab76388ae93fbd929 SHA512 c1fc4f872a06fc51cd82258c9a15d56a95d31ba21623a9e4169f26f06f2ada27438dff1282c97ff888dee20e644324c617a3a3a27e9db57f4ca1cd2dc9ac8374
 MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild
index 7831e54c9fd4..c2b251d44cdc 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='ncurses,xml,threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
@@ -98,8 +98,8 @@ DEPEND="${COMMON_DEPEND}
 	>=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}] )
+		dev-python/lxml[${PYTHON_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
@@ -120,7 +120,7 @@ DEPEND="${COMMON_DEPEND}
 		app-text/ghostscript-gpl
 		app-text/pandoc
 		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
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
index af982d2bd20a..fd9eb3bf75c4 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='ncurses,xml,threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
@@ -98,8 +98,8 @@ DEPEND="${COMMON_DEPEND}
 	>=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}] )
+		dev-python/lxml[${PYTHON_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
@@ -120,7 +120,7 @@ DEPEND="${COMMON_DEPEND}
 		app-text/ghostscript-gpl
 		app-text/pandoc
 		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 4a5bdc20bfb1..f420d4f6a4d9 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,4 +1,3 @@
-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.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch
deleted file mode 100644
index c7173d91b244..000000000000
--- a/app-emulation/xen/files/xen-4.11-efi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index af27147777..a5299b3868 100644
---- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -57,9 +57,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- 	[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
- 	$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
-+	if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	else \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	fi;
- 	[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
- 	$(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
- 	$(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index ec02972f2b..628c245564 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms
- 		--rename-section=.data=.note.gnu.build-id -S $@.bin $@
- 	rm -f $@.bin
- 
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 008c6a752abf..182e123d0d74 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index aa53aa9183bd..6f995dc7b782 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,6 +1,6 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
 AUX blas.eselect-0.2 4948 BLAKE2B 1d96b09958669a85b6276ebe29f146cd592c141b11454c0c981c24e6a93f17779399300bfe540aa89c11f2399ef6a716728e3e2297e0cab8a1652b96a0c5ca94 SHA512 f312bb665fd70ec479fcd1e2fe11b50ccf8b6e80b8513e41a648328f521e7fc0639e83bc615afa177f780d3ec3d37ebee0c4755d2d03a3a604d71562791b4b11
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
-EBUILD eselect-blas-0.1.ebuild 689 BLAKE2B 7bb2bcf30dd97d8480cf4e8077129c524552d289b6c84849f977e04bb018c91ed716af61bb3fb352e878c317db75ac71a2ffec9b165447355cc8a5e6c4374c9c SHA512 02d513868d21e3ec1230d2c535fb41fc09087642f839403f3d0d56d27fee8bfd7f5852487256cf7c95371117dcefdeaf565338fee7f59fe0ac79c464d341c43b
+EBUILD eselect-blas-0.1.ebuild 689 BLAKE2B 23bbb495d1f9342c175b3ecc140826651ec58e023651956134a34a60f2a314d050ad347bad30ec148162df420a905dd176723e4722b5ee771cbc9fcc62ba4fbb SHA512 5755c6c01cad17e28223072a16277f9dd98fbec7e90eefb8056b5f18b213d68aa474a28419b4104b5a94d2e8f5ff7623808c65d45ea22d1196cc0af3008caded
 EBUILD eselect-blas-0.2.ebuild 678 BLAKE2B 3874dd3f30eb085da351d6f38ba67eeb4f514bd57e852e098d8758c97bf02b1f1753a7773112cdb5662b37fed4cd1e37c4d103189f60940b28d5439ce10f1a25 SHA512 be3737a7edf93bf739c26c14456c9a71a48cd012beaee1020d62e6c48ecbf4492e5c43a446e91d3a5e030aabfd79afd53607d767044c42db292fdb2b983298ca
 MISC metadata.xml 277 BLAKE2B f7ddd373063940f565a3c424a8cc9a3e092d44389a56930db8a875b880d5a6b2ecf644d4605342199f3dde5332caf903bf094daa554bd9abac6919230e371e21 SHA512 970154fcadc29300b663def3d2b5c46b1cb934694850e67ebb72cd9a5d838b602690379db0eac0cb013f618d977e2141df4dee89d0c5fefeb2b672a7dc86ab17
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 786faf501089..ef334a1730a1 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="BLAS module for eselect"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index 41e9929fc239..c3af9791fea4 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
 DIST eselect-java-0.4.2.tar.bz2 13782 BLAKE2B 10fd7faa3759f5b0d52c04bcd5a9f1c438814f4b477c12d2f0843c146d10cd8f7db43594ca4dc29de85bc33864fe1b205c69f9d2dc10c739ca1d50071fac6aad SHA512 dbb9ff873cf3073f60ba783e32b5a75c88114f790643d4a898db5429d04452f64cc5757a1ec2fb7c33beee1fc4509abeb7016f112c2bc75543a4250a85cb19cb
-EBUILD eselect-java-0.4.0.ebuild 1181 BLAKE2B f7b7c669bf6c2b509ef9c8d5fb9035375fe465abeb69098a1c40c060d42efe9cb59b006dcf368cb79fcfe4467af171c4fc0892a0e548d05f82ad35f34d612e6a SHA512 178f5835e1a30de24eeab918cd867ccce91b51622ca538c27134310ef71b9145124184b04dac4c5d79d8fe01ab060757331f9ba7b405e6183c72a2c3535b5a64
-EBUILD eselect-java-0.4.2.ebuild 1188 BLAKE2B 486fdd3b745a58a65139a625e4660ae1cc523a23ba4727b2cae5b0196a1a087196ab3e9cb1747d411bcd050b3d33981dd4b4350bb4efabbbe27ad5475f51aa54 SHA512 62a088ae4954a6cd2e2bbb5147042a8831c1d239159575d947f1e3d74ac53c922518a1ca9c9e863ec088543a6210e39e824c8d0ea9f6445ec6a32fef7b68b08b
+EBUILD eselect-java-0.4.2.ebuild 1184 BLAKE2B 237d0a89ebebf52faadbf3739766fcc8c3b09ac2192249014ab609ddc493b513b95de93977b7a98fc676d6080b992547214ca4f642707f774e31355d9d563bc3 SHA512 a64163e41759b096592d7632994c19d4c5e0e04ef9be9c9712fd101c11a7cf98a893c51af51889a4f94c147f96d274f5b5e35d2704da78f68e5249700bab9036
 MISC metadata.xml 255 BLAKE2B 10c56d3b58749cf6fa1ba350b10fdc53f7e7f6cc877224a1c098191a558770c904da2e97116396d8f50fdfbc71577a83d050de2411efeab4d89ec573f01fa36c SHA512 8ba7144e6402ba28e3c4a96edcfca7484aad1a5ae1908584a5c8abc98c26edbb58741b8c440c5f28288bf98be00453e32488cbf52f15474c25621a1a988a28d9
diff --git a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
deleted file mode 100644
index 6e4e7b76ac3e..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.4.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=6
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ ${REMOVED} = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-eselect/eselect-java/eselect-java-0.4.2.ebuild b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
index 1e1db97bf426..4a0b02d9ccbb 100644
--- a/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-ecj
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 203ffba00b56..1a00fa37bf60 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
 DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
-EBUILD eselect-repository-10.ebuild 975 BLAKE2B 2c20086412e71e0fccaea146bc9aaf79b0d81e81fa51a3ef2d048baed86175a4ea0d92e849c80e2a71befdf116e759518fcf095944b784a430c21693c7fcec5a SHA512 58c67bd341b3edfdc09b0eb4234b07700d6b18c921dd8c30e4055ee7bd63ffef19ad0addea87d21ccf52285d3e1d9fc8eb3e214fc6d6711d831baeedffd0a8ed
+EBUILD eselect-repository-10.ebuild 969 BLAKE2B a4122bc0eb40145e010eea9ec409384b15942dc4a5fe34b2b04ff49883d81cb84e8687f5cce7c90c51b7387fc5ac4722e401b915b429ea40df868dd83b315e23 SHA512 497bbbfe2a9bdd6015a61eab9b40e062824beb50e59fc9850dc76dd9bd1389aecdacbc6d3c1536776d6dbbe406a47d78f9ab713c5ba92127ba1108d8b3e87697
 EBUILD eselect-repository-11.ebuild 1133 BLAKE2B e5b8008ced2b478c424cdcca871c8f1746a20c5d519495811b1fe551149ba50c16f0e435b3ce7e4ed49c47830c5f9360b8ac87a273855a1f60bea6e279a37835 SHA512 65c1360324945f1cba4c4b2c5d6abb32bf08b0dc547ce424fc12884cf64043c080183b5ab59da3486c14ace6f589d2a0e10334369b8134d4ebd072f17bf85ae9
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-10.ebuild b/app-eselect/eselect-repository/eselect-repository-10.ebuild
index b0b71d29e522..17abf1b7a558 100644
--- a/app-eselect/eselect-repository/eselect-repository-10.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1
 
 DESCRIPTION="Manage repos.conf via eselect"
@@ -18,7 +18,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
 	')
 	net-misc/wget"
 
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index a1095323a756..8f748f28844b 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -5,5 +5,5 @@ DIST ruby.eselect-20201225.xz 2008 BLAKE2B 1471c174dddda5078f54b39b46d78dd0a5a2e
 EBUILD eselect-ruby-20170723.ebuild 660 BLAKE2B f99f0a670cf3b8072f559d32f55c4e4084cda34be9792ad32897e80906a1e003399960a23e2e5f2bb6d44b6d730ff41e9e5a57176e26e3d9e22586311702f358 SHA512 b80d231e5251aaa9d8d1c43be530318f00b66a7a2b233067bfe13e51134a7767831499c68d797eb0086941812d2933c54645d62b5ed09e0d2902e0d1ec17b0ed
 EBUILD eselect-ruby-20190121.ebuild 659 BLAKE2B 44da41f3cb85c9055523e37d013055156fef7f0d77e12d95dec973f361b02e34599cfdff89bce040f5033c6105b32f306f1f171fa1a182a2a7ad6feb45d642b8 SHA512 6a4919551a48048f4123ea846983a14187fa599ea5e632cdf69fc54c80603d567fac710ab0d25b8211d043d2fd57db63d5c472b86a6615dcacb114adc40d58db
 EBUILD eselect-ruby-20191222.ebuild 660 BLAKE2B 612ef4f87880d2e1bd92cde6a11945cf13018494ba6851d1ba576c8da5335f746cbce823e6e28e09d6c30d35cc1ae25fd891a21f5784d62029d777525313febc SHA512 f2afe5357484f1c9e43caadb2358fec9ba3b46a748ce9d505669b1cebaee57a1081f5bd3860835f7e705125ffcd5f6c5df8fb1dfe2fd315f4c53ca20df4f0410
-EBUILD eselect-ruby-20201225.ebuild 660 BLAKE2B 612ef4f87880d2e1bd92cde6a11945cf13018494ba6851d1ba576c8da5335f746cbce823e6e28e09d6c30d35cc1ae25fd891a21f5784d62029d777525313febc SHA512 f2afe5357484f1c9e43caadb2358fec9ba3b46a748ce9d505669b1cebaee57a1081f5bd3860835f7e705125ffcd5f6c5df8fb1dfe2fd315f4c53ca20df4f0410
+EBUILD eselect-ruby-20201225.ebuild 667 BLAKE2B 8099fd217a6e8823e535c8dce429b7179038912d7a2c36fc75f3386897db3868cc94b11d587dbc345144c0a9b7d7765970a1784bfdbf4b69dc5f419e06d6ef00 SHA512 291d22cbd51e986ffda457ad670ddfea3374694b369b5889b1f154f58fb29ecc3505cb6e02addb942d00bfbabfc384e6f8ee0ed3f4df3063a8a3621dd5634b05
 MISC metadata.xml 270 BLAKE2B e0b0821f9b433f500d524e196c1959cdffd4f3a2208df4910dfe38a9a094093adf261eb432abfcd482b3f6c2674e13989e34080bc5a1d0ffcbd0131906786aa6 SHA512 a513d4e935263d67c39c625e11e91f6b88ecc0bdad483bba666b0046bdfe7f8cddfad6eabdace4c7d02dff9503de06da158f0186a3a894325d515a6d6e216cb3
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
index 587297ffbb97..f065856acf72 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ff0a5b204330..13ef0a6b7997 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 265b626bd158..f9b82e0a4fa9 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -3,6 +3,8 @@ AUX aflplusplus-3.0c-LDFLAGS.patch 445 BLAKE2B cfb1282dcba575ed96f355bf6695896f6
 AUX aflplusplus-3.13c-CFLAGS.patch 5732 BLAKE2B 95e4a581fa9e0e9cf8c321968c8f4774c5012f4d5fe0f1d940b0bab3aa15803758c343af0969a5f7fd05b3454845ff306325cd29821f04d630c4bb42f4bfa2c9 SHA512 3e35b5068d64429a435f58e03fc557056ee9b0f73d4c407e34abef083b7c4f47b072f84d1e2abe99bf49449a5f6f46217b158893b84d635bed025979edb8c5e0
 DIST aflplusplus-3.12c.tar.gz 2065569 BLAKE2B ff7a87eb02f7731b5ce8e1a3016239c6fd1cd1bfeb0b9c0fb69f72bdbf079e7700cdb32abe64f64853e5ff82f1c0ecd86d2cadb892e7c40be6bb2a7b089f7387 SHA512 a814d61298b60d99388289e742dbedf2ed1ab454a5e1ea20d48bb2f18b36c01553ab1f097a06f733439d67e804d48cb823a82ff249c404fb0b83a281564f3040
 DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a40d145b7cb91b8b95488bc975804f70887bc1c3718fbd12c76872a0126f3bcc36134eb55ef729060b5efcf93dad424 SHA512 916a714deaf67969c9ac6e90bd2d8015a1e5188c8a8122f4d5d64ce4b841822de65458e469a47d4244358fab5e31ef4e52b8ec1432dcbd60d29aedf15e4c36fe
+DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
 EBUILD aflplusplus-3.12c-r3.ebuild 2139 BLAKE2B 34c4f1e336fccd6ba6d6e91b679043430fa50bace3be3e7e7d6fed9ee3444aa0769997ffc535dad7d6246560912ffab03344d38c8e88726b667b23554e612dea SHA512 b937af8dd761839bbeda049f4b5d8000a50658232a57a4eef2e601e0ed5748e7e5367eccf29c6daa74b259419d6144ed1dd6186a18492be503693683f6e6e472
-EBUILD aflplusplus-3.13c-r1.ebuild 2140 BLAKE2B 60073940627a3db7799581db9ad14fecbce22aaae5bb89426a4f11ff99fc8c4975fadb5ad92b6096f0f512a6737fadb1c04a1670e56e4dcab3c544b113ac12e0 SHA512 91d48b3277791848d91398fd4a24021af7f3faf2e7910e937080b00ff330fc03e0b4460834283dd7b2988e1a6dc5ab3a93a7ddb960f994679c0740141473d300
+EBUILD aflplusplus-3.13c-r1.ebuild 2139 BLAKE2B 8045bb4aec74858a6786a1129c9b7774590b1a26040ac3cd1a3f2de166df17fa32540018ec46bcf9b7c31602b7c4e21729d29cf18242a2a087cfc713ad36a63d SHA512 9bc0ecf56b00cdb23ed87c655844e089c5ba1ee1c12efbc0b07b7cfb7f9aef45b0665581807420ff1e9d2d201d1ab32c90229a9b566acc560cbc7614d2115f4a
+EBUILD aflplusplus-3.14c-r1.ebuild 2162 BLAKE2B 11113de7c3f6d4c5107ccaf1895d0699f290bc86c388dadeb0d0dc383d082658b012006b04a2529d749a0c5fd64174a345dc79df43b4d93db4abb1c53f1fb5c9 SHA512 c59d194efa1910f8d1b7bef62cc565d8360b41c5480fe9f4e1fd384eb250dc6b16deb5a45239dfb3f2e359d89fdaacd7cf5d1a9ddbcb143d5b425f3fb9c426e6
 MISC metadata.xml 327 BLAKE2B 25fff77dada492976b7c412879dadd7df2a78a05cfa2be3ef00557f84c3f6679dd2977c8ea11573ffda864b0c88da327ea912a358a2b44b4186c71c6ed7086e8 SHA512 b2c58af252bae6ba27785f059c67edbd7c05469965e67c5e6f053bd385463b5f02b2ee65df3174fda85dfcf741add66bbc33836b3d8edb76acec91727f008746
diff --git a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
index 9fafa1fa35e0..fb2fb3450833 100644
--- a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild
new file mode 100644
index 000000000000..066cbd062f6a
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-3.14c-r1.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,10} )
+LLVM_MAX_SLOT=13
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/AFLplusplus-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+# It turns out we need Clang too
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/llvm-10:=
+	|| (
+		sys-devel/clang:10
+		sys-devel/clang:11
+		sys-devel/clang:12
+		sys-devel/clang:13
+	)
+	!app-forensics/afl
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+
+QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8"
+}
+
+src_test() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		install
+}
+
+pkg_postinst() {
+	# TODO: Any others?
+	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 0134ba0258b4..ea35535f2d0b 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/dbskkd-cdb/Manifest b/app-i18n/dbskkd-cdb/Manifest
index d7554b35406d..226afd331083 100644
--- a/app-i18n/dbskkd-cdb/Manifest
+++ b/app-i18n/dbskkd-cdb/Manifest
@@ -2,6 +2,6 @@ AUX dbskkd-cdb-gentoo.patch 505 BLAKE2B c97ca86f77514ee8a887a2091449a44aa20180c4
 AUX dbskkd-cdb.xinetd 239 BLAKE2B 46b6b7bafff05f00ea2d1e6420cf443e490e2692ec96065b25c14e41ca7adfbec80d3d9a2dbbe5c848c81a6da7da0a19a2815ef4af5320e2a4a91539abbe1e39 SHA512 a7efd15b7676b857b2adcc23df023f5af8d29a7357b77ab3fcb494fe6cbd401b28caf51f4f3ded5432bed0a3f1d29b0cc65148f3a8e083ebce70a0aca0437915
 DIST dbskkd-cdb-2.00.tar.gz 9296 BLAKE2B d863e2a05cdcf9c8c030c2e3cc2a46a22f5bb01d844ee5120d686a672952ff2609f994fe8a4915daa5b293357f3da87cc9f702f7307dc162a20ffd0a7d47f804 SHA512 3582728d2a1917c00437b273208fa150a5a32dcd462752c6751ddbd574ca7f1476b2aca0d2613471a800bd17f80e2c4b60846f9056ae621996f8f5a5592fa22a
 DIST dbskkd-cdb-3.00.tar.gz 9380 BLAKE2B 81b167485a0ac287c01a5cab2fc638d4303bb8e1529dfc14b89ba8242915de38165acba5d0df00714bf8b1c5b190b3cf655e654e96bae5081bd3fba1f71e7a6a SHA512 a3fe5a0f2e96828d22a75e4daf36eecaa8d903efe8c8a5f6972178f52dc01cac5df5f3e1d8a2cf684d6b78a9c10c207b655a296ceb456dec9f0e502142de094b
-EBUILD dbskkd-cdb-2.00.ebuild 1225 BLAKE2B a4d0f6a2475aea89ab4db9ab852592e18ee4aab70f171e04cd2431ce46d018fd4e5ae5d271908b0b69c68f4957da27ff7a6b48f6dbc58ce12ea65652d57a1780 SHA512 89a38d92e9573336aca31c3e0f2cca6398d864c1790703aa5691ac8c10cc9260603dcb192863c9fbeaeacc1618ff0163c1ea8c037f3e82155553025956a7d6ed
-EBUILD dbskkd-cdb-3.00.ebuild 1179 BLAKE2B 71aa41006a1b373cc292a17352dd40ef23f440af34ec3471086e97331de0c98b520b4beab2f62b0198f56641ca0178bd29500fab882cb714dd8d0cc063f4e819 SHA512 84b38add6d9befc6280e1cdb6265a54902b505b939e4c9c39d41bbfa131934a9d7c30edac39c7a65faaf5fdb2ee0a150a419647c36d2aa6277f5480eef4dba2d
+EBUILD dbskkd-cdb-2.00-r1.ebuild 1205 BLAKE2B e36202358b631f98731dc6283e54312f2c4e35929ac09c26c6082f338520f13c4415130fc0e6e03e536774add50ed009b1296db98279e314af6a4462b61099c4 SHA512 3d04cd19f93f57c2bb00de464a3efcde1ef5df7837591d0ebbcb37f623c911d2757b0fa659e472e00be3d7be7ac8aca44b11f593f14b84fecd92e7a267144511
+EBUILD dbskkd-cdb-3.00-r1.ebuild 1184 BLAKE2B 392a88be4e1b91813ccd5f1d0ca58cab1f4aa6bbbb5729be89f67e21ad66024dee07c9c6ad8363018ac3ac1a2ad93aa02561f553660edaca9c40d27f31115a38 SHA512 d4ab6e7d5a12e65ecd005717542bf163bdf23424d7eb46e08efc8abf160efec4bbbe47eb075f42eacc113df30f66a6f0940bf83468e36a3b97d8c17925939c9c
 MISC metadata.xml 326 BLAKE2B 5471d3951565efeb1d626e1189d835e9c70ec80fe1a877698380019aae8ba8ed9e48ae9d1eb4f70ae9386162dd3fd5f402a764291c22ec6f6ae9893ed5f15c80 SHA512 56d019cc1f6e39d358e431b910f36dced992bb1f202bf7ef405979633383301751e853e19eaaaa84408a71699bcf63480575a081a5981a49022a0fc0d32cda2f
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
new file mode 100644
index 000000000000..f63e8826adc0
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="SKK dictionary server based on cdb"
+HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="|| (
+		dev-db/tinycdb
+		dev-db/cdb
+	)
+"
+
+RDEPEND="
+	acct-group/dbskkd
+	acct-user/dbskkd
+	app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	local cdblib=()
+	if has_version dev-db/cdb; then
+		append-cflags -I"${EPREFIX}"/usr/include/cdb
+		local a
+		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
+			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
+		done
+	else
+		cdblib+=( -lcdb )
+	fi
+
+	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe dbskkd-cdb
+	dodoc *.txt
+	einstalldocs
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb
+}
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
deleted file mode 100644
index a1acbae2b9ab..000000000000
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="SKK dictionary server based on cdb"
-HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="|| (
-		dev-db/tinycdb
-		dev-db/cdb
-	)"
-RDEPEND="app-i18n/skk-jisyo[cdb]
-	sys-apps/xinetd"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-DOCS="CHANGES README* *.txt"
-
-pkg_setup() {
-	enewuser dbskkd -1 -1 -1
-}
-
-src_prepare() {
-	default
-
-	local cdblib=()
-	if has_version dev-db/cdb; then
-		append-cflags -I"${EPREFIX}"/usr/include/cdb
-		local a
-		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
-			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
-		done
-	else
-		cdblib+=( -lcdb )
-	fi
-
-	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe ${PN}
-	einstalldocs
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/${PN}.xinetd ${PN}
-}
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
new file mode 100644
index 000000000000..6280316c12af
--- /dev/null
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="SKK dictionary server based on cdb"
+HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
+SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	|| (
+		dev-db/tinycdb
+		dev-db/cdb
+	)
+"
+
+RDEPEND="
+	acct-group/dbskkd
+	acct-user/dbskkd
+	app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	local cdblib=()
+	if has_version dev-db/cdb; then
+		append-cflags -I"${EPREFIX}"/usr/include/cdb
+		local a
+		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
+			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
+		done
+	else
+		cdblib+=( -lcdb )
+	fi
+
+	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe dbskkd-cdb
+	dodoc examples.md
+	einstalldocs
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb
+}
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild
deleted file mode 100644
index d8cb4b874391..000000000000
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="SKK dictionary server based on cdb"
-HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
-SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="|| (
-		dev-db/tinycdb
-		dev-db/cdb
-	)"
-RDEPEND="app-i18n/skk-jisyo[cdb]
-	sys-apps/xinetd"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-DOCS="*.md"
-
-pkg_setup() {
-	enewuser dbskkd -1 -1 -1
-}
-
-src_prepare() {
-	default
-
-	local cdblib=()
-	if has_version dev-db/cdb; then
-		append-cflags -I"${EPREFIX}"/usr/include/cdb
-		local a
-		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
-			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
-		done
-	else
-		cdblib+=( -lcdb )
-	fi
-
-	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe ${PN}
-	einstalldocs
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/${PN}.xinetd ${PN}
-}
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 1f15f8700bb2..ecbb7dc87bea 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
 DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
-EBUILD ibus-anthy-1.5.10-r2.ebuild 1328 BLAKE2B a72f035a04b7b4d01e9dca0a97d9f5dc3d72a3233597f7e81dfc2f031d2d885e75fa62d9542962786b3facdd1597b7d10872834b5577c68c575a75f4185c6546 SHA512 c8e5b4a33da192cd9222093bb7082b4dd91a2fe858f573a0388cfc652bae67af764a097ed51cb47e5f3dea7c9426dd08aca74d560a164f2f9329f29fdf17b80f
-EBUILD ibus-anthy-1.5.11-r1.ebuild 1311 BLAKE2B 9d6b53e0741c89ee49e407827316a33f49bdb3e3203c923aa7ac01fcf835ebbc1c66040e0f5af2824e1dd3e8d03f3596f532aff3c89fd9628021e2ee615c1b42 SHA512 7ef33badcd1cd7d246e940466e758c89862c246da4c159ff2bcd3bd7f665ca8d7b841e6e4eaf81eba5207e6170c8b4d3de354fbfdc539acf599a870e89ed2464
+EBUILD ibus-anthy-1.5.10-r2.ebuild 1314 BLAKE2B 726a8f9f01dd569abc89b24c9a7eefee70d4fbcb5616349c27c5c8a844e5d6f6fb485cdcadf6463d68e426e13c99f92edc7d30158f76f3f6001738b361c48bdf SHA512 d71429e94cc7a34e055e7bbce7fd456ee41eef86c2d35ca722f3e5eb6e632563dcb0e4ac75db3443002d0d3a41ddc52b6cfeac1f35e00a8dfc58bd9ee57252db
+EBUILD ibus-anthy-1.5.11-r1.ebuild 1297 BLAKE2B 1deb05b819ca920ca0412660fb11e34936cda99fe6f9b3b43f2d5919a75cd9f95b4211b83951bb2b97c30a5fdf237e67b0f181931c90d92be72192607e2ae8d6 SHA512 0ce75b6eaa0f8363ae7a9c4ddc75ad0f12d8480ae925a2b33c8d2233af3af4e97628f9a3fb6c9493ee143aed810632921740629344c11effaa8419a5061d9d09
 MISC metadata.xml 324 BLAKE2B 23933e913b8147ddcfb4c67ac1751a3e9145c92ca0c93a190a437d11a9e20b7e668fc3f5562348ce69da05ba0a2e9eddf4f36f78efc0881ceb62b33d2e1ebf43 SHA512 2e01d285b415d6f8f114306ad24bfa756d11e83bbb0e61f21bc5a4b1c99fef92627766a0437436aaee0295401e2cd55215751e5511868eb8ce70a2affa38518c
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
index 6575faf79d88..211a9f814861 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
@@ -19,8 +19,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/anthy
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
index cf0c19241799..26c60f321884 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
@@ -19,8 +19,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/anthy
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 6019519f6511..f7c20cc1dfec 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
-EBUILD ibus-hangul-1.5.3-r1.ebuild 1002 BLAKE2B de48a1863994d45cdabf962deabc90b563fac6fbbf3b526f13cb1480552341f8f3cba0f11ac713d767c8859aa732a5d13acf9342a8d6a88b0fc05e6db9afb1d6 SHA512 d192c1960d7d17af73cfb28781b349b4ba06b8c74f591c41218848008c9845f66e65da71529faab906b2c053f08998672b3f4120a9f72d365c42ad831d0c1fc3
-EBUILD ibus-hangul-1.5.4.ebuild 1004 BLAKE2B 5d42cd00dfba9a2584311620f0ce607c69ba1a65591589a8c5268cdcdcfc7d1a9298a5150642a03c6410928576f6a591b35843ee6cf1690fd54d0dc1b36b98df SHA512 ed6d37a21f1587e3ff96af97a1cfa138b3b7a94e1b7e1ed747236f59f4e509ecf096ba6a786bc048e29b89a14429f4b9f0cf2958f7fd4d259cbfe914efd725d3
+EBUILD ibus-hangul-1.5.3-r1.ebuild 988 BLAKE2B 843a94ce91a794fdb3edb82521e1ac317eb13d42a596286049b46bac75963987b3e8e62a462cfed23ac8ea1252c6cb04805a04d83dd767916816daabd9d43137 SHA512 31ca698a4989a3503ee2f79a6afb5d6e7dea3906f553ae03034f47c479e5a7bc404e7040c4344ffe117a1aad0db81b58189353e5ab1c569c377464ba8da05119
+EBUILD ibus-hangul-1.5.4.ebuild 990 BLAKE2B 7dd6f3dfd6f96637fd73e2e0f1dbe3eda72c454a319aa56fb389ebb1ad9667373d8992eaaacf2e54576b83182ae18c7bf9cabe185625da424cf407cae7458599 SHA512 a0b4d22d042f94880f07b38815bb8ff2fa9ed14698fcb40e33fc0b70e5c59311aae8f1683ea24959acae723596f1dfc52dadd243faf196c25e4bedd17ee04e30
 MISC metadata.xml 320 BLAKE2B 1b7a03c3eb5ec719b5e6fae06a8189708e68e43d2e9ec26550d6ddf0d4d5a744ad0a7beab4a5952fa9b1284abfb8c723aedc068a0651d3c5cc314c97cd0f6e4a SHA512 8db6cca378e45fd7d112e23a23a3c50f3f4e6da485ddd2e7831c45a64d7df8f8b9d8867c29bdaf924d08f4a6baad563022c4517dec4989c2a37d26719372b8f3
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
index 6ab0b33d94ed..8c38721ea651 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Korean Hangul engine for IBus"
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index 05f3c852f1b6..4d13e3d9b116 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Korean Hangul engine for IBus"
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 26ca9457641d..d83476cab520 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
-EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1472 BLAKE2B a76ab66ec1339d07b3841076a7efc7e2fe9b3e11e1572e5c1d35da2430d0d770d3bb8b05f5ee97d504fb2dd5b926520d4a7d9cf409be4e6f79777e78ba1be79f SHA512 c325487a67d1ec6bfedecf93c7749791c535bc6e20e51c088f3fe1a153c86b78c4a9020a75a2a27d08b8c52fc2d0a3ed584b28d26b396902f84af0c03c09c9da
+EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1456 BLAKE2B 69a9730afac64a04abd796d913eea56515dd963537992d31860a0b700fff1943aadad668539cbed1e60d7a17d232a673e970827d02a5375387dd778113aebc2b SHA512 ec42608cd34e73a7a0930e5b4b06b3e29b992440767fabeea0ec9e1cb390396f4952a611b2a86828396f1452357f5d3b6bb61639bc484c76b527f52befc3ea41
 MISC metadata.xml 833 BLAKE2B 82b50e83b1dd6598cb98a047045ce82fd01ba187140ac9304fd886ca289cd22e988959d7cf5160668dfcc00d34ec0fa246676ec07b1e297505bca3f927edd6c2 SHA512 57172e8a3a3378a3b68d30482c1a3659ad44c96e90a03604c47f19bb4553cbbd9549dd284a48812cf65b49fc8a107f485108c9c432cffcf27812b6f79c89aacc
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
index 4e73913398da..e60f8ad835a4 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2015-2020 Gentoo Authors
+# Copyright 2015-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 LUA_COMPAT=(lua{5-1,5-2,5-3})
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 
 inherit autotools gnome2-utils lua-single python-single-r1
 
@@ -27,8 +27,8 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	virtual/libintl
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	boost? ( dev-libs/boost:= )
 	lua? ( ${LUA_DEPS} )
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 879625e12761..24335e7d38c8 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -2,5 +2,5 @@ AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38
 AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r4.ebuild 1315 BLAKE2B 16458502108b394c2220e45a414fd9ebf4118c6404465075c7f207621842ad7c93c25adc8a3a26a3d01510af059fadc9fbf464807d88d9bd5c639e1d2dfca5ee SHA512 55a5df6eab4870836034473e72c9d24786fae1991bfbe1464fac57d66e2bcfab2bbb8b3efb36faad0a39392d59caa703ad85305e1590895b1434138ad408da7c
+EBUILD ibus-pinyin-1.5.0-r4.ebuild 1301 BLAKE2B 11df25aa728dc12167dd011246ec5d97ab3177434e0518fe6b907c33820eba310425a298a57c87dcb7ec4077049e664481ce9e5bcbf6baec18c4813d42156d2f SHA512 142a0a156837e15d40b894fcccaa7249f4ef1910699748947cb9791052670582811a07d77db6ca73a3ec0f49fad2bd1c3154e4067d5f78146991b33cfafe8a45
 MISC metadata.xml 524 BLAKE2B e4e6b11896bb13e6a6578cf560db7d0ea592af3d129cb15b9fa2302f259ef3fa9e78faced298bb2d1e0b8c8eb763607c84f0fa87feaf2f319607a4565a3d14f1 SHA512 cb400bcfd3a92b0adde9301e1c8c9b4f3251307d351caca6ece541793d24763431d1b67c35a191a28affd4543e3b4534d15c5a573299659f29edc8de26fb441e
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
index 5344bb6d677e..e41e4c2243f0 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 LUA_COMPAT=(lua5-1)
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=(python3_{8,9})
 
 inherit autotools lua-single python-single-r1
 
@@ -22,8 +22,8 @@ RDEPEND="${PYTHON_DEPS}
 	app-i18n/pyzy
 	dev-db/sqlite:3
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	boost? ( dev-libs/boost )
 	lua? ( ${LUA_DEPS} )
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index 49f33269ec82..37251d74bc16 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4691 BLAKE2B 162301e028b0b8f864c394368897d635b3fea8939e52c9068884b08752f51a5d550381680dda65b42e80f471bd0ab616940f138fd53c79655454d6fbfa070b3c SHA512 e67e202fe2587a4b985b047c893164d3a68ba7ff4ae08d9cf5dde501614c9d71bc4d9628858f7bd9ef2f954c9826134d8965c59f8548723df6e94ab8652daafd
 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2176 BLAKE2B e82fe7067cddf6a37881129f4c9ee4e206da9b8a9dd54fd2a2094d7b0d7f1300c5775e9eb7ec45e1e17d3d5a6a1c70b34ff5b3c7715f1cc50a6b33c91073ecb6 SHA512 f2273b3117c9b05ba5b6b1b9a1e130246dd602f2bab38cdf70fe4404d389498ee8a5bc159b8fb210c236aa2f1df40d53458a31930c04c3490cd400a48428e4e6
+EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2160 BLAKE2B 86c8625181f76196f2c1aa605ec0e10c0ce021b0992a3de83d1a4ae37199ba717ce9760f4e2c12463c1176e111e2ba14742daf3280e840fb1530080fa28fca35 SHA512 d4df13e7906d67ac3ebdfb30996eec77fbe7f0938cdb7723936d9e3069af00f58ac8cd12b2aaf86186b276fd98c3c4eab175b526a6aa86408d5474d1858cc134
 MISC metadata.xml 420 BLAKE2B d59e5e24e6892f397a61f9b4f9cb3d82ca59a522ad8a82c29fcd9d636f097c0b8257363ae6d6977dafb3894aa8aa5f2f22b7664e4cfd8c79a571f9bf62e55f73 SHA512 ed92e8d756f41ea6618cf6f159a3514739a32344b4a63ab64037083e693d18af37de8747edf6c2f6e9006e4ce60ac128f4dbe36c2ab85801b78cbfe28a753a61
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
index b9a204750900..119bebaa5ab6 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 
 inherit python-single-r1 scons-utils toolchain-funcs
 
@@ -44,8 +44,8 @@ RDEPEND="${DEPEND}
 	gui? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			app-i18n/ibus[introspection,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+			app-i18n/ibus[introspection,python,${PYTHON_USEDEP}]
+			dev-python/pygobject[${PYTHON_USEDEP}]
 		')
 		x11-libs/gtk+:3[introspection]
 	)"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 53e1d1a9a608..e83c990e9aed 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-table-1.12.4.tar.gz 1371890 BLAKE2B e0d531bdd38e536ac9fc92465a651e971969278ab4826198d12399ebb1cd747d1f5d21713ecc86311ab3995b04a2842d230da8caed962045a959ba136f197cb1 SHA512 3e175dad8d9e12be91f6b6878b67301bbbf04c55e43d483162d3b10d2edbdcf1077d1f37beea2ef36323eb7de289a0c60cd3d055357a580e5d18bcc642bb907c
 DIST ibus-table-1.13.3.tar.gz 1408143 BLAKE2B fda380e284a996d34053f6bae543ebc2c072ffbd870a9421b76f18a3fa5e45ca6e687818f40bd1335791f1b92dc7ffa1ccc35c7cb55d1a6ade26bc958a2bf8d4 SHA512 2959b2f96c9a490032dafbce2b4164fcc07797ab73e735f26003156a891e1e3760e6a4f42713084b5ce1e408cbe21c3060d99615d898fe50b8d51405dcd42a3b
-EBUILD ibus-table-1.12.4.ebuild 1049 BLAKE2B 91fdb64bf25c53f0969ca7daa33e8285dfcedc3cef1fbde7520b3fb3f985abdd3a7047160637f258da77845c93f0703dd702b59df088403170dee7a4f8339494 SHA512 d51fa637a388a012bfd488e553a09b7de95d189199a6080c023fdf1489528436c953c92c93b247dcd970f5aecca97afe701e3295c70185228797de80d4c6a19d
-EBUILD ibus-table-1.13.3.ebuild 1051 BLAKE2B 1dd8c9008d0bdb0b8a0770d19e911fda75adf8c0e06e32e3f60b0f5b58d82a84e552e8920c64f297cf84f591511a52fc3f53c3e44571f63a1ba93979cce6dcf9 SHA512 92a7aa189d958e4951f9790a610334c6331144532eaf7632131549a953ceb9ad6642577cf99aee1299f529c390f1c8fc0cc621a538541a10d84ba0bb9a5454f1
+EBUILD ibus-table-1.12.4.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
+EBUILD ibus-table-1.13.3.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
 MISC metadata.xml 314 BLAKE2B bf730195fa020f6a78881c37dcca2874ff8d055f92cbfdd5c8a051bae6e6e7ba79f3346962e9dba9b424e69e6c01dbaffd65b2ba27aa374bbb34d7569f360868 SHA512 9abb502029e18744eee84d9a362594222a10ae9efb9a4d42d9bab1fc04b57c1067051676b028b10304d10a3925b23ee8bb5542d289db071b1c189d19764f81ff
diff --git a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild b/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
index 122725a49a30..98017235346d 100644
--- a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	virtual/libiconv
 	nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
index 2a67dd2b2766..ff60ef200c5d 100644
--- a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	virtual/libiconv
 	nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 0fdb746e2d92..0ecfd968d0ee 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-typing-booster-2.10.5.tar.gz 9448121 BLAKE2B 32e332df5e68a81c4f86df298389bb1fd9daf97b1f281bdc150183bd939a97021540aa81db5fa94ee3890c9b9a031a8eb75241da3716763ed6262fc5d5b3fb9d SHA512 f3bc5536874227b5482e46a097ac634a522651b3d200b33207705f5b1d87b8894dd962e19c389281fa5f32c1edbf3186dbfba12d718cbc6fa159d648bc622bf6
 DIST ibus-typing-booster-2.11.5.tar.gz 9485824 BLAKE2B 41d9aa2ba310e2db725e7809a67988fa69fee117b560d945a3cd935e7b2bbc372f448a531ed4ebd2a131dc1ffe3cb7d86b7d10fdbce56a2e241157f08a84ca69 SHA512 a30c81903b3d99f23a606f7f083615283ba64a0e62ac54183327447c33f6f7212472742036634522d36776a45ac72ce7874bcada624361f930785e2823652f0c
-EBUILD ibus-typing-booster-2.10.5.ebuild 1099 BLAKE2B 5f8ea62ace5aac6d16da6369500c7a1ed07ded2d5ffdce51f8d64dbb8ec06e46b74c239fbc338b833b55b05856e6af702fda90a0a3c21a62082e5dc5958a3b0c SHA512 398c480a411af850fd52705490903c26769b6402b1453455574eb9edab1e966e569c94c370610ddc186ff1240a9898494f8da160b2f0e215388d6214ba47b550
-EBUILD ibus-typing-booster-2.11.5.ebuild 1101 BLAKE2B ecf5e44d50604fa1e21009ba4725e4973ea93f8ea3e892d07270b9b5f5f852cfe2e023f7d8b671015dc774636b0cc8e5c57dd67c9f72e0c6916208f8f5b055d1 SHA512 1b4736dbcccfa576025b520456617fbeee876a94d7194f0903e5ee521dd6024333b3f3fe28bdb9b03dbc44e77d4b820d498ecbe16e5238e25e39461339a46695
+EBUILD ibus-typing-booster-2.10.5.ebuild 1067 BLAKE2B a880c11bdd9d4d8ff1a1bfb707e0a7e17f490fab6e36a80c8c442d65aacd46303f7920e1f6a8fb1b2aac4b66dd5f9f577097d99334adf2db1108111624a0e775 SHA512 724c53725bf813dd05d956863f9672725459bc506aaaef30e2336562e41d47df1890cca6af2c1adbb76988eba82a2e9b9299288aa9daaaa85fc981f1d1f809d7
+EBUILD ibus-typing-booster-2.11.5.ebuild 1069 BLAKE2B 7ddc93761c9e1007c0f4d9e09ccf8693d956d7f04a759b42187cfadb67b8f3de369dac596f4a0979caeb149f842565f633653d154675bc2bc7000941bb07176d SHA512 762f465a512bf1b62eba82dc0b6ccf494987ec12afa24c13f2a7a950cfa139977b9b7a2e37044c396cdd52bd34469cc1883a59b2ffa40b5f264060e4b49fb6d2
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild
index 7435956552e7..60292db609e9 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -21,11 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')"
 RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
index 4547ea3abfbb..4e8cb0ffc7f7 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -21,11 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')"
 RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 4842e3cd6e9e..a040193d21e0 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,5 +1,5 @@
 DIST libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
-EBUILD libchewing-0.5.1.ebuild 1574 BLAKE2B f115786ab64deb2511c31fe18d0f5caea7cd6b7fa3cdad01eedc2474ac234767914c5b417e8f96286b6fe285f88b0c8e17bb90623868d075bb746e349c7edfa6 SHA512 1273773d8803f46589f5d3c2e63376096ab390ee544f29953645a13b6ce6a2286c362b9ef73d96037849bd22a5b55f0b92cf4d2f14745421f52d50fa229c2e45
-EBUILD libchewing-9999.ebuild 1543 BLAKE2B 7eb46008f44ce2947ce897a1473019b240499301414d8b28485c0bb547c396ea4918107dc1b37a3810fdd5736742c0f81071b42f2d087b264f075294dc19dd7c SHA512 3719e6ee3c0655a40f6a8c5d401c5ca54e5b730bee0be8b2395f8605e486c2f9e79a0934b1c65c9fd7e976ffdcf138832c227d711765204a11a7a14c091f5df1
+EBUILD libchewing-0.5.1-r1.ebuild 1577 BLAKE2B 743bab3b9fb97610171f368c92297a8672f57de1377b8793881c3d55d7ea68dc01c539f46dd984ab517cbe8b7bc7a19c920920a83bc747d030ccb21f57ffd6bd SHA512 8ad88794739290cb5ab2987e0c9fd20fd6ef80326e607303f5aaf4170f2e2d356f2a19086d02dd9b6e75f7bca583407593ed5c8f31e4ca726396b093d51e1cdc
+EBUILD libchewing-9999.ebuild 1546 BLAKE2B 473a7f0dbb25153e14ab5563bc735cf833e20b8ccf52acdb87bb4ca0a6c7dd802c42d146b9ea307ab5f2900a00b5c2ce3da24bee15f2fd5947038dd09fd8f1f5 SHA512 06ab48e4d1a6809a1ff26565813daa4ccb763909a6423144908c93ca16f56340cbb3b468fb38fcb1dff74719d2249f90e3648da7259fd2b7f820ef12287899fc
 MISC metadata.xml 465 BLAKE2B 5d172cd0bb5dcf9aa6dd0d6c26c6e3eb85f9e3ef7a280a113370d6db927dd23d6616e288fd96e699b5fd869ec7568b9b476ea298452d5d7b31ae29487e672e1f SHA512 957acf895204f1e3adda5286ac240edd3f6f1387460459b4d20e4788e1db4a52d79b56735ef8c84e97030afbd6a03d6b1c4c9a610edf59cb0760817ae0114d3f
diff --git a/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..e29bd0411fd8
--- /dev/null
+++ b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+#	inherit autotools git-r3
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/chewing/libchewing"
+fi
+
+DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
+HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
+else
+	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+# BDEPEND="test? ( virtual/pkgconfig )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	test? ( sys-libs/ncurses[unicode(+)] )"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+#	if [[ "${PV}" == "9999" ]]; then
+#		eautoreconf
+#	fi
+}
+
+src_configure() {
+	# libchewing.a is required for building of tests.
+	econf \
+		--with-sqlite3 \
+		$(if use static-libs || use test; then echo --enable-static; else echo --disable-static; fi)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -type f -delete || die
+	fi
+}
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
deleted file mode 100644
index 4447cb296419..000000000000
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-#	inherit autotools git-r3
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/chewing/libchewing"
-fi
-
-DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
-HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
-else
-	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2
-	https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-# BDEPEND="test? ( virtual/pkgconfig )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	test? ( sys-libs/ncurses[unicode] )"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-#	if [[ "${PV}" == "9999" ]]; then
-#		eautoreconf
-#	fi
-}
-
-src_configure() {
-	# libchewing.a is required for building of tests.
-	econf \
-		--with-sqlite3 \
-		$(if use static-libs || use test; then echo --enable-static; else echo --disable-static; fi)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -type f -delete || die
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -type f -delete || die
-	fi
-}
diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild
index a02537b46ef3..25772f0b7e77 100644
--- a/app-i18n/libchewing/libchewing-9999.ebuild
+++ b/app-i18n/libchewing/libchewing-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-	test? ( sys-libs/ncurses[unicode] )"
+	test? ( sys-libs/ncurses[unicode(+)] )"
 
 PATCHES=(
 	"${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index e98094237b39..9d1c471fd0cc 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-it-5.06.tar.xz 363716 BLAKE2B 57ac90d11a76217ead0f201ed4f8cfd0bc5f08b97662023a540f1150fc8fb6804980e6770cc7d707097d732645ebc9b3b85feb15736d7e925df2711a3f32ba6e SHA512 d4d89bba004265c70b6f0220b0172798677174e8034ece4a15c21432423ec904d0a3b7614987a165950c4f28af02c1b9374f536982771307b78617479139f900
-EBUILD man-pages-it-5.06.ebuild 660 BLAKE2B 7b411bd8d65a865825c6ddbb2214278e26452e508912656bba90b794be16444b5f3755093ca28ac3bb6af5b14b011b7911b304ec7bab15dee89224bb47b4b712 SHA512 723c938e719172dd96938612df891bcaac2535c0237a7c98ca62b8039cc739415bb999498f016227aca65b83d7f5be8561be94fdb8ffd73d2ef27b4a517083a0
-MISC metadata.xml 557 BLAKE2B 0d94b1dc3aed2a023636a4c25ccc94880d651603767523607469c2b7a438eb8bffef168015910f626f9c340600d3c70f8fc42b95100a9c5fa66a30ee127ab268 SHA512 ec496ec5707c293b28e714f01315ee730b607550d4b3ab68e28a21dba4b08c93550a48e3f708921e27f11e2b27aab8ebf4274a356dce1ffb2b3f021976226931
+EBUILD man-pages-it-5.06-r1.ebuild 770 BLAKE2B 802102ac35673edb4ae25ae95f530500b3e29a8490faa2b000b6422f08041ef098327a211c163c9687a79a7c0b8b0263cabfe9f4cae7663a315fbecd181b2c0d SHA512 e07fdfb65ae75d34207210af5d15c31a71ea1da4a2b70a7d87b081f30d811e224654a8cd0f7f3d6eb45660a5b5c4e540344eb82385242717e9b4d411fb675646
+MISC metadata.xml 305 BLAKE2B 809ae5adc5df5aa49702a9d9d4c6763fa3c91545e9d91f96723eef8a10d225a69e6ad5b7edc88b2d5c629b5e87a7cb7b15255d21b6f192b863b4052ec7e99212 SHA512 9379e9697859a2ab06cd2c1aef12279e9e8ac0183ca730a16234bd208357539fe1743d9f27b6179f498ab6b845e8c61ba1378657829fa740d78fc5e5691cbcda
diff --git a/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild
new file mode 100644
index 000000000000..f64599a295c1
--- /dev/null
+++ b/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
+HOMEPAGE="http://it.tldp.org/man/"
+SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+	default
+	# Remove man page provided by sys-apps/shadow
+	rm man-pages/man5/passwd.5 || die
+}
+
+src_compile() { :; } # emake does bad things here
+
+src_install() {
+	doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
+		util-linux/man[1-9]/* misc/man[1-9]/*
+
+	dodoc description README CHANGELOG
+}
diff --git a/app-i18n/man-pages-it/man-pages-it-5.06.ebuild b/app-i18n/man-pages-it/man-pages-it-5.06.ebuild
deleted file mode 100644
index aa8fa6c67c8f..000000000000
--- a/app-i18n/man-pages-it/man-pages-it-5.06.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
-
-DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
-HOMEPAGE="http://it.tldp.org/man/"
-SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_compile() { :; } # emake does bad things here
-
-src_install() {
-	doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
-		util-linux/man[1-9]/* misc/man[1-9]/*
-
-	dodoc description README CHANGELOG
-}
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
index b01eb9b00144..65484e7dc6cb 100644
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
-	<stabilize-allarches/>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>giulio@pluto.it</email>
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index da56a7b4c592..e01fa61afbdc 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
 DIST man-pages-ja-20180315.tar.gz 4808885 BLAKE2B 961cb265d2a5034368ac5766555440019e3f80710644f9ca6389e9932391f806ab37803b198d4f3619ad2a3fb34a91092b7c50c8f5c69dd1a909268c739fb931 SHA512 5cc8d247f24aeeb5f9ef9b89f214f7d74cf3d1db8f46140cb307f8398bde785c13041ec2947173d3a79121285afb3a5b383d3bff972eba017e88d17d722c173a
 DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
-EBUILD man-pages-ja-20171215.ebuild 2021 BLAKE2B 50d5d97fdc3eb29a4c7351265b1b7fb3eb43a3490205aa6e9f120ea7b430cac6ae37b3a1e0e5709bea0abdb582edf23f9e5381d37c078c037f840380d984b714 SHA512 21c0be60d5af6fc85b21165d9d1b0cff49c30d028c7a3275c142efa1b8195026ee7c2683fe94cb5a7f7a273184784fad8ad05c8fdc05f256ba4bb62e7b2e73a8
-EBUILD man-pages-ja-20180315.ebuild 2036 BLAKE2B 0013bdf5a1e29e9bd367e8ebf140e8a71d439d5e205a731852014e4270f4ef4e6707b3f2c5fb1e8eef83a2b91aab0872e073d8bd89d8b488308dc372210f5350 SHA512 743450e4507af123e8693ddaf9878b5841b389a576bbcb6458bdbd1cef0a4ea2de4c8e5cfb846452718ae1e183dc2d8aa46fd1d464611846a284f85569894bc4
+EBUILD man-pages-ja-20171215-r1.ebuild 2058 BLAKE2B 64abd20a69a75287fd176e0e7a868c0e748d5ae63f1665fa694b1e43edb75cd060554a6aaded93a0af04af3a3d3cefe4a11b1094ee11b583f7c7a1f2323e87ee SHA512 f203267a4d619433f2a2049e73dbe383006b23412fad0488a74faefe797a00c94965a1c6ae45799751376c018ec768e101387051c35e0c1e402c6ffa407e2e13
+EBUILD man-pages-ja-20180315-r1.ebuild 2073 BLAKE2B 8d0186e62fa896f97ce7c9ff63aef194922b42d962dd32e7a736671adba0ad974a53fc8b1a7e216007acc1cacebe173a9a38d7a1b0fb4ecc467dba2c1c7a5c5c SHA512 3f2d6bfc829d59999c103837e9f688b5e7d44f6d4925f7e84409ba14fa5375ee728ecd76eb43303e7d4f7bc01a4f2dcbe1b867dc312766c6123e24ce0dba0b11
 MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild
new file mode 100644
index 000000000000..a0032aa708eb
--- /dev/null
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GENTOO_MAN_P="portage-${PN}-20060415"
+
+DESCRIPTION="A collection of manual pages translated into Japanese"
+HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
+SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+
+	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
+
+	# remove man pages that are provided by other packages.
+	# - sys-apps/shadow +nls
+	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
+	rm -f manual/*/man5/passwd.5 || die
+	rm -f manual/*/man8/{vigr,vipw}.8 || die
+	# - app-arch/rpm +nls
+	rm -rf manual/rpm || die
+
+	for f in manual/*/man8/ld{,-linux}.so.8 ; do
+		mv ${f} ${f/.so.8/.so.ja.8} || die
+	done
+	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	local x y z pkg
+
+	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
+		if [[ -z "$pkg" ]]; then
+			pkg=$x
+			continue
+		fi
+
+		if [[ "$x" == "N" ]]; then
+			pkg=
+			continue
+		fi
+
+		einfo "install $pkg"
+
+		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
+			doman -i18n=ja $y/*
+		done
+
+		pkg=
+	done
+
+	dodoc README
+
+	cd "${WORKDIR}"/${GENTOO_MAN_P}
+
+	for x in *; do
+		if [ -d "$x" ]; then
+			einfo "install $x"
+
+			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				doman -i18n=ja $x/*.$z
+			done
+		fi
+	done
+
+	newdoc ChangeLog ChangeLog.GentooJP
+
+}
+
+pkg_postinst() {
+
+	echo
+	elog "JM (Japanese Manual) project has used utf8 encoding"
+	elog "since 2012/04."
+	elog "You need to set appropriate LANG variables to use"
+	elog "Japanese manpages."
+	elog "e.g."
+	elog "\tLANG=\"ja_JP.utf8\""
+	elog "\texport LANG"
+	echo
+
+}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
deleted file mode 100644
index de70fa027bd0..000000000000
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
-SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
-	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -rf manual/rpm || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "JM (Japanese Manual) project has used utf8 encoding"
-	elog "since 2012/04."
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.utf8\""
-	elog "\texport LANG"
-	echo
-
-}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild
new file mode 100644
index 000000000000..385f0d11be23
--- /dev/null
+++ b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GENTOO_MAN_P="portage-${PN}-20060415"
+
+DESCRIPTION="A collection of manual pages translated into Japanese"
+HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
+SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+
+	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
+
+	# remove man pages that are provided by other packages.
+	# - sys-apps/shadow +nls
+	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
+	rm -f manual/*/man5/passwd.5 || die
+	rm -f manual/*/man8/{vigr,vipw}.8 || die
+	# - app-arch/rpm +nls
+	rm -rf manual/rpm || die
+
+	for f in manual/*/man8/ld{,-linux}.so.8 ; do
+		mv ${f} ${f/.so.8/.so.ja.8} || die
+	done
+	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	local x y z pkg
+
+	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
+		if [[ -z "$pkg" ]]; then
+			pkg=$x
+			continue
+		fi
+
+		if [[ "$x" == "N" ]]; then
+			pkg=
+			continue
+		fi
+
+		einfo "install $pkg"
+
+		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
+			doman -i18n=ja $y/*
+		done
+
+		pkg=
+	done
+
+	dodoc README
+
+	cd "${WORKDIR}"/${GENTOO_MAN_P}
+
+	for x in *; do
+		if [ -d "$x" ]; then
+			einfo "install $x"
+
+			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				doman -i18n=ja $x/*.$z
+			done
+		fi
+	done
+
+	newdoc ChangeLog ChangeLog.GentooJP
+
+}
+
+pkg_postinst() {
+
+	echo
+	elog "JM (Japanese Manual) project has used utf8 encoding"
+	elog "since 2012/04."
+	elog "You need to set appropriate LANG variables to use"
+	elog "Japanese manpages."
+	elog "e.g."
+	elog "\tLANG=\"ja_JP.utf8\""
+	elog "\texport LANG"
+	echo
+
+}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
deleted file mode 100644
index d37c1cb8beba..000000000000
--- a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
-SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
-	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -rf manual/rpm || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "JM (Japanese Manual) project has used utf8 encoding"
-	elog "since 2012/04."
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.utf8\""
-	elog "\texport LANG"
-	echo
-
-}
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index b86170fac21a..332cfb9fd3cb 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,3 +1,5 @@
+DIST manpages-l10n-v4.10.0.tar.bz2 64760050 BLAKE2B b70d8b0a48050538f7af90c248f3132dadd69e9eca0e3f438aeb6b8086aed8f70ee4d54af3608c602910fcfac68d1283971a9a1869b3854d1802794c56837b58 SHA512 59f5daa7acf29252af2c733d7084bfe9bccbbec19f5e8cf1855df420835fd934e072479149d679a90ae4e52330763599a20fbb5bc8459b8a44e5bcc1628ab501
 DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
+EBUILD man-pages-l10n-4.10.0.ebuild 1793 BLAKE2B 2397c7a74d5e7c3ccfbe1876b6f7481bbd30a13e0b588ba512867f6c22e92ddb7e3f6ede9b48cb2833ad64654677b5bbca2f3445c12675b91c7f83dc5e43c203 SHA512 244c0416dd0ba943041c40856c850b69e0dfd584b37ecc01db8efebe4847227237ee8aac909c0cb5edfeece389b29a151673f26d7d29c8439055b7310b4ad643
 EBUILD man-pages-l10n-4.2.0-r1.ebuild 1799 BLAKE2B 16720e493e97ef1144b96919c70f965a3ee52a2d45cfcfff02677a44ae842ad464119ea89f0b820676481a6248f327c06570e3015a4300caf74400664fb4b814 SHA512 654b3e9ab65b6a3dd8c500066833e4ed33dc6ccc908b8ae4895e5922d35e758ed8a3b3ac8951c0cf3af6baf8d43a2516dc5a614a21f57b6dde09a9b9672cab28
 MISC metadata.xml 235 BLAKE2B a6e10699959bdc64d99b8c0b00f46388bdf0c1e125a9351c63e61aae65c6bd9f70ab55a9497f6a6dcf10b161022abdd23c50443193563ba83744c09d1d4cd9c6 SHA512 fdebae10dcd9eddfe7d9546337826902e38d3d0e7b7e6e140038bcb293c98ca81b096d203b5709f42948bfa8868fe2d68d1385fae6664505e14d9ac1541898f9
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
new file mode 100644
index 000000000000..cc7410ba4530
--- /dev/null
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN/-}-v${PV}"
+DESCRIPTION="A somewhat comprehensive collection of man page translations"
+HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+MY_L10N=(de es fr it nl pl pt-BR ro)
+IUSE="${MY_L10N[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
+
+RDEPEND="virtual/man
+	l10n_de? ( !app-i18n/man-pages-de )
+	l10n_fr? ( !app-i18n/man-pages-fr )
+	l10n_it? ( !app-i18n/man-pages-it )
+	l10n_nl? ( !app-i18n/man-pages-nl )
+	l10n_pl? ( !app-i18n/man-pages-pl )"
+
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+DOCS=(AUTHORS.md CHANGES.md README.md)
+
+src_prepare() {
+	default
+	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
+
+	# some packages have their own translations
+	local noinst_manpages=(
+		# app-arch/xz-utils
+		de/xz.1
+		de/xzdec.1
+		de/xzdiff.1
+		de/xzgrep.1
+		de/xzless.1
+		de/xzmore.1
+		# sys-apps/shadow
+		{de,es,nl,pl}/groups.1
+		de/su.1
+		# sys-process/procps
+		{de,fr,pl}/free.1
+		{de,fr}/pgrep.1
+		{de,fr}/pmap.1
+		{de,fr,pl}/ps.1
+		{de,fr}/pwdx.1
+		{de,fr}/tload.1
+		{de,fr,pl}/uptime.1
+		{de,fr}/sysctl.conf.5
+		{de,fr}/sysctl.8
+		{de,fr}/vmstat.8
+		# sys-process/psmisc
+		{de,nl,pl}/fuser.1
+		{de,pl}/killall.1
+		de/peekfd.1
+		de/prtstat.1
+		de/pslog.1
+		{de,pl}/pstree.1
+	)
+	printf '%s\n' "${noinst_manpages[@]}" \
+		| sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
+	assert
+}
+
+src_configure() {
+	econf --enable-compression=none
+}
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 3da4e27f8cb1..e1f3fe38f052 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-ru_5.03-2390-2390-20191017.tar.bz2 1725818 BLAKE2B 8ab0e5e6c0b7a0bda8e80e99202a9de38298a743ea7b356abb7f50840f222c5ef5397c96e490bfb1b37858fbaf50704e38cae7b2df5f81e0890efd7f73d3a909 SHA512 959ea5f206674b1bfbdac944a391a8d183b02d67ac26a9f33abb11637157cff6c60fd89f87669e2561eaa1c6c0bc2565deceb6f7e72e381d202a93773251fe7d
-EBUILD man-pages-ru-5.03.2390.2390.20191017.ebuild 612 BLAKE2B b567102f6b3ce324ceb3ccd33b7d440b9dfd197efdc7d90206c3a4971f25ec39a62cf602d08bbb7ba8abdcd3366e467131ab8086e3bc3e8184226580f1d9fcb3 SHA512 3b0e81d801cc8916e907f6de46f109d46a841021f24e6de40c0f18b7c8a3abb206375107d0f91cc1e692b90b67eacc6c74fd3682fffb47e3b683e6c7bbfc0c1e
+EBUILD man-pages-ru-5.03.2390.2390.20191017-r1.ebuild 712 BLAKE2B 6b87735b3b954b27218a898a816c99dc41c6aa3ebc285367d103897456cd14aabacff6e75561596e611b344ca078b5cedee7a1fe0bd6cf5b0ff5afbac09285fc SHA512 97594886008275e3e6323e3401e4a47f65626bb004729b4cec5847a32272b2bfe78d6e804b7e961e952e6e30fdd6959fceb289e9423d746b5928a9b65e7efc47
 MISC metadata.xml 436 BLAKE2B 7e17e7dc25a13db3594b5a5e630e41ff08012b530736bcbb5f5a1cd302e705cf30025bf93afb31f3de631e01e9588a037d9213651f0ad358fd3a87ffb727ca3e SHA512 1f7c55f697fe501f62c9cde15f0f82cedf7cf62251efba961c4e236ec99974fe7345fd77a48d92eee9472fe519e7c4ea040fda5df31d743f2eddf09644ae81a5
diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
new file mode 100644
index 000000000000..c22c58267e9a
--- /dev/null
+++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_rs 2- -)"
+
+DESCRIPTION="A collection of Russian translations of Linux manual pages"
+HOMEPAGE="http://man-pages-ru.sourceforge.net/"
+SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz2"
+
+LICENSE="FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="virtual/man"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+src_prepare() {
+	default
+	# Remove man page provided by sys-apps/shadow
+	rm man5/passwd.5 || die
+}
+
+src_install() {
+	insinto /usr/share/man/ru
+	doins -r man*
+	dodoc README
+}
diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
deleted file mode 100644
index 9fc6918f3025..000000000000
--- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.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
-
-MY_PV="$(ver_rs 2- -)"
-
-DESCRIPTION="A collection of Russian translations of Linux manual pages"
-HOMEPAGE="http://man-pages-ru.sourceforge.net/"
-SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz2"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/man"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-src_install() {
-	insinto /usr/share/man/ru
-	doins -r man*
-	dodoc README
-}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ab2736dc53c4..06fc14634c89 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index c99cc133efed..fcbc210b52d1 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -444,5 +444,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST pushgateway-1.4.1.tar.gz 4264820 BLAKE2B 88fb916831a441478b5e03fdf6fccb32b33746569c109d17d9bcc0a76cbe0d0322399605118456b83bdffe7617f098c2e2188ddee9dc08568607e3bde2c7cc72 SHA512 4687836c6361d6c1a7e672018b1212a31a749af575707ac8e41f4f078e075e12658a52ae58ccbb27a5699c164255b6f4ec259f5433dffec8af25853f014fd17d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
-EBUILD pushgateway-1.4.1.ebuild 24639 BLAKE2B 00c968d6f6885f06938c1329aafccc17af09ea0f4b7c8b9e9855fb8dee0f880569dda41f307d2f34a27714827c03d6545d026f1f412b7cf9bfc9ec72b84687e4 SHA512 93dcce190abc9fd4f454fc568636de70d75f3ad4e480779a20b1b5e83bdf52b9593ddcc1370b79f8952cd1b9d88bb02e0239da3aa1c05fadbe7a967c6f1764f9
+EBUILD pushgateway-1.4.1-r1.ebuild 24615 BLAKE2B 874ae8acbead5184188b7c1ceebde4f5cc2efb7314c33f68c157a2bbbbf105c95b9fa6ae02f9de435149cf7fb738de743d6b0c3e2908a6408a4e0e1512faffa7 SHA512 5175699c795385efb6690ec27e772094d911514ed1c862b8699b7f746eeaa3178d7132cd721f5b08b68c81b98aeadd9617f6b21ece280dc833b63a95baa43af6
 MISC metadata.xml 331 BLAKE2B 4b07a7e72e94f5a764207f0e59f1a6e8f578b83f761f2cf658ef3a554e6d3fab9725445b6a2a8adc2de990f4a156c14ae9c5d10632f28ab53d995ce4ffc86ba5 SHA512 7d59c6fdec106a6708a76e44714ff47a947fe2b85839c96dafb2768733bbeb37d04a3d936ee8f371f432055f49f54fc904ac1a214fa96da6d4a961a6fb81d599
diff --git a/app-metrics/pushgateway/pushgateway-1.4.1-r1.ebuild b/app-metrics/pushgateway/pushgateway-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..fe8bd1137f51
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-1.4.1-r1.ebuild
@@ -0,0 +1,493 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+GIT_COMMIT="6fa509b"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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/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/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-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/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-v2 v0.18.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/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/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/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/kit v0.10.0"
+"github.com/go-kit/kit v0.10.0/go.mod"
+"github.com/go-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-sql-driver/mysql v1.4.0/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/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/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/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.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"
+"github.com/golang/protobuf v1.5.1/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/uuid v1.0.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/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/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/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-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-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/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/hudl/fargo v1.3.0/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.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.10/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/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/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/lyft/protoc-gen-validate v0.0.13/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/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/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-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/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/oklog/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.7.0/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib 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-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.3.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.10.0"
+"github.com/prometheus/client_golang v1.10.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.7.0/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.19.0"
+"github.com/prometheus/common v0.19.0/go.mod"
+"github.com/prometheus/exporter-toolkit v0.5.1"
+"github.com/prometheus/exporter-toolkit v0.5.1/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.8/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/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.3.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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/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-20200824052919-0d455de96546"
+"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/sony/gobreaker v0.4.1/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/pflag v1.0.1/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/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/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"go.opencensus.io v0.20.2/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.5.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.3.0/go.mod"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.13.0/go.mod"
+"golang.org/x/crypto v0.0.0-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-20190701094942-4def268fd1a4/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-20201208171446-5f87f3452ae9"
+"golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/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-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-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-20190404232315-eb5bcb51f2a3/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-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/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-20201207232520-09787c993a3a/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-20190215142949-d0b11bdaac8a/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-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2"
+"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/text v0.3.0/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-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-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-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/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-20200103221440-774c71fcf114"
+"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/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.3.1/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/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-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/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.22.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/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.23.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/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.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-20180728063816-88497007e858/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/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"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="
+	https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/pushgateway
+	acct-user/pushgateway
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_prepare() {
+	default
+	sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	newbin "bin/${P}" "${PN}"
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-metrics/pushgateway/pushgateway-1.4.1.ebuild b/app-metrics/pushgateway/pushgateway-1.4.1.ebuild
deleted file mode 100644
index ee560d7671a1..000000000000
--- a/app-metrics/pushgateway/pushgateway-1.4.1.ebuild
+++ /dev/null
@@ -1,490 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module user systemd
-
-GIT_COMMIT="6fa509b"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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/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/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-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/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-v2 v0.18.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/casbin/casbin/v2 v2.1.2/go.mod"
-"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-"github.com/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/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/eapache/go-resiliency v1.1.0/go.mod"
-"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-"github.com/eapache/queue v1.1.0/go.mod"
-"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-kit/kit v0.10.0"
-"github.com/go-kit/kit v0.10.0/go.mod"
-"github.com/go-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-sql-driver/mysql v1.4.0/go.mod"
-"github.com/go-stack/stack v1.8.0"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/gogo/googleapis v1.1.0/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.0/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/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/mock v1.1.1/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/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.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"
-"github.com/golang/protobuf v1.5.1/go.mod"
-"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/uuid v1.0.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/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/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/hashicorp/consul/api v1.3.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-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-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/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/hashicorp/serf v0.8.2/go.mod"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/hudl/fargo v1.3.0/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jonboulle/clockwork v0.1.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.10/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/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/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/lyft/protoc-gen-validate v0.0.13/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-runewidth v0.0.2/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/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/modern-go/concurrent v0.0.0-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/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/oklog/oklog v0.3.2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.7.0/go.mod"
-"github.com/onsi/gomega v1.4.3/go.mod"
-"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pkg/profile v1.2.1/go.mod"
-"github.com/pmezard/go-difflib 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-0.20190127221311-3c4408c8b829/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.3.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_golang v1.10.0"
-"github.com/prometheus/client_golang v1.10.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.7.0/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.19.0"
-"github.com/prometheus/common v0.19.0/go.mod"
-"github.com/prometheus/exporter-toolkit v0.5.1"
-"github.com/prometheus/exporter-toolkit v0.5.1/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.8/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/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.3.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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/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-20200824052919-0d455de96546"
-"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/sony/gobreaker v0.4.1/go.mod"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/pflag v1.0.1/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/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/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.opencensus.io v0.20.1/go.mod"
-"go.opencensus.io v0.20.2/go.mod"
-"go.opencensus.io v0.22.2/go.mod"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.5.0/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/multierr v1.3.0/go.mod"
-"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"go.uber.org/zap v1.13.0/go.mod"
-"golang.org/x/crypto v0.0.0-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-20190701094942-4def268fd1a4/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-20201208171446-5f87f3452ae9"
-"golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/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-20190930215403-16217165b5de/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-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-20190404232315-eb5bcb51f2a3/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-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/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-20201207232520-09787c993a3a/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-20190215142949-d0b11bdaac8a/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-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2"
-"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/text v0.3.0/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-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-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-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/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-20200103221440-774c71fcf114"
-"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/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.3.1/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/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-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/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.22.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/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.23.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/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.2/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.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-20180728063816-88497007e858/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/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"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-)
-go-module_set_globals
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND=">=dev-util/promu-0.3.0"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
-}
-
-src_compile() {
-	mkdir -p bin || die
-	promu build -v --prefix bin || die
-}
-
-src_install() {
-	newbin "bin/${P}" "${PN}"
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/uwsgi_exporter/Manifest b/app-metrics/uwsgi_exporter/Manifest
index 85bb4b644924..5d701541fd64 100644
--- a/app-metrics/uwsgi_exporter/Manifest
+++ b/app-metrics/uwsgi_exporter/Manifest
@@ -2,8 +2,6 @@ AUX uwsgi_exporter.confd 857 BLAKE2B ab9ab9a1b80247d552a64d2b3d4d5ff22cf4d8f9dc6
 AUX uwsgi_exporter.initd 627 BLAKE2B 37b6a417bbf2073dd30c7233266edd683e571217eb0aa12a9617ffafe44bbba449e508a437da1facf387e1ad801003a20bf8eed57177c5f62fad875d7ac185d6 SHA512 9735466e203f42c415742c2f6384357c7cd6e2e990dd75761ba79fff471680f2a41ae3324431e6c214f33c227b7d3eaece459cb9f10c6fba9a6080adf2448e30
 AUX uwsgi_exporter.logrotated 101 BLAKE2B f375e39ad267147f98945120479e6c43ea2a0987e882880942f1b8e977f9263fd63cefc433897a1091eea1a1da54b1dfdbb50ff7e4753aebcd23602ef2232630 SHA512 8dc8c9ee998c26d128c26de1c75011d6200c78098bfc9f97bd1d40946b0923f5a7c56eccf8fbfe59fb9df0b6b1430ae321b7f9da817dee1112d8a407d735af71
 AUX uwsgi_exporter.service 454 BLAKE2B 129a09d27a097a1e8a5ee230082d56a6a3e85387e84d8758a5d05589f5a24817146f9198106029e3b413ae4fbff01b05627ff865c6edefb2eb1ffd2e442dcc3f SHA512 b57a18f882285f2c91408697cd144ea4907f17428032f58e91abfdfe18fb76ba6ae5e31092f64e49bfcb5aef43f01ff162f9f15cb9a7b62cdc3bfa68f920b233
-DIST uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
 DIST uwsgi_exporter-0.8.0.tar.gz 3040547 BLAKE2B 5b6769487b3a08752cdff9dccc727096bc6b9d49e12e8aa35d04bbd0c3534503c19a4dda882c7efd7409549f3cae750021fa7ce87d12b798a2998efcdfc9f1cf SHA512 a5a1439f554749c7db4857651a11cbbf0ad0a0a8da0ffd421e374fe08194ba289a6bb04a95e4169ba6a75d0358c7a96e5b9f3cc5813cc39004f81dce42edb3ed
-EBUILD uwsgi_exporter-0.7.0.ebuild 1299 BLAKE2B 2b616ae2f1b8823de2ffc693e6e60ca92adfeb2db8c75126688aafb6e7df1c1b405d5192470da7a458b681372f8c230be886997b2a65183891b87029c6f43fc1 SHA512 69d2e60751d68c771478e5fcb4dde3cedda119a3c1097e05b0bf5c41633d9d24ad16f45cdab1f7af5a176cdd60f0dea84d1698d69bd8f42caf75dbfe5cea6c89
-EBUILD uwsgi_exporter-0.8.0.ebuild 1299 BLAKE2B be312e35f8cd472b26864b5c3e01e3e180864d32a1cd60fcc4ab19ab8ae6875fb51bc6bd406c54dcb0659e7299b5646058ecc54adce3ff37ab90fcd8e0f5b127 SHA512 93f78ed203899649d420d3a8254913e72f5476e2ce059fcee59da24645430ba7d109683509d1585c5eed3bc01a08ee19eeaed82731160e103f191a07e4cd2dfe
+EBUILD uwsgi_exporter-0.8.0-r1.ebuild 1298 BLAKE2B f65c9faa759d093d58d4efd9e7602d41b439817a20494934492f591d3c17dd1c1b2a5abcdc57f615955d6a740a12b8a281a4f048bec008c5f14091502701d929 SHA512 eebad63a099c77073cd52612e28d7b542bb74ffea4c888a0140445d34a870bcbc54ce30e004709d43a3e0cebd6fe4cc3893460ff32c5676215dc9d425f147357
 MISC metadata.xml 333 BLAKE2B 95f858b4f8e6c056cdc531b5a8e5dcd4f1a3ef72937d8e9d25276fec38ac13d5da50c3a97c221735bb93cc1bc431e6408c5ef4a68a694a94f077270bb4acac62 SHA512 95be3084c4d196026c2447fbdba6c4c8ca982f04757e613a2b097c0481ca49b5eb0a10e0814fd7bbf1dbcc5862e5704a5ae6cc0b7192e0f4fe87e0ba9ea14e0d
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
deleted file mode 100644
index b705627040f0..000000000000
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/timonwong/uwsgi_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-UWSGI_EXPORTER_COMMIT="20e35a9"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="uWSGI metrics exporter for prometheus.io"
-HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD ISC MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/uwsgi_exporter
-	dodoc README.md
-	popd || die
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..5be77e4e77ed
--- /dev/null
+++ b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build golang-vcs-snapshot systemd
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+EGO_PN="github.com/timonwong/uwsgi_exporter"
+UWSGI_EXPORTER_COMMIT="ddbc18f"
+
+DESCRIPTION="uWSGI metrics exporter for prometheus.io"
+HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0 BSD ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/uwsgi_exporter
+	acct-user/uwsgi_exporter
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/promu
+"
+
+src_prepare() {
+	default
+	sed -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" -i src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/uwsgi_exporter
+	dodoc README.md
+	popd || die
+	local dir
+	for dir in /var/log/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild
deleted file mode 100644
index 05b3d84ad98b..000000000000
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/timonwong/uwsgi_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-UWSGI_EXPORTER_COMMIT="ddbc18f"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="uWSGI metrics exporter for prometheus.io"
-HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD ISC MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/uwsgi_exporter
-	dodoc README.md
-	popd || die
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7b28bb531bc1..3cf377506aed 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 596d31374119..10a7ea3c1062 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -2,5 +2,5 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428
 AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402
 AUX anki-2.1.15-unescape.patch 474 BLAKE2B f78067433039e22e335811dac2af3b8237a96f5d5025fe36cbea32d117d015fc1fab8f9ac806135e2ec910cdbd10131f731b8ea5fcdb5e88cd6dedbb8322bd8d SHA512 90e5123991120e696a94119413add54a205d87969b8b7f7167bd66d9ac12c6ad5f4ecba4692d7dddb4f8b47bb13aeea502e95a9be0cb72ca578531fde1473e1e
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
-EBUILD anki-2.1.15-r1.ebuild 2502 BLAKE2B 4846657c1b97b1f4da76af16551f719729c663a48d36403135a0353e9cdc6c438e72e9ab6602fab525b8e73f40671ebaa9ac3d473f74d146ca34f719523ff94c SHA512 ceb8fa0454549ecb1fea2262228ce858effbc876ebc94d60b9e92234dfc936d476cde59e5f18b5d3a999ae3e3fd32ebd437c8795162e53c831ec087228cc26cf
+EBUILD anki-2.1.15-r1.ebuild 2434 BLAKE2B 5d45adb32028e79c0bdcd5b5e9b1f909fa905e136d6f2d177f340dcd7cc712dd69aaff18856b323687dc566d20fcd072d87948aecd4141885e0b16c27f25cdbe SHA512 48c92e9480908a8a0041bc78d12a0446010a7586d7d07e6bd25060764e85297124096aba3fce927a0977fa4aa96cf744fa14003a94ef3c1f868843ac577481d1
 MISC metadata.xml 533 BLAKE2B 25491ed8623750ad197813d9504620f588e2df815a844711f057b544cde1e7622df46018ad32f994c689984dd301049caadf481d67737e94714f3fe57ba7863b SHA512 cc621ffca18afc64c6c1f758d919d950a39d5f447ae7740abe21f5b140fec8e2b8cbcfcfa4422fb5cf55f68c1068686344a8d9020e0aa477b3687ad84bbf9bf0
diff --git a/app-misc/anki/anki-2.1.15-r1.ebuild b/app-misc/anki/anki-2.1.15-r1.ebuild
index f97f7bb0fbcb..b5fc94f7294f 100644
--- a/app-misc/anki/anki-2.1.15-r1.ebuild
+++ b/app-misc/anki/anki-2.1.15-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit desktop optfeature python-single-r1 xdg
@@ -21,22 +21,22 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/jsonschema[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="test? (
 	${RDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		dev-python/mock[${PYTHON_MULTI_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index a23982881954..f8d8f3667fab 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,9 +1,7 @@
-AUX conf 292 BLAKE2B 985eee63e2f797dc7bb84a19b5dfb77bd6bf171d675f881226fc2b5a833392f179c040d71f45b4b4a8fe723eb7981f5fdb317d7be3dc7c7725c46879bbb10412 SHA512 56c3fe690e513f0e96ef486dbee3dc862409321935be03977d38a47641e7b8fd87c2b2a29d444320a1554689df497b5aee204922f2059a1e2d1139b8fce6291a
 AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c40d4b84d554c11ffb9d3c628b0142f5ce33d6f5e1ff8b140d8cd7d05642648c2e4f8bc700d SHA512 981dc0dca903f8ebdd3cc80368650d42f02bf194ccd12e64d2d4cc273ae13ec42da69341529750bca7232d7bcb3df67a02aa3db6179c4835682e86fabef689f0
-AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5221fc3ffcf68618e6434dfe7eaf83a361d4c6faa7799ce5342d5c546edc3f0930a499 SHA512 cbeaeac8a993711822086a761b624783bbf4ff11cff5c569a4c0cd3e6e174fe36904a661155c1460f7b43e0b2d6b631cd9e290d76138520021a702567b0494dd
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
-DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
-EBUILD beanstalkd-1.10.ebuild 1031 BLAKE2B 4f2acac9f9b39efab62fcfb505954c077215dfdb7ef1c26371c3e8129bda91ebf55507dc9e2edfad0ecb9077f93a5a4193a5b89252b07465be66ebbf8ad7e0a7 SHA512 121e35a3c4423c7323dbae112e4609a3b16b1c82b0f380f54133275fcef27dc74085949d55176ecb8ec49ee6a1684af12f821a1b7df590296f8a1c22d9adcf4f
-EBUILD beanstalkd-1.11.ebuild 967 BLAKE2B de995db0b67689a1bcfe0fe26782c1816516f0681bc03cd617db80966e7a7def2b90e3deac21d8289b753fc298a13b97cda23b70a0ad42e89f9680025a834527 SHA512 363223dc266de41d6ea04b6f8b67f480fee20e3cf55658c1182e3211b89d98e250c8c75570aefcf87f615961c4ed779a036184ec14a14fe25c5d67683a1298df
+DIST beanstalkd-1.12.tar.gz 79592 BLAKE2B d0abe510bada93014c9c748e116a7a34e947be50269eba3b64ed97739800f3464b7c2574c9d7e87786855f6f50701e60464d280c95db4f75f402f547700ef19e SHA512 347f8cf29501d4bf1a01a472f8f6265d1211eadfaa4e5626c8fcab5b1f8116e1e0ddee2a0c82ac116ee60655a2e3b514d254f98c2154be76109a24d77f7d8210
+EBUILD beanstalkd-1.10-r1.ebuild 911 BLAKE2B d912810d75d0e822a44481bbc1a3548fb6f9cc6ae0863f1ddfa6126d4627d51970f67a85e0ff82aefd51be95ff6bd816858b66c15df37f063d09410c7c81106e SHA512 925aab027bb55d6c856b7e55c724eb4028a828501ad35b00959a19cd08563a372e00d8c9bf6a5109ebe57684e9ee7236463a8be3f442698b4c200d86ed398163
+EBUILD beanstalkd-1.12.ebuild 854 BLAKE2B 1f52fd1076c7e18cc0b993a9301a08cf017989635c5c7c6423cb04271584800fd4c286d938fa347bb4ac32cbb10c4555bd0a17c4478162507557db728ff16a35 SHA512 7e8459ca2a0c78e499ed7efb7809e1b8020b97f43609bb8abf2591e1bcc50d87a7d8627884bfc3774b563210e390c502a9217a82cef1a72790fa4fd3fcd8b16a
 MISC metadata.xml 250 BLAKE2B 7caaab71f81fdc8dea5bcf2e8d1896f61d0d0ca7ad0f837c6e09ec5f788ea4663d2c179f8e25bd2dc2c6e298b5ef34b1c066ffd8d4d99f191fab1de7965948e5 SHA512 2d931d2f89bc23783adbf91ac5be611b0b9bc00f16d36b0d1bbcb19cd2ad77ba6b4d3b2a6a9af7afd33027a1f850384a22cc48f148ea0620bb956d39c46247de
diff --git a/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
new file mode 100644
index 000000000000..489bb2fc14e4
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A simple, fast work queue"
+HOMEPAGE="https://kr.github.io/beanstalkd/"
+SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	acct-group/beanstalk
+	acct-user/beanstalk
+"
+
+DOCS=( README News docs/protocol.txt )
+
+src_prepare() {
+	sed -e "s/CFLAGS=/CFLAGS?=/" \
+		-e "s/LDLIBS/LDFLAGS/" \
+		-e "s/LDFLAGS=/LDFLAGS?=/"
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dobin beanstalkd
+
+	doman doc/"${PN}".1
+
+	newconfd "${FILESDIR}/conf-1.9" beanstalkd
+	newinitd "${FILESDIR}/init-1.9" beanstalkd
+
+	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
+}
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
deleted file mode 100644
index 0207e6355a88..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.10.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 systemd toolchain-funcs user
-
-DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="http://kr.github.io/beanstalkd/"
-SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
-
-RDEPEND=""
-DEPEND=""
-
-IUSE=""
-
-DOCS=( README News docs/protocol.txt )
-
-pkg_setup() {
-	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
-src_prepare() {
-	sed -i -e "s/CFLAGS=/CFLAGS?=/" \
-		-e "s/LDLIBS/LDFLAGS/" \
-		-e "s/LDFLAGS=/LDFLAGS?=/" Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dobin beanstalkd
-
-	DATADIR=/var/lib/${PN}
-	dodir ${DATADIR}
-	fowners beanstalk:daemon ${DATADIR}
-
-	doman doc/"${PN}".1
-
-	newconfd "${FILESDIR}/conf-1.9" beanstalkd
-	newinitd "${FILESDIR}/init-1.9" beanstalkd
-
-	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
-}
diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
deleted file mode 100644
index 3f10665d8ffc..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd toolchain-funcs user
-
-DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="http://kr.github.io/beanstalkd/"
-SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
-
-RDEPEND=""
-DEPEND=""
-
-IUSE=""
-
-DOCS=( README News docs/protocol.txt )
-
-pkg_setup() {
-	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
-src_prepare() {
-	sed -i -e "/override/d" Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dobin beanstalkd
-
-	DATADIR=/var/lib/${PN}
-	dodir ${DATADIR}
-	fowners beanstalk:daemon ${DATADIR}
-
-	doman doc/"${PN}".1
-
-	newconfd "${FILESDIR}/conf-1.9" beanstalkd
-	newinitd "${FILESDIR}/init-1.9" beanstalkd
-
-	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
-}
diff --git a/app-misc/beanstalkd/beanstalkd-1.12.ebuild b/app-misc/beanstalkd/beanstalkd-1.12.ebuild
new file mode 100644
index 000000000000..0fafbc7be72d
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A simple, fast work queue"
+HOMEPAGE="https://kr.github.io/beanstalkd/"
+SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	acct-group/beanstalk
+	acct-user/beanstalk
+"
+
+DOCS=( README News docs/protocol.txt )
+
+src_prepare() {
+	default
+	sed -e "/override/d" -i Makefile || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dobin beanstalkd
+
+	doman doc/"${PN}".1
+
+	newconfd "${FILESDIR}/conf-1.9" beanstalkd
+	newinitd "${FILESDIR}/init-1.9" beanstalkd
+
+	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
+}
diff --git a/app-misc/beanstalkd/files/conf b/app-misc/beanstalkd/files/conf
deleted file mode 100644
index c646326bf271..000000000000
--- a/app-misc/beanstalkd/files/conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BEANSTALKD_BINARY="/usr/bin/beanstalkd"
-PIDFILE="/var/run/beanstalkd.pid"
-
-# User to run as
-USER="beanstalk"
-
-# Port to listen on
-PORT="11300"
-
-# Address to listen on
-ADDR="127.0.0.1"
diff --git a/app-misc/beanstalkd/files/init b/app-misc/beanstalkd/files/init
deleted file mode 100644
index 2dddc9d6d6f4..000000000000
--- a/app-misc/beanstalkd/files/init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting beanstalkd"
-	/sbin/start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY} \
-		-- -d -p ${PORT} -l ${ADDR} -u ${USER}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping beanstalkd"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY}
-	eend $?
-}
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index c7179b1ecd1f..2d7814fb87de 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -2,4 +2,4 @@ DIST bgrep-0.2_p20210221.tar.gz 4854 BLAKE2B 85c9171572e440f1e5def3a902a4adb1a33
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
 EBUILD bgrep-0.2_p20210221.ebuild 751 BLAKE2B 776c93fdcd639867a50cfbcb84abede39c6c0fe1524f69c9f848bb3d5798bf5fbc75edf116413cdb7f7f1f286d5894f7356b2867da0155cf8369d8873d1b0ea3 SHA512 1a06e055664c0617e086e7a2683c379075d9832fd5084f930bb879a706bde59d70d1864d837618eee4e15094ed9478be8cbf9db442d8d50387c8c9f1e7c5a1d9
 EBUILD bgrep-0_p20110121-r1.ebuild 835 BLAKE2B be476291900a3b914cfb7615c4f49819aacae13adc798568b0683018ad80928c204264cd55e0cdc3ac2cc32cc5b0b080d46e29f59763531586b77f272d8b72ce SHA512 0eb81251c1f16f93fb9cddc2a5249fe897cca706fd30021140251e260d48fe23c72a87de4af71c0d57eb28350706139ae0c7522e8ae19c63b8a7e41e2ad0a3b8
-MISC metadata.xml 472 BLAKE2B 2bf1cb880bb4bec129b6300a9862284b28c26d21f9250c924d8b01f2b285ef72dcbb3dc4398dccf955f20dfb9a25dc0f5e85327f3087ea0b5f9ffaa7c9e860e6 SHA512 d43b0586b8498bf4b2e75f82c345d50e155a4c26d4165b95ce03ccf6aa9f1a72633397cc87f410ae46a4fa4b88d8cd5b38249f11580730c16e0007c169570dd2
+MISC metadata.xml 244 BLAKE2B 9cf23b3baefabbf2b623318893f1c94d5a6770f08af063794b83a3eb8d768cb866cc9d2c191cb509e284844a248cff323f97437abf9c405973f45dd44e3d2a63 SHA512 bced5ef92f64e9ee772d946156f804b2b9fb1af16e4c8b4cf669aeb3853d6a942b5622a9274d9434afa2a76fb985cad62b8cad60d9a8cedf5bebb33079d64c2d
diff --git a/app-misc/bgrep/metadata.xml b/app-misc/bgrep/metadata.xml
index d898893e4df8..b5deb7d160f2 100644
--- a/app-misc/bgrep/metadata.xml
+++ b/app-misc/bgrep/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tmbinc/bgrep</remote-id>
 	</upstream>
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 7e0f1dc0d677..b084064a807f 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,5 +1,5 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
 DIST byobu_5.133.orig.tar.gz 761655 BLAKE2B 796cfe22ba60a8cfe41ca6570e4c7f265dd249e7767086341903da7862037f39b1f49434b6dae36d12d82df1ee34306b815ff3f8e703eeedab79cf02e8d86a7d SHA512 4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c
-EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B e6aef7019900baea377c940b63563e67b78c13c6c13593c5d18cc2c501e20f46fa1bf10144a16ea420939e28d9524857fd8edc6e4defabf5b92ca54636e60e3a SHA512 86124d66f9fb03d4c9639e2e7f37f2d2b3660d0fd13a5f6e4cd02819289712e51e8a25632a043ace598bd8bd309ec0a82262a3caf2203e41fb2a81a4ed6ab578
-EBUILD byobu-5.133.ebuild 1138 BLAKE2B 6068cbd0bcced68e975352e100fb3ffd80f9108d50ae0b67af86209a9704c37b2a482ad20cb6332151953c3c843519be32c15acac2710b237707c92482a6ef48 SHA512 a2d43819a12e62b693e89187627a5d543b9e1f8309319e5404f8fe4724ab89ef434e53bf47cc4f3ca5f736fe3080eacf2afa6ee862de8e5513e3d6cd38f1e4b0
+EBUILD byobu-5.130-r1.ebuild 980 BLAKE2B 4be97801c4415c3fd5a8c8c8ffdaa5303e926df3151d6f637d42ec2310a8ea5ad7f22edad2b26c566410dcfce4c7c07a4ad91540b804ce07051d5d9d7fefd7ad SHA512 cabc19679625bdc2189ada61e9b1fbfab96fd61b882a092c5c14b1c0c700643f3e10f2e847f149c607dcb83af596273f0c950cb765875e8702be9c87a055e9b8
+EBUILD byobu-5.133.ebuild 1130 BLAKE2B 62c87c9c62f7020492b6b6d3d6153cc11b5e4c6852eba61bc77fdc700e88e3d997b131ce48b40d9fbdd742fd615a0f573dbf964aa7e495d71b8bb93be32bcf06 SHA512 164215114cbb19a9b93a4ef71cd81b3ec9d40c24b789ac7ee17ea68bfd8a9e99f0fed865193662034756aa93be12fa3ea5b22fd3bd96f288322a40beed237fc1
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index 7872a4c00fa4..bdda7111ba0f 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.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
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit python-single-r1
 
@@ -18,7 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+		dev-libs/newt[${PYTHON_USEDEP}]
 	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
diff --git a/app-misc/byobu/byobu-5.133.ebuild b/app-misc/byobu/byobu-5.133.ebuild
index 6b46ae0973b0..1f5d32517105 100644
--- a/app-misc/byobu/byobu-5.133.ebuild
+++ b/app-misc/byobu/byobu-5.133.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-single-r1
 
@@ -18,7 +18,7 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/newt[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-libs/newt[${PYTHON_USEDEP}]')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 5869dd4fd3bb..74694d232648 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,11 +1,5 @@
-AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e56040027b5bdbdb2ab22b010fb78acc69a1532738d6e76d453eaefcef0e47d3a5cc6f123167ee6687ce8bc8dc923 SHA512 39c4838e39c494ac70573f1d7202d7bf359a01903877eabac60f5576c288372897c72393322a3d991ae6bfc75f8275c178ead912321836f570b6535b9c53fa8e
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
-AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
-DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
 DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
-EBUILD carbon-c-relay-3.5-r1.ebuild 1514 BLAKE2B b785d81ddc95d3af346eab986d91a37bae33a10ff5d2376cc21117f75c857fc9ef71fb2ed78ec5a7ab66aa1b79938ea4d3d49cf9c5fbd49ae0ada636fed3707d SHA512 88cb663258a0d84dcf01300bee13181e517a6283ccd5305e2e85c24361b80d8d1152fdebd8da25d95e5df43a788e1fc74491ff0facd12595eccb1cc9b573e564
-EBUILD carbon-c-relay-3.6-r1.ebuild 1614 BLAKE2B d638ee7914142d9cb8d996dff745f75addcba95810e44288f6fd2cb0a0c8187af7a3729e45f5850a84092c88c40bdb3dc164073b0f7e1ee066a74ebf2ca6a3c1 SHA512 d1d20548e0a3997071e7a53c817a56b904661badc2d7aaf56cae00eea4536bb514d24578fd8a4d1cec99f25bff9c0a3926feffbc678743cd39ded3dc3f4dd1a0
 EBUILD carbon-c-relay-3.7.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
deleted file mode 100644
index 4fd7b63ac246..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
-
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
-REQUIRED_USE="
-	pcre2?     ( !oniguruma )
-	oniguruma? ( !pcre2 )
-"
-RDEPEND="lz4? ( app-arch/lz4 )
-	snappy? ( app-arch/snappy )
-	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0= )
-	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
-	pcre2? ( dev-libs/libpcre2 )
-	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_configure() {
-	local pcrecfg
-	if use !pcre2 && use !oniguruma ; then
-		pcrecfg=$(use_with pcre)
-	else
-		pcrecfg="--without-pcre"
-	fi
-
-	econf $(use_with lz4) $(use_with snappy) \
-		$(use_with ssl) $(use_with zlib gzip) \
-		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
-}
-
-src_install() {
-	default
-	# rename too generic name
-	mv "${ED}"/usr/bin/{relay,${PN}} || die
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild
deleted file mode 100644
index 9a577c441d51..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.6-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=6
-
-inherit user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
-
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
-REQUIRED_USE="
-	pcre2?     ( !oniguruma )
-	oniguruma? ( !pcre2 )
-"
-RDEPEND="lz4? ( app-arch/lz4 )
-	snappy? ( app-arch/snappy )
-	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0= )
-	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
-	pcre2? ( dev-libs/libpcre2 )
-	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_configure() {
-	local pcrecfg
-	if use !pcre2 && use !oniguruma ; then
-		pcrecfg=$(use_with pcre)
-	else
-		pcrecfg="--without-pcre"
-	fi
-
-	econf $(use_with lz4) $(use_with snappy) \
-		$(use_with ssl) $(use_with zlib gzip) \
-		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
-}
-
-src_install() {
-	default
-
-	# rename too generic name
-	mv "${ED}"/usr/bin/{relay,${PN}} || die
-
-	# remove libfaketime, necessary for testing only
-	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
-
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd b/app-misc/carbon-c-relay/files/carbon-c-relay.confd
deleted file mode 100644
index d2824644d3c0..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# routing file to read
-#ROUTES_FILE=/etc/carbon-c-relay.conf
-
-# where to store the PID-file
-#PIDFILE=/run/carbon-c-relay.pid
-
-# user and group to run carbon-c-relay as
-#USER=carbon
-#GROUP=carbon
-
-# any options to use when starting the relay
-#EXTRA_OPTS=
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd b/app-misc/carbon-c-relay/files/carbon-c-relay.initd
deleted file mode 100644
index 8d39afe05d49..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.initd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description="Lightweight graphite metrics router and aggregator."
-description_configtest="Run carbon-c-relay's internal config check."
-description_reload="Reload the carbon-c-relay configuration without losing connections."
-
-routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
-
-command="/usr/bin/carbon-c-relay"
-command_args="-f ${routes_config} ${EXTRA_OPTS}"
-pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
-user=${USER:-carbon}
-group=${GROUP:-carbon}
-
-depend() {
-	need net
-	use dns
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		configtest || return 1
-	fi
-	touch /var/log/${SVCNAME}.log
-	chown ${user}:${group} /var/log/${SVCNAME}.log
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_post() {
-	rm -f ${pidfile}
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --background --make-pidfile --pidfile ${pidfile} \
-		--stdout /var/log/${SVCNAME}.log \
-		--stderr /var/log/${SVCNAME}.log \
-		--user ${user} --group ${group} \
-		--exec ${command} -- ${command_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${command} --pidfile ${pidfile}
-	eend $?
-}
-
-reload() {
-	configtest || return 1
-	ebegin "Refreshing ${SVCNAME}'s configuration"
-	kill -HUP $(< ${pidfile}) &>/dev/null
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME}'s configuration"
-	${command} -f "${routes_config}" -t < /dev/null > /dev/null
-	eend $? "failed, please correct errors above"
-}
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 405d4cb7ec15..29529afdc662 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,3 +1,3 @@
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-2.0-r3.ebuild 834 BLAKE2B e21d62ae01d97cca5681c4f7c646b724cb2bf1a937bb123446e0d69564dc08b5e5b473ef8912604d4c9c31caa030442afdebae0db724f27a01682b6146e68fc8 SHA512 b5b5af76c4035fc821a22e72eb8ec65c9df38b4f5e4d5a80d6055855625be6b172619d2d5c7494910253600d1d24db82403192084450ccbba73fd5050a0bccfd
+EBUILD cmatrix-2.0-r4.ebuild 836 BLAKE2B e80b8f30b177e0c42113d24aee36c7de770055cca5ef7cecd6dbf94e2cd5eb752ef33e3f0f259d77ceaddf0ce0f3ebbaa46991a487f826594a6fd199f3060189 SHA512 2e1714a75144d1f7ea9a870a78bb2af2032599d55bd780d5d281579ab7b568a5fc38627705daaf179ee25cedb184563e7cf115ddc7a478d043716a44abb4c726
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-2.0-r3.ebuild b/app-misc/cmatrix/cmatrix-2.0-r3.ebuild
deleted file mode 100644
index 18a688600f04..000000000000
--- a/app-misc/cmatrix/cmatrix-2.0-r3.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
-
-FONT_SUFFIX="pcf"
-
-inherit cmake font
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="
-	https://www.asty.org/cmatrix/
-	https://github.com/abishekvashok/cmatrix
-"
-SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="+unicode"
-
-DEPEND="sys-libs/ncurses:0=[unicode?]"
-BDEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DCURSES_NEED_WIDE=$(usex unicode)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use X && font_src_install
-	doman ${PN}.1
-}
-
-pkg_postinst() {
-	use X && font_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && font_pkg_postrm
-}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r4.ebuild b/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
new file mode 100644
index 000000000000..6d2ecbb3ffd0
--- /dev/null
+++ b/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_SUFFIX="pcf"
+
+inherit cmake font
+
+DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
+HOMEPAGE="
+	https://www.asty.org/cmatrix/
+	https://github.com/abishekvashok/cmatrix
+"
+SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+IUSE="+unicode"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
+BDEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DCURSES_NEED_WIDE=$(usex unicode)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use X && font_src_install
+	doman ${PN}.1
+}
+
+pkg_postinst() {
+	use X && font_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && font_pkg_postrm
+}
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 1d6577852762..3f6b4c34c605 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -2,7 +2,7 @@ AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a
 AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.15-r2.ebuild 1251 BLAKE2B ca2566bbfce7e9ece7adf4b02b02ebee3d381b23c02219970837f286f6e6d9c15c2dac78a6f51cfc39bc2454920e5fe19fc47aa623df7aeff3d53c9ba2489550 SHA512 0265a5d734176a3c23ea3cd609a13ba202bf4b199471c37ef9e652eb5a78cb58a1cb5d6367c9e66b18202519b826583160993fb202900da43a3fc0b32300815b
-EBUILD dvtm-0.15-r3.ebuild 1246 BLAKE2B 930eea360ee8e5a801e6f4ff3f890c57bffe069f70b22bbb746297ab1fb42e1da23a53642ecadb939c10abddbcc880ef47606767f91334a25ccc4f194fe5f38b SHA512 30122399a8a54a7b3fad309ad8f20f2c8ffd5252f0b5c7a4540b4c8ba7fdf23aa5336d7374b204855d40d82387610a95c5335f21694b5f5729a59697b57cb3fe
-EBUILD dvtm-9999.ebuild 1250 BLAKE2B d4d4479d93a67b41de5ac9b514e4241479a34ffe981e1a6264e36ea05ba8eaf3f788d314f3488dc089f0b046563294eaefbd4f9c5d9ee24a1412ff8ec43ffd58 SHA512 66a0ef9a78ab35d0f40ca41b6d1a1bd66beb4e1df54d3961905421ddd0f923a6accf2672fb2927b3cfb3062f006cad617ce0defd7bf3ebf78361b613b08e3b2e
+EBUILD dvtm-0.15-r4.ebuild 1253 BLAKE2B 021027e4f943c8bb67625142de1627478fba15b815600a6f0a271e9bc80344b76c5c92b513c9baedac2bdc132dd51a3bf2ebb8c30ba47bf32d7ce35cec522d07 SHA512 4d905b73a10e2cb994ccc4ab7efeeda22f428567ec244c52623550626c2abaae89f8ee43a5c00a6e31fd3711ffe3fae544742c639884cd994e2576a017d77d77
+EBUILD dvtm-0.15-r5.ebuild 1248 BLAKE2B 487ff2af37a2cf2bc5aac83b785e4aacfa9b1b15c59e4d4ac312cf69b15e9aba2d683c9af68706fbf6046532ec5a32ffdf3880d7fb68678365b9f1d22fc593e6 SHA512 c5c1a7c7446f5c44de7837107fbf4df7cc45c2ef2792c03918d44d0340813b5ba1fdd91815e78c83b022dc798ba03a3aba7a940977e3b956acdaefb79134e823
+EBUILD dvtm-9999.ebuild 1252 BLAKE2B 62291128284ed3d07e655b643e31fb1105331a8dcfbe8ae6bc187d4fbb5120805afb12e06b185fe1d65bf8d8ae0a5333c5cd8f99df6531dd33d85c82bb7ef3ef SHA512 7213a5bde6d927907366a4103e6f1a863e85193ac00456a6268017bf947f2c405cca72193c658f532e7c28086748f5e9ac0f5f64dc4aaf223024a5d63bf7db6c
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild
deleted file mode 100644
index 46ead862d726..000000000000
--- a/app-misc/dvtm/dvtm-0.15-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-else
-	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="sys-libs/ncurses:0=[unicode]"
-RDEPEND="${COMMON_DEPEND}
-	!>=sys-libs/ncurses-6.1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README.md
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	elog "This ebuild has support for user defined configs"
-	elog "Please read this ebuild for more details and re-emerge as needed"
-	elog "if you want to add or remove functionality for ${PN}"
-}
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
deleted file mode 100644
index f83a6475a961..000000000000
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-else
-	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15-gentoo.patch
-	"${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
-)
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README.md
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	elog "This ebuild has support for user defined configs"
-	elog "Please read this ebuild for more details and re-emerge as needed"
-	elog "if you want to add or remove functionality for ${PN}"
-}
diff --git a/app-misc/dvtm/dvtm-0.15-r4.ebuild b/app-misc/dvtm/dvtm-0.15-r4.ebuild
new file mode 100644
index 000000000000..3603e5c884a6
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${COMMON_DEPEND}
+	!>=sys-libs/ncurses-6.1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	local msg=""
+	use savedconfig && msg=", please check the configfile"
+	emake CC=$(tc-getCC) ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	dodoc README.md
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	elog "This ebuild has support for user defined configs"
+	elog "Please read this ebuild for more details and re-emerge as needed"
+	elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-0.15-r5.ebuild b/app-misc/dvtm/dvtm-0.15-r5.ebuild
new file mode 100644
index 000000000000..a80b982cbbc7
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-6.1:=[unicode(+)]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15-gentoo.patch
+	"${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	local msg=""
+	use savedconfig && msg=", please check the configfile"
+	emake CC=$(tc-getCC) ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	dodoc README.md
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	elog "This ebuild has support for user defined configs"
+	elog "Please read this ebuild for more details and re-emerge as needed"
+	elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 44e2ba21eb3a..1ceb143cf9e0 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-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=6
@@ -19,7 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
+RDEPEND=">=sys-libs/ncurses-6.1:=[unicode(+)]"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 8cbbceda6657..899763e9dd78 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
-EBUILD hivex-1.3.20.ebuild 2145 BLAKE2B 3e3890b323f7c0f8ff968e6adf62067f5a088d43b8ab67521a63de24496c5684c5bdb3dc45d5269043f6f4df41e502dedf6ff3e57703cb5697451617ca61f2ea SHA512 a14d1fdbae2a0d80b1ea15b02fa90b67807e1fe3112706f68decd0638d123da134b59e3cf738bdf1cc87b5dfc41442c98406d55ed55209e4dbe44c7d5a08908f
+EBUILD hivex-1.3.20.ebuild 2145 BLAKE2B c932ca4bc05183f047b19db401a56291a9089ee0d7bb8fdb3689a280ccd5ee230188816c5ccc3d928c161f65d6b3294215846613629c9a0db38e6bbe6a269a91 SHA512 d642008949798287e6808437919c20b2a60a6f5fd65c00eee349eaad5a0f1bb110d7f10a1a5778f3b60706181ebc86ba39c440b534d590eafbead7c613e47050
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.20.ebuild b/app-misc/hivex/hivex-1.3.20.ebuild
index 2758e02bdd64..7c8d10963bbb 100644
--- a/app-misc/hivex/hivex-1.3.20.ebuild
+++ b/app-misc/hivex/hivex-1.3.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_OPTIONAL=yes
 
 PYTHON_COMPAT=( python3_{7,8,9} )
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 3bea2fea5de5..72790d80abb1 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,5 +8,5 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r4.ebuild 3893 BLAKE2B d7a0b4ca2ddf368528e7865edc399e9bee9b028328ec7dcba50bdb9e90d8566c51aab85edd222ef90034006689ed98c7bd3969ce0e172f7381687bc7b1dbbde2 SHA512 373788d69845a78ab4e06f8551a0f10e731609a67a054fecb2c725fb0fe3e84c497ecc62265776137f4b5989f77ad5ce228dd49f25b97af8be938d306528050b
+EBUILD lirc-0.10.1-r4.ebuild 3873 BLAKE2B 86e7b43237f46499ab35f8d6bfb7df199ee70cfac650044c9f7735d86f854c3e3bac59c46fbaa9631de74b7bd879860aac174b78153c171ff8097881da68683a SHA512 6fdb69b711b7fdd9d6782f96c73d7e99d991d1e562f87c5aa1e2cf646f42990105cdf2169e193bbf0b3066a1b09d6c07c6be60f4c43752e8ede486daad2f9d28
 MISC metadata.xml 817 BLAKE2B 2bf367849a5d41cc4a0b5827c41a45ec144e6c180295d8a2e00376a90b88f98fac655812bab6693464417553cb133cba59c982a84a76d54b0b94d302c0ca862e SHA512 3ed7ee97de581de955efc5120f20603dc29f4456cf2b51ec4391cf0811df33472d8b5924a52910ddf88b54733edbd7622ae5e86630bad1fc8527393f60f651b0
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index 4ba35d6b3865..ad0a7245c132 100644
--- a/app-misc/lirc/lirc-0.10.1-r4.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 		media-libs/alsa-lib
 	)
 	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
@@ -55,7 +55,7 @@ DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
@@ -67,7 +67,7 @@ RDEPEND="
 	gtk? (
 		x11-libs/vte[introspection]
 		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject[${PYTHON_USEDEP}]
 		')
 	)
 	inputlirc? ( app-misc/inputlircd )
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 462dfe476367..4ccd61de9396 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,7 +2,7 @@ AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434
 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 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
+EBUILD mc-4.8.26-r4.ebuild 3294 BLAKE2B d8757bd527ba26203b485b4fb0b84b0efb1d8bc5c43fef9306663d0082798c01ce9d4fd9ec07d7099657d0bc2f45af76dd939723e7c155bac151a7c5c8e59893 SHA512 4aa5ab667b8ba6a075eed3ecf862bc1cf1bfba3de5b741e2eb35e4cf4946aa4102d03482adefd8cdbc7928c9bd263c224b49e5f081ac11f7e37e3825467e6eab
+EBUILD mc-4.8.26-r5.ebuild 3590 BLAKE2B cf13b66bc38c20d1ffef0097c55daa212bb0025c71cd125a86f77ff23551ccd6e2ee0657bb4b9f4909b74f625449dd57dc56dc6c1b440880c0876c3e3a3bb79a SHA512 eab5773774b148f607b08125ef8a1f02b8acead95e517165fa5353a938b99ade94baea96f538943e0c8c56504e590fafcd69c9150d856a1122ddfac696b51f59
+EBUILD mc-9999.ebuild 3187 BLAKE2B e23cd19959a0708d24b5035e6af3df69fa8e345b403f6b8bb7b19d67ee2929e0bcf5148ab1c4a81962afe6db98a7b17733896a1e7bcc8a8485f9fa17950012d2 SHA512 5ae2b7579a5f05c56c39a5d3c568e1ddd1d2f3ceb0bf4a0c10203a10feeae7ecc76a597c8d16d654969bbf80c4f0789e3cfeed0893dc9b209ab5b7deef2a4f86
 MISC metadata.xml 886 BLAKE2B 940640f07b9e76e2d2baced47b9ed9a699fad9fcbcd9583b5f78f1ea69f949a26f8f1b34f1de88e5faeeed523fe8b4486724d6f7884c3f186635753391d4d1a7 SHA512 a876eb2a3581ef4e44600c750fa54f7cb85d76ac1a83cbfa982b71313404c89d73dc876cb2d86cb53853ab1e404f93549bef4b4769de11d543cb118e4be8a15b
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
deleted file mode 100644
index ad9cf8c1f56d..000000000000
--- a/app-misc/mc/mc-4.8.26-r2.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
-
-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}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shadow-crash.patch
-	"${FILESDIR}"/${P}-file-seccomp.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() {
-	# 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-4.8.26-r3.ebuild b/app-misc/mc/mc-4.8.26-r3.ebuild
deleted file mode 100644
index 97a15d1bc054..000000000000
--- a/app-misc/mc/mc-4.8.26-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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-4.8.26-r4.ebuild b/app-misc/mc/mc-4.8.26-r4.ebuild
new file mode 100644
index 000000000000..26d020ad5a26
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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:=[unicode(+)?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shadow-crash.patch
+	"${FILESDIR}"/${P}-file-seccomp.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() {
+	# 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-4.8.26-r5.ebuild b/app-misc/mc/mc-4.8.26-r5.ebuild
new file mode 100644
index 000000000000..9e443ca61fdd
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r5.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:=[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 3bc775bf4695..1d3a9867b94d 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
 	spell? ( app-text/aspell )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 70a5a5b2e8d0..b756263c33a6 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,7 @@
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
 DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc
-EBUILD pax-utils-1.3.1.ebuild 1875 BLAKE2B 990d153b2a24f2aedfcc54fdfbb2eeb8249f3d4874502da412c9c7f32a9981d54acab6729a037e988943177f6ad91796316da16451d8f6eda2648b12d98e8d71 SHA512 9c0f0ab27270718e52b7c1f386f15a668edf424a46bd477a5c1479f76280e94ecc13dc2b2370b97b921c66433123d0b8452c6ae17fb334075ac5c55b5a770449
-EBUILD pax-utils-1.3.2.ebuild 1843 BLAKE2B 515b433e95e9ddc438d1cc0e8c0b13dafff7b9797ce46d9c5de1c72176757f2e807cf57d9bf5839e879301c9bd69f1ebee2ed1ba46ca8cef5363ba3f736c1b68 SHA512 2839eabd7f534a2e417b13220b87f5bfa386da7024a234b86519bd550b54ba801d5cb0f20637843c211200b14e3e5a5330fb356ab3890e1edbb491df867b6abf
+DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
+EBUILD pax-utils-1.3.1.ebuild 1867 BLAKE2B 327542297176ddfbc3fbc6257f1d5c675ea78851d656f29812f2c153e4abfa8cb01c1b0e359dcfc3e8fe2ec0cb72ae89046fefff705775d220ca244602fcb6cb SHA512 ac2ff5161fbb3f7d6c5283f3f75c5f55ee6aded83b26101c326cf504f8ab8bc547be052eda326079b636441e85c69f0fd047fa8bf931dcad7a9f0016a137a347
+EBUILD pax-utils-1.3.2.ebuild 1830 BLAKE2B 9b676110512cad0ef77a7f6475357ba895970b102603585678d39b58d376a6e26016d51a9fbe70cc703b3da2022f49a0d202264a64226c6c0d3089a34e83ccfc SHA512 f8c9a4ebe6a9d0519d7dbef48c840b610334fa522150b8e2ae31d1bbd3f831880a74c1e2ac8ce204c9e341e3709b523acfd298076098a85132f8836982b7f4a2
+EBUILD pax-utils-1.3.3.ebuild 1835 BLAKE2B aa715968e80f4e6f908a79c0d4223625e23ac386e02a4830b9a586a610d95e4e13a22cfb770ed1dba66acb194cc5286e1f706e0e7bf28872b175a17bcda0f2b4 SHA512 d98639b4eec3f3d5b3464de67317f5bd83fa62a4e8302030d4b86699602bb11ce61c9d4796268bcd26cd0b5fc7c55b718a493f322bf6dbb825300e9a870b162e
 MISC metadata.xml 677 BLAKE2B 22c40493c7f29ed8f77b7d5c00d37c70cdc9713c4873c083483513955ec02e2a1fcea7106354d01a31b961072353d4e735c43f8b9cb5f90870931ed387f8208a SHA512 039c93e2ef3ffbd085a67a90163d36eab812691679a644696ebd856b84e09301505dd726387b1c26b619cbc0f17f9608e62ce8f3c3c80273dfaab64ee29d1818
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index 84b6622ff9a0..dc857708cfd6 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
@@ -22,7 +22,7 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyelftools[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
index 9be693bc86f3..0c1a64066b19 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
@@ -15,14 +15,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyelftools[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
new file mode 100644
index 000000000000..0a9b82a4936b
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.3.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,10} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug kernel_linux python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_USEDEP}]
+		')
+	)
+"
+# >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
+"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux; then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index 3ad8a3cbb848..cac4d53869f2 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,3 +1,3 @@
 DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
-EBUILD piper-0.5.1-r2.ebuild 1119 BLAKE2B cade2791f7d41a13c9b20593c272adfba38d982ff9e7896c2e62d27693ce69ef0efc82d29241f4154c2a7ab7021f16da34a7494a68799ecaea945b7aa3ade531 SHA512 fef823bea58b8f23db95775c66ffec046df43c9669d5c429663b916a5f3db9ec125e1b18c05339bfd97a94a5f1c6137b7c1ac019309530bcb3b21f50a84f7d45
+EBUILD piper-0.5.1-r2.ebuild 1095 BLAKE2B 9592809f6f893a9352532a5ae8fa80b7b1ad134bc8f8880337901b6ec01727e820cca73094a2bfa8e6b370ca0b2cebb7f3e5cf04bcd8d2c42c5ce628d111cf6f SHA512 a485183489bf8a644c5e5039c81ef53bfb6e3f58a514487d409e3462a299b721ef1883dc1efbebcc595d090d12197e843d575a1a65820428046cbdd3a99232d4
 MISC metadata.xml 619 BLAKE2B b002311b812d313df127db3eb872aa052382550833e5c64f1b575d965958cc266eb2652946491b1a63082403a4740d86ce1672e32fcbea691075acf12596cf67 SHA512 c6ac218834d9b7ac04da0602a64b2f1b56118c9ace6b2769b0d201e8baa6c8984c68984925a0d80b1616546f44fdd742c0edb2c28a20a2c161660481ae6d9b7e
diff --git a/app-misc/piper/piper-0.5.1-r2.ebuild b/app-misc/piper/piper-0.5.1-r2.ebuild
index b46057798005..029aadea4ce6 100644
--- a/app-misc/piper/piper-0.5.1-r2.ebuild
+++ b/app-misc/piper/piper-0.5.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson python-single-r1 udev xdg
 
@@ -28,10 +28,10 @@ RDEPEND="
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 69037fb60f9f..160456223040 100644
--- a/app-misc/radeontop/Manifest
+++ b/app-misc/radeontop/Manifest
@@ -1,4 +1,4 @@
 DIST radeontop-1.3.tar.gz 38138 BLAKE2B 41bc36c571a99a136f2d1c1d5ff1a06b1e99bccb6e01f7432b9867e2700afa9d2b5cab7f743d3560b2120642c98253313e0356af977805ada173cd3c2168acbc SHA512 cc54e0726b2a934d14ad591c7a199474b49885e6122399b282e9289610d26f3c55b3d68a7d655d88a0ff8de1a0ac0994e868fa06ae1198416aaf857a099181f1
-EBUILD radeontop-1.3-r2.ebuild 1127 BLAKE2B f2c3a449282e84b39caabecf9c133dd983f78766b0f48d85b4690f11c1128e774cb4dc092082dfcb7703d1597a868781479ea891c57eea5e009a58109bef36f4 SHA512 ee89705660af341058cd9ef25f3f99e78243dd1d835089a0c4359b68092543bf6c43bef0b3c41caa97df92970be6a62974a42cb579f7ebdb0f9ba00f5cd22c81
-EBUILD radeontop-9999.ebuild 916 BLAKE2B 39e2d0f6389253aa19a82cf13c1e84e67d7ea3f0f7b39960ee40544169239baad2091b6b842d77aed6a57d180a59c6ffa273e9e016a85b6b03875d3b1d24997d SHA512 8f7c892e6a4b1af1bbea595e34f55c403e411af2dc4097ce683b3c05a831b86681aca75afc92249ad22061efd95af34247771d14a22e3f3ab11d01cc2914f25d
+EBUILD radeontop-1.3-r3.ebuild 1128 BLAKE2B d791a9aa27a3b33c65da0edeb3410c4fe47114257708b27dd2b33fd0c70c7b05f1ac80895f0d308bc7795e6cb896943f340fb32b61a5b8d3f701ba3d86f1396f SHA512 744ba98deea03b99b470a4128aaaebd46d518330c2e36e3a02261024c74aba3aba86b4a28c5e0a3c555eb6e93ec6aef5be586de7cb99f93d72b24ac3f34fe816
+EBUILD radeontop-9999.ebuild 917 BLAKE2B 96db984cb26bba22509dbe5c5427278c590c92e07015515e08b52eb3d48d44d66bebecb6e2fc0cf7e15adf4a6c1431c03839151e2c63a617818417d70b35378d SHA512 fee87ac572a56197a373a605feb260f33c157b42c19a5ef42884f9e82e6384379811586261440e02d3b06721ef80986bf6143b09faace09c1d6d02d3c4759977
 MISC metadata.xml 481 BLAKE2B b381f684b2211492f06268d65b5eded2c001150aefd3e66cc27d9bba633284b5e14f0a6703871bbe977ffaf7be5c3212be1bed68109f9dbf95aa57df7a563e83 SHA512 04d4d1e7fd8bbeb603cc3ba80b3a06664a4ed43cbf0ec0b8b925d2ab4d0392a648ed7bb8c5bd71a71f2da36e6a476359c28102496a6836cfa6d35c31afff2155
diff --git a/app-misc/radeontop/radeontop-1.3-r2.ebuild b/app-misc/radeontop/radeontop-1.3-r2.ebuild
deleted file mode 100644
index 504d9fd32d8c..000000000000
--- a/app-misc/radeontop/radeontop-1.3-r2.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 toolchain-funcs
-
-DESCRIPTION="Utility to view Radeon GPU utilization"
-HOMEPAGE="https://github.com/clbr/radeontop"
-SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls video_cards_amdgpu video_cards_radeon"
-REQUIRED_USE="
-	|| ( video_cards_amdgpu video_cards_radeon )
-"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?]
-	x11-libs/libpciaccess
-	x11-libs/libxcb
-	nls? (
-		sys-libs/ncurses:0=[unicode]
-		virtual/libintl
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat > include/version.h <<-EOF || die
-		#ifndef VER_H
-		#define VER_H
-
-		#define VERSION "${PV}"
-
-		#endif
-	EOF
-	>getver.sh || die
-	touch .git || die
-}
-
-src_configure() {
-	tc-export CC
-	export LIBDIR=$(get_libdir)
-	export nls=$(usex nls 1 0)
-	export amdgpu=$(usex video_cards_amdgpu 1 0)
-	export xcb=1
-	# Do not add -g or -s to CFLAGS
-	export plain=1
-}
diff --git a/app-misc/radeontop/radeontop-1.3-r3.ebuild b/app-misc/radeontop/radeontop-1.3-r3.ebuild
new file mode 100644
index 000000000000..4088c077cd3b
--- /dev/null
+++ b/app-misc/radeontop/radeontop-1.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls video_cards_amdgpu video_cards_radeon"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_radeon )
+"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?]
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:=[unicode(+)]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat > include/version.h <<-EOF || die
+		#ifndef VER_H
+		#define VER_H
+
+		#define VERSION "${PV}"
+
+		#endif
+	EOF
+	>getver.sh || die
+	touch .git || die
+}
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=$(usex video_cards_amdgpu 1 0)
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/app-misc/radeontop/radeontop-9999.ebuild b/app-misc/radeontop/radeontop-9999.ebuild
index 8185bf5f830e..72a3586f9ba7 100644
--- a/app-misc/radeontop/radeontop-9999.ebuild
+++ b/app-misc/radeontop/radeontop-9999.ebuild
@@ -17,12 +17,12 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?]
 	x11-libs/libpciaccess
 	x11-libs/libxcb
 	nls? (
-		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:=[unicode(+)]
 		virtual/libintl
 	)
 "
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 898b1a81d410..b7e001949b92 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,6 +1,6 @@
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
 DIST ranger-1.9.3.tar.gz 280363 BLAKE2B 2698f82773aae0224e7385413a1f939cdd4b3374eddad496781a42b054e26a8d7e5944bf19bc846736a9171df317c0dbc3c8bdf83c6ca9bdb95de17f9229809e SHA512 5cd7bea714a6542d0a5445f5f0cf929b2df4377df3ef710f3786c6c46dd58b017a8060cde3969076637bfaac03c13297d3020fd82f4574dc49546ca223c0e8d3
 EBUILD ranger-1.9.2.ebuild 958 BLAKE2B 8e0141ab238f23237f6f263ef89f27b5c022e52ba6fb5a69f84eeda6ff698017896e0822157faa04fbad95d471d7ef0af3e634375e847725844682d4272fd36a SHA512 c4a02cb06dcae94374bb1759d5eb4bc99ff599a87ba0ca5c779223b5d8f4ec24ce9e82bd00709111d97becac3a9dd365ec1e8277ad6a9f2504346697903b51de
-EBUILD ranger-1.9.3.ebuild 957 BLAKE2B 0826e431c2c7094e185c2a5207035b255337a53ada70f129d3eceae00034757b1e26a228518ad8f338a654a415688b1c50f4bd0664e078f328f0587561f459d0 SHA512 5e48c9db83d67343e72460109e78249b754aa66fbfb4635d59bbc5a676d61c1dc6eca661632576d067527bb53569164dc58fdd6aec16e396e8d7577cb351e845
+EBUILD ranger-1.9.3.ebuild 964 BLAKE2B db09a5c40d6f64df5092fcaf4dd1acf296b06376311ae28387d6b58bfd5e9a3bc82dfeac03e41698ee51bab770cc8f94b34f2f69165e1459307eda2f9b63d289 SHA512 07103a263aacad1631396e29042c1a107652fb2e668ba16efeebf6eb79b57b7a1be399ab1ca45b94c957deeb240109c3b18f276b2890f1bdf09225d238922586
 EBUILD ranger-9999.ebuild 959 BLAKE2B 12548ec7a077daa8121b1ac4879524d2edf2911b8424d7040b82525aa3017aac35c27be941bfdad9e391a43c04d554acac3a91c1ae05dc58da8356d7ef7ecc2a SHA512 72a160f13fd7b387b8c0038de9459d47c7026f9787a5b55979f89db5fe99fd90cc528a7e66b0bbb2e030f1597bbf28ba65d5c04c40adaed1619b528a081aa8b6
 MISC metadata.xml 695 BLAKE2B a6e584fc3731a0a9d7bdf8b6c7fc4bd4c88de12b7beec511ed67db337621c4156c6c3ac86289202e7e94c1378dbc3bbd2217d9005ede45071b310abd8bc1faef SHA512 1dc83811a39cd6a1ff11e976b22f74a15e9ab74c44377b92196cc7962d6d4703b522c9fe9ba2c97f43f5c5935a15cdae2c1a95935b6cdee8007749fcd4e7a34b
diff --git a/app-misc/ranger/ranger-1.9.3.ebuild b/app-misc/ranger/ranger-1.9.3.ebuild
index 34900fa2ba09..3e5e5fb6cd27 100644
--- a/app-misc/ranger/ranger-1.9.3.ebuild
+++ b/app-misc/ranger/ranger-1.9.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ~ppc ~riscv x86"
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
new file mode 100644
index 000000000000..9c2d01e61036
--- /dev/null
+++ b/app-misc/rdfind/Manifest
@@ -0,0 +1,3 @@
+DIST rdfind-1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
+EBUILD rdfind-1.4.1.ebuild 534 BLAKE2B c960258c2a59410b3d106cd24d699976615d2263d1177400bcee8ff9eceb44da319b8ffa11dc9002aa8bddcfc1ce50be46830fefe37fc5ad5e3b9dbacccb45a5 SHA512 8dfc23566939b930ea55daaf71f05f653167d5e4f7dd9ae9e543e77e6327545ddab10b304db267375112b800f35f3e2d8aa1ff4be05ad0433914009c54b78489
+MISC metadata.xml 840 BLAKE2B 626aa0ec88cfaab7fe289e824dd330fc415b4cd865c4cad195af8f0034bedd19b62114f787436038d18bd26b2f478c3fc78cf70f417a824d07e61b5bcb186ad6 SHA512 1b5b235d655e34d040860dc699da8e3ccc65e50fb14dbc0a65d42596f56cfaef24502c69198ade10f07482eaee3a5b03c1a4addbc035a2b8abe6247635f265d1
diff --git a/app-misc/rdfind/metadata.xml b/app-misc/rdfind/metadata.xml
new file mode 100644
index 000000000000..b130a960d03a
--- /dev/null
+++ b/app-misc/rdfind/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Rdfind is a command line tool that is useful for compressing backup
+		directories or just finding duplicate files. It compares files based on
+		their content, NOT on their file names.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pauldreik/rdfind</remote-id>
+		<bugs-to>https://github.com/pauldreik/rdfind/issues</bugs-to>
+		<doc>https://rdfind.pauldreik.se/rdfind.1.html</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/rdfind/rdfind-1.4.1.ebuild b/app-misc/rdfind/rdfind-1.4.1.ebuild
new file mode 100644
index 000000000000..3d1a5b6fa188
--- /dev/null
+++ b/app-misc/rdfind/rdfind-1.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Find duplicate files based on their content"
+HOMEPAGE="https://github.com/pauldreik/rdfind"
+SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/nettle"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index d8e12ba0bd3e..830ce7e3c0e5 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -136,5 +136,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD rpick-0.8.2.ebuild 2647 BLAKE2B 68028dec9ac8da55d7d8e335ad188581b11c90fb463270ee9a522e1de821182f737df8f30f2a4ec0a42c26519e5daad24d2d373b18ec952a62b7360832b24fef SHA512 4ab8741291f5f1664e1f8bbc4c80ff2330fa7928b41d4d82536fae9d3d5312d941242d714984207ac83f1d7d2e832f929aaa2fe02ca1c8b66d6f1a8ac268c168
-EBUILD rpick-0.8.4.ebuild 2553 BLAKE2B fa2d2ed47f20dbfe50562b85ed74530439aa167ed241c6d4b004c6d6cac43ed9cdd4a2b426ba3709b7fc95f6f381c58f3ec629e0a78d5dda3b0c575472b32b98 SHA512 5810799656057e103542c691e99ff9c0532297aa6cd51cbe7ba17a79061655356a431adaab00756c026563c0930afd7905be252fc0508f2a6940f0234c1c6c88
+EBUILD rpick-0.8.4.ebuild 2551 BLAKE2B a538a0b6486eb16ebb901d53b6bcddc5566a126d864e85a2aba286eec32db8403ead19bee202293cf7176be0ef80792d6dd02de512ffb3bc40a52a4366fb5412 SHA512 6b0ce216fa0daffd9a935cad0cf642e2a91ebc3269c157d6da699e8a90619d7a704793ebca9e395d02d1417a19d2e44a6f33036a21ddf62a8528cb7d86eb00c3
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.4.ebuild b/app-misc/rpick/rpick-0.8.4.ebuild
index 89bce4c4d0d2..ff055e6b0320 100644
--- a/app-misc/rpick/rpick-0.8.4.ebuild
+++ b/app-misc/rpick/rpick-0.8.4.ebuild
@@ -121,7 +121,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index e0f0f7f870e6..fd6c495f7029 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,6 +2,6 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
-EBUILD uptimed-0.4.2.ebuild 1605 BLAKE2B f66561abfb9ab1ffab3f6ed3ef7aecb923f3a4727c52c82427c919057f506b34233dec125821cfefa5b0ad015a722c9b56be76ebf4f90341fd8da58175f2b638 SHA512 5a6e71aaa998f1ebec32c35a0cc3862cde612a2928a6cb8257e3e4ef8fcf97ffa384ec4392f2834164a0e85161fa7638930eff599755481df4c33475a0704996
-EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
+EBUILD uptimed-0.4.2.ebuild 1604 BLAKE2B 957c1478d4812c478c44e1f9b94e638681468103bc0e6600f231bae7d975cacff1e3aed5907f5346dd0dddfe845cb5f146d8c99749fe2443e3bfc5e9e98c8a89 SHA512 72978d6e27db7aecd5d8724df5f183e7f23498358705676c1ca40851d0a72138dd8000361425f4fe648a9cdd98e9c0a86876296dcb5611cd0267dcc777b67c00
+EBUILD uptimed-0.4.3.ebuild 1617 BLAKE2B 9fc292ba43d86ba69ee0eefe2b53c93a65b7bc7a3b53c3c0a3e9f4d0c7f3690fac8b21823d5f27f6b43284423cbf2c4126153966ee79ec0270311ff1b934e292 SHA512 f741e02af02fd1b87950ba59ec96c03da3ee94a832ba4e8a9c8e96d957b84d2d9227a296b866da8b7addd09ffeacfcdd26e59a1ce9bd3589cb57f40a98003695
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index 889f23dba921..3c37d27f0782 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/uptimed/uptimed-0.4.3.ebuild b/app-misc/uptimed/uptimed-0.4.3.ebuild
index e1746141b171..3ed12722f97d 100644
--- a/app-misc/uptimed/uptimed-0.4.3.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 3280bd27ff5a..6ef1c0b1cf36 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,6 +1,6 @@
 AUX wcd-6.0.2-gentoo.patch 1466 BLAKE2B 2e6834d2f8f742b1582667c0ee3b0ca974600dc26a1e270bb1ea7be39ac266c019c8464f61d332c2919a5543581c9b07000ef8bdcbece7684d1046b808af920a SHA512 33ed7d9812676b5cd478351fecc31e12dce29c8e4c5b28d44b3580ac01074b631906fcd0bcea0ad66a6fcb72ace3cf13004f492c96d8a5533af7c8500ea5e703
 DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
 DIST wcd-6.0.3.tar.gz 813763 BLAKE2B 2e215c427914705213590d7c5182bebf39becbf24238bd71c5fdd12f7e63894b2ad571793f6d25833edd3f7cd4f3acbb07bbc821880c22d7a5d4f373cd972055 SHA512 b48a6f8a196725b4b570701813cf8a96e13e4fd6289b6c779218acc20ea1ea841e5f8648f717bb389976b715b95856e91bad3ffb20f8d80961d75eae8eacfbe8
-EBUILD wcd-6.0.2.ebuild 957 BLAKE2B 51c8469cbb8aa1e8963424ccbc695c6e0cd4d00b4a3053d17d9111fab43d0df59f4ba6462ac298d054529ddc7a2440eb1e50878628d0ec0d5dcf9861f70dc149 SHA512 e8526905b7d8a0a8f623247bad7ab61a5f0cd21f152cb0fdd5f0f3609fa89dff4a1f600a6afdba7fe391b9fa48d49a49136e90c39d8a87841c3ca93ed5b0a5b9
-EBUILD wcd-6.0.3.ebuild 971 BLAKE2B 764cafb6f5c3877b79b65467f069527c85e2603c38aba63978eab87a0a988c6da43070c461215729fea7af752bbaad7bf82b15e47ac8cfa0f19fcc26f35147fa SHA512 b31928aa7e27ad6aa8883ac0395d43598d72a008c07ed6baf6876befa413a48ee8a2a62187790677265deba90097b0d42efb344893576d311bc93664e1974eac
+EBUILD wcd-6.0.2-r1.ebuild 959 BLAKE2B fb3fe319a16e334881869ff64f8c210051d821d4a035d4edbb214eba59322f5d97319774d806759086c37c2dd3d47029a3c24dd85758c556bef62fd3dbef684f SHA512 306a4990f8954e8948a91260469e020218a967ec9f105cf9f3c71f0f332bf49d17488e12363af0380d9d92864199a0ab3e6e4d9ced168c3b240707fff2339b2b
+EBUILD wcd-6.0.3-r1.ebuild 973 BLAKE2B 1517c3db37ce0c235143ad3a3d4ca47fc28ffcd3366e5694598f725c34f8d08e6a9d9ff09177d596525aa00680f0d118c14729692a8bdecd2c3a81386ba40aba SHA512 08b70aae7c2f6cadbb2a68fc6ea74a533a90a4b9538feb84c48b5897d5fe0ff9ace000aa82c1c4ba6729bd931b068dd87e5aed3e5b5deeffd8e47b96026cb953
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/wcd-6.0.2-r1.ebuild b/app-misc/wcd/wcd-6.0.2-r1.ebuild
new file mode 100644
index 000000000000..075149a043de
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	unicode? ( dev-libs/libunistring:= )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
+}
+
+src_install() {
+	local DOCS=( ../README.txt )
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/wcd/wcd-6.0.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
deleted file mode 100644
index 13c99ef9436a..000000000000
--- a/app-misc/wcd/wcd-6.0.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=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring:= )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
-	eapply_user
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile+=" ENABLE_NLS="
-	use unicode && mycompile+=" UCS=1 UNINORM=1"
-	emake ${mycompile}
-}
-
-src_install() {
-	local DOCS=( ../README.txt )
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-6.0.3-r1.ebuild b/app-misc/wcd/wcd-6.0.3-r1.ebuild
new file mode 100644
index 000000000000..0b64dfe73744
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	unicode? ( dev-libs/libunistring:= )"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-text/ghostscript-gpl
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
+}
+
+src_install() {
+	local DOCS=( ../README.txt )
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/wcd/wcd-6.0.3.ebuild b/app-misc/wcd/wcd-6.0.3.ebuild
deleted file mode 100644
index 7f6410ba6713..000000000000
--- a/app-misc/wcd/wcd-6.0.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=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring:= )"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-text/ghostscript-gpl
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
-	eapply_user
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile+=" ENABLE_NLS="
-	use unicode && mycompile+=" UCS=1 UNINORM=1"
-	emake ${mycompile}
-}
-
-src_install() {
-	local DOCS=( ../README.txt )
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 1d1cb8dc425f..e3c9c910137b 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index a944d5050eed..20a4e89a6c30 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -3,4 +3,4 @@ DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4de
 EBUILD heimdall-1.4.2-r1.ebuild 1032 BLAKE2B 2098606391be23818664ae61af8757f78d65bcdbc6d377e97de0776b53aa89e714f29a1b315f1ed0a2f58212f48dfec20408fcfe8c7df12162c36841395812d5 SHA512 07f6b8a103e3ad382fa99e11ef3d95c6cd7fff5ea51ae20a1f44ea722ffeae2f87a9c54ab35ac8016bddcacbdaed411201e9c69a2e6e2056c21596004d02bc98
 EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
 EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
-MISC metadata.xml 484 BLAKE2B 735cec9feaeda05021f60068a46ab3156e6fe08c8e6c6abbb986170817db5d2c09b704f34c25b5c3da3549999ac28af0150a267b60a24555bf3beb0c34966865 SHA512 7425925defbe15e76ec54212daa8d1e6d45035102962fe4dcc9bd976f0610e2b535c52974b498cdbf55298f20095ee41c2f3545407534841c01fa40a6f89de2c
+MISC metadata.xml 256 BLAKE2B efdeeb82ce1f505f34a9468962ef41b138636224d888c9ac26df5d73a0bd6febb80026e78df8e15c6414fb0a7fdf77158db5978a6cd16654ffae2925d4e517c0 SHA512 e758c747c220e60d8420fefadbb409a4cbc15238dcd3c4f362d8ef55552e7499252a2ef02d5f6ab97e3168368b4bea1074966877889bec2fcebc6407b04f44c2
diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
index 499a4a303ee2..17f0ce1e2306 100644
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
 	</upstream>
diff --git a/app-mobilephone/scrcpy/Manifest b/app-mobilephone/scrcpy/Manifest
index 5692fc2478cd..96d454ae4821 100644
--- a/app-mobilephone/scrcpy/Manifest
+++ b/app-mobilephone/scrcpy/Manifest
@@ -1,4 +1,4 @@
 DIST scrcpy-1.18.tar.gz 299497 BLAKE2B aaecb14ea5accf12b23e3b4d07069640e3778d6050dd28c7962ca458645f5e8215b7b7376b809086a3edf98fca1375d935eae429219c1fa5df91088360e46347 SHA512 9cd3841c65cd1f20f277e336b69eec475ea75f403b6761b91639bf6fe876c29d763f056ee2b226f6eabe312b3bdabcad9e72c0384a11fa9f5091ff9587292a6f
 DIST scrcpy-server-v1.18 37330 BLAKE2B 02c5e58d72825abbc7d5a6e0f0e87f7effb016cc8baf77f975d6519200aee00401a67ea0e284e4f2188623dfd1c0800cc0dbfad25df0b51b3bc9aa5bacc3a7f2 SHA512 fffd06bbd1cae78af2112f0bd59c8da1c0f838206e3141d255a395ee633f52499eb85b5398a8b4d121241dd3e46088c790476061c3da2a12a319791096045454
-EBUILD scrcpy-1.18.ebuild 709 BLAKE2B ceb86db4c065ed9bf000435193246bceea775f50c49b90f978c3e1ee372d01e4632c635d31e4c680c5c825e402fddda2a00cd8e3e5b3d9d017359a36110c6268 SHA512 55098dd5366e286886f13286d3f9ac114789c6181199c2c6b4f323520458bbe4454f45a9c7b415441f7c8fe150e01c04f2bad6032069fef02249b1753de7a41e
+EBUILD scrcpy-1.18.ebuild 716 BLAKE2B 9c1c868edfe5492ad98269792e6511b511bd248ccc24eedb2482b96f399f0b2877f6425d572b90519e3b26db63ab363c5236299358e3c200976b873f0d2599bc SHA512 04b732c74df6d781daadba37d55ca1bfab33987c239dde8450f6c78cc9e5e63d689b5f0479b001cdab3c05bf3598806bbc09626ebcf65b61d7152052545eb6cb
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/app-mobilephone/scrcpy/scrcpy-1.18.ebuild b/app-mobilephone/scrcpy/scrcpy-1.18.ebuild
index f446dc491375..514ac43356e4 100644
--- a/app-mobilephone/scrcpy/scrcpy-1.18.ebuild
+++ b/app-mobilephone/scrcpy/scrcpy-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Genymobile/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="media-libs/libsdl2[X]
 	media-video/ffmpeg"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b3bdeaeb1eca..02962ec25784 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 5ee047bed959..8fc8c18ea8d1 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,4 +1,4 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
 DIST calcurse-4.7.0.tar.gz 699134 BLAKE2B fb50ee3d5fe6a0eebacb557ae6fdc1b49a413b35d53fd8dfb64102bd2ed963bf83f27f1e3c3f454284143d1410f18766b56792252634ad82b1b20c130364a54c SHA512 656f3e74cde923bf7bbe5aca56f0544023b69fd8ff6ac8c851bbe224bf6cbe1fb58eb141b66ba818b1382d705e1a7c82a7e20eda7a1672d513ad54749d5a2bac
-EBUILD calcurse-4.7.0.ebuild 966 BLAKE2B 827e72b7fda6e962c3c1561286606d336ea55de24be84993b820437d5de2f62801fe9189829c0c79891b9caa2f765630b0818bf77c2faf7855ab619b08f7cdce SHA512 8053074be5ea40de3fbf0358464cc823eade9dc370d5bab8f3ecf517b5227da84834c7c9dc0222743a6b6b3cdff36c7de9efb889e865d5e25ed2d28f8c634716
+EBUILD calcurse-4.7.0.ebuild 960 BLAKE2B fcc2c870c835128123e0f129ef8d544a7337a706a0b7d3f08d7d2ea2e9238c149b589614093507be4799e33e0a5b6189ba7976ddb6fe910c20af20203192b54f SHA512 5019193cb5ab2d5cd8cf753acfb10fc21972fe50deb2988ab9e5a2152052725f118de49467154ccc13c0149b36f2cf69d55fc47656ab722ca77f5178349af80b
 MISC metadata.xml 542 BLAKE2B 3b8858b3784dee744d56a735c20ca5faf165a5e9ec1ba4789206aa112b6dacfbe7ae563263eb24fd28da6be5bc02573f9ebfeadda96a9378f577d31a022f623e SHA512 6dcb0459490f73f429bb62201b0168f87c841b66d3e14671628ed6507c57704c16f26fe1ed5a7a0b896087a6847eb76c00680bb76f801d2220c64506d4ba1d2b
diff --git a/app-office/calcurse/calcurse-4.7.0.ebuild b/app-office/calcurse/calcurse-4.7.0.ebuild
index 36594cdc25e8..6f9ff7aa9cc4 100644
--- a/app-office/calcurse/calcurse-4.7.0.ebuild
+++ b/app-office/calcurse/calcurse-4.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1
 
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/httplib2[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/httplib2[${PYTHON_USEDEP}]')
 	sys-libs/ncurses:0="
 
 DEPEND="
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 0b2d78432eaa..9f3fc0ddf511 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,5 +1,5 @@
 AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
 AUX calligra-3.2.1-cmake-3.16.patch 2484 BLAKE2B 7a3aad5be9c793e027b9dcd2344f86622ddfbe0272ae0ff5ed624cbf030168148704dad5d225a8930ba3c7e5d18cabe9493603ffe16c47511f10deb064c47f08 SHA512 8dd6498dd5b225a630f69da37e5e53f513c9d4bc764e3ddedfb06b6403faca298358340264366972953ca5cc4ec3c2eb59fe76fb7fc0d924653a5c885f2a5e4f
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.2.1-r2.ebuild 5242 BLAKE2B 2ec98e92fbaab4e666fbeac720eda74bc6dadddaa63227a467e50dd28be482e3ceee854012afcdd40019093a97902db058615d5778ec40cb21f119bd9e882a52 SHA512 dbdff17791845bd0da6a42a556c237d39db459de90fc8993bb37cd09fa8734088c9fdf33adb48534aa41e5a7912fd762d0c2d5594dfa3e5716caa78f878cbde0
+EBUILD calligra-3.2.1-r3.ebuild 5252 BLAKE2B 4d281a3ef6890825a4cb19b15f6ba718d73c872084c793438709fc91fe8a50bf439906b2ddbfe42f0497bce6495765da7733452938aebfe11a26635cd76c79ed SHA512 9f7f0da34a639688d73a3a4a1175fce3fab321ea67917869c7009e50a0ad4025647497955006851e8ad555823f1984eef0be0c2267522427be14ebe2b0554327
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.2.1-r2.ebuild b/app-office/calligra/calligra-3.2.1-r2.ebuild
deleted file mode 100644
index 7fa46d30c399..000000000000
--- a/app-office/calligra/calligra-3.2.1-r2.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
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit check-reqs ecm kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr
-	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${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/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${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/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${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/sonnet-${KFMIN}:5
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-	gsl? ( sci-libs/gsl:= )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	okular? ( kde-apps/okular:5 )
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	gemini? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
-	"${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use okular && myproducts+=( OKULAR )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package charts KChart)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini Libgit2)
-		$(cmake_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-DENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-office/calligra/calligra-3.2.1-r3.ebuild b/app-office/calligra/calligra-3.2.1-r3.ebuild
new file mode 100644
index 000000000000..c47da0b88466
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~ppc64 x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr
+	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${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/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${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/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${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/sonnet-${KFMIN}:5
+	sys-libs/zlib
+	virtual/libiconv
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	charts? ( dev-libs/kdiagram:5 )
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+	fontconfig? ( media-libs/fontconfig )
+	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? (
+		media-libs/ilmbase:=
+		media-libs/lcms:2
+	)
+	okular? ( kde-apps/okular:5 )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
+	pdf? ( app-text/poppler:=[qt5] )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	gemini? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
+	"${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
+)
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	# Unconditionally disable deprecated deps (required by QtQuick1)
+	ecm_punt_bogus_dep Qt5 Declarative
+	ecm_punt_bogus_dep Qt5 OpenGL
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		$(cmake_use_find_package gemini Libgit2)
+		$(cmake_use_find_package gemini Qt5QuickWidgets)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular5=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-DENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 331b95529e1f..e6f06a33ddfa 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -365,6 +365,190 @@ DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 290349 BLAKE2B 503a
 DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1049341 BLAKE2B cdce93c542342e56864980e052c78e4d1bfd0b1939ea27511e66a88a821dc83318729f85258adb47943d41b3440e5561a56e57dc4268d93c6ddaaf21a4a4eae9 SHA512 80e69367d6cade76997cce796d94fd49f944e4dcbb232fd097185b64c9d15409dbb550c91af8afcba8a4488947abeb67a86da42e4cf85d773be7dd94e1dba00f
 DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 984558 BLAKE2B a2883925b36cda669f1737cd196a9c0457718c76ca50aaf7c847e3bb8cb3349b8a84d91169234324af80e396806a9619127abccdda72ff5f225ebff0ce6f60a5 SHA512 24f08efcb7831fb0516be389d5ddfe33a4299b2a7057714c457589c2f90dc84fd94333e0c3bc024f803ff44d97979a49b7811122d2baead5e4cfb1a9b075ffe7
 DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 320136 BLAKE2B 71c261a3a66819c65be221001a7f4a9c1356e3980cd030f0e785e5e478ff6ddd8ba277c1d9dd55f37331f439f7971b83aedb7f5738e73503d84b25483bd5b567 SHA512 3966db55370f59f2f4f1fdd1981b7102ef7852b461fcb84484c8d319733261138f4004d38c84f4584cef60e1248e8ae19d474b2e1a664fec08bab7c30ec4257a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_am.tar.gz 4127872 BLAKE2B 7f9afb43ad16a75df6b9ddbfdffc5ea0b82a7fec8e5334e5b2f44f0338e4efbf3e5968a28860fe53e4bbe7987f90d79d60e52134fbc3ef38d73bf75bc7da8b98 SHA512 b0b819277d8d6d530900dd2c53dc15d1767d9297d42bc016554bebdc9f71d87a980f16e336da584026e0c372d63c4b6c5ec9cae1b761c216f7d2fd6e52da5fd9
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3599123 BLAKE2B 5db9fad077ff4936d35ddd8183af2dec4d9bd3998dcf0f1d3a1f2d6edad459ae21cfece71e296d156d8f631c89c3479ebdf637434308ed866aca68ebf41fcacb SHA512 456f9fd7add645379f790535f74da7aa6fb2c32fcabc542c53a2796dfc8fabe65eddb8dbdd18a1a91d33b212fe4ee5a12971b0537981aa4817830b4626572a2b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3837450 BLAKE2B dfe9506f2ddb5a71e67b5f875a225b4462971062517f4bbe1d044882b1d29c9fbba853875d61d58136179140a5e8e7d65372e01b0332beeafb5c6b4f0bf8aab9 SHA512 14fdc51bb62940fba4a96a2c8c91fca40e94c0b8f669cd36eaa9c1022f058a0048001f1944d0c000ad806c025cd495f15c9fb4dc261e756adf4f49748ab31aac
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz 4166805 BLAKE2B 935a88ec7607cbb8c0fd4de95b917da705b34b1bedf172fe92c7a82cc4d9e5856ee59bdf6714f71fc6f963f8d20a1f2e49c0ed79334e81097f51075b5ebf7107 SHA512 ccda2aea6ff7ce7cad82ae433e1572a0f4b6094198bf323217beca29f55736d3b8d108e82617c0007a987b79b922f5c5f59eb84e76e842fbaabc6e8db55dab17
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 4303811 BLAKE2B 9de664eb17a38638b351b47ee82f21af909363f8451d4a824da8ac85d05c01a2ed4c6e59bde5430ce24ffd35d90fdcd9c1b19e1d10b0574fd3a1427eb79c30a2 SHA512 1b6b15e7d576ac871ee854a547c6d2113f97109d815b8b5277bb0a52cf7567c2a3befa7c20ba6da1748b3ebe9eecf81c2988b246bc2d3b666ab256baab30606c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3981899 BLAKE2B eed7d92fecf7888650c9e78cd0344b9877bd26aa13b57666babad9a95d1153672cb45e368c81077a37f1f76434bda32a812bc96ff17be2113d0ee9af21095b67 SHA512 d55e0eab8e5452ab313990a7c6fb08c000b64d2f70d4a15eee5599e5087b650e29c6f71d366849b066b7d7ee0494e3e3deef364812d083bb4bf5d44d7040ebe6
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3990369 BLAKE2B 479b6e904765ef9f4e49d335c78afb5d13974d2b84194ab81f7c43acb7a03c0f19ffb1b1dd24a6eadd766e94442d9cd0c3490b087a56c52a0056c2ca5694416a SHA512 082d0665a2ee0feb594df188e0b10b54d27f550ca9aa53100e850865f9c9597ee91c2f2363f5aa9e1da0a9d3d9728a8ad23d9324b62676bda7fde04d674f209c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3721274 BLAKE2B e751e21e469ce84cda3aa230abb6c212550a8992d01563598b06fc4a78bef0a43791d8f171c5b4f3f5a2bf85d97be4506a845e6e25c8210e97f5cc96f9175933 SHA512 e8a46afebbfd01828b11ac3d7d4181f45d977818397f72b0c695a24dc80246aa2902287839385990254b2b35cd1458610ed12de7119075288f29a2eccf879cc9
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3866787 BLAKE2B 39270ef55ee2cf17c4c5c549ac7966a185ad9f9f2b90d61e8b84fb2d16888bdd8f18786a4853ec1f681647d3b879ecf31352ca2f2dfc904c115792a8f84869b1 SHA512 28ef2a53790269b44c641784da343aa4ecd4e199ba9d04bddbfea70fc7601fef75465d32a64961ae7e0597d5f913d8873a53afdbf228a211449ba884dad7ec1d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3855503 BLAKE2B ed9c9464decb1a75899cf838c8f804635a76daaa2373503b41506c46c082ff498645c49bb8a2ec65849aec2da093eb6237a1a9917ec40a92a86d29a99579a456 SHA512 b9029c6e9c1052fdb1114d310b9901cac6c2b0b37386e2d0a6c3050478ec95e572b51fb8dd7389d28a625ae4dc4b85a97801b25c494e14c530ca85dbd41b4632
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3881106 BLAKE2B 488071e08c02d3aa988ddfac5a9833c760aa591cf3bab9cf6d6ea4da8e4f301f216e3dd7772f3294e6e60f5b461d124d867a01be9fbafadbe1f963c01c987629 SHA512 6f2edad780c5a6b7246542b963a509d1116deb436de6794482a65631f62e210499e70f0b2adfe8829d0e01e42f0457e122030d6cfe7c8c77f23ef00aac0c3a2d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_da.tar.gz 3785284 BLAKE2B 3f9a304c652de42ba6743c2d4f3e2832495f1ad124cfc886af4d4862cd8527c4c0c917dd8ecf22ffd72bff593ca566844ba6a168927fc863b011fdf751d0b775 SHA512 2418800c73f634d7eba2d8ed136d23099801bc35f3e66778051b7407bb5a3dd44f1d495d67fc23bb7e61d0930f64a7f2667962bc029d87eabf574ec829b007ab
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_de.tar.gz 3950637 BLAKE2B d0d72384cb87466b706ae3c1c51a420dd5a18a414cc0282433106440e93fad3f67d0fe2fcf6aaaa170bd7b1a6df106fa41c8630473286253a5c3c8d1608928ad SHA512 7392139e0e339c92d712e0c3d69a446ae9e1c9fe95f48a094f43303b839fdd51d49ecebb629cb9c97593e57ac18896f409b79f98c2802e85d3d7919c25e81004
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz 4137376 BLAKE2B 81ebee16636b5d0130c17214dca84f830c5894e6a6fad9caa1fc399f6c98132dbc8ac3959f5e1a67861eef34d65b2129b8c79294754c3bd896790e100fc46e62 SHA512 fd18fc34f4417c4d36253268380f4b8095f699cc6c4c56b34492f8fd76f443219c84c75a2e2283758346f10a3e4ee95181d11ea8e808b2b32ac9807641a0a807
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_el.tar.gz 4590964 BLAKE2B 1da50cbf51cfcea9e0cff28c1429f03bd5ca2de05b8867856960b216e985e07e3ba012a22491c0d766b67b3b9db569d5179acf9a399e75a2be71d44382054ce3 SHA512 ad2d94148c2bade5a1b6570a61f6622bcb03cd0d133cc73e3984906ac24c39a9495a71967e0e8918ddc5c36caf5853294a170ff1097a957c6703a023c10f4e92
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3607426 BLAKE2B b78b54d7aa6f8133c795d42d7ee7fa51bce4c27c03c2633c9389dae5d5f66ac608733886418698abcee795d792600d2a5f14ca2294833c9e638d448e7de1b04b SHA512 5f4fb38d2a1061ebc9a53a3b2f43e3df66b513ad3763d02e8b166f2cad86dcc198edaf1bf980b017fe1e92d36c2834b069f39d40989979df35382770faeba7f4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2286496 BLAKE2B 7b74570e43a35404e0ee11726ec653ab351085d08ccf2b4fb72acb8e6c43c9b2fc005e5890603ef1530fa0a364ddd0d732c7da891d826c4ecd047dd2f6a75881 SHA512 d69d0fb217b4830276aafa82f4eec0080d7176175cb13a862ed03ef0b02615212df2654d830b13250680bf2fa86f5f88abbfa46a5da496a1e4d6b5e652ecbd8f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3600085 BLAKE2B 18aa21fc737f2978679802eb8a8ee084cdd9e2b040b2775990601192ee5ca4cda700883e9e1489e67fb47804bc0914aa2a211f7a0c6b8fa1cffa9724e1ccb71b SHA512 2092931c09c963692db90773a2f2f55bdd74283813c4e264335655110e243744f3d28dd82d908e538cf60f4ac7b18f5d9c12c0313d0a319ae819b5cce8a537c0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3700838 BLAKE2B bc5916e04e0dcb664d97a62da8367f5fced05d9e7eeb92924d3c0f05a26fff4181fca853cdc65a87c53d6f19c7ca12e56dd8ac740b005328cf3de3ec302b6768 SHA512 13ee3630b0d66433579686e8dc38bfc15c0ce0084ced21c5025036fca0131bd43ecf7d714fd6b7d5530504ae69d26b076ae8689b4fca4c3c37b7289070c320ef
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_es.tar.gz 3900598 BLAKE2B 613636fe9d5780d67848fb9befbaad3109bc40d1250df060753685db469e10a5cf9930d5cfafd28f03df3c5f0eba4d90992d8ef00de9a2d56a599f2de9e67a29 SHA512 69bd8b24f7f60ef18fe3bbaddc3bdce299a66a0ec5378268aeeced2ac1a399ce49b3b47da0a6974b6ab6aca078cfdcae956e5c05ac724b24b74bc2d05e6ebc04
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_et.tar.gz 3744977 BLAKE2B 3598a711c9b120c1c96722226c0e163ab8c4b55d1ef184270676b9ef89cda0ffb1650756bafa019c9ee625f0f233f4e08db77c77e3efd7028da89a08b31c90e9 SHA512 ccfde682ff3ff0caab8ec985b652f9746005443ed5dde681aafad7a7253f67cca3439dbb0e64a44dc18204bdd30f264ca0a5c0bd0ef1d1708a1b2c28f7c758b0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3727997 BLAKE2B d90302c1b2ee603b67795683f0e91f03b44b689a18a81114c5cd72ad111ec22cd80c486c72b404fb79b8910f20add828ab8ed8705084fa2df84b2ea52b24fdd9 SHA512 c2c755355fbda36781417e336651db830fda047db03dda438ada87d88f105950eb72bbb08afaf10e355adfa2f7eebcf6f4b17aeb907c4ced7b2a6e82a09bffb9
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3750931 BLAKE2B cb5a2e6df77e25112e9c31df20a6c97853cb2fe1b40dab0c642f0186da987afa867fdaf2409693895c87a36f926811d898a080716cb31a7e995e1d0170cbb2a7 SHA512 6b73c8d006e7819ad8eae0c5388bcd718373913331cdfc44e402550792ff27fdeee38fc4ff0928c1a14e38e8953437ee4c5c76b2862fbd6095cac0d0b4e0b4f8
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3882915 BLAKE2B 7ade8ad6a298bc709b0202c409f973d344a87d9cf7a80c79f624e5ae0b3b12529e53a88dfc177efa584250e3c43f4faafe6e58d12bafa959121710d449928b87 SHA512 0ff02f48cb2fb146a2cbdfeadbc630b98a2bf0f0e0d8abcc9c6094294042e0767177ab02ff9bca7f25ea5e48b909cd516298588a461eac2f31f87b2cb32b551d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3836155 BLAKE2B 3c133c8f0f79071cc2a8d48386d6f69e67c0f64e0f0117a1b690f43ccc6d0b33c428812ce44522fef2125b307e5dd5d8915691765de8ee5443930d341089d269 SHA512 dbe1a8d785242876d388c32e9f81321d2c984b8adef973f8d2a7938b3e24009bf43fdbbb0621c63fd09439d88aa88890b84126eba84809d5529ece0f7ea232a4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3687927 BLAKE2B 5ab3a8fbc63a4732f984015e6cb2d6c095fdadcea94acd8ef3766eba4d38373ed321a4fd9e8409102674cf875a719195fb01b51700185735bfc0715f43ad4cb1 SHA512 46ee16eb609bfdea6ce43d9a57b2321b52f411fd87c6e2f7f1974fbcc162aa5dc679a2c2807f837e03df09304c7e819da92df19bb69c71680d4a1f3e1e88bd19
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_he.tar.gz 3460169 BLAKE2B 0ad763b9142fe0fb0206a45711f1a60f17f282de53f05758ea42aa59fd53ff0a50be482724d32260e1d6e67f87d79c87eb514fa728ee9ea0c04416f5a56ed910 SHA512 13569fdb75acf996b24d8d339f0ee71c9114803dde93a153f011d72552e0849451f4c49f310c299f029ba46c0aef6b608f9ca27486ac0c71ce910bf557ccf80f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3816121 BLAKE2B c9edd40123e4a52c0580b978c10b2bbce21e1ed53537fd1f213205e53c13c5b2f71dcca8e0895dc7a49252eddf3f95a2d0ce30de624c0541f1502031abf2bcc2 SHA512 8b47843c8f6ae49ee9d37fa48e9ffa093b865e47de5ea141978d4408b2961699a7bea5ff477c325a754257f5d5b6a727b3744f7244d68c662b1040c6298bf816
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3726652 BLAKE2B 0ff61f72b51a9fd899a42a06a0d9e42ed2f4e72d22137b602e29fb74530dafed04385757a6b1552138ea7fc73792318836cc33896bb6fe46a4307c36afa7aff2 SHA512 76353dc0678c635d9f35757f0fdf352c4f5e970b2e5b37018a134de0e8e42fccb26ba4b57d1a4a629a3a8ad93b893d42b0a74d4a6cad17277c60bffcea8036d3
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz 4004703 BLAKE2B 7cc3a2f0420b7f1cde64881b539dd87a2723100514b8023daee48b0cf213750719ae3c85efa1438b87835cb8342534a517ee039183a17730f4306142d5bf665e SHA512 2805b50eb5127d6d0330aac98995e28d5493aa2824dfe3c3457016ad53b0092a3d8e498febded99198944be0801270fb6d1132e286df6cbdbbdf045c9627ef9b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_id.tar.gz 3682329 BLAKE2B 5e118d5b2c009ec5ffed1d45126c0b5880c87f30d640cb3ab3685c129cad16cb7b281440ce83127508902ba44d6f5a223653073f4b058e861c09e7dd61332574 SHA512 0de3a6a7d48f8be36dfe4723027256f3209df36619fa317fca66863013395176f8845f86179d8b6567fb2b01d90da349558a1ecce45e903028d5e8e0ee5a9df9
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_is.tar.gz 3744970 BLAKE2B 9a803cbeca4f96e74baca306a74d01218a4a86b6422159eac3571c15b46de5ba3492d6a61e306eedf0356f9acc422b3585d0104d39e34ccd14dd740d432fba83 SHA512 ab89d81497d28d2449050c0a88741790f0392c7faab6ab10efeba80c53b3df5569bdff6326a5bce56316ecef6f1d96d4626b699f6afd1c823dd45964a0cce4c7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_it.tar.gz 3805259 BLAKE2B 0606f6069a835ade09f5d7f8ba72a0e78336998df1939e9cb58361ce62c6e563218c8914b8d06bb8dba5e2a8cf8adeb2defdaa1787132eaa276a1427904d3949 SHA512 d4517f9ea43c0527bc9168c5eef6ed7633edd2bf16625739c8814679911f36980247682d880300616834cc8b422b61261ac540feb1c0ef6dffedc434a79c28c1
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz 4463887 BLAKE2B 5c07d2f611deafb2a15aebeaaf0a04b54dde6756ebb0a64c6d79ada5a0d34b1a82731c433b10a4cc761379e0aef3dfc73a34867d8d7fa27d40a2f2f89e274b06 SHA512 b914cf02e86a1ed5893c0217b37c1c1f9da77916846d61c14626a6b29db8821667a99cd21a8b4a7f99e32e597d6fe7065aabefaa382d50c98e5b1a0f64816e5e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3932144 BLAKE2B ce1d2585b8d38e84c0a7687aeee9ac57c4f76dd80b506c3fbd44bf687154f528ecd899fe04a58d65b9997da61ff984f529b6f608cb7ac999ce5b482854e88766 SHA512 8b59cbc9fe9352a0aa57b4c0b32bba6f2f036a7a21ff401a1f7063eff5656898fbecf64e2235c28a9d51b4cd57768b1037f620d1704f684eadf7c6b45eaccde7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_km.tar.gz 4268278 BLAKE2B 781687ffd62c8993480c73eaef7be8005e1756eab852050e6c805f5f490f09ec4e9ff1a6cc0b6110fcca582b91ae1371cd88ef1554c530c2a523153e31feb74f SHA512 1ced1039c63feabb5f754bd3e9d7f728ea80e6023b2b7f3c16e9929dadf519f41958ca6708e36c432710a3ed0247e3b83cc8cfaae3e433efbc59b6a1306d680f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3964504 BLAKE2B c02f1efc3a66fc0a43741bea1822d681ffb281cc79d1ef8bfb3697bd13631102214f1e2b5a27e53a006cbc358499437402ef320907a729b0d3e1abb728d951ce SHA512 355dcad50c149954f5c116de9b1ef9b3e6689dc1f9fc6887efd46e57e81eb432e1480f3978cf0f12adf4fcc09555ca5847e92cd881cd870601464b309eb4633d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lo.tar.gz 3685690 BLAKE2B 8dcf321c728f94321e88edb080cfbbd6e3d30bafb85c0a978343449656357efaea0599fb8a010b2634f386157402d3e6130bc215dfab3706a347c8159ec6a8f6 SHA512 7af5045d8d856e84748ccaad4d904fffdd1dfce02be875f4302a2b4b7438c97069cfe7e1f504b3504d4a6778db66b23a317ea1e82181ee5451c1a01885e5594b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lt.tar.gz 3903216 BLAKE2B adb19aad9ec70ad2054272bff387175204ccf813984f115ea0fbb599b7b98b57ea3bd8f02066b8d134ca6652e44ac19e8f21277f71104240031eb380cdca7496 SHA512 3fcff4078c6f59b4179be51a2d2df455b3d3b01546596a7842edbb3bb33619ffa892245573c506d25f26d50b61d2e3de88c8f3219c29ad1a5bda48a5b02abe57
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lv.tar.gz 3739035 BLAKE2B d02fa5ce1880de02e72b7da47f74fc203e6771ad5279a809061aa1de9457e8c7840f6bbce0f872358117266a7eacaa93df9d6002f8d6e7ce904a8a0e2c5ec867 SHA512 a389026b620636fbf82cf9d8835317084df0599b9a54b3ec88ea8af5f32cda046fd2af2cec7d31522e94068e77bbadad1e314cac669824674048456c11899bff
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3779520 BLAKE2B f3e2f94d52e25c4ccd9799b76cc15753346081ccd03e92fe6f28db4fec425ef4d8b11b0e0c28dc7a2af766bacf3b0b550940d9773290454f427099e287f705c4 SHA512 46f65eb54966a7647b51223666d376bfbba0ab9ab2122b5bc21171378fbedb6028372650c9b18b94afbb7baec9b7204a04e2c550229a496a6c07463f4261e553
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3742552 BLAKE2B d730283561abb7387d95a3f2e95580acd4adaea81f2c54b73d650ae8573c576d8b0d81e05c7f48ef289de22a332dde3a42b0a4dc83a0428d176e706b3fcb287a SHA512 bc9f939135edf8f0eaf3f7581f204ac671c812f4ae0d3cb5591fb067237d0f31b6094c9ce615d023eafe7dd1ee04c8ed06921dc80d12d496152d611de0e8bedf
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz 4019976 BLAKE2B fe67f9b139996169a20559a1fb53e4d959364c3401ea8033cbf749c2b666f4345e8305f4849f12f3efaa4d86423fe5f5a74279043e4994562de608aa39f292c7 SHA512 05fa802730cdcf048ce1acbb2e9fc5ef37975b720376aa67bc572946eb791b7cc5e68d56af249d8256d37501ef81bbcbf1cc8cedacda390971c20d96eb9850b4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3847625 BLAKE2B e1afade2edb9b3c627724cd9532c7b001b68edfb0bbdab58538558bed797e6d63d18d86c11b4d1aaab0ab1f4bbdd51d9b5fa09a597b8e9ff21a446c3a1e5daf6 SHA512 b307daf385b08f948594964182cb74cb3335109c125a826b7001fe387b664c54069605babd4e343dd8b8f838950559e236eb398e915ef5ae21219172b68344fb
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3895898 BLAKE2B 7a4c9be9dc86760958b686c1bbcd8980d5d83e4ea6af934d5d145ad951d2a4bfb68d322404f277da9db0789c750783a2d8490530c65446634d23edb1809bbb19 SHA512 ad2f6bc2d130c002857ee9b820525bfb7cb755c4dc32969e749bbc7d47f01b85df8686db6de40d76c443cb55f220088280476a199a9c376994055c01eb51dad7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_om.tar.gz 3791531 BLAKE2B bdcf76a011909bdf54ef4d754808bd9ee4086aba6c3d5c2062f097ee6b081f441dcc0062ea6b2020ebfbc9845752bba57005535fda477ea736328b73c1767711 SHA512 e594c5413f27d0059858b8f51b13e838648bac30260fd733cbd3e2efc85a436b8a75fce1652b2252a05cede956d7b2444a04f7c652858a8bbb40b190126657ec
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz 4035717 BLAKE2B e24c3598b21f0e792137d4cfe2a4212295f00bedb33868db624c2ae1111a7d6d68e3ae63efee683ff91b46d7a19ea07137609c470d92eda5ee10dec0c7e603fd SHA512 3c3db4a1626fe291f5ca0eb771723688f27c43d2e2b2dffde3347ceb8ba65953f2d967282b3bcec03b6bce0ddcd00e09137a56ed87853833b7e6c36d88523a38
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3842837 BLAKE2B d10b7fb853f3c5e752864600e931c6845561f9d09ef71390cdf9c448d482e8fcdf5cd4d190054026ce615e4121e495525f00d40a8485b21d614ec64dd21d558e SHA512 1e2afb885a4c4f53686e163e6c1b4e1f8f0f3a0c6407ee605e684e4871d1969a6b75d4f003f5879b65c1f451554c24990c47d4ffec9f3ea426076845f1db3a8f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3830339 BLAKE2B fc0b7c280ac296b7fbf35ef823d9e127ada7e8f3e77c1b894d30ac7707cd8542f10b85cc56e862fb221f6d936105c4758e17ccf7846671514a6313dc4a47a216 SHA512 e78c7e2fad885b24b345aa0d06e8a63f53cad8ad76cc7a4b3011f55749ceaddc9e2fb161635a12c34a1e862020cf9d2aac11615efcb4bbcbfc240dec5660c9d1
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ro.tar.gz 3634553 BLAKE2B 9e1e70b786170f068d28109efb10309424cc6c85c79e67fe488620218d0f950551133e22fee3572faaa61161df994aa9a2527558b1304e16587f358eda6ad5a9 SHA512 bc12c4433fe5dede148659f39e3be9efce3722264fdce982dbd2d7a88caecca26deb36078b4a97e43b822f99aae9887fad1e83353b297ecc8105ba0adcf5e8a0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz 4185273 BLAKE2B e718a218ef836818d95a2a6ea8c646167909dc2c9fcd8d66ee305eda5d3e9ccac2e1e163f3b7ec22d7cf98fe694e8c088b72f417cde6a54eafbfa3e7c2e10612 SHA512 98bcf09ddcd056030290eb78817413841e746c67e4875e2486813f6ee854d2bcac028b50c66abfd9d1a7e70d0324ba205b0ea363c67d17e4ac4eb70873ca6f51
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_si.tar.gz 3916496 BLAKE2B 8be0283ac116b2228b010526ad2e2e4658e7d62acbbb73a40bb65557eaa0b44be84bbcb3746d4c0be5cbda773da04562002d8732501f20dd8d74e2af4bef878a SHA512 b584ee6c65ed1d72d3da0adcd59082ae1e15c0dc471dab96dc504e4c62923e89828525fe9d7d983f79bcb9507003b6004d71a32e9350faab8e7b2c6699845ae4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sid.tar.gz 3781152 BLAKE2B 4c9c516cf3aaf47c2286259425f3a4bf229e35fdc4ed66f3d0018823c5e331d11dabac2d374d1cbb2bf3d6da6da0154c3ca5dff6afb356b2e81d27e7e63ea096 SHA512 fc4e10c1bfbe37f3c8e49a1f503b6399cb7c3a958a89115bdf9d3477ae15108ed215c8ee49f52be7c732413b03b65a381f2a32a66747a1244da1058085b28b32
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3939270 BLAKE2B 91676a66e3f31ff75e7c7e6f7585d8e166f9122a7f8182b7f28252172bad0dc9d5f3d1c5edc4b30a93402b6be07d2527570f60225c4ca128c24f023662985060 SHA512 93b0b619381325b77355e9ed09d2bfe56d1ec10bd908407acee03c797b666dd2f3d57afa4edfeba5733b06ee27ef63dcf2ec594a2ce119491abdbab852452df6
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3796083 BLAKE2B ad123dd24a5186fcf9c0a77abc6a1680b5f234d8eb0c4ebacb76ded6056067883d6a371b0dfbec03202aeddeb43d6413b7483bbf4cc2622fe662f64467323e13 SHA512 d61985168eac31260894097a758bfca06254429eeddb000b87588fbbc0d5812c82e99f012d11466914fc5159f8dd45c79c827f715b513ca6b7455b834d43f59e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3695742 BLAKE2B 88c5e2266d316ef268a260e0080f94fbd62e37079c855d9d05bc988e7f16c7c6356e8976245c30cdc7c76b20b18d5fc42c16d543103f7232bd33f88c11f11eb7 SHA512 6e7c75a879fa53f950efc41f616afdc7968f2161546e2bbb16cda44f26dffadbd6de7ae5ce250cb3612354ef69148cea8b8cfc870a1e144374e21dd8f8fa5e65
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3782205 BLAKE2B ec71c23cc922165696275366b4545c93d7b10cdbee3a0c501c57d8122d5865fe094cc949699870db534be523c466df48fafa84cb89295dea96b3c9c853734fe8 SHA512 f33f1de3c05923c03c4745e07a25ec7479572839eed95d62eeb891c8a9470c8f59587dd1b32bc22911307a0508987d15f335c4c7773534b75eda2f1d5b4ea0ea
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ta.tar.gz 4129171 BLAKE2B 9aac3bb5653442796049cdad886c25f6a531951dea3ad9881db430515dcbb3cdb78fa5fdd935a14b23a7234446ce2edf9f9fa9f54b3e93204f2ab922c46989d3 SHA512 181c26651f0b326290be0a18cddc5c866272341c99a7960ad07ea8cbafbf95e42c1283cd2b41b38ac4d96e960b9de031e72b39ef929fa2fb81ea874a2174d599
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3749416 BLAKE2B 402843e3c51a313675b0eb52ecf3caca3104af6f34443733cf495c7b554b936d2ff5a74235bdea1f04dbe1a2bc4b88a73c85dbf280c820860eee9092fa362c91 SHA512 02e74f2f056ec56a7cadf287912a15eac843ac98908a3afd2bf6b967deaec77d5ac78dccbe1fd0db56c9ea395d123e7032ef80ea0421fad29cfe0568c3f66c8c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3848640 BLAKE2B 37d5228b565412b516432bcd2ba851f2d3583d6e7efb7755011ed48e76b18c51293136c832dcc3e5aefe16564b0b12a9cd347c2981296091db7c8e7943db66df SHA512 3137e93ee62e51cf5085070dd447037930e66996910f808423e945ea7916f572e51d7880727951834b9b832dc68ed4f005655bc6c8098af66f32cdf8dfb0b724
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3861905 BLAKE2B 4c13f5d8a845ac867fcab2e3561968596e32a9d8405c9b78167d9a649d8fb5ec233f36c8d007a3c64223db857799c3cc382baa03ba94394730620655477ea422 SHA512 d9ae7da9b92ccde47b5f579395337bc4c411f9516ac15af500ff7b00e1bb97382d7ea2d01feec8d589b78f98f9ea8728217f97628c75f4cede28377d736b91f7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz 4173784 BLAKE2B f06073771db91a56f5ffd5acc758b51c5a73cb7f26e2f02436f8fa059bdc0edc293726268d2c79e3849e3114f7cf315a2a7b8d418718e71c6706c7361043ae30 SHA512 b56973eb975c81d0f39081db9bd17088b062621e38a3915ef4fc65b75e1e346cf222c2a86c70c8e7e285f47a5e5b4c6daefdd973ebec636bdc030ef0500686bb
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3824588 BLAKE2B d3b2362ca2cc07c630b12d4aef68c5579632c651503e2b0e21a0a5cd2f550c4847528dc1095b7fb4072b6f8e19ffb1baa0511adc3f4957076b983ae50e0ac199 SHA512 3edc11c4fddaf4cf96be25b0e71bf8818f09d7aee50cd491dc00d00780e0c9b8d4f0f4c309152f3e86ef5f1a6195f7648447eec343c8d116baf2fff2c6d88e4c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 4090279 BLAKE2B a1d4c07b08a5924b240337343d40922bda7a49a6df3c7d64342c911bf2f1ebb9c8144fad00d7ba2b8584a280b30f921183cc4ed4ab9f9d25b9a391247a7bab9b SHA512 c03b57816d3743759bbafa08f1ab12a34ec7fb3531d110eddfa3cf41c1593f4abaa693f3e9c08ba72bae91c5465b0f071fcc54c5b8a81fba518deee9a52f7f4e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 4208126 BLAKE2B 33d3cbc4affb8376057a36e6b64cd56dc488010a6447ae8aa4e598276b57213f21b317e6300fd148004ac62e52f5dbd1cf2b3c594bf0b345f9bd3f020e96bcbc SHA512 b422418cf3c2bff2d31b0c455409430ff6f9d663b2cb0102dda7f6645e878054f3450b1c5eee1b171f6dca8dac74413017d45e5a785a65e121c7a19ca687c59b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_af.tar.gz 1486276 BLAKE2B 09f410ea1b6cffa3ddf3da9189512693d6a283d0977714dbc02d492a6a0945462f9c95016ea9680c664efdb3734b8b41dea4dedf9fefea029f779d2c5ac67ba5 SHA512 92f2830f45a3e4c3dc1ec5bec67eaa4de38adc4db19add25defdcf89cd5ca04fe6bcc72a0a1886b68962a8c6abeea536633d5f52faa4b252db33a58512cb4ea8
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_am.tar.gz 961488 BLAKE2B 6c476d73f03189dbe029b7eb95a2f36bb499d93a813187f3b57a9c8f38be9ab0659bd86792c3344c728d5ecf8fd76c614da642651801fca4c0b948773384bd32 SHA512 b25490eb6cd0ecc8d8cbd19ae87c37f42f676f451c4fd12649e56258fb8f2414cd97cacf51f42c54c2657af292b0397d8ce4e12617c302832c0ef0d678cef255
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2445257 BLAKE2B f7975651e514dfecae5297337dee7f85bf5b57d43faf9be662fc89dcbf19018f169805916485ca084d6bede8a08f2871ecb9584714c937ddf70f7f4769243941 SHA512 277273ad12660eb7dc0efb88d6672bfc17af69d1674083270b723e653efff46883f037f67c18df0088bf46a8d1667784356f821598a1d8aeeb6155b01ea5f350
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_as.tar.gz 524295 BLAKE2B efbe6b921bb47eb23ee82632a024bfc57688e27b488ddf659550ab2bd68c1fca849e8c6d5d86f300ca4272b2e7b6922a0c870de77ad78133fbf7e2129c764a92 SHA512 b0b87dad990fe1b43381cda8118e416d04f4ae9000c9c5ef4eb02ed3a3ed0f66e45a01a145eb146f069db70d244faba894956b01cf77092718bca27d908ca662
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz 574281 BLAKE2B 5ffbfc5ca0dfbb9071234b36225cb5c624b06490dc0314a85bfe32b82e82e5b9baf1127857588d5b1ab79c41c6bafc427c05108a1ecbb3252ebd0b806bdf4c41 SHA512 84cb397d684d54ed0e89cd1780182bcad59981457c78086b56ae1436ad0ee15949e0864d8253cc907b81cd566c16bdf8aa56037ec2b170fa628f86ddadff3df0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_be.tar.gz 1050998 BLAKE2B 59193208bff07c846f6d25425f852c27efefc99ed497c10a9f6989c4c2d92b89bc041edb6ea7bdb663310c56788cdb4e90484def319be5b815a941b61046e5d2 SHA512 bd43652a4fec6a676c4aa6d6259b17f1d87ba483463fce4a4cd2355eace049cd3168498c006ebb032fc0f697c2f61a947f3652ce70ab707fafaa371124561141
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2749473 BLAKE2B da9bc5f5dc8c020dbb324147a7f0165f1cc412184cfb8927c56eff913298116995cdd2ceedb9a0096cc7c518b956c61f4030559c402597dba87c72d617bc3f87 SHA512 03eeb9f7ee35684c0d3ac61569254f92fa786574eb363e68bd53976360d5fb91f79f36a34e98902bb803de7bbea9804437c3e003c51e5a0831d050922ce622cf
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 724949 BLAKE2B fb5321c17a330d22c503fc4089041217c2875291a4d67b253f7eadaab469cd2b4184441603139128eb843047927b0ed3760fbb1644ab0e2e6f3ab6cd55b7d900 SHA512 a69ceb3bb00552180428b80808bea5ff37432f40776df9484d36e75fefad214474e5f1cb01c96c53e4ada4118a6045bb67e737b9ba3f5187a7e096826713f972
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz 879943 BLAKE2B f1e13698afd99cb4b8c3dd7397d223131a3d48546c4943faab679deef74d0ab43142b5279ea393cf5f378e888b3a97672f64c5c6f765c74ba43f62b16bf8c176 SHA512 bf124b8656023f69272b81732027d1129798b3736f91736c2f6eced906b7b1f5176315f32f75b68387ad6c91a80f9b5375cfb0552becb6058a4bbd7fed233e2a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz 458537 BLAKE2B 110bc3183f62fc2589b811f2a66a05f3a7b75a5868bfdf2668a121836d2112193c6ad302c95198c51726d4efbe94ca17a86ab3f7891c54609bcd368ddea300b7 SHA512 adc8be60686030d0311045ddcceccd3e85160b74bdd1d98ade600419e731517cbe351ba873f41dffabcade573e55516b3ec66361a555a95014e4e0c4fe4ab43e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_br.tar.gz 1519321 BLAKE2B 66eaaa06aef63b6a591eda42e8593169aba74e2f5996e98e3a4c661fe607b970ff3fd2923a20b30dfa1e2897500021e58641c41a83adba1412a02f52f7cb85cd SHA512 229d16ee8483766d9dfea22ca617884f1c8bc38a1aafa4aeb4ff9f82568b34e97d0c2c888650cb4c6e343fcfb786fa6a3e4096d301f7c1f82b7877bd14fad773
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz 336092 BLAKE2B e33422153b2da97b56b16bbf2d6d3fa74cb24893d1164248d72e97f8c626b3e8c34456db33c36b81d442af6d7ab2e4835c7ba938db8d6e985ce386ac9ae0a0d8 SHA512 7bf140894b9c6b50ffbcdd682aa28857e81b082300ec04c0885139cb7c3b8e5717d781c0af936a3dace93e3fa671576c76e351839bbfe2504214cca8a6ac035b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz 672240 BLAKE2B c7ea81922a96f1d15dc2d58ccd29eebecc1af075a0caa140e2f2a31064713026605944d511448605c5db53d7a4303247f9257473cfd7bb14ee989fdede9e25ec SHA512 c7c3f76d45ccb542979a29d2940cb382bb87d8f3c706899a3e7df8bea100e9a0da6541940c5822b0f3ada21e5ec181143eeb1f71d686413c0222b1b527f55c22
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2657359 BLAKE2B 28bb32c2452b684540d4d79aa617fbf05c4863b11917aabe7410d28dfa5f9c9c4c49b726655c70128764f6301722b75fa72306993e258a86686e5bfe028d9d49 SHA512 ff0e5e1e39cc990be3aa5be304fbbe26506fbdc590a86b625f001b48632ced3772c9963f4271432a6c244c616d2cc6b6b033c70ff9e7ee1233079a6b00e2ebe5
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2724157 BLAKE2B a36a3eaab17ec4becb1794b2bdca6d4572d46ee052d2b7b0482179b9fde72c377f06b336f80067655b8d2e92f35d99bfa34591ced2ef88c625ff3b25cf4b1fc3 SHA512 7fb9ce07da8f856941c30d338d8067fd278f85fdb6ccdeb269fe0ef4de7c24504648258027e4bcb315f734e3e8913d0bbb9e9416601fddaac02a313f8f9186ef
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 365160 BLAKE2B c00faa18a17e68e3e87f52a12d910e295212262b2f532d7a29ee918ae195c66b0414b148105b3ff7652df77a403ab2cddb9c59141b0882ebda99d6a80eb9a5e6 SHA512 ca131a59b557df64f2be8f40a8e5f7dc600f6e4059223ec64a37ab11cf29da3170a329395df9b93dece49e9b72df14580b18c0378b9e07bc9520297916a3ff09
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3471261 BLAKE2B de84a02aae561a2a9b2c408e0fa5b0db8b0318b43515cee4cbaa8bf71deda57b99108d410887b19c41318bf41f6416c03312f5cac5aab82d2ba1f54f2bac1676 SHA512 4cb2fabfd36f1148e0cc4f3a52633e4de7b30dcefcc837afc5ee248262edc7cdbca28288a0f526ee33480ac66ce9de5ae575b5f5b69dd709b4c87b2ced2223e3
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz 1013103 BLAKE2B 831a68a9249651ca41ed4134ac3164eadef0b7738a826a473fd8d035aaa02c8da44badf612c910f87346a39ddbd2f1dd924af3f1eb88b8f8dfb41e98f0a86c2a SHA512 6829fdc544de97805086ee67efb7ba0563de2448de115804bd525e9d8535677ec8ca698a6211c5be5289cb7cd74e089201b39b40e3239850121fd4979560b150
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_da.tar.gz 3112368 BLAKE2B 4c72efbc7e2f8cd8f8283a72ef4ca882c3eb67a0ea19dd1076e0d3e136a3b0ff36835c28f6e3b00d77b8d1ca1a5e3801ad1ad758aaf0afc5caa6606984fefd78 SHA512 7809574b938e32fa2aef8ef3f7fdd1f934db266a89ecc01b7af004a77c22851fd43ab98a1e4cc537f23406ef39f541a03f357c4f708031e367e363d1460d7de0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_de.tar.gz 22051399 BLAKE2B 485a8dd4d2bfca5e08a5e6f1d50cc32a6a18b9ed20a694c0061e89b8b0bda745bef548b4acb678a3902d822fa76faa36b54e78e515aa1fdf897e965257f47d97 SHA512 7283c2358ca9ac1e0dc57bc0e2342c0388b46aa9e844766f3668f34f3ca637dc0818030a1b0b37c480f28a82600724f1593c10eeae352600d93921be198668e4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 434842 BLAKE2B 408d5a2a5ec4907827be281bc32e76b20c359d6ff867316b70eab4d81c7adabc38f70141473f33b9a77a87b60fe19bfe01b84da0d7644e104bed1fb4e332a7ad SHA512 4a773ce0f86be49d66bff7d8e3fe433bd964dc4f53a4a3d81a9542ef8cb7764f643b7f77ab57de13a01f7849af214dcba8cffc51370dd59754f6460cc4fb79e6
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 908659 BLAKE2B 0a40a4bb1c17660a7ddcb29f199bce5b62193020c1df71f91b578dc91dc61100b3d0726d7dabc69e177bfa109cfc2bfca234518a7e8311e2db3bdf5a942d8c41 SHA512 9dce8d780f9a7fe0e140d859d26120c46d742ca494b7d1335f7e4713073d077cf0c77420885124aad4480c26962a8292cec8e267f31b58973b8f5006f2c78cbe
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz 484916 BLAKE2B 58e952dbbc2900f3f59192927e79eacbc61a1768a550e984d57ed6089bc85f7adbe4c3c31958276e579bdd382bce96f4d213d050bc6f0520d597ac49effa7ac1 SHA512 c2ea9f9c31eae39b2f7b44e09ed3f68422ced883ad510315231fe1c3aaba3e203dd7ef04a3d81a52f6d192fd4288273d3dbd1be5cb480d145b3243476eeb8665
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_el.tar.gz 3151207 BLAKE2B 8a255ed5579e55cbad43157a49a6e8fa6bcc72357db96b176bc88c2d6b55e830acea85f0bcd425fe68fb3eb472c7d05fa8ae5dc6a16744c60aba55d681650b79 SHA512 a2a1a982656a33051e31410247e62aaf0fa608367b731201c9f1cd733f0af77a13545efc8df18993d192cab202bed77a833ee5e009c429151dfcca25e67e5165
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7620735 BLAKE2B 28a4ae5241a0834aa6add8ec35a76b8b640b7512ddab64578ee2d8700ae062976cc9dab71ee6ab86b0f04978ff840f61e36f9cc38176a3122e19375e9ceb1a0b SHA512 27d59a0bc4313ad71d7150a05a161c59a9a354069459a36c736d7cf16d07750c6a2e0a6c7e88bb51f84b8d0051bc670727dc09cdd5cc755e80f68dfe8e46ab6e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 7051177 BLAKE2B aa9d5b821253b21b824b940a2541b7c81bd61f914f5a3e72b2bd5b37e1e16e21f55c2830433fafd3c67a04c01f92c8693ead80a2b6e6052608bd5e78311283d9 SHA512 a4d4023daa7cff935f3fa6d2ebeb213279297df7f336772edf32f4efc537cf2958dd6b21b528042e6baadc76f18ac8f030a0dfc86aa307557ab9995d421d0aa5
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz 988977 BLAKE2B 9a694c93997c5255c495cc3de3f4ef55e426ad83b733b0dff31579b0a88d1f7dfc4e16ae830b1b892f05d2eb622a9757ded909f62479aee26666571157db02cb SHA512 af835426182110c02759620f781e4a5ad8d3ca7dba87348ebca61fd13d1918ba6509b712d29f05b251d071681dafcb9fc929cc807c85d346927dcf00ffbc0952
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_es.tar.gz 7781208 BLAKE2B a0b2876522f9aa98b261a542edd0465a2e8a59e5abec9e3b1e5f1d262cd2bc7db14817708274e843fe61c33d9c72a4e4987b5d3e02e3a22fb9ec88dbd7e8578b SHA512 43670d4be527cef1c47ea2d6be3e3138b8a80ba9107e5af7d6baa4fe469773b23efa0ebf578eb8bc4056f56f80bb587ada7a5bb5a08b4fb80eb103d6d725b14b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_et.tar.gz 1869066 BLAKE2B 5329e8b4a71edb0f26f8b3eed983545a48f351674eb3a90c917ba1c478f6e35c73673690c696b1f940bd2b804795a982276ad5ea1e9a056c3503e64b1eb307b7 SHA512 b61443cd5e017a45c35881f21cdb146606e83f21cc72f72325ec639d0fbd83ab11d373b1ad93cf0abfd328f9080e71983a20490e3538c6357811212440c9aa81
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz 1014242 BLAKE2B 9b6e7d040007bd5539989026234bc1509916f72598caed915ff60a5b36dfe0eb54b339d4bd63f85da770e3d48cf33d21c1e4bf23b2da7a47b801f774ee5b809b SHA512 ed22041ab5a88ed9decada0cade2b414633fd2f999e13944ac9af9b358c88b83427f284a082c1661d0bb1f1930604beaa45563728fccac09b8f192e313acdef9
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz 352274 BLAKE2B 122927156df0fed3f1278adaf5fd000d815f4a81bc6fe20da50a83130b9a3d338f0e751a683f9d71047d49b19c3d6ef0723aa93341ed59c9bf1f8df69dc2edb5 SHA512 7e868670764fdfd616d99a92119181eeba28ed5ac50c6904c2973c66181a736ea58129c1e961f701cecdec9dd089062f405d71b067a16cb00a983c74094a6743
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz 878304 BLAKE2B be74a0dac4a703eb45a4f41128019f32c3e12db76bac3a016151157226b2bcef1deaf4d3f987cfbfe37a2f66aca878373da6dc19bb1ad7219cb135bce8bbe621 SHA512 5c5b682a18a90929f829dfdc96ed616d73077e112c62e3003f8f085890562cd59d5d3a4d86f500fdfac39942214b505aeb55c4bacc66e9f4ae6f12230c02ebb7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3323745 BLAKE2B 4ec352e370fcf8077c1d5b870c5db6ed46198e39e95635751a008255aced52fe81ec0796ab0eeeda618811ae1dcd13f272a8eb0648721c0dac085e4fdaeedc2e SHA512 a2b12f909358aa691664f046cc83945298f3df6f7b3bffabcc56c9d6d50f43ed31c6fff8f517e63479bb160a8c12e8358fe42135394f2a15087113c595dac7cb
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fur.tar.gz 189256 BLAKE2B 97424ca9534d81a5662febedfbc13371d91e0a303df70d7fe7f04ac6a175e63e3a0340a1b948a0225a2d850302b150584ed51647c31941c8b3c054aa100079c1 SHA512 99108f9e5e4f7123da9f195b3e162762e9ae5126a714445c7c66636a11253352b7564c2f2c1e471df1c6c9a2d6b7403ec557a1140796276a2a41f46081ede8f4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fy.tar.gz 904717 BLAKE2B fc1b9c16f88ac5714476cd646bc3af7ffeed62e907e660330f1f95036d8cd7b0b258cfa21d218e17aec3841f8e0f7d02e1b2ce9ae373297115fcf23dfea9e203 SHA512 97035b7822c228d7a4bac02b159557c5fe87eaf205ca0225c2d1d4c99fbf3f3f8d4f87d4c5c0626defa2ca5e95e976cb28f59886f0f46f5adfb0b47b0e77a09c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz 725172 BLAKE2B 74a3321168d29829eda55490cdd566778e4edc6adb041264a9f523d094bb07f2334fe3bcc6d15d48d77b2a68f652d15b3ffa9ef02a8704905ea7867bb7b0d711 SHA512 8cd17c12cb6a319121a89e03878c2085a5a93295f3fb619d6c51cea36cef8f74e1e950ef9be820051a3577e476daea87263a6c97b0e8a8b04533715351ae40de
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1772296 BLAKE2B 6a18682f21444b7a82694e02db7bc712943efb7781562d43089768ccd83627d579bae2953800d8741478f350eb5548fd322ec15b92e12c18ba0dc5aaa268eaee SHA512 a3b66456f638d37c13f1b472683ab27dd84cbb5a76cf3c11711acf83f364b17f6f6c077602ff284a57041f8c729f03dce14f1f8688b0b84f157317cce07ac811
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2906540 BLAKE2B 2a934b9e338f04afc020a73f94eb9cff7e6e2bfb3267dca632c7969b437d48f607143e8471895f66a74a26a36a70d58488a4f04a74b45cd7fd7fdbd11e00986a SHA512 a2f185214e557240105ceb07ed12fd7dc81a089b82a5128d5526aa027f0fefdd859f2a865c054ba17614959464ae47a0b4d78ed32a5ef118d419507c0a0f019a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1304268 BLAKE2B ce7f11dbe4abbd17f51756c8b7a63ef1f99dfacc0e52f30278b03dbfbc8ed3873d489a4cb58cc5765dfc830c6c5ff1f520cb798da38464281fbc4537072aeadd SHA512 12eaed941c5f6a3d2e913495ff2bb2f39f4f54eae75564d4187b7b11df7999ae4beaebbc4fe60832ae4d6c25d64317f1b232537364613b71b8420e41ab9f494f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz 511900 BLAKE2B 6b27c6129383268c6373b61a1bf1a863328585e054b745d45ad55397364a5d4ac23da322c2c012141033593bfe0dd134dcf57e1461d1aa496bb219d56d9144c2 SHA512 960891127eb4123f280eb15575aa84be0007d2413b5b1260eac2d9c1fb15ce1ce056009b8f8d1bdb78bf19493935c17f7d1cbb06f0a24ef0abdf3198a739897c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_he.tar.gz 1683523 BLAKE2B 5276063aea94f4cec0fd4673936090fe1644b597674972c717d3bc3c3c83d79e15b43c85dd5ab9cf71a54f7428bebb8eba7564df410e584053a3c5698b4b86b7 SHA512 3d30de79de66573bdb0daf119b06d01ad8c23cf4d040441fa709dcf5aaf0ba63db43d540f68204ef0a1ef28ac276ddaf00006d2368ea63ace84d02078e73fb23
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz 562770 BLAKE2B 050233be546f9769b6469049882377d18e512ba2128f2196a9da0deeaae187e9ba56a5a1c7911b6d35f46e398294e117dcd111a68522b8e6d4b847c5603ba0be SHA512 89223ce8edf642f5a5ad60c361b46a470c2b78956014cbb9641e232c1d885bd5a6ffd96047e7f4f91443fe29740e1eca7b0196cd2366db9cafcd71e01d2beb38
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz 997958 BLAKE2B 12c02f951946531ebf67ed2512dbcb9b2330a350f4e59659133966c321213c07b8cec8114179d62f63628f70c16be0e80762522b6e61d83f057406372b464857 SHA512 59982be3056ad49df81d2f082c54c7bc4aeab33abd8881c25d612a420e34adde88ab8c8e4a24bbca7d709a8b11cd4f8798966955a136b038651bc46a118545ff
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 917980 BLAKE2B c55f8a1698f1e0843de243a053f3a5bbe838f67dd2857adaf7058375ab4269604e35f5057871f866f714644a0861794091950dc54a92bca3dc2f307fbe5e8793 SHA512 2add6d6ed6cc903b5d5705b2b8037153defe1fb83ee6d3953fbb8870afbf1c0be8ef34a1569add2a3888789c18df710739778566db6a3de2262dbc31d770ce3b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3315543 BLAKE2B b182b1fe04058b0aa1719fb651530a2f9e7ac7b9a959a08bd75cc1613c9ede10343fbdf9c832ea68dffed0a0bd581fc47570d506d4fe8412e353f8ec42f91512 SHA512 f33fcc3592f3fb9699ddd4f98a672928199724c970bbf04da2b3cb4d76bc3908f11afdaafd063f98da7b1d5f6934e518da1f6a98078d8fc6ca32752642511e2b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_id.tar.gz 1863194 BLAKE2B e5c9397ee8c340eb240e5985bfca6994cf9a152c2cb2a037e0c2c8a72648dd896872f054eb5c5f38b5a4ff979770b1eb3bcf3c3af3e0952c5485518c5cc308dd SHA512 e3466bc5b918910c8f9b6536f84c49965e22aebee0e62ff2f66e2ada7f0f869310c865f55fe1780a9c0eee1f39328942ef8375e2749061d5bf851fe38e3b0f2b
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_is.tar.gz 1539576 BLAKE2B f765c9519142b75db4f9642c4dde7577718c484cbdc106eddd18dfcdb0942ce36348adda8f9b03b5cfc10191533ad086a598a35930d0c28a7c62ea4ae3670b31 SHA512 11b47fb76851a786b6615c3c267d9f9b4b7fbb81446bead28454ad219fdbbb2345d4a3020e02999104c2d9b03137b4454ea0f51bfd4c14fd8c450ce46667d18f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_it.tar.gz 2354749 BLAKE2B 75984d4aa2b4eab130ef1075168bbb13be62efe68a20f398332ad70b939d051664284ae101aaa9023d8709b945b9c8274252a6878f3d8086cdfd3afdadfb6d93 SHA512 2958594b69fdfcebaba682d26cd5c37459870348fc3a724a5844005b41ca7f05d655aee394bfa6a1daa2c493495b50540de8366661c7fa0150b439fcff478297
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz 1012795 BLAKE2B fb45922db2810a8b4313314d8b51b0dc3aeeae3832ddf9f06d146751c9c5a2a01754f5d28f763e55f66a907f805fbea0816b63a30401f81e6cff78a019f48a2e SHA512 d3508a80a906455f5eae834fc22df220671afb0c618a4d758dd56e0aa8ed17cd41ee6b21f5141ccceff6a935e10b8436cdb0f0d226920459feee29fb2dbc1eeb
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz 401438 BLAKE2B cff0529d1fac86446880bdb4a49d103a3bae6bee421abd150d6ba03cd372c382b46372e2d73f8837fdfa32f9d50614eee3b664267f1a6f2b64e9e68ccfd85f03 SHA512 a075ca94e1dedc70466204530484697b65186bbd5d3f16568462e7e595155937f75350d140a71c8adc982b3fc411fecfa0f9482403e15905d778eb1bcd3f407f
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kab.tar.gz 638620 BLAKE2B 95a983cf895f29443fa3d23ff3bb2d9245693354f8b82dc8c2ebeaefa82d83e836fa018d666f69cd84a9ec3f52a806fac4ab27186a9d414a47d423c8a36d8b9d SHA512 db4fc64b7a24bfe61662e2661765d6e66e6ae72c5fde6a9e4d1ef358019af85b3f0d17deb9f11b8ddb201418b06bea694366d6ce81a2b4cf040cb8ec675068ae
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz 831980 BLAKE2B 8fe2650eca4e7d2df53c3f4037f1d5f8935b986fc9e6662fae22bf4165a559cbcbc895b553e96bab433da3f8b9a89a08bca48c480d426c1a53ffb7a0d2021866 SHA512 62f43cc24080bc10ecb3ffe142a46229bc70461cc50ce5e17cd8855bf780af1f0f38ecfa3a06ce82bb0e0623e8809ff1405696c2fdb2adb2e216a73fe1dd1534
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_km.tar.gz 823771 BLAKE2B 4e9340dd412b79c5078b0bc8b9fe61e754ee8e37cf23af07458d9479baa58bdcc8e9459039c6ee52ff1a62538b072f3f2f9417701903456936ae383feae5debc SHA512 73fc3099226e497caeeb47874bd76972afa60d421f7fd83c1153340889141c87a6a57b85300bf2d3d08053e72209d79218f2ca7ca4cfe08baa7978b7c38d2116
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 335449 BLAKE2B b427c5734ecc6306ef824a1c92a44a1279e9c94bde684fedbc9df401f373cbdfcd601cb86c8568d6320796043539e882c7e7fbc333d50f23ffc2e2b2b97107e2 SHA512 5063b478b65e8b765530d0db787922a8d1d1533a52710fa5b63184d7c9ee2d16673c70cba169761c919606de1763900bf2e4f637ed429480a6eb5ae21b7b2ba4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz 573122 BLAKE2B c7f2d610d565f0dd99db025e4d681248ad42786437b7dd491b63a934ff436ceffcc5b68a5c0bb7cd3f7c7a22a8fd7de811848972027baa8f78a69721fa2ee9e0 SHA512 70d90bf40bfb7473693ed07f30d9fed18bc50515793f83e5ba1fc7defe21c7820a54ade854b35137962c563200e088e38475f361f90cf817c8d40fc5f39f1d9c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz 1702048 BLAKE2B 8488c1a1cb3a480f1e0c4af8f6b12d9c26e5c233665bcd3dbf608bcf961b3cec7c3cd49367c38de64e40e71115f1338b3791848aa9ecbe7a60e8fe1b98168ddd SHA512 c590577bd5c8e3c962e2fd90f43c52c3f46e1a09995bc18f64e370a3d4d576455e56b066c5df6400ea391930920ea301382a10eaa7a1ac2c79537d9a837f870d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz 409554 BLAKE2B ea83ef79507c123890e8c959de6f6f0f6897ea191fec1cbb1ad43b64a794629c13a72886e332982317238ff16ac3b62c30ed58958928e9c4bf39d22813758e77 SHA512 b3123bb0368bf4d2cffa14bb70997bc4ac3fc7402d2f42691b3891d937b9fc0e014cf71a358995fe696f34882a72de08f9c04680dd18403dc2f03a662db42c59
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz 330060 BLAKE2B ca534ed28cb3fe92e76b563e0a834d40becbbdd4ad795a403051c04777ebcd67d2263f195cfaf5de57feadc85de928bd0322bd1fa3c1afd6df7ba8af8515645a SHA512 b3cfebaba21e9a5a1361ad996e1517125ce96aebfe3c01b0cb0bc2ef187fc199bba1ead93f08c56b86fafc3ae2198e120abddd905d8ce244f625ce45eb03d2f4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz 147817 BLAKE2B f73c2a9bd183d4bdab201435c0919cf9ac97f24ee9243548ca8130702e6e40b817fe908ed714cf14cb120e74d72bbe6776773f62c1fd806b4b2d8869f8e57760 SHA512 d5c56a70735a00edf9acbad75547b15db26522a2eb89e1e864fea34ecbccf0e571d16f596514ff27fcef3c1da51c895758292f4c888342f7cd39d9542bfc35b4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz 433323 BLAKE2B 8c2af0c208941f944652208c0b2bf5befb6a67a9e1ae19f767a6506db86b86c586f050a67becd765507e3e299fd4cc658dd31ec7af1803bb840e031614f2372d SHA512 e793542746a390e6f339eec346db51ba03c898637cce3ace5ed059b7183da86be32e6772a79c54e2abbf7632110c3656ae816507124b2464cd98a573b67d3741
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1247924 BLAKE2B f55fde6a93e81a53d9966471d8953ed02000c2aadeeb0e678411b941777c6384e8d047ddc53ae254e3981eeeffb5ab11edf2d8763dd40eb60379b68913447869 SHA512 987b3e8b11ce017937cf31a9952de7b7b6264147b9eaf5d9502716a056de651f4dd90501c0b5ca38330e699778774dd9970bb14a3cafce85f74ed867e2b5ee15
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1176593 BLAKE2B fdbed18a6605eed05605ac0a32da3e7e6aad1111ad95ebc8f8bfd9e3fa180df4edbf125f10afa626dadd9e9b3f00405ae62c8a9213d7958b33456f6eebca7fb5 SHA512 7bd017c88ef5f5495f1d91020b0565e8b7c3c9f57eaaf3b285751d007bf4bc1c05fe79c491064743c45784b66b96129e5180c24eacd91fa494771bf6f9122f53
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz 331245 BLAKE2B ef61c85f4afb1ee389bab9e523188b223ea1d27d6f5d065becec3d14744209e39437432e86a791bf14ed4154fb1378700e6e85fc67828b51604f53c5b00d77c7 SHA512 60c7aded065a014bb7a6138ea5151a784d128487c2db1649ea07d0797ab1f10ae7b559655790f6cbdd04535e53cf00f743f5fddf25904af788c5704883bcb93a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz 485544 BLAKE2B 284bebc444ddf2cd70dbc2d70327a2f57872c78e0f643b1a35f1761e06c92c6258068b5bafc6df346f6939e01b798b0da4ee04ef138b51f5192fbdbdcf94c795 SHA512 a1af89a0727668d4eeb6fc430396cea12838cbdcda0010a11b4bb46746e54ebe0dee826144734385c8faee9f5f820f933340477c8e73885f1f389d3d3234b5a6
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz 532757 BLAKE2B da697125ee88200e2d80cf26f22467ec5ea1625bd00b58f09401278e036251c90c465888e80e28b76a60b9267a19ad7388f7c53b31852a42ef9793b9fa589ba3 SHA512 fe540818d1306735588c79d176c31782512cf9639654ecf2d042f33d2a46e39e793803159a7a46e304a2007dc6e50eb8da4450755dc01f57ca1a583d044623f3
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz 691857 BLAKE2B 042173917c0dc007d5c34c888241c91c41861ab2b626b197f058e5ecd09bfd94aff01446103d47a3308b3083a3fbc95c25984afd2b4cedebe9e0313ea8f627c9 SHA512 332b64cdb79120741c778ab37cfb23b2ddd261afb7a74c6a3c9e6c78f128bba1dca1e4785aaf3fb8180bdbf56b40e37d0231168a83cdbad2e1dff8940458792a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz 398744 BLAKE2B f9043b9bdf4ba251b94fe2c7a5e014afcd30de04af16b2f4f041349278f9500f1736680e114042f6c7a876af5edbfaa028decaf4fa55ae4be3bec719db487c2a SHA512 98008945ad877c220b8dc9eb39be86712212d6450596eea36503ca0340590cb82a63f318e359f02fcc1bf16221e1d8b873cb4adfe36025fadc37ba07fd491acd
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz 567849 BLAKE2B 654a5d76fc27e3b713436279222b71cda7e65849dfeee6f451bbc6576afd62cab9395cc649714856c0d55e21105e107d9dadfd6d88715ee21a907b56c8851f9f SHA512 9a7b19b193ada7f7a9e6ad747248d95a42a9729fc3892729eb745cca94c714b12ef93f8b41071af1175824d4991787fc52190d436445889aa32a8a1b10dd5edc
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_my.tar.gz 458259 BLAKE2B a8462ea9b049c0c4ce22c769390cafa15d3e0da2cda024eb9e6c5a2855d1082e602a3cdba32d00d8905eeb6686c71c07bdc0c5ad7972a0bffa9dc4a9f039fe3d SHA512 cfc0b880dca02509a86971be19e0887f33aced4ba5877762316507b6f5caa36b1ef5806ac81f6aedb5c85988af9ac4ab0ad6c3b2309d263ec997ff866927a286
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4348304 BLAKE2B 4a472f9be3ed78e1dde62de470ec975a09323acde0f7e08d470c3225dff6d96601a5e2438f355431f1ae4ec0d738750729ad2c17c312085416d4b82b6a60e1db SHA512 fa525cb5fb2e9d391bf841cd930aa8b69114911e38fc143404bdb07768c3236b4fc4c16e46909d7967141e6460f937aa78ae95aa5e1f396a90e0b9c71d87fd6d
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz 948964 BLAKE2B d0216e6fe9415de6b997cd72a5ebf0ef59a584ccc339106482ebff16cdf2a0f4fbfa40c8470cc97a35c22c0356e40b393b07ad7e5cedfd1e4c48e1afeb16e060 SHA512 62a6429fbf911c7c8b21c4ddcc57ad499cf3439b4b8d30d765faa4c8cc89ed25cc239117e4cdaa523ddce9521b7faa6a4e8bd9178865bd647ae2a6d06713de85
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1811192 BLAKE2B a2940fcef4db6dede2573c86cf24f8fc802013fc87b7be07e19313b642a9738fe554d46619e872e9dba6b5eceb11747abfe0e0ad00d3bd651db69078576cd20b SHA512 c4e114e2854a49388a97faa74fc901b2cc26ddf8c09de711e9a850492208174b5137efd2e734260addd3c34a5c82ac0e03346105f7bb9e525a2df5183d703da2
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4350348 BLAKE2B a0b0cd4ffc472a2fc0e95e60d54d6abea66e6104ffeb12b3b62def5ecc7bfdf73e9e3badc3397811a66add758c0048b9baf622458deef2f09523b3683ab0664f SHA512 a6b26eb0b37d856a29ebbef2d983403729ae06e2a6d682f781a9d933263ed752ae5e133ea1b3e189d30b34c3acf4d1013afcec9ec467b2bc9254ef7eeec5c899
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz 278971 BLAKE2B a7750d82b386ff4dc0a069993df560068b1ed08c95a5525a2456e09c3324e95e6c22118468e1a7b3ba6233a18ff55c3dd6e1d1b54f8efce248eca0f776e92d0e SHA512 aa8d6345457693ad5a37ae9affb010eb23efcf75390c10e353ffe23bc36e0bf86e450a853563d30d9c93652454bef3c106315b8ec08e07f3096be388d01a4e32
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz 321641 BLAKE2B 1ab643295c2f033b9db70a1bbfe0be76f64a7989b3ceaafcabf2545e1a99fe8e02173a07ced0cf3a6e35787bc507eb178e0442f91bcdb98cb3b3969940b828b9 SHA512 eae1ee27f3fd238ba872cacd9d3b70b550062293861ae0d1e14618073b0046e67a82267412ce8435d9c72bb9209e1df557f17fffb9931fdfa324332bb7859969
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz 1324939 BLAKE2B 0b57c41183a41cc954bfda8f5b750faf1694be2996afd8bb5d1d02c64f95b335b6f0ca8b89b8fbb04908ec341f3f3fc89fa1d557ef1c923e02aadb966c14cab2 SHA512 1c3e1a1493921badf74e08ee92b887516420bda6bb5b4d25869d001ba44f37cadaa4ba6d03462b35c859be29efe1860399fce7eeaeb485b0afd98f3da3772059
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_om.tar.gz 486991 BLAKE2B 85f7f4045a364f31557d3efa24105552f67ac9f0c3e0b31f6f0f067b4d1276acc139dd0f4fd8a746fddc76286eb3afc14e33224fa56d4c3920af5cc7586d0662 SHA512 9cb2191f547fc318c9f6df4f44b7fd0d92fe49f8e8d0ef54af0224de639837a096725406113263fe14ad878a9e60c962452f7f01088f3474cdeb5bc98767e675
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_or.tar.gz 587674 BLAKE2B c98a96b8c8032ee9f729fcc6ec1ce974e10e3f1654e5b80cc04ec29adc5ff55b56f5956af520245ff55651da00f92773c92890fc0756656e5b7e7b0be0a0782f SHA512 2c73d600fbef7ac2813ad94d2bd8a093735a6af939f196a1827f622579680b33f5b84f53bebdddaeabd6d4fe129cdbbc561189d47b701b0bac556101a747d0ee
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 483935 BLAKE2B 05db66422cdf455c95e51f3da1595dc4ebb0cb162d811c97164fc99629f249fdee1027d8fd599762005a5dbc878613952534ced98ddee3f8f2ac59fb1cc932e7 SHA512 3845b5ff0b1c1d1d0298c57938cc29bc8b733cbf7a1a74f014e36ccdc9b8b4593151461ea04411932a5daefe9901e33d11e046e5b08df23b218cbb707f1384a0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3381370 BLAKE2B 485077d5185fa2ad0d1e971274996a8561296ad6d77c4ee925c08e92228a996729f2ba25919852ce25aec20ea00548b8cb4c08c79fc25c38ce7950e74804b71d SHA512 945dd9c48bbfb6ca690e97e390d73138dd973a2b041ab29e2e19d47b7a4f26cf6c9187c7cfb1d2a7b7e01db1f047c3a2863af6dacb019c952031481ef235e7b2
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 3096488 BLAKE2B 5dec2431788c8c514594e7ad2d7e9d90c9f8283871a114b61d2cbc301a20fa00a32e9590f8a5f6263a60a5654874e0d85518d992f113ed551983947490363a1d SHA512 6ed1aacde96269d4f2292b0f7fae91ebdcf33789b130ea0941ca98e664c49e70cae385c12673156bcedf2d210eb4ceaa3dab80325b82a5c3581d03edec0608b3
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2642198 BLAKE2B 29ee60b284aea56aa150010d9bbf9d8ee005c51926ce0d4a4e3ab2d2810bc7331566e2004d1b1f2aef1a1fecbaa59b5b27261ccf78774e680814b01896f1761e SHA512 bea1275db397bbe35c5df5060cd0c66c2cbb89e8e694edb30b1869bc58aeb5bee2de5a3e758a049da03d6b286ec463c8f38e561cbecda1b256a03b33d6ad69ec
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2510927 BLAKE2B 3917104fd59d0998b2afb029986e5009c1d20980423155cd1972ec2dd1353c123eba4619932160b7017f7947edb9a6c458fe811358f19a9c20dfa8af33cd85e5 SHA512 4efe8d255148f00c54fd111215162f45a5c79c606696b850f568f0bdffd80c43b2886f178811e32dfd7fda55506aa00efa8c8c93114c4b9f54cdde001959eaca
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2362908 BLAKE2B 3747293b288dbab77a75e45072ae677c9b287950217cf0df9703a9cbbbcc251254d7b870b8be92259f24d27807ffb15b8c871c22f38ad5a6ed5f5c02c6886f0f SHA512 860da5e92f015d051448a1627835533cef7e8ff7d7f92cc1bbd36607bc95b07c4ad7b88328ddd7f47e85f1b79298ada1f9447a6048fd7f0fa4be4f7dbb54e1ca
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz 346167 BLAKE2B 9979a5fe4374d5add9e2ccf56419e94ee78863fb92cb6942445c1e772e740447466ef1ebeea3afc161498092c09983bcb0287783eb17958a4f57218eeb2b7544 SHA512 f7b981478d112811bdf8f5ed6cf0a28c913cd34badb16bf0ea53e8307d967d50a9fac78d24255379ea4803f0e8dfe79ad7defd845571998ec4788d431199eee6
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 445273 BLAKE2B 06e9bfb98f15ea75e51f6ed289d5131924a00575e082331e8cf1afbe4f9d0e7b7ad1f127e113288b0e4c7c62606b7652f79dbc19c45d00b7488ba61e385e9457 SHA512 e9dd396b90ddf1c173c5ab5b009e5b16dac036cf999f65f46c031f1399bcbe0b8a227665ec687e29b5fe608a392418f3b7100160ae0e2d5055f2a0cf1bcf1950
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz 512588 BLAKE2B a30130b42c7c4f77b5fc29e646284d837f6c64138634f27aeae79db83aa126596b12763f854b9460f99bdd8883f85a8a304ae059d8faf6dafded45cefab7c335 SHA512 fc47caa4f1036847a990e3f634a10160ec43a8e9b5dc5fe43eb043037e1c3e7d2d9b4321041c1fe57bfc5aa1c3da0988487887bfe848d0dea7bec6cafa669996
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz 433036 BLAKE2B be45e69dbaf91ee61ebdf9c02bb567c3c460740f51ef1035a4f226dab747672301101abde6e84986d57b58d77b1574b779f27af7cc0234b27e40593f4940a05b SHA512 8de243f7135ec5a188653f505c9e60d8fc57c3906a6aa78e601ca36ee8a84f9459dcbcc0b72717373c6cd077ccef7dd75ea5980cdba732bfdc7061e2fcf5b927
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_si.tar.gz 754599 BLAKE2B c67b66e1a4b93b5be74284af42a0f6bdb1bdf085cd33b7b425d04d0ad6d28c32a3ff45c8e2d20e74d55c005b049ec78b50c7cddfe7f42bc0a4cec4ef08e86014 SHA512 c5f69ae422e24ef361868460d8590b08aad23bc4ddfd3b84aa0d2567f033c9d66187ae1c787069597288bf9b9894eadb1ee209e79cbbedb3069f9a1f4a50d655
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz 522376 BLAKE2B b791d76eaa73044740147b8af7ffc80708ae7bb47cc6a9ce27ffc0d12d3eba448a2ba56cb83b7881554ae0c1e66b8517a684291e6a4804fde2b264ca8d348a23 SHA512 c891a974184579c14cbccca549e94a229d024914ebd498a1cec4cc40ba919ac321b7ed1d1282b1e37d08477164de1f1e0a3e2ea0d366cda28f33ae6a3fddeef5
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2359019 BLAKE2B cc02222a30862f7dcef6004cac3a397a2753f425a7c9220e3b8ec2aea2446547f3401ec94924e2d6134a67a3713ac3501ac51b3355f638d8977bd93d1db0ff2b SHA512 6eb0f05471eb320fdf88959fb6b4c959d13241efb8546348a448391a23557fb2aa8a79c352344e3e0740253850e200ed3886795afed96fe1bfbeefe982d12b26
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2764153 BLAKE2B 6784101aa8809ee9b385fb13fc7307938dfec1fc350b70869003052d8db987ea72813e5184af04722c99cab99991fe8744088b2feabccfd26210848007a15273 SHA512 60cdf21b5ebc1cee795d5c5eaa1b5ec14fdfe7b2ae74faebe689bba8962beabdaf4633cd71687b317d2341680865c1131c02c38d60ae1ae86a263b503de627c1
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1166405 BLAKE2B 96d5156b5e3917aff6d6511746c85ed4b3f5c6137f6688d053b4e93a70da03acc9cea6ac834dcf12df051eedb55e7d0e5cbe3407d6ea810705bfbafcb143c337 SHA512 8b5d58be122ddc1a6325de220b65966fe2b70958bf23312e8a617cc1228c34d2ad370220099b44530c2471b8bb645379b3233bee3411a737135d7f8aa9649400
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2406932 BLAKE2B 4e5eaca3ef19f73f47f3bc4258a1a7b1c6a5489b3ae6d9b8931b52ce8750bb92dd5714e644b548c742f58992768fa8efd8fe6239aadb5378269d63a7de58249a SHA512 739e2ad831853502d988f7f096654caf85fef6a07f41abac2ed3d164bed0a0fb2251e914f72d8f716c05b4a8709b6a5e71edef1d9cb7b1107c5b1db167d1411a
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2775905 BLAKE2B 12a3d072a5d0762256b7407dc304d5440920f3ac9fa64e92bb8df38653e123ba6a0b9ea57a9776720f715eaddec7e95b14a4d5f5cc1dea839f4f3a28b4af3d99 SHA512 b2658fddbb2703e1716021710b0c58b83c80b2b3eaa693d9f86cb9deebb4d6abd393ee766cbe96209d1bbe0df3af835a0e6759abef330423b5cb185fcbef2222
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz 286876 BLAKE2B bfcc2f5fbfa1bd25b428851409ca467d294fdcac50871d42406fa295ce6ab4bb384ed096109e6878c2f022ea0a0a579dbfbc8017b6bd0b3ddfcc92540baa6f69 SHA512 578e935fb5ad41c56542e08393b16913d18ffdc22db44afcdb127a282273754c852e06a83681ae6f89576822c17532f72e9eb4bb6e8585de2612ad41d1263822
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_st.tar.gz 280611 BLAKE2B 908a5df42b5842f5a73320dacb39cbb0e72d53a39282ccca6dc33f72fd752241fbb3282206cf977d23f05eee272377166e685275adfe1dfb899c02dce2ce50dc SHA512 7b8969385cac24f62d565914e3cf5f391d288fade2192d5a07f2bdcc5adea276728bda1958c16438d8ee7f424691d0d9020385756106fb084e607983729c12fc
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2836773 BLAKE2B 72f549397f86ca318f88ad668fed182b522d41ad977e07dcb1c5c9402b7f0e50b72f8a3d745b5f53ea11a583b4bc3932c856a652f20d9fa09b83b294a4370319 SHA512 bffd5bde4cbcda117e8a3bb59e336fc828427a8efdcb0976f65f3b41d7e698eb88ee4b14a69ee361afac5cd40d0f08809e7bfe7d9693cc8da68e883b43b8ef58
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 318522 BLAKE2B 1f76c32ae44a13b12591d2c0da30f6a166065d8c47886bbea228bc35937a9ac61e7576e6332db55d86e02c83f2c86ab3fa1ecb62ef3dc1d1b6e9d6f0ea6f0c17 SHA512 e6cbc1649ca527164afba823a49a8daca47d9bef30ca471cf03c37d37b76c537ab17b5d5cff10bc3a0c99bf4c2e9505981b9cf27c02d2521d6e9661172e9ade4
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_szl.tar.gz 734428 BLAKE2B 96a95ec3438013b1156db238849080f998abb06e16b96ecdb2f9bbffc744a37c20803d8ce43472e61308e04e20ab45ae8f41dcb9e5244a78c044263d12bac69b SHA512 a9f39c296f6db1ab2b5289b5be3bde2f119629a153e6d9258084b73e8c1f9834fab16e16c883d599790895b76785c650b4fb405f43c1390e0935fea4583e1ad7
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz 731117 BLAKE2B d1d077b7c1b08047c1c8e53ee6fbc9ed5a05f770606cf7a7df01d00de1baa8c219d28b93c56606e690cb197d360ef8e4e915976232724e8524f08f4744812cd2 SHA512 25f520dc9130fdd20ccbddcbb2d98c67fbfb86515ba06647220f47ea5352759d32b6ec9b04ffe4fc2cab0c37ae970dfe15f43fb4d9eded80af7b9a3cf5a0ab95
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_te.tar.gz 1077497 BLAKE2B ecaa3360463704ca1c7ec44307a8cbc9523f49923fc51b30f6eb484cbb1be847ea991a40aa00001a98742ab7c6989aaa019367daea8c529aee21ece491e1afac SHA512 265d44eb6281cf4587b0be8990c90a35b993a4b4b53485faa115b7518be6992ba4c5e11820c87e7cd3a72d214dbb4b51625c841ac840db4e3a3a1a9b59fc0fe2
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz 390927 BLAKE2B 8bff8c44c5ce58233593caa4d048222d9db48d99510232e930c7d885078ca300f7fe544c4eb0989a833d3bffc9199b0d26f3763dd7b02591aa3896b8ba5efdff SHA512 8a6bbe91f27ecdaebbc4bfd715e7758814abad5ee6f21d9f9ecdfb2eff0e7ea58b1e4a574d6b6f4e12a7285c2f8839fe545dc052d5380d6b1d5510e727ff5084
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_th.tar.gz 740612 BLAKE2B 371b6e9a6553c05651286859ef0d0823d1dc9b184105592927d21070d88b100ea9bedbf4402dce89664e6f452e6d15ea018438c943f986adb10ad2cb11bcf101 SHA512 68343aa05c80d897b0686177c62b56c13a95e886784d4ed8b618162cba00ee18b73e6dcf51a924ce78816baf4a00b69a690e71db76186e9c523f7568fe611ff3
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz 260591 BLAKE2B 86dd883055ee036008f98f84eebee6f71adb8f6706e14e7764487df7b96657c28e5bf53d9ed6efbf18e2caf8495f0c53c96bd5fa9f739d7d08f60204566c9fa7 SHA512 ebc8cb2cfd00960365169be2e5a82722abad2e44e428b00985696b7f85e01773e68ebc2bf7e8c02e7d40bbf0673bac86f3d96e9b263963460cc596ad35390d21
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3331505 BLAKE2B 89a5c60e582b1bfdb32fe16645feb6d5ca18781dcf0dc78c9ef257b6758d3961be33c4cd99998421de3d2a39aee362b20dc5732b4d289a0cd36960bd6bf98d49 SHA512 ef92c3b19be9c2e0f15eb51e66b196c027098ff25d434137addfb0a0503c319f5ffe17e2a9f0188f3c6b59256bee729a0a057d8a99bc03b95aaf6f72c311f4b1
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz 278254 BLAKE2B c0507b5caa6fe99be861d43faff903a1d5700e317086ad88867d12994df9a40a7634af0d4d9dde6c419e5580b14a16befef68967d58e0943fb07b095b3972b16 SHA512 6a930833575ea1a8d9210a95bce27ad22aa2e1424731a4be7f73f0f9871ce6d05b403e245438f9f0032cbd9410c6628fc10b1e1a4de82d472e3ccf692ff31926
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz 187194 BLAKE2B ce154641bbf9731ebb1b73ead539ad04901abcaa8e87ef8ee4e6192d5e091bf6d6d5a566c7df473f3a66928e4ec777ff4fa1987cc19f978ea3618bc1a084045a SHA512 91912d260b7c55320e388f4d055a8b3e3be0b4234d74b7f63c889efce2aad64b19b23f1fcf17e571ca750fa944a228c6b403d3852d962d69224a1c94e40bf65c
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz 541047 BLAKE2B 9d7fd1c26a503a64af397ca2cd016c5a8d027014d4e404cc35f22ed49c8fb08e2cc4bb8cbbbc032ce315de6b0201e742f7df782381f232ffbee9d08c188619d5 SHA512 c90cf4d8239f963194ceee2d1766f3a9bdd01c38f99a42841f4805be1dc53cb866a66b98f5e1b1876532058844c1d0e20c3c15da9cf2f531a109f3f6cf874ff5
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz 2857703 BLAKE2B 6c2229a7dc2550635a70b900cd98c1c29f874a343fdc7513db6c5eefe03ad88f6a8fe92c537e636e320b11777f58eeed2b3d3b1741da7997b9a56efa1cb6b4c5 SHA512 c88d020502ad09cf95d6ed499982ad99ab080fdfe31f11c27a0279cb6cd6355c8931b3bfb7e9dd50cbd00ec07e42a0f74589c892c350d954c23a8e315ca0034e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz 314405 BLAKE2B b368c638e3ed29ed7c4610bfc9d11daad65ac91ce040bd21812bdfb977117ba2ab3f8d215180adf9122f89a19acfa28674647cc05a0e9871388ae7f4e08664c6 SHA512 3ec5ea964114c4f60aa4437b8559651b057f7d983de4b5176bd3f82265972096b996eeb3d8b6bcfe503da383a4361f7683674ada888bd711d4c50c7504e58c91
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz 283536 BLAKE2B 1424f8f861aa730444d3f488bb3a3495119a6bd51832406b8a298b60165e042047590256b176e357a47b9ce7662182aff3789d739767f75ee31ab81e76109456 SHA512 ea4fd3bd5390f0c890ba759f0e95adc2e99c3dc07b72a1350458a51fb392304bce924e9a49fadd26bd03a4320d8cc9b1764b27985d61ab85d169d93d47352e0e
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vec.tar.gz 755966 BLAKE2B 58928eec376505a37448c9e3116d7be8475ea1ce434c00861f11890bdf99e7e863d1285bf8fa0e57b7a2f1104de97d45b8a0c499235953e3ef238978c4626b06 SHA512 d2e1279782190c1bdebfde81717f5cc0be2ca7fdeb1d13b91ecafd68f780bf778ca481354d2009e27c4fa4c906038ae0ecec3b49f344fe1438f194a8de5546e0
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz 567291 BLAKE2B 5f3f535736152ac1b104942c3fb0a3f60edd71cd4c2ade78d3873677ba92084b38ece90548f45bc1caa925fb2c035a2e0d3d170888163fe944f3fae7c063879e SHA512 f44856e89d5a17633cdd0a5b0e0f3ebd38c80cc3b62a7b7f2ebd7cf617f6dc5ef65db6174edeeedbb3b7a56ed3ea97e2301bb0b8dbcbf990e64f3942b64c3bd8
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz 290386 BLAKE2B 8c2e1622d5a414d983418a35ae5fc93f79dfcb7a1626f65b0be9d99eff5d9fe0abb5d2dec58134e3306efd15ab70fb9eaf7511795032c6b7261cc0be0820acf6 SHA512 8db68f9678b22b607bb11c21157dc63ab8af865d135d179e00a9c9dc22060c0b7945a76a82e2f0e457ec654cb11c62235b6a492083eaf12eeb774266f56ddcb1
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1050281 BLAKE2B f8ccade1548c3fae80f5bdf9ddda683450b2e4e6c8dfb686c644ced739e69f8db6dd6251d71c5d2af5115b1e931c5a4c6b20215422c333f402d288b4524c00c2 SHA512 548ee731e3ff343b5c4c01d338e865c0e8d23f82bf34db04eb041cdb857a1247f29fabab31bc7a3872f67c615834c5312ae486a713c8e192552639aeabb8d4bb
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 987668 BLAKE2B 64780a374b7c10bc55e91425adf6b1d08e2ae2afb450088832ff9a646ea7b23431b8919e59525ce4161f6c28963844175031c5a03972c426e763051e54e7c6c4 SHA512 55c18b812d559512c725e0bcb42d9b36548ebac1054f6ee4d64d084757dcd371eb2b9e8c87ddae7a1c4cedbe862ef338c189292dcca60bfffb209638062ca639
+DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 319620 BLAKE2B 1adbb995324a146c0f5d009961a3bbded522394e08a5791dbbfccda6fad469ea11aaf73a9f876b862de5260eb75c354a4120c3f195b70102e31ab3a1d3dbe5c4 SHA512 a1a8bc2e7fcc14a47b493eef30062511b3eba4843d3b5f66d4f32e4b05d41a96e8d6d3a5f05bf4f5249b947e2a2d7e0f51df72612ccf3fcf3147d8bdd88e1852
 EBUILD libreoffice-l10n-7.1.3.2.ebuild 3686 BLAKE2B 92110978a07882d8a24f9ea24f30c0fb5109bda02508e5b8f93f3f2d440177519da9e28b392b7beaad2498dffb32982974317ba8bd8c68527b25e1ad9de93866 SHA512 a28a7b8109c8d863daba8f9cb3d7662fab4ef06b428cae0bb0567c6e13e8fdf7c76380f5b96aeb9d069593abf984c357f60fdf4ab65b8c17b51b5c305aee7a68
 EBUILD libreoffice-l10n-7.1.4.2.ebuild 3688 BLAKE2B ecd55ba287977b5d1a1e5b7f5b5f4337834da81bb08a4f7b490fdf5fe77d5810276234daaae0b7b52350d308fa71efc6b915af114c9c59d1b090aaf3d1187928 SHA512 84a8c639fdc7dde3cf1440c6f56188919ef34aa4cb7e549d9826ec52c5e0553b24cc9590b7a6d16534b2fd0cd72cdfe2fc1ee4d5390573439754b3062632a83d
+EBUILD libreoffice-l10n-7.1.5.2.ebuild 3688 BLAKE2B ecd55ba287977b5d1a1e5b7f5b5f4337834da81bb08a4f7b490fdf5fe77d5810276234daaae0b7b52350d308fa71efc6b915af114c9c59d1b090aaf3d1187928 SHA512 84a8c639fdc7dde3cf1440c6f56188919ef34aa4cb7e549d9826ec52c5e0553b24cc9590b7a6d16534b2fd0cd72cdfe2fc1ee4d5390573439754b3062632a83d
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.1.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.1.5.2.ebuild
new file mode 100644
index 000000000000..5356be44837b
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.1.5.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ar ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af as be br brx ckb cy dgo dsb fa fur fy ga gd gug hsb kab kk kmr-Latn kn kok ks lb mai ml mn mni mr my nr nso oc or pa:pa-IN rw sa:sa-IN sat sd sr-Latn sr ss st sw-TZ szl te th tn ts tt uz ve vec xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in l10n for some weird reason
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 50d65aeaf516..531ac7fa5d42 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,12 +23,15 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
 DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
+DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
 DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
+DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
-EBUILD libreoffice-7.1.3.2.ebuild 19601 BLAKE2B 16986ed9efe1ef7f36ea49e28523b01ade69adae78a6f093feddc00343b4ee0bf7e7b4a90894776f334af954cdb4b5702825838cf331b42cd9f10023db5d4d65 SHA512 3e6938b66c63c71063edff5663e2297fd4baebc9baae00fb3861f79c5919ebd2debc2cde99e61a98112899f673cc2d09afa54168cfa648ee2ba10c47b790c061
-EBUILD libreoffice-7.1.4.2.ebuild 19612 BLAKE2B 526428ed9d9678992bac63476cd973cb2a81cb33e169f2d7fe47a54f3469b141ab75f04af4750a7221a67e8a403f9860cc497072dbf8259aedbd25447993d0e1 SHA512 6acfaf9d821fed2fabcb9399d48c759b6219c81af8612e3b083b8fe22e887984c7f56bb705ad31560ed78a49cb105e8e4e34401eb7a21006ac0ece8a530db81b
-EBUILD libreoffice-7.1.9999.ebuild 19533 BLAKE2B a8188e1fed67316f27c43c98ee9ec5401c0c452aea17ee1d67be489d60cca8b6fb12738bfd3536e6f057e4ca329cf269ed4abd3f9ac2c27a4ff4955340b27454 SHA512 1ad4750417630ed56700da1ac658c9d65e71de7bc36155cf3e5be70fc747197912c77830c751603ee697ffe1e6dd26db96b7ed6579cac99e85b8ac8863841ae0
-EBUILD libreoffice-9999.ebuild 19517 BLAKE2B 409577c0d2592cffe177102833b3a2531846f65bd8cf78a8db077304e1f151d6d9b2fa73829bfa32a3244dd7037a180faadd4b94a749fb6ddcc15495a1fd53a6 SHA512 327c5140f8d5b852b0de3469a05cf43c9fc6b0184f6b671ea4b3116d3637400e6be990d3756fe334a937950f19b47559adb0317e8f9d7afdc344c3fc4af4da16
+EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740
+EBUILD libreoffice-7.1.4.2.ebuild 19604 BLAKE2B 5cfcaeb55d88132f18c70f268d0ca070a041a00c071dc46bca6b0bbac064841c5ce902c452ec9ca27e8d946f9c3fa1b8d9807279d11671130a253700ab62dc78 SHA512 653d02dd4736e98dd1584b9dc906381476d00476bc44a45ad575d5547ec93420bd4aaa8a414699831fe09d2b7b8a63460f9af219b9e0dd6a7bb2ea5e5933ebd7
+EBUILD libreoffice-7.1.5.2.ebuild 19609 BLAKE2B 83226e67fcd0f3fb54690687dcf0c8ee7426c1d97a9be7b4fcb3702752aa06ac3eb9d815b34d9614e758d920fee56ed5858a387261818d270bd04517a59d686b SHA512 cfd2da54051e21a35ff93999c14dd0fda841bc081d1398990a1674f820d3cd66a55bf50769f39e5bc97f76d21fd70e8ab9e9ed34af93baef4e539c2a90eeabaa
+EBUILD libreoffice-7.1.9999.ebuild 19530 BLAKE2B 200d1bd15a68070a7dc1f11a57bf06af8f4da3f1fddc77572e6ebb9dbcdf6e1cbf341c7232ec8b20d9ab5c35a800fc47c896df31c0534fc0ac9a33c72e05f97c SHA512 a3ddf9d003d4410c630afa09198e535ac774b49ab68a57512d814c0574cc2a602ee106d7aa1e67f9ed81f00b7ccdd3e94db25eee76eb133b05a380242650a634
+EBUILD libreoffice-9999.ebuild 19514 BLAKE2B 1e87e2b25207d53d88727d2347b853ca778f791c83220fc52d4563e8ddbf1267d0e0e3d587e39ad997d8f6351330ec78a4369756f15059cb0a6821bb83e96b0e SHA512 445c191747de6e1000ccad00f5ba7981e28ff113eb11490f15a417aae40042d94eec748f0f40ff56c38b97e05690604b2427e4ce2c04c96364bc6563ea4e49eb
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 83fd2fd63bfe..8a1c3cfb7d65 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 	)
 	bluetooth? (
 		dev-libs/glib:2
diff --git a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
index e90810957e90..23d791513de9 100644
--- a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 	)
 	bluetooth? (
 		dev-libs/glib:2
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
new file mode 100644
index 000000000000..c44dee00e18b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -0,0 +1,664 @@
+# 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(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+	"${ADDONS_URI}/dtoa-20180411.tgz"
+	# not packaged in Gentoo, https://skia.org/
+	"${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+	# QR code generating library for >=libreoffice-6.4, bug #691740
+	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.16
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	clang? (
+		|| (
+			(	sys-devel/clang:12
+				sys-devel/llvm:12
+				=sys-devel/lld-12*	)
+			(	sys-devel/clang:11
+				sys-devel/llvm:11
+				=sys-devel/lld-11*	)
+			(	sys-devel/clang:10
+				sys-devel/llvm:10
+				=sys-devel/lld-10*	)
+		)
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus[X] )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/1.5
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		|| (
+			dev-java/openjdk:11
+			dev-java/openjdk-bin:11
+		)
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+	# master branch
+	"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	if use x86; then
+		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+		elog "most notably Report Builder in LibreOffice Base, will not be available."
+		elog "See also: https://bugs.gentoo.org/785640"
+	else
+		use base ||
+			ewarn "If you plan to use Base application you must enable USE base."
+		use java ||
+			ewarn "Without USE java, several wizards are not going to be available."
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# Show flags set at the beginning
+	einfo "Preset CFLAGS:    ${CFLAGS}"
+	einfo "Preset LDFLAGS:   ${LDFLAGS}"
+
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		LDFLAGS+=" -fuse-ld=lld"
+	else
+		# Force gcc
+		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 use custom-cflags ; then
+		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+		elog "the build succeeds. Good luck!"
+	else
+		strip-flags
+	fi
+
+	export LO_CLANG_CC=${CC}
+	export LO_CLANG_CXX=${CXX}
+
+	# Show flags set at the end
+	einfo "  Used CFLAGS:    ${CFLAGS}"
+	einfo "  Used LDFLAGS:   ${LDFLAGS}"
+
+	# Ensure we use correct toolchain
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	if use vulkan && ! use clang ; then
+		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+	fi
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	# --without-system-qrcodegen: has no real build system and LO is the only user
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-vlc
+		--with-extra-buildid="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system_apache_commons
+		--without-system-sane
+		--without-system-qrcodegen
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable kde kf5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vulkan skia)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+		)
+		if has_version "dev-java/openjdk:11"; then
+			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+		elif has_version "dev-java/openjdk-bin:11"; then
+			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+		fi
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+
+	# bug 703474
+	insinto /usr/include
+	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
+}
+
+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/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index fb1bb2078177..7ce776f6f001 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 	)
 	bluetooth? (
 		dev-libs/glib:2
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
-		media-libs/mesa[egl]
+		media-libs/mesa[egl(+)]
 		x11-libs/gtk+:3[X]
 		x11-libs/pango
 	)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 51e4baf41b64..45f856b59db4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 	)
 	bluetooth? (
 		dev-libs/glib:2
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
-		media-libs/mesa[egl]
+		media-libs/mesa[egl(+)]
 		x11-libs/gtk+:3[X]
 		x11-libs/pango
 	)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 352f80203898..6657f2af0622 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,6 +3,6 @@ AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
-EBUILD scribus-1.5.7.ebuild 3989 BLAKE2B 4e038adf5f2fe3797e5d06db2a5ebcbc5fab1abc4290c8c500fec11759e4bb90cb7dce35f84a14085cef1caf5fa49b35a2a7f85f6365c899822f9c17c44d6488 SHA512 80890b92964d5f32eece3621c6c7f45308833753bbb2f8218f9f0e8ad3cfc1e0eabfdd28204b8ab5cc1a40c52ceda68568ed30db6aa43c1698bd0e5aee545a5a
-EBUILD scribus-9999.ebuild 3952 BLAKE2B 324e637c48bfa8d2d4c1b4f065e21263300df57ea11189f294b0121a1d1925678fcff30b36f5f75d23a2be455ee43a3f8845a326cef99c77cd5527bf54829146 SHA512 38c4ec22cbc9df9c3664bae7ff0e6131003b29da21e13956d04b7a3493e7ae0e7d3f05c025b303d9d51ce6f5a00fb5ad31be0808212413974e131937036933ec
+EBUILD scribus-1.5.7.ebuild 3981 BLAKE2B a1e9e67d0c942109d2270ffd4bda424176f695ed6ccc01b3b64aca1bf68ad5f08faa1f2ca2b6a079dd61263af860f8dac63678e8831705804e83a6fa685dc55d SHA512 97e876421064b7e3669e30af46f335a0e6755e196de579e0b062441819720c3edc7ec77039ce83a951c6de34689e1168be3ab66f53415a18732a801278b14bfa
+EBUILD scribus-9999.ebuild 3944 BLAKE2B 8153081fc91237f982398981ff2e23944d74f70ed0da082c322054458526179fe2b10600403eff6ffe1e14eaef3a27ed6795cc728766ba9ba6380a3bfa6d646a SHA512 a27f91f0a3a25857cc74d568faefdee64b1cd5cafaeac00b681cc87fda6e84a5fc378296a52a5175a45e63dc8c36db7f1ad8d0758bc0ef294f2c0ce254663d47
 MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index eebeed0651f5..67c6ac3aa058 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 xdg
 
@@ -62,7 +62,7 @@ DEPEND="${PYTHON_DEPS}
 	pdf? ( app-text/podofo:0= )
 	scripts? (
 		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 9a56ed6f282b..d3fee462bbaa 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 
@@ -64,7 +64,7 @@ DEPEND="${PYTHON_DEPS}
 	pdf? ( app-text/podofo:0= )
 	scripts? (
 		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 9be74cf17db9..c8c665de86b5 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,8 +1,3 @@
-AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dce164bc194aa49b7621188a701b057918a99ed377cd3467e8eec6b0c6988269454950a8750498fe0bb0bbf001eaf434221cfbe695cb SHA512 2296a42b907577f44e3b498ffa95cf1a1cc1dc729e340d3238b1e19796854d7405fbab888910f1f305a87477cdd40648a7bd2c5651f65bc642273ef4310df9a9
-AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3
-AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec
-AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5
-AUX texmacs-1.99.9-guile-remove-deprecated.patch 10877 BLAKE2B 7c33d89229e419958ebfd82a0b60680df04a12c84aa08d8e4a7e568f3dd2c70465244a295ef6457ef2ae21ffff7ee5be89be87ab2eefb7d7c79114054274e069 SHA512 0ce486bd51b382de80f12d08976d660d4b25d403488cc33534baee563e2641eaddd34009e13c514c5f36913ab31e3b05350f37ac470dce71052fc1d2399ed1d6
-DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
-EBUILD texmacs-1.99.11.ebuild 1696 BLAKE2B 0c256b8601bd9bf1e378fabc1264892b499f49cd188d9dcb5b4fa196ec2e45438cc8bc6e31e28b437767389071d670e68fee1cda679fa939cd06f697a9fb757b SHA512 116cd26a0a76b281073a86077a4630c51445d7f55bd2122cf75602849228866057f0129ff8e63593e67d74d37c1a0f1103e141f24d754f841cbcefe549cac37d
+DIST TeXmacs-2.1-src.tar.gz 35851289 BLAKE2B e29cf78d4c0f8b9d8bf89fd448775979efceaecd409c407bf66622cfa0e0aa166fe9a0abc146a282d71d989cdf03b21a8e17545a93196b868190ecb5fff3e993 SHA512 9e33bfb0a74ca6f6947cfa632adc162776083ae5e5ab46bc85fc8dac5e531457a2f888da5e552d6da39db16e543849a7b86f0fc6918b62e911d35ff725e47a2b
+EBUILD texmacs-2.1.ebuild 1332 BLAKE2B 2ce4ee726959e8db244b9494aa089ab6e8882d099e1b4a4ca0725c6a43d5b9562bd1c48325d38399f0770b479fed49f0b429ddad7dd48778875dbe55afd9fe2b SHA512 51d17a346aee52357286f949f4355e7772115ad1eb91ca5f8abf3690673b429082345154943437908415f7da71c57ff3e00a56ed0112e082b1eb4b52fa800458
 MISC metadata.xml 549 BLAKE2B fcf79150a49b13b5028b10439ea4c753fc3309dfe50a72d4a6953c47661ce5a27af0968bc186a1b412dabd2789fe108a12fadfad40b81c015f738765cfd1b45b SHA512 d3e0fb9a7a228d68910cf405d34eba1ffeff3f437a4d93dcea10a1871814140e1fc85508e9c7dfb06b8babbf3fef4ad70dc45ab5ec0a264b04898c73480df5b9
diff --git a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
deleted file mode 100644
index 45b08226f652..000000000000
--- a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove new/delete declarations, which cause problems with recent GCC versions:
-* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=590002
-
---- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-+++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-@@ -384,11 +384,6 @@
- void  operator delete (register void* ptr) throw();
- void* operator new[] (register size_t s) throw(std::bad_alloc);
- void  operator delete[] (register void* ptr) throw();
--#else
--void* operator new (register size_t s);
--void  operator delete (register void* ptr);
--void* operator new[] (register size_t s);
--void  operator delete[] (register void* ptr);
- #endif
- #endif // not defined NO_FAST_ALLOC
- 
diff --git a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
deleted file mode 100644
index 275f5571ebd8..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- TeXmacs/misc/mime/texmacs.desktop | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/TeXmacs/misc/mime/texmacs.desktop b/TeXmacs/misc/mime/texmacs.desktop
-index 493103c..cfd66b3 100644
---- a/TeXmacs/misc/mime/texmacs.desktop
-+++ b/TeXmacs/misc/mime/texmacs.desktop
-@@ -1,14 +1,9 @@
- [Desktop Entry]
- Name=GNU TeXmacs
- Comment=A structured wysiwyg scientific text editor
--BinaryPattern=texmacs
--Protocols=
- MimeType=text/x-texmacs;text/plain;text/x-tex;
- Exec=texmacs %f
- Icon=TeXmacs
--TerminalOptions=
--Path=
- Type=Application
--Terminal=0
--MapNotify=false
-+Terminal=false
- Categories=Education;Science;Math;
diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
deleted file mode 100644
index 3068169618fb..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-C compiler compiles this code for bot int-based and size_t-based
-guile. C++ compiler does not (and is what used by texmacs).
-
-https://bugs.gentoo.org/652054
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37e9e87..5de2711 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
- SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
- SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
- " _guile_str_size_test)
diff --git a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
deleted file mode 100644
index 006c92c2be33..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp
---- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp	2017-12-22 03:27:43.000000000 +0700
-+++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp	2017-12-22 16:44:35.052378917 +0700
-@@ -24,11 +24,4 @@
- inline int    sign (double x) { return x>0?1:x<0?-1:0; } 
- inline bool   fnull (double x, double approx) { return norm(x) <= approx; }
--#ifndef __SUNPRO_CC
--inline double pow (double x, int n) {
--  double r= 1.0;
--  while (n > 0) { r *= x; n--; }
--  return r; }
--#endif
--
- 
- #endif // defined MATH_UTIL_H
diff --git a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch b/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
deleted file mode 100644
index 183c771804fa..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-diff -Naruw TeXmacs-1.99.9-src.orig/CMakeLists.txt TeXmacs-1.99.9-src/CMakeLists.txt
---- TeXmacs-1.99.9-src.orig/CMakeLists.txt	2019-02-01 04:33:32.000000000 -0500
-+++ TeXmacs-1.99.9-src/CMakeLists.txt	2019-06-02 17:13:47.980498170 -0400
-@@ -274,7 +274,6 @@
- elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
-   set(CONFIG_GUILE_SERIAL "D")
-   set(GUILE_D 1)
--  set(SCM_SIZET size_t)
- else(Guile_VERSION_STRING VERSION_LESS 1.6)
-   message(ERROR "Not Guile serial A,B,C or D???")
- endif(Guile_VERSION_STRING VERSION_LESS 1.6)
-@@ -286,7 +285,7 @@
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig TeXmacs-1.99.9-src/src/CMakeLists.txt.orig
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.orig	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,32 @@
-+
-+add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
-+
-+add_executable (${TeXmacs_binary_name}
-+  ./Texmacs/Texmacs/texmacs.cpp
-+)
-+
-+target_link_libraries (${TeXmacs_binary_name}
-+  texmacs_body
-+  ${TeXmacs_Libraries}
-+)
-+
-+if (APPLE)
-+  set(MACOSX_BUNDLE_DISPLAY_NAME TeXmacs)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    MACOSX_BUNDLE TRUE
-+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+else (APPLE)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+  install (TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
-+endif (APPLE)
-+
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej TeXmacs-1.99.9-src/src/CMakeLists.txt.rej
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.rej	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,19 @@
-+--- CMakeLists.txt	(revision 11761)
-++++ CMakeLists.txt	(working copy)
-+@@ -274,7 +274,6 @@
-+ elseif (Guile_VERSION_STRING VERSION_LESS 3.0)
-+   set (CONFIG_GUILE_SERIAL "D")
-+   set (GUILE_D 1)
-+-  set (SCM_SIZET size_t)
-+ else (Guile_VERSION_STRING VERSION_LESS 1.6)
-+   message (ERROR "Not Guile serial A,B,C or D???")
-+ endif (Guile_VERSION_STRING VERSION_LESS 1.6)
-+@@ -286,7 +285,7 @@
-+ 
-+ message (STATUS "Checking the size_t of guile strings")
-+ 
-+-check_c_source_compiles ("
-++check_cxx_source_compiles ("
-+ #include <guile/gh.h>
-+ #include <libguile.h>
-+ void print_string (SCM s) {
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp	2018-03-23 08:44:53.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp	2019-06-02 17:13:10.420604916 -0400
-@@ -85,19 +85,34 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_file (char *file) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_primitive_load, file,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_primitive_load, file,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   file, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_file (char *file) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-                              (scm_t_catch_handler) TeXmacs_catcher, file);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-+                      (scm_t_catch_handler) TeXmacs_catcher, file, NULL, NULL);
-+
-+#endif
-+
-+#else
-   return 	scm_c_primitive_load (file);										 
- #endif
- }
-@@ -121,19 +136,33 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_string (char *s) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_eval_string, s,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_eval_string, s,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   s, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_string (char *s) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-                              (scm_t_catch_handler) TeXmacs_catcher, s);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-+                      (scm_t_catch_handler) TeXmacs_catcher, s, NULL, NULL);
-+
-+#endif
-+#else
-   return  scm_c_eval_string(s);
- #endif
- }
-@@ -180,19 +209,35 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_call_scm (arg_list* args) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
--                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
-+                                  (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                  (void*) args);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   (void*) args, 0);
-+
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_call_scm (arg_list *args) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-                              (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-+                      (scm_t_catch_handler) TeXmacs_catcher, (void*) args,
-+                      NULL, NULL);
-+#endif
-+#else
-   return TeXmacs_call(args);
- #endif
- }
-@@ -443,7 +488,11 @@
-   return SCM_BOOL_F;
- }
- 
-+#ifdef GUILE_A
- static scm_sizet
-+#else
-+static size_t
-+#endif
- free_blackbox (SCM blackbox_smob) {
-   blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
- #ifdef DEBUG_ON
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp	2018-06-28 04:13:37.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp	2019-06-02 17:13:22.220571381 -0400
-@@ -83,8 +83,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-@@ -103,8 +103,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp	2017-09-28 09:44:11.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp	2019-06-02 17:13:27.543889585 -0400
-@@ -139,22 +139,6 @@
- /******************************************************************************
-  * Evaluation of files
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_file (char *file) {
--	
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_primitive_load, file,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, file);
--}
--
--static scm
--TeXmacs_eval_file (char *file) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
--							   (scm_t_catch_handler) TeXmacs_catcher, file);
--}
--#endif 
- scm
- eval_scheme_file (string file) {
- 	//static int cumul= 0;
-@@ -172,21 +156,6 @@
- /******************************************************************************
-  * Evaluation of strings
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_string (char *s) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_eval_string, s,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, s);
--}
--
--static scm
--TeXmacs_eval_string (char *s) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
--							   (scm_t_catch_handler) TeXmacs_catcher, s);
--}
--#endif
- scm
- eval_scheme (string s) {
- 	// cout << "Eval] " << s << "\n";
-@@ -214,21 +183,7 @@
- 		}
- 	}
- }
--#if 0
--static scm
--TeXmacs_lazy_call_scm (arg_list* args) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) TeXmacs_call, (void*) args,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
--}
- 
--static scm
--TeXmacs_call_scm (arg_list *args) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
--							   (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
--}
--#endif
- scm
- call_scheme (scm fun) {
- 	scm a[]= { fun }; arg_list args= { 0, a };
diff --git a/app-office/texmacs/texmacs-1.99.11.ebuild b/app-office/texmacs/texmacs-1.99.11.ebuild
deleted file mode 100644
index f2326cb3e659..000000000000
--- a/app-office/texmacs/texmacs-1.99.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[debug?,deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	>=dev-qt/qtprintsupport-5.9.1:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	#	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-	#"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE3=$(usex sqlite 1 0)
-		-DDEBUG_ASSERT=$(usex debug 1 0)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-office/texmacs/texmacs-2.1.ebuild b/app-office/texmacs/texmacs-2.1.ebuild
new file mode 100644
index 000000000000..e0775e242482
--- /dev/null
+++ b/app-office/texmacs/texmacs-2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="http://www.texmacs.org/Download/ftp/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug jpeg netpbm sqlite svg spell"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	<dev-scheme/guile-1.9[debug?,deprecated]
+	media-libs/freetype
+	x11-apps/xmodmap
+	x11-libs/libXext
+	virtual/latex-base
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-qt/qtprintsupport-5.9.1:5
+	sqlite? ( dev-db/sqlite )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SQLITE3=$(usex sqlite 1 0)
+		-DDEBUG_ASSERT=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 833500e73946..7f2175855448 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 0b6d4319678d..d4a27cbb4698 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -2,7 +2,7 @@ AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
 DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bbd999d89b7f90bed8ef9739182c8e4af0033aee92453d6b0731ac5d8c168e3900abe0a4466d584bfd9bc64917a SHA512 b99bc165ab08755273ead73fdd3602c9266a9bb243c46d99805c1f8b07f7e8ea9b0583aedb9b7ab717461f2ed3bd27dcf0a5677f2d908d3fcc03769794a64d5b
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
-EBUILD elogviewer-3.0-r2.ebuild 1754 BLAKE2B 9dc22d3007857eea1581084249321f1079095995fa67581a1ee87ee00ed529587798a9e588e4f1e5901f54d5cabc3af4d6c5bf23041e74e3131f2fe83a3ded38 SHA512 8dd610e4dc94ff1fd69d2db221e8494ec136fc1813a04fad8fb36d335406ce623052a4c9aabd46aa8740dbd9925884b686ce82c212cd62472def108ac0e2fae8
-EBUILD elogviewer-3.1.ebuild 1750 BLAKE2B 3423aea8fa75f784ba54aa0c491ba75dfa57b8dd65e88c5f636d1ecd5ef19c56b98a7b06580837ee3a7b1cdb8e82be017245dfbd7b0296c71b66548942f8d463 SHA512 abaf4d80987e50f9299e5ca9568fa81a7e8aa820e7cee5b2d363d9c47be74c1050c0ee3c2eec6aaffca85b866cc139a2cf10dc90c9a2ed005746c7730d3f054a
-EBUILD elogviewer-3.2.ebuild 1691 BLAKE2B ccfb82357e50dfb71b9e89c9b994ec1bb5a73194e51e8aa30275cd741c462f140830ce342fafb4b79d417190e2f46e8f64403262cbbbecf9cfae4e76f5b855d4 SHA512 2821f34ecb038cc8c62fe1f56bd00121bf5b79c94b8aaffdda66f5f09b0108d46d7e351c6de83cdee3541c7287a13902e8aedea1eafb784aade90b88fc3c8550
+EBUILD elogviewer-3.0-r2.ebuild 1732 BLAKE2B 4219540079d7b7574d39f07d35c8a37d488cdc9d103f64472d02dec0f3ac77c71442640b6c08af49ab722467eb7273f24bd652dc566dbcd1109c986c2114d49c SHA512 1a079c1c01b836d226c29b44f1cbdecfda2b1f9fd16a80560498f9dd2adea528f32a09e4fc71cc8085f6cb9f4cbebc7b17a6694cf1547d5cb44351c1cb7be238
+EBUILD elogviewer-3.1.ebuild 1730 BLAKE2B 25a3b312f51344adc04f623890229def5e7cd6c5e87bc97df505c311b879871e6cfd46cfb7df946f117b24319a6193a7d90199d2d2a9d91bbd96ffe49debe9b9 SHA512 f19d0c3454b4083f36ec1a1cd05159ae3fc9fd296e4d91ef050aa9ad8488a8d68e8b9cdf03d0e1e1123a5efdca7e046441288abbf3de9a6fd652b7b3ee540641
+EBUILD elogviewer-3.2.ebuild 1671 BLAKE2B a3bc93f16c789f47455dfc7f80212a5bd654bfb9ee295096253fe31cba48d935a7015d2187fb70ca4bb78ef602a3dee4a645df29f184722f819e0bf7c89881e2 SHA512 cef96d1d292283b15fcef0027737794a567aef89349b1670e91671fcb7dc2cf50fe9bca7c3529b280b37348521efec9475ba418bfc674da58dc5c3c0eaa3312a
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index 760d5b30feee..a74707ed46aa 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-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=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 DISABLE_AUTOFORMATTING=true
 
@@ -21,13 +21,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/app-portage/elogviewer/elogviewer-3.1.ebuild b/app-portage/elogviewer/elogviewer-3.1.ebuild
index 7e2097ac19e0..3a21c008fa21 100644
--- a/app-portage/elogviewer/elogviewer-3.1.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISABLE_AUTOFORMATTING=true
 
@@ -21,13 +21,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index 67fed128f29e..fed3a755fb78 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISABLE_AUTOFORMATTING=true
 
@@ -21,13 +21,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 2df357c44243..d7e4093f250a 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,4 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1-r1.ebuild 1128 BLAKE2B 2b082a3b04c09a85ceef15e2cbcfa29ab4e482ebceba038b48925e19da468f9c62f28cad50fbe0d5e324dbbe8b2aa23cae0f0a6be5e31bdebdc2b8a7c4ded217 SHA512 1d17dcd0eae77a95e542f96eb1c0fc27bdb14a3320a6bfa723ba99bba46aa20531b16ee2feed0f59a7f7312bb29cf6e8856719407ce086f62f11dfeea0377ccd
+EBUILD flaggie-0.2.1-r1.ebuild 1135 BLAKE2B 534821028f131d1b55137105bd7f81ea9cba613ff97c1ae56f2d084563c195a971353e2bd8fb157a6fb2cddccba76c1ca3b3337990b8d3ef7136d4f5c64c29c2 SHA512 fb3f4269c8000020628ec800bea068e1c496923ae969fafcdb14d349f8c8dbf2074db59c846420a82cdd2a5406092b552c9e73f2e1d5eea545997ee34676af54
 EBUILD flaggie-9999.ebuild 1057 BLAKE2B c5c42e151353564f6710bf366ab7037b13511d68dbd0c98ecebbe0afc69bd446e3bd4a0346f36c5579e0b2b9a7f28048776ae952d6600e0df522ee326c6d17bc SHA512 b30cfe61f2d21f27931f7805d4005f0a28e8a3b55da3e2cc10d09d9e7c52ab94da973d865a23f07957b5ec2df14b059c20d797fa1386988c4031aff1c66f33e8
 MISC metadata.xml 503 BLAKE2B f86cc20c12e1bf2bfb8d04b6ec0ae1cb66fd4a239cfe41885b1277abc2590fbed0a27dcdad6c0290227f140e4b783ffcbeb8c4556fa4874f0cb4e1d77e691165 SHA512 d406c0b2397c2d40c1aab0db4d4a54c2b928075558c823da63fe21762ed618da5aa20fcfc86c4b3066d8a7bbbc4dcc55d6037025db27a7873de274282dc0a88f
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
index 7fa8f87b0bbb..fc24c8393df4 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 437b634b6cbf..aa1c5db57646 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,3 @@
 DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
-EBUILD unsymlink-lib-20.ebuild 726 BLAKE2B 70107471668fa844fac02d31236c85b5fa5d61f27fa485794505de883f0e9660bacc70e1d02c573cf37b8f38218fab1cd6a4cb92a8674b3663c1c7e0a37e81f5 SHA512 6a4febbeab1036192815b11b81869ce14a0f9f47a35cec873b2f454cf2f1dfcbae8ca527682e4b4c603d72ebd1e4f86261ceac6ddbe448b143f969f7ad5df484
+EBUILD unsymlink-lib-20.ebuild 720 BLAKE2B bfdbe74e0d8ea88448996ae8031dd395b390196753c4fb3efab1b0d27317269ee8b3bdf17ae60e7ede77f9f33e806e11735075fc58dcfd8556b5549380157988 SHA512 c3765512ffc76965dc61db0053d7ad1c76c06c56fab1a3881d8a3877b2e9f369166355175541632c45e676976280b0dd21176f0cb41fadb9c966171925c79407
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
index 6aa03a6faf3f..3cca8af5cca1 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
@@ -20,7 +20,7 @@ RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+		sys-apps/portage[${PYTHON_USEDEP}]
 	')"
 
 src_install() {
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f85e2d61f6a1..3b59405bb39c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 4b432d24ae47..9cdbbbfd059b 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,5 +1,5 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.11.ebuild 3950 BLAKE2B bc1283c36737d32489613a1eea5a3085261892d002f05b74c9144f6453f1fa484c9d2ee2e378b3317628ff9a46001ac2fa06aa8c18654084310c2f25fb0fd991 SHA512 45172cdf69f7a86cfb2f7b9b07b279ba04b298c33b8eaded593d730209cdbaccabd8af29d21d2f30d461d30cbd746cd277a4bca3dea4add8ffdebc552bb664e2
+EBUILD bash-completion-2.11.ebuild 3957 BLAKE2B cc815cf7990a09a53aab6aa2335aded7a1c1dd32c15113cda467d8d6f6c987b4845c7d60f16e5dc7097e020345aad8193f4c972660d473eda5e14f21980bd3b3 SHA512 2df99c33d3f49b16eaee429d490d42b587b36f092ebeddb8a018fbfd88e7d74a95fcd58392fff5ec77b6c6f64c49b19284e8054d3fe1f3b491d3b408ee0c2a22
 EBUILD bash-completion-9999.ebuild 3905 BLAKE2B 86242be9deb7bfb5cf3587167a92f4615a099bb143f2d92e382be8e9ecc45ce1dad3a140030c25daf1a69e213c84ff59d889963e1c39a94273d54b4be39a2878 SHA512 3241298fdeefa87925c6de6a94760318ef2fddc26d195bb2872b758cd35d376a2715e2a1f0a07ddf5b49efc58abc13a6a386889248b289bd1507f04dea83a089
 MISC metadata.xml 1439 BLAKE2B bd8b7a31daf2b9a9b094b053c8f0b3bce069107ae00aa95ba8386e259e79d7a95ad4f2b8a3ed9a7a5b6f2b7204d3d74770a3c929a54a563eb5678ecdaac14be8 SHA512 d7c85fab833584f2ffb08c4601e7900511e640adf532ee80b9a047254e8f2ff9bb781a02f02d5ef2a5247f5b6be31be68181d557618101c792a0dd0cd13e89d2
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 0d815c2bd7ed..c3387f61f119 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index aec428ad3cdb..4683bd28d227 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -5,9 +5,9 @@ DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63
 DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
 DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
-EBUILD fish-3.1.2.ebuild 1559 BLAKE2B 6591d08cf4f1a160d5b133436b7e11ac4eabfa506710ad2edd61c3b98894f32265073102acf83dfffffdd4d4af67549240f7e8097cfe74691663ce0ec5d2b4f4 SHA512 b0d4f615573a43b5407262629d40c3f3a60d3007ea53978173b29ac9a996a72a528f538f83f1ce7810948dc606509494e2b92e6ab1c846129aed29d3b7c9d754
-EBUILD fish-3.2.1.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
-EBUILD fish-3.2.2.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
-EBUILD fish-3.3.1.ebuild 2163 BLAKE2B 9417a5edbf52b31f50539bed34e6053677d63a59240e4cf48718844e93a3c9f3e41a812f160946b089608655a2ab026a790ec8ecff619c389e2a0c81cde46ed9 SHA512 27ce51c1251b0c551b82292ef05a69664043e8391b997484be52953de37d74a3fedfe3ebf35c3511fec05a75816481da4789cafe9b73b83e50b250b669c2c10f
-EBUILD fish-9999.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
+EBUILD fish-3.1.2-r1.ebuild 1563 BLAKE2B bd2839a8e63f93b61d78b0f1d61996d30ab4e3903f51a0973f142af5685ea9ccd721d848a96faba760d01fd6447b7aab0ca63be6f63539975b1120d60f0fb147 SHA512 5bd0c9df88c49e3f0969e4afa0ccb5da50b9c35df2bac49b7086e3bc9c399d322110e99aac9e985ebab4a31cd99ba2138c03f8e35c5ce63c241762ff0d1ba845
+EBUILD fish-3.2.1-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
+EBUILD fish-3.2.2-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
+EBUILD fish-3.3.1-r1.ebuild 2167 BLAKE2B cfc3e737990c11ef43a9d7f47b2c3e11fa61138026fd0d5cc44e1953c86a31cb7cb2d4e4723b7bb5ae994b4c7704623a6b2fa511d374fd2ae68b112d7e80f425 SHA512 509bae15277b7508d409544ca19ac0c2f93c7afe8037a8b428569bd3697665bdcf8a4a6b6c8ff525450144373a914e6408ca75b64f7faf911f5a8db577f1da66
+EBUILD fish-9999.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.1.2-r1.ebuild b/app-shells/fish/fish-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..177c7aa2ce46
--- /dev/null
+++ b/app-shells/fish/fish-3.1.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-3.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild
deleted file mode 100644
index 20411af588c3..000000000000
--- a/app-shells/fish/fish-3.1.2.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 cmake readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="doc nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32[pcre32]
-	sys-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( dev-tcltk/expect )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DBUILD_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fish/fish-3.2.1-r1.ebuild b/app-shells/fish/fish-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..abb51e209302
--- /dev/null
+++ b/app-shells/fish/fish-3.2.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-tcltk/expect
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+	)
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	use test || return 0
+	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-3.2.1.ebuild b/app-shells/fish/fish-3.2.1.ebuild
deleted file mode 100644
index e2662c513ae4..000000000000
--- a/app-shells/fish/fish-3.2.1.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32[pcre32]
-	sys-apps/coreutils
-	sys-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-tcltk/expect
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-	)
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DINSTALL_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fish/fish-3.2.2-r1.ebuild b/app-shells/fish/fish-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..abb51e209302
--- /dev/null
+++ b/app-shells/fish/fish-3.2.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-tcltk/expect
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+	)
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	use test || return 0
+	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-3.2.2.ebuild b/app-shells/fish/fish-3.2.2.ebuild
deleted file mode 100644
index e2662c513ae4..000000000000
--- a/app-shells/fish/fish-3.2.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32[pcre32]
-	sys-apps/coreutils
-	sys-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-tcltk/expect
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-	)
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DINSTALL_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..e24e0866494f
--- /dev/null
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/3.3.1-don-t-override-linker.patch"
+	"${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
+)
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-tcltk/expect
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+	)
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	use test || return 0
+	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-3.3.1.ebuild b/app-shells/fish/fish-3.3.1.ebuild
deleted file mode 100644
index fc205e24afcf..000000000000
--- a/app-shells/fish/fish-3.3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
-else
-	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/3.3.1-don-t-override-linker.patch"
-	"${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
-)
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.32[pcre32]
-	sys-apps/coreutils
-	sys-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-tcltk/expect
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-	)
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	use test || return 0
-	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-		cmake/Tests.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCURSES_NEED_NCURSES=ON
-		-DINSTALL_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index e2662c513ae4..abb51e209302 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -28,9 +28,9 @@ IUSE="+doc nls test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/libpcre2-10.32[pcre32]
+	>=dev-libs/libpcre2-10.32:=[pcre32]
 	sys-apps/coreutils
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 "
 
 DEPEND="${RDEPEND}"
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 84adc06aa83f..7ae8d9e6fc0d 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0-cflags.patch 882 BLAKE2B 451086d7f84b97fd78518838ac34541b961cdcc76e929153f1bdfbf0bf95e6ee50d923a33b70514314cb70b35dd48d3930a5f5281eb1d80588f3263cc5e6e972 SHA512 173dda551294d4ac83e286844e63af46e988d5ceaf812537e7300ade56a8d1ba5da4db2db9da49dce7ab491324888860692746e2ec47e8cf44dce16300b54dfe
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0-r1.ebuild 1139 BLAKE2B 05c4c5586bb5c3aa000f0293d3031fdd22aa88a95eb772909349d04442bde8dfcf8b5ad3241cef2375756a6c4c77a9bb9fae403b81d8d92ee345401dfe4c120f SHA512 f61dda91536de597bf3c81493d252312499222c1889b2f74ffdde627863c76b830b71ea5c7084c7faa85d46028ad056d58ae2b803412a51b6914d08c0a393bd4
-EBUILD fzy-9999.ebuild 1148 BLAKE2B 960c02f3d8f5bc86c02159315327be946c7a1b8c7c6730ca441679f47cbc89108a446369a6cf4a5636b9572aa962111248eb87f4a938010b71504341d11f4b55 SHA512 ef34410d77961bbf62bf18112c718f2db02cf359ba46da4172b3068b6362c45761eb4d31a914d181fd01841ce201555bfd0fa55fb9eecf8b50ba5fa395cd2522
+EBUILD fzy-1.0-r1.ebuild 1146 BLAKE2B 9211a075e07150cb73830946d5ad0a7a5607a5ccdc49e77768385f2913c0bfc387cbed819b581ebe34e9587626eb37fec32e9845fee100f8112331510c0e2947 SHA512 b464658b0af9bc28a832626e1a86a6d1b879c7d312781741e5eb8f32c5fcd664db861e3c578ba6ad8d78debd31e815af078ba724a31ca744d94a418b408c7707
+EBUILD fzy-9999.ebuild 1157 BLAKE2B 06a72491bceabd358164632f75dedea112f5478d7dfa1f4204e6e05a3681a5408e13a09a83e4fa0652b581141a9f1c35422d06fdfd55701326c8f77d0d3584b0 SHA512 472f5416705c992f64de24cec7c9aa935da1053fe691c503a02a3b6bf54b996c4a50bb5a326ad80e0f135c4571b9b5e3332dfb31c4765e7e10de2e8ec75d0a2b
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0-r1.ebuild b/app-shells/fzy/fzy-1.0-r1.ebuild
index 51a641ab47f2..2e74b46c1a85 100644
--- a/app-shells/fzy/fzy-1.0-r1.ebuild
+++ b/app-shells/fzy/fzy-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index 2079e70d413b..702455296c5c 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-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
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 2786adabf48d..a9d34c7158b3 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
 EBUILD gentoo-bashcomp-20180302.ebuild 722 BLAKE2B f908a369249ed2d7c81cc280af05a917eb563b17db357f3b6b96ac12e179851d2c0a48a7ffd969ea9919d59f66128227eec71cf6f74c42090a44e94251431e42 SHA512 7491e976613a97ebf513f48566ebb6ffc76d15fd8e359467ea5317fbdf71300562f3e836e70f696bc5179c48e1b79c5601da87cc00decfba923ce7b162303fbb
-EBUILD gentoo-bashcomp-20190211.ebuild 725 BLAKE2B 8add2920405477984ad1eda32e8c63a25797e7f2a7159ae9518c96fe81303b872c58790c4641e05b4bde27b63ad4d4d4bf7feb4c2d72c3987bec9b8b05c9c7b1 SHA512 4e369606b48c0828ce553b75b4cbeae5bf2f7b65ec79c9f8af0c36714bd1f5742471b596594b423e4074de8d66d48a6092a81cfed64037ba6fc70bfe45f807b3
+EBUILD gentoo-bashcomp-20190211.ebuild 732 BLAKE2B 2cce286dbca550412a6bc28543e2d9e71f471609a0c5ee6ea1380d88f6e64f7fb661c372dcd952eac63a506c2aa47de579bd2bfb7920a063a5a9f0b56b5e5eaa SHA512 6c6dedb256dfd2ed75b2fd78a531390c444634c52e292bc959b248309f0eaa5ae582dd56553121184c7c2645ae94cf97ce846eb0392e21e5ce2f5855d59819f9
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 56215d6bc3f3..545a344deb43 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+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"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index eee7ae6f1661..3534755a58af 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,4 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2493 BLAKE2B 32e198aea7efd9416526feaf85e06029f05ec26aa982ceaacbb7f505ff8a4e7995a8222a3f033ca270b9f09ecf0465b56f9c3ec5b15dd202fa26e0f7e011062d SHA512 3c43179ce88a35599d44c60af5f4287383c0612eace067f2097e26bb2ab6d05573e8486ae83b9d1f6d222a65fb4466c64c4d0a34b15cce8bef4b75af0ec0b7ab
 DIST hstr-2.2.tar.gz 1246786 BLAKE2B f14091fea391dada79798c957b0b1094aff73b7ab4f8d9fd53c1070924556a7ff59f6f5a2e49b36dcd46ca6f93c5f8cd0fcfef07d5f7458d4bbe021546ccdc7a SHA512 c133edaa63a2be76356c08e52303d4133b11803e3ac6f915566a8d1b4651991b14d43974618061b2fc98c49e21b650ff6b9ac8168512e76566e327f90a550e4a
-EBUILD hstr-2.2.ebuild 701 BLAKE2B c510eba37ab95bf6bfabe4cf2df2884c1438d5f904f97b6bc50d81dd5f2895bee647f877113ef175550e65de1dddf395eda72568f36a24e386aec1e385f960c9 SHA512 5269917863760e8c4524d3376a3ba6aaeadb2aabac6563b3188384456f38efdfa1c4d295615b2e72a0098522ca273763beb39245a307996de6fa01a94a40dcea
+EBUILD hstr-2.2-r1.ebuild 703 BLAKE2B 218054027f539c1e36210cf32788cacc3fc5e9b3f5961d7ac64f3c26b10faef223e19e34d7b4a4059bab2960593e77402cef401f6c8c211c205364bf9a5d45c2 SHA512 3972c456e737bade36e91e7770ae2620701dd7d58681da0c7c46ede8919eb6b2cfe4dfe6f7951a8890f8886e666259fedf2e1d4bc12504747ca52832abd15d67
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-2.2-r1.ebuild b/app-shells/hstr/hstr-2.2-r1.ebuild
new file mode 100644
index 000000000000..ced186d9d6b4
--- /dev/null
+++ b/app-shells/hstr/hstr-2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Shell history suggest box"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)]"
+
+DEPEND="
+	${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CONFIGURATION.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-fix-ncurses-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+
+	tc-export PKG_CONFIG
+
+	eautoreconf
+}
diff --git a/app-shells/hstr/hstr-2.2.ebuild b/app-shells/hstr/hstr-2.2.ebuild
deleted file mode 100644
index 2945e1ac8406..000000000000
--- a/app-shells/hstr/hstr-2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]"
-
-DEPEND="
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-fix-ncurses-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-
-	tc-export PKG_CONFIG
-
-	eautoreconf
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7758b31adf55..2a88689b9027 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index af9bbc716e4c..96b3694e8601 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 1128 BLAKE2B 73ab3b956a4baaa37bda981acf6c5161475239fb8767e464b4575a1ced7c24effa499a45d39935daca192d7fde0f797e3bb38692a2602c5a9ca8f2166f2c76dd SHA512 a47abfafd79f627350640e729769232fde9cdb7a25df4c137d3fa92a2d9613f32d21493fb69b1a0463d0c2069a658bdabd249ed064975d25b47df7d7f698ccd0
+EBUILD ansifilter-2.18.ebuild 1126 BLAKE2B 66cc5c6957c567eb5f8478d42275291a750069656c2b1a4d613be5edbb7bd0150aa13a71f94a575c322e62c4a20dac0c19edd585a6459c34cd08b45c163568bb SHA512 45e22b73d462c7b9d1a64640d182dfbd875a9913fc8da6385bbd8875b1b5991886669e4c70c6d69bbf782d85252b7c0c28124d203f7e207a3c0eee50bcd4a889
 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 28c39b8bbaf6..89c063d0a69a 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/aspell/Manifest b/app-text/aspell/Manifest
index 75f18dd0a2f8..05d25b6e3e20 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,6 +3,7 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
+AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8-r1.ebuild 2785 BLAKE2B 00825b68a63d55438388d5186910efb724e2afd6a4bd8bb2973f75b136a754666753a1ed43bdeb906e9fc1051597eca1129c99496cb842a08d2d3672cc1ccc76 SHA512 48ce8e82a61f1180f81e87826f9c97ba9fe7c44a70f082a5dfa76cc9797c54d6d5ace73d2e3198e008772e9b82a614987415b8c02016759e5be108c30def6cbb
+EBUILD aspell-0.60.8-r3.ebuild 2836 BLAKE2B f263110d907b5d3906863e2196f873073b209662d4a885fd5d2dd0d58e2f4fc81f743f0b7b9d28506656ac350ff4a37419229870897de24308eb465ada95c32d SHA512 f2275e2d87c00600d7ad265db2a6822f3ac7af84b0474fb500acdf70ed152cb48969e8d41c0e5703e3a6a2aaa4f26e6be6b17c03cb1a71f9cb8770410dbd33d2
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-text/aspell/aspell-0.60.8-r1.ebuild b/app-text/aspell/aspell-0.60.8-r1.ebuild
deleted file mode 100644
index 8f4ef0b3e3ce..000000000000
--- a/app-text/aspell/aspell-0.60.8-r1.ebuild
+++ /dev/null
@@ -1,112 +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 libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-# All available language app-dicts/aspell-* packages.
-LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
-	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
-	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
-	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
-)
-
-for LANG in ${LANGUAGES[@]}; do
-	IUSE+=" l10n_${LANG}"
-
-	case ${LANG} in
-		de-1901)
-			DICT="de-alt"
-			;;
-		pt-BR)
-			DICT="pt-br"
-			;;
-		pt-PT)
-			DICT="pt"
-			;;
-		*)
-			DICT="${LANG}"
-			;;
-	esac
-
-	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
-done
-unset DICT LANG LANGUAGES
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable nls)
-		$(use_enable unicode)
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# Install Aspell/Ispell compatibility scripts.
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# As static build has been disabled,
-	# all .la files can be deleted unconditionally.
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.8-r3.ebuild b/app-text/aspell/aspell-0.60.8-r3.ebuild
new file mode 100644
index 000000000000..499e003d437d
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
+	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
+	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
+	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+	IUSE+=" l10n_${LANG}"
+
+	case ${LANG} in
+		de-1901)
+			DICT="de-alt"
+			;;
+		pt-BR)
+			DICT="pt-br"
+			;;
+		pt-PT)
+			DICT="pt"
+			;;
+		*)
+			DICT="${LANG}"
+			;;
+	esac
+
+	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+	"${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
+	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable nls)
+		$(use_enable unicode)
+		--sysconfdir="${EPREFIX}"/etc/aspell
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# Install Aspell/Ispell compatibility scripts.
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# As static build has been disabled,
+	# all .la files can be deleted unconditionally.
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
new file mode 100644
index 000000000000..2f15d380ec0b
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
@@ -0,0 +1,96 @@
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include <stdlib.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ namespace acommon {
+ 
+@@ -26,6 +27,12 @@ class ObjStack
+   byte * temp_end;
+   void setup_chunk();
+   void new_chunk();
++  bool will_overflow(size_t sz) const {
++    return offsetof(Node,data) + sz > chunk_size;
++  }
++  void check_size(size_t sz) {
++    assert(!will_overflow(sz));
++  }
+ 
+   ObjStack(const ObjStack &);
+   void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+   void * alloc_bottom(size_t size)  {
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++    if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+     return tmp;
+   }
+   // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+     align_bottom(align);
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); goto loop;}
++    if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+     return tmp;
+   }
+   char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+   // always be aligned as such.
+   void * alloc_top(size_t size) {
+     top -= size;
+-    if (top < bottom) {new_chunk(); top -= size;}
++    if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+     return top;
+   }
+   // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+   {loop:
+     top -= size;
+     align_top(align);
+-    if (top < bottom) {new_chunk(); goto loop;}
++    if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+     return top;
+   }
+   char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+   void * alloc_temp(size_t size) {
+     temp_end = bottom + size;
+     if (temp_end > top) {
++      check_size(size);
+       new_chunk();
+       temp_end = bottom + size;
+     }
+@@ -131,6 +139,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ca8319b76221..c95dc7152862 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,5 +4,5 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-EBUILD calibre-5.16.1.ebuild 8750 BLAKE2B 128ae61e290363b2409e7b8bef448b1b91f66c69cf6ab9cf9116a8978e17a553e18e237cab21d5f6d83f6e9e21bd87c270391060fb5fd8839d4f958765261860 SHA512 f1d3b025ce5e9426f773520613b434d66a211ab5bfd4047dd2c3b4cfc96300d7dcdd5de58b88f37c8e44218db44bef99853cec4b17e8140708766e7095e41657
+EBUILD calibre-5.16.1.ebuild 8594 BLAKE2B fc44679327343cd2ea1942bc079f83128e0cb7a3992358df5f1a443828aaf4482b7d2943735a1afe28b5a2331970acd517fef5f28a8503e57e87aeba138a60d5 SHA512 90de7afbeecc7458302b68b5a02125b6b23bb027aa2c1e95d4eec1405cf08ef461d7a46bb0cbd71b4107e20aa8dcea8af6b25310aa39d926536c663a1c0356e6
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild
index 6f924cf6720a..497d11873043 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1.ebuild
@@ -49,30 +49,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
@@ -104,8 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )"
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		<dev-python/sip-5[${PYTHON_USEDEP}]
 	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 510f3f024b3a..cd570cfa0547 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -17,7 +17,7 @@ DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b48
 EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
 EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
 EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1232 BLAKE2B c2483720ef4ef27504127501af5f7d44a03f9f9333af5145a84c60153c017d6eb663fb6a0c50433ae2022dc5d71e0051994847ee20c35c15f5fbe3cf38a2469e SHA512 edf606fed086249b923748496c04ef5a74f20e3143c1d0669184646d8ce663361eb498c45618258551ea6b59ad365b855a2077c28ce25824436cfe6b68baf575
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1273 BLAKE2B 3f84dad5ef3a82aad8a9fc62fd05d309943f65a1138d136101d5c5484ac2e97125fed7dd68206510a99822edad7174aea10dd056c92c883e30540873b2cadd7b SHA512 c42a392feec6611b34d2d4b18a423a8634021986020449207fa3f28e329e08d8399c938ff79c18da39266a3dadf7f25df38b2f4e41f1b77e32ca4b560fee58f5
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1280 BLAKE2B 49ad5753228fe65e7543dd297eeabc1ebc5a89518614c146df4f563df61b1d5d19aa839d9d73cd5ae906c23a92807bdf131b1f83dfaa519478ad8e1bafd4c405 SHA512 5eb01d5fbf731b15a7c6a75395f2bbf629cb00b2798b2572063fb990cb154f8285fdbf0836be5435611b311f6d28e2967d14c9d085824dbae7e20ed7582f6e64
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1243 BLAKE2B 99c9f189727a9888950cdb57444ed4e828449119ce6cc316e01eeac1771b0db8eb7759fc4490cb70a0132206df2a79d5996b853f110459ff9c21a36494a7d19d SHA512 b9b45a3902358fc2e339198bb0c158375b0e793ec991f50d78d3e4b80cc032d02ebd92736ea64afe1a6cf3385e52ceb636ef7a54ebb06e0f2f0d7ae10c1384d0
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1228 BLAKE2B e52d47ea5e1b6e293d0db85fa22cf97e37d337dd995327426c2b5039436c050648f2f82aa9e2b250fb67dc61ca604aa73c9df6e9554a22bb8a5cf38064f36cde SHA512 bee5d2c27aaa39ab117a2db8a87583b81cce96498b3651e1d2c26a000b90a30d96f4ce4d3301ebebc1c9caf8b2c4140788a53cc1d37404b7917b8f5498df4fba
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1228 BLAKE2B 86ee53c87d3b24c59dc396bed4dfdd92606737fb66048617f6c5d44e5bd18401d3f2c6cefe10402147b2a29c26b1959a6f7a02fa1cb971dce6f2cc3277d0aeb9 SHA512 284353f760b4de149db6516ec0a82357353837a27cb1855e2ca2a5b6e5ae34a2421e2c689512f627ddf688d3b1ae6a636b06a76f9afda47f87e2316bd195d790
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index cbe5e272c54d..7a62740ffb32 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 61ee3230eb24..c67084913ffa 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B a2aa3f6567ac4c3894d43c793e36ea75583e18260b33957bc45d3ee21c9c1b30886ec15dcf297d97d8b156ce3e8eef7d4a4596efacebe70f2fe6d37ef68d2907 SHA512 86572fa6c4d1d864fda79ac9426a95a5207a7d7e1ecc2baf3681b39311cc4b4dd4799bef74f5f6746337f7b05714a2b327c3679457cc49b1058736298430e5ff
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B db74883504a3e5690f3b01ef19daefc2d8d1436e2b4681a4926881b8323aad69d5ab69751080ed1b9abb60e61566ddea8f6bb358a1476aeaf4bcdd612681b5c4 SHA512 a952d27cef1b2970f7c312029575c4591aeb649b7319f41c581e627ccd3d33adbf8a70580b40f6438c6494155d80f0b9dfd4d80fafda6b13db21a282e2bfb3ca
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index c09f42d5032a..572429784248 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-single
 
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
index b8a76d82ca73..d229c3b6e2cd 100644
--- a/app-text/docx2txt/Manifest
+++ b/app-text/docx2txt/Manifest
@@ -1,4 +1,4 @@
 AUX docx2txt-1.1-paragraph-newline.patch 220 BLAKE2B 0eb924a1d303058952947daf449cc74969094a57b5c4c045ce991a48394543982595d0be3c72d9845893a5836af704b244a52a974bb676ae569fb3f8758cfa06 SHA512 07d8686e1bd1f5ad1b18a5a3559667243dd9e580dff52711090843d5814736a371c382c2ad12d2dd01bbd827acc9a6f420d34f3ff4d02f9fb5864c07e86ec39f
 DIST docx2txt-1.4.tgz 31302 BLAKE2B 3f57b95e40eb92f5b16f38fab7122cd75b23be0f1489bc83ea68f6feb16c14ad524119468da44ac5bc3989a1d61336c436a862b58bc3d83a565bd61b031c8f4f SHA512 5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
-EBUILD docx2txt-1.4.ebuild 541 BLAKE2B 1681156aa250f3f96e2f3fd468e8dff7e9be426e447dca729e5bf41cef178724b35ce238caa94fbfe8a5690945df9227d21c320ea4423e6582f16f6594605533 SHA512 9118f31eb80e1937b4ed7a9072452100cfbb90d7934ae00015234e0423f3bdb5f34991834ceaf91511f09ec5046c2118b6f61f9ed3ef8e34c582a043bc3adc70
+EBUILD docx2txt-1.4.ebuild 539 BLAKE2B bcda467052d94bd2f0b060022a6659065aae74b4ca052ed4b5c35503e8a721b28327b41b9d83a0a70ecd3507d596ec9b36630a8e0a324830eea0c8ba70a4a83f SHA512 7e310a73d126509352f3cc2eb6240c0e06b82b40513481457f4df3265d5716ab69303b1b9f2cbe538fd654bb24f2a1f271b0c6d093b77960ff5b8da8594174ce
 MISC metadata.xml 245 BLAKE2B 83f8ac378d6bc4be2dd739680a7e6ad6264169b8b221be6310eea6f8f97c99575cd2895917562bc3239714a6a23a643d54a1bcc97d343e33c974d2378298c973 SHA512 51572585cfc018172e522db2e217ff0d465cee65ed298ff90df88f91b644c16da16a7e9b7a472b75c5fea263aea8614a07ed30422e879323108a0d098c8dab0a
diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild
index 1a94e8e4c98a..7cad88250407 100644
--- a/app-text/docx2txt/docx2txt-1.4.ebuild
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="app-arch/unzip
 	dev-lang/perl"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 2060ef36acf7..a510520abcb3 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,5 +1,5 @@
 DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
 DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
 EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
-EBUILD dvisvgm-2.11-r1.ebuild 1167 BLAKE2B 7321b97eff0658d9c98ed1c992ce628345aa303af5bb47b54eb01e86ba6f71c263762f3393fe3064eac3eb7b8377e94544c9b2d4491b6343f122ee34abc564f9 SHA512 7e700ab1782124c6ab613d929fd813336aa0553d4d4b1ad8c5387e40159ca90be721a46e0efba1a13b87a2154391cec317fd5f58ecbfac4282727fd114e075e8
+EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B e4993aa5e154933dce24b7da16fa968e36922b58659f23199391b1b04933ec1cfab75d265cc0479b9fd2203ecdd4037131b7989b87971739ab347b18d15c35c3 SHA512 82b42b4d29502975215e88eba5067087db20fa7c9d301d438b634acc242f82bb35f0d90b607117508302212306bfd4a599aaf3cbf6656421d98176fbee50aaf1
 MISC metadata.xml 382 BLAKE2B f53c90248d27a826350a572fef359f9cb4ba83ac99ea787db1a035bd1e1e63e757566fefe0e531732900cbe32fa02cad6894d8b038019db88e147398df24e39f SHA512 6bee249b741358b1c82d1e2ec8bde902f260c3f3a506be1652a50f96cd4e0b1f6047f2527942f8df83a3be55c53c9a49c13b528c464016582302165bd01e48bd
diff --git a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
index e662f33b53bd..3bad4b3c179c 100644
--- a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index 6fe9698085c2..ff2e5d21b2fe 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,4 +1,4 @@
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
 DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
 EBUILD fbpdf-0_p20200614.ebuild 848 BLAKE2B 949f4773cc367a87c78f498d90ef810629b4a2cc342bf8b9008db51d76eab9d75a1ac168b0f0c207b2edcdc4c0a4c6dbe0a460b6b2b7e5908609d1e75ae582fe SHA512 c565fd79821adc8c19435d7fc65c779b673a851899d45eb00016dc776e1ddbf4854a97b570aaf9577e717053430b562f648f74bdd483eee30215e530ec28ecce
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml
index c5298995d2d4..7a38bb900964 100644
--- a/app-text/fbpdf/metadata.xml
+++ b/app-text/fbpdf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index fd75f35b6bb9..825daa0927f0 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,5 @@
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
+DIST lesspipe-1.86.tar.gz 120910 BLAKE2B 1065bd95707991380cee8b1be917ae66a6537fdd721e9ec0c326b1ce3358ae518dd28902505967fc086e57e9d3e603e27a328f38c79ae38fe70e5e2a8306b59a SHA512 88a890b91ff3d889f32f23d85d76ef96947e8f1175d54d4301e8891587e87bf1c0a147f1fd5391e52badf4ee31229d337b97c5d5e5f74f4dde966eb93294cfb2
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
+EBUILD lesspipe-1.86.ebuild 1166 BLAKE2B 80ddf411639e4d6acb5e903ffab5a7c0d5cb1ac9d579eb900f543f145701f0c1ae66c58292501a373b7d2d83cb0f2ba4c59ee324c253221aea0d5e316af60ecd SHA512 4f0ea8a65ab014a91779884f47f4b8538af9fb4a9b55a4522f005f0fbaa91e1b3f85c59c683f84bef3a6cb54ac09d354cc9e1157a63c49e7039afb68e15b9266
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/lesspipe-1.86.ebuild b/app-text/lesspipe/lesspipe-1.86.ebuild
new file mode 100644
index 000000000000..6ebe2f17d7a8
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.86.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Tests are broken in 1.84, 1.85.
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index fc4cb07d9d2e..5cdcae1a7def 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 631 BLAKE2B 7d0891dec4d9979dd90757edca0f92a5c604341b474b4f6c40e633a481750b03c66d9481bc065115166aa16ddfdb0d964dbef52300bce43fb21a5bd1d7130679 SHA512 d2c329d9b083168a29ef6d1a94fbad6d846997c1204a721decb33ac8f716278f5378e03563a58a9f916df3d4c19f7ce19acdcf574386d16de95b1b92d318175d
+EBUILD libexttextcat-3.4.5.ebuild 639 BLAKE2B 1aae1efa89bbb23bf4856334b1346006af09242dc2cb4a59dedd0e2e1a6d06279b4357fd012de9419a30e85fcd2c76e724c51a527c526bd3bbfb1f7b973f500c SHA512 943dd27809548b7c5419de5793f5d50757a5370a38e23160027caf292c5cd24300895de2c479064e77d9e7b2443eeb5f7d065e8cb1e8ecdd1f9be0617f0016b8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index 01e091381ee4..31d321846aae 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Library implementing N-gram-based text categorization"
 HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-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"
 IUSE="static-libs"
 
 DEPEND=""
@@ -23,5 +23,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 6f994a6926e3..2dcb5c44ab7c 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 1146 BLAKE2B cb7163da02ca129b6b6b38b569051d7abfb59366efbc0315427eb2d2ec6ce380c58dcdaf0bd504cbe0fdd3fed267ea2aeccd334019d4d52c5556c2a38d44ff8e SHA512 a278608d0089455b7133ed3118f552ab1d47bf4d4878d7a4d4344240be82756660a95b1cf9514ecf53d06858446ab47aa4d0805904d98429e9f87d7257842c3b
+EBUILD libpaper-1.1.28.ebuild 1142 BLAKE2B ed2674b50afe719886dfec1e284a57a20d32d62c887fdb68c981a6c1d563980e1c0bde075ed753351a0b856599ee7b308c48a03ed591aa98a451b38f434f354e SHA512 7708e7db215a9892bbd6f5c98680f278537f667e742acab9b4c944afd68c906eaaaa1fb004489396b82e3b371f6e528f4eb1afb368c5d9a0e48b1d3f85b767b2
 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 87f52550286d..5e4f7ebebdaa 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/msort/Manifest b/app-text/msort/Manifest
index ad01390c0fe9..23dacbc255d3 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -1,8 +1,7 @@
-AUX msort-8.53-find-utf8proc-headers.patch 1540 BLAKE2B 2dd8cf34a982048df63cd4dab0aae8730975c1562e8fb818336a84827b93ee2cf75cc66179d0f92d4be9d5fe3316b01058bc0c69bf1322d97836c46a511f3e14 SHA512 fe19465012ded3532db5bd4cca30f3a8721d42d2301e232144be411a364941c7d63da47ea5b6c9d70cb7631bcd3fb50fcefa96421f2e79e5bbc3831ff3307b53
 AUX msort-8.53-fix-icu-build.patch 239 BLAKE2B ff53316fd6b1f531b432655d1fac1c3b24c114ea35ae63f4f4bb65f4598db2039dae80103bf942ba2ecd269ae3fb8ea9735bee71907876a6494181db052941ee SHA512 86f7c131166a568dd3b9534662c02681396686d9642d6cbdb6b4128d0c6c8eeec9660c8e5f9c8156e78e096a668ec67eba52e9c368455f40002e18de4dddf269
 AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d845c1c94986f3bbe9f75aab0069d7a12133043ba547d13d26727251cf2524e4e285d0f1207ea43353972eea782198dda34456b984707a SHA512 9e779627e2f92955dc66b03fb64fce767e2cbf2dcdd8a42c9e10f06b512625be10434a47c26a9b7c46e1a15c226d4f66eeda21194f9a0d3eb6deb801b83633eb
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53.ebuild 1025 BLAKE2B 3c7acb0a7fa29c2612588898823c20690f2dee7e2ca35d855fad205a197f7cfd514710dfd77fc3cfe3ad9a7c7431836187100a99b06db51a07bb0c61e9fbf500 SHA512 1f6eec831620854e795d243ef81660a439df1ab99878205f055e758f55ef075315a0b189b69117ff13bd4a21f0d1d31a9df775197f2e219f8cfd1a64ebe30caa
+EBUILD msort-8.53.ebuild 977 BLAKE2B dd13d82936ba2f22ca96a0f5c9eb52a89ad415710418f8f35fdc4b520efb9152df497e7d722b54cca6d18ce17a69f4d1970aa1c97de7d375eb13536d39061b0d SHA512 2abf69beb5c31b3372389e9c2382d47a2c95f81a6423739236410b34478010fa7432a758bbcdc6940c5da2d07cd70b3e8e9658408c1f85273e06b8e223ab3118
 MISC metadata.xml 1000 BLAKE2B 97ca2922b7def4cba7a8b30ba037f225985d0f9894bde8697a743b0ae7ca62762bcc5a5407840a67967f705521782b82302577492f7ec7d7986fd12bd670b485 SHA512 6015e576adbc1d3569c30e0e60280b537b313c9eda6c5c78fa8fa9ed107a9e258de5e4bb33158c7a6298d32edf9d6099834f41792cd5f043b17bc25c35a6d438
diff --git a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch b/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
deleted file mode 100644
index 9b3845bc601c..000000000000
--- a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac	2010-01-11 01:56:36.000000000 +0100
-+++ b/configure.ac	2018-09-27 15:05:20.205734233 +0200
-@@ -94,7 +94,7 @@
- AC_CHECK_HEADERS([alloca.h ctype.h errno.h gnu/libc-version.h langinfo.h libintl.h limits.h locale.h stdargs.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/stat.h time.h tre/tre.h unicode/umachine.h unicode/unorm.h  uninum/unicode.h uninum/nsdefs.h uninum/uninum.h unistd.h wchar.h wctype.h])
- 
- if ${utf8proc}; then
--AC_CHECK_HEADER([utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
-+AC_CHECK_HEADER([libutf8proc/utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <libutf8proc/utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
- fi
- 
- if ${uninum}; then
---- a/misc.c	2009-08-05 05:09:21.000000000 +0200
-+++ b/misc.c	2018-09-27 15:10:37.355738021 +0200
-@@ -41,7 +41,7 @@
- #include <unicode/umachine.h>
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #include <tre/regex.h>
---- a/msort.c	2010-01-11 01:53:32.000000000 +0100
-+++ b/msort.c	2018-09-27 15:10:30.275737936 +0200
-@@ -57,7 +57,7 @@
- #ifndef USEUTF8PROC
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #ifdef HAVE_UNINUM_UNICODE_H
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
index d70c5e1bf098..62a6fff19ef6 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53.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
@@ -22,7 +22,6 @@ RDEPEND="dev-libs/tre
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-find-utf8proc-headers.patch"
 	"${FILESDIR}/${P}-fix-icu-build.patch"
 	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
 	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 43e4159816a3..38bde31905b1 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B a791eddcdc501d050773c76a1ff83781546f7d0e5a563a2a7a7ce3bb8f09e6366151660d87ff1055e1e60b409abc1c2d7bd28bc628dd642f70ed52e937658047 SHA512 978ab556dcf9a7bb59875945d577600d68d8154f3a1d79eb90d2b2e9ef33178b97f3d56cf7ae86f1a98d22b24172f33521991ced2dee5cd7f5f7d8f3f2c2caf3
+EBUILD multitail-6.4.2-r1.ebuild 1318 BLAKE2B 71a4471f33060ef18f2ddfd4c408bc636c780924c6190a8c84818b44ed266dc7bf1bbbad47df0b7d1b25ecf4667b8ae3ce7367fccefe32a5c63bf5705da455d9 SHA512 dbec42fad2778223331f50404d90cd666d5350accc1628036596d4cc639587833473553f9eac75e16310b59b1d390d144370fe1026a99aeafcbc128341e57ee7
 MISC metadata.xml 346 BLAKE2B 664f02453aee33a2c256dd6bc38117edb07ebd971f2b3caff2042c905bd0eaf0b9b58374c448c6f81d345303f7eb449ca7637dc21728cb8be3464a30da7cd179 SHA512 0e40da217b3ad26c858f6d8b995300a903fa77eda44927c710881bf7968d4033dfc82ef1c775c76de3ee08fd7de067882253d848b51373b0ac25d6e33e02220e
diff --git a/app-text/multitail/multitail-6.4.2-r1.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild
new file mode 100644
index 000000000000..8c10123313f6
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic optfeature toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+RESTRICT="test" # bug 492270
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch )
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \
+		-i Makefile || die
+
+	sed \
+		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+		-i xclip.c ${PN}.conf || die
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	use debug && append-flags -D_DEBUG
+}
+
+src_compile() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install() {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	doman multitail.1
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
deleted file mode 100644
index 57f9b4e9f0a3..000000000000
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic optfeature toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-RESTRICT="test" # bug 492270
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch )
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \
-		-i Makefile || die
-
-	sed \
-		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
-		-i xclip.c ${PN}.conf || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug && append-flags -D_DEBUG
-}
-
-src_compile() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install() {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	DOCS=( readme.txt thanks.txt )
-	HTML_DOCS=( manual.html )
-	einstalldocs
-
-	doman multitail.1
-
-	if use examples; then
-		docinto examples
-		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
-	fi
-}
-
-pkg_postinst() {
-	optfeature "send a buffer to the X clipboard" x11-misc/xclip
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 202f7b5052d5..8ab9540fdbff 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -8,5 +8,5 @@ AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r4.ebuild 4259 BLAKE2B c95febaeb6be6ccef3c48ee358e3f1f32e37af133bf3885dbc381efbf0fa9a85d81f50efbebd7da36d70c339ca465b3670db1daec0061c876ff9ee52a765a65d SHA512 827ae51bdf6613893eddee22708c8fb5ae6322752afc76cf1eae0386f3f610f5e26697e0c68729a65fec0bfcf6ba3d8eeee82544ad9d4d4c7bf5c440ae79b044
+EBUILD mupdf-1.18.0-r4.ebuild 4266 BLAKE2B 840bcff549d8911c422580d8ba07dcaabc5e036840bd4ef3cd2346703465365d91d7cf58fa55d4860dfd6c39f7f32b23a1ae97c32184dfdfa8e5c11e4e65bf7a SHA512 b62fe1022ba26fcd7f2f9e7ea0b6b7f94bcc1e80cc5d8dbb086436afa46c4978249214bfc46d4057263a0a5f6c06a28eeb40c31206355379a442979e857cc722
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index db2b4ba6fd92..66511fc715fd 100644
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 1e116d254d25..e9adb84284ea 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,4 @@
 DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
-EBUILD pdftk-3.2.2.ebuild 894 BLAKE2B 251c4f945e0a818f1db0c2e5043db5cf2abfb7d6595bdff4888f6a24cdfcd44d6f8e783a496ae96a673065c79927d44593774eb87c8c1a66058c0b0992cc36e5 SHA512 590422bcaf897d40412b8c45f245a93062d878196e953e058038eedf1b37443a6c9481fef2c35bf3b83542382939702cae2e0decdb610cd61c5e5361b8efe9a0
+EBUILD pdftk-3.2.2.ebuild 893 BLAKE2B 5a6692ff39c58520d8f7ca68121274d978b26307db92a1957b389997469d432c724c3aec16f9afeca90a42a7cd22d71601ba35ef6352c8bf147274880137e2d6 SHA512 aa3391a55d5955e7c9271fbfb70cc6defbe9be3b315e7c229149bde83195cefc47ae62d9f5631dcb885e28563353b319fb480770463a13e8ba9d8d00ddd68020
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.2.2.ebuild
index b21ad2a678f4..76a67b2ad73f 100644
--- a/app-text/pdftk/pdftk-3.2.2.ebuild
+++ b/app-text/pdftk/pdftk-3.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 7310f96e235a..8897da0035a7 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
-EBUILD po4a-0.57.ebuild 1294 BLAKE2B 99bc832e107366ff1f49adb1ffe74a0daf7f3ca64096f346bfc24020b373059d97d2be306eb5bf7b8bb87a95bc94758ffada7abd7b44c480e3debb1a658bffee SHA512 1ac41b725531ce40e1ccae1d6034d94f57b3ae2e9591a06ff28c40335722d143c065600268a7fd1c60ec1ad2c643440eff2cf8feb08f0d01eb62b8cb7e2d9803
-EBUILD po4a-0.62.ebuild 1391 BLAKE2B 45c1a482176dccf701cf754f4814faafa7c2a15be167bbf80dbbed11f71be76fc392774131bf8b41a35c3473d84541d0c18d08e2ae1e072806ad1510b4669956 SHA512 accd7452be3a2810fbaa7398efd0cfe5e45b3a0178ed4fbaa0c7a47166d57137012c83115c4a83770cc385367dbe6f26bd77cb575454f459cbf2e70ab58f5790
-EBUILD po4a-0.63.ebuild 1391 BLAKE2B 45c1a482176dccf701cf754f4814faafa7c2a15be167bbf80dbbed11f71be76fc392774131bf8b41a35c3473d84541d0c18d08e2ae1e072806ad1510b4669956 SHA512 accd7452be3a2810fbaa7398efd0cfe5e45b3a0178ed4fbaa0c7a47166d57137012c83115c4a83770cc385367dbe6f26bd77cb575454f459cbf2e70ab58f5790
+EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
+EBUILD po4a-0.62-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
+EBUILD po4a-0.63-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57-r1.ebuild b/app-text/po4a/po4a-0.57-r1.ebuild
new file mode 100644
index 000000000000..e05dec8567cb
--- /dev/null
+++ b/app-text/po4a/po4a-0.57-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	dev-perl/Pod-Parser"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+PERL_RM_FILES=(
+	t/09-html.t
+)
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
deleted file mode 100644
index 08593f0289b0..000000000000
--- a/app-text/po4a/po4a-0.57.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
-	t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.62-r1.ebuild b/app-text/po4a/po4a-0.62-r1.ebuild
new file mode 100644
index 000000000000..d2312dd067e5
--- /dev/null
+++ b/app-text/po4a/po4a-0.62-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	dev-perl/Pod-Parser"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
deleted file mode 100644
index dfa0d2ba8699..000000000000
--- a/app-text/po4a/po4a-0.62.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"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
new file mode 100644
index 000000000000..d2312dd067e5
--- /dev/null
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	dev-perl/Pod-Parser"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/po4a/po4a-0.63.ebuild b/app-text/po4a/po4a-0.63.ebuild
deleted file mode 100644
index dfa0d2ba8699..000000000000
--- a/app-text/po4a/po4a-0.63.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"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 738b92c6c906..8658a3292e2a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,6 +6,6 @@ DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c61
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 EBUILD poppler-21.05.0.ebuild 3275 BLAKE2B 68c1ae9c653cc9f1ef2ec69f31729ba20d76ab5ee7eac8e19091e38f1eddb9d73714a69c0cda3df1abf9736d4dc1599f5754421da76b2b1adaaf729cb8d619e4 SHA512 e23de4db062620e849b62a511221b7871b0f1e927189c6e7424271f0eac7945a5af929ad12a604ee43fe7e00c2c49d2c99b9e74d955ca8ba64506fbaf473fc65
 EBUILD poppler-21.06.1.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
-EBUILD poppler-21.07.0.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
+EBUILD poppler-21.07.0.ebuild 3410 BLAKE2B b5184ade27866acbc521230ad858f1fd955039869ac06489867edee3fb23ce4c571e64366500122318bf4bf21022cfcc241a5d69a66383fc91ba1297aa3bf479 SHA512 8ee74313f040dc9c5c4c283f5303bc2d0537e8aa5286b45624ddfdbce8921a2cc77ae5aa92dbc89c69e3e2c539fe3f270ad05a77197669cb523e1c03e435c015
 EBUILD poppler-9999.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
 MISC metadata.xml 1094 BLAKE2B 661b20d0ca935bc2d7c91a395f1a541085bab7139858f50c5a8adf04b3d8c8ce97b80153ac9be3a6a92d5ee008505617f305fa1b37e94ecdd77f524f56b28a62 SHA512 51bbcede699a7f4f3d70bbbf18080ae17054daa48de147bc9756614a84225e71d1bb9b7dab918f54661e001cdd33f5a00c5b55e292d8a99e7ed66b82798a9b69
diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
index 048302fba121..5730019c6024 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-21.07.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${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 ~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"
 	SLOT="0/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 357e532d4e5f..6d0addc00391 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -5,5 +5,5 @@ DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f
 EBUILD qpdf-10.0.4.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.1.0.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.3.1.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
-EBUILD qpdf-10.3.2.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
+EBUILD qpdf-10.3.2.ebuild 1251 BLAKE2B a6c12b3178f671060f2c01633ec3a6b0de3343ca9087998ca54a3364f06ae055d442595ad173057c936c55024cb90b81f170d09259f2d14b7f82aa414c7701df SHA512 84fe44d555383379f59fac01481619e3282ee334e862ba16df186f58ecf73ced5a6a1877e2ac8519ae604850910c07133b4e1cf60be0caeb29d129e81cb7e8c2
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.3.2.ebuild b/app-text/qpdf/qpdf-10.3.2.ebuild
index e6c1b1772480..9b78f115b945 100644
--- a/app-text/qpdf/qpdf-10.3.2.ebuild
+++ b/app-text/qpdf/qpdf-10.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index a975e6b55aab..1a8f1379065c 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,6 +1,6 @@
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.11.1.ebuild 1190 BLAKE2B ad23f7d61db3cc4a223e9dd192dbf90c77a55dde5a61b172e89582b939df6a4051c7ca616e9a72a4ae4a8bbf28c83099ab4c8d4b612f4894b01c8ac95fcd9350 SHA512 7346bdd524f6a04bc39d554a4b73aa6138489302e4fc31aa8a463008c1ec3274527fd432e6fe01ed8d8a17074d575b60c01860c27522112bd7d37a44a43a1e38
+EBUILD scdoc-1.11.1.ebuild 1197 BLAKE2B fe17671505392413faef92b5bcdb3f44b487064b19e522486fbe65dd1b7adde2c8e3fcf7e0807428891447214631ca066e3754e6e90b4cc79c292781ff5621e7 SHA512 842b99af5aec1a9166cb83330a9a789bf2329cbcff0eaf23488a908f860dd4949fd391fc26bbfba0a652ffc23761eb819a10693edb025957a2d38213e94592d6
 EBUILD scdoc-9999.ebuild 1173 BLAKE2B 873f1def0a103e8c431fad6ffbf902a9e97ed543d29f738e0ff4799be7f5d49449f50b30e4f37ae5310f7ede07e15f76a395f553756f1d048b3f36ee8aff0b4c SHA512 4ac9391cd7564179179a1951469c73e798c12a6ad3b82c72019d64e6364c943c02251b43344d5e7a1f4e9f1115c941b2e5b89065be25d00002cf5b6dc8fe3af1
 MISC metadata.xml 436 BLAKE2B 488499e5a1aaf5c623a667415050a63f1460eb6495b1013dd81299807a330680d02f65f725dd1f964794b28956d7d4e32b07cf24bbbb2dedd77d2919e23e131d SHA512 13ff20e7c0fee769e256c7e9ab595ec623d86878bdbd0a57ff036ac496513aac348796d526b978539f0cef1bac23549324fc7a6ed1dd45a685050e04d4be66d1
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index 8c4bd7440b60..edae9c69b757 100644
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 7753a58c270b..90d13586064e 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1,3 @@
 DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7
-EBUILD xapers-0.9.0.ebuild 795 BLAKE2B 4fa945cf7fb8872b014c2be83e57f755718b9f3ab298199229d2a2fc9c09cdef71723c9ecafc66bb6a470727761ad2d8cad55fd79442db8d8a0201b26c99e375 SHA512 cfaf7744183bd8a347c6bb7de747f6f1937b167d695f49cda79e610f7050cb1c045edbeb7291d56c0e70bc7cd08a2182df2a7733b1197b39056de20a31332678
+EBUILD xapers-0.9.0.ebuild 766 BLAKE2B a2610982f8c59d93fd8be9d1f960b9c606d83448e06f440d2afced6b26eeeaa5f2d0fcb8b3f60f6858779cb0a8e54bab795336f268ba16e2fd32e62214b09d6f SHA512 6a4f095c8549ee2fd8bea3ec393be4891374d7013defe2d22d1fe559cff6db4959a2c8024725b40c6523343eba528438d423070cfb65664cf2ded77f0baa0df1
 MISC metadata.xml 583 BLAKE2B 89ab5d3ca7ea4dbe5b5371c19793d9f2feca363f5690a67478e83963e9afa273113c95c1b395b12e060754864f2f9c77765a486f7577f864f3a8d0fa73e79c3c SHA512 840c4e58c80d826e67ebbfc2b88670d70a4902f8188fbfba9c63e0553d40676c4df9684ab3c7d086e9c36d28dfec7d402147cf537fd4d4517aa857cb0cd714b0
diff --git a/app-text/xapers/xapers-0.9.0.ebuild b/app-text/xapers/xapers-0.9.0.ebuild
index ca6cde8881d3..e47be22b3be4 100644
--- a/app-text/xapers/xapers-0.9.0.ebuild
+++ b/app-text/xapers/xapers-0.9.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-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
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -28,7 +27,7 @@ RDEPEND="app-text/poppler[utils]
 
 BDEPEND="test? ( ${RDEPEND} )"
 
-src_test() {
+python_test() {
 	cd test || die
 	./all || die
 }
diff --git a/app-text/xmlformat/Manifest b/app-text/xmlformat/Manifest
index 22f98829aa2d..bea2bc6e776e 100644
--- a/app-text/xmlformat/Manifest
+++ b/app-text/xmlformat/Manifest
@@ -1,3 +1,3 @@
 DIST xmlformat-1.04.tar.gz 156498 BLAKE2B 18463dea611a5d080056b0ed314eb12555e2abb12d630fb879421fa6359606f7606fda42e146eaaea7ae2fa470661ab4e28a86762375024704e607316f6323cf SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d
-EBUILD xmlformat-1.04.ebuild 934 BLAKE2B e7f14a90ccfc8c529eadad43d641cd2f1c4ec04560b634822534a15793df1d86164e43acc2b0ea120f5645eef0cffd34ad03715ed777851e731da78b8f7003af SHA512 6191ac9a87aa91b95d004e1762ea94ca66f25a919f2a3df1b677f73b01c156e16fb08163c7a218d1e80012aa6b0bd97f2231d14e34452e6436d630b2e49f1ff0
+EBUILD xmlformat-1.04.ebuild 934 BLAKE2B dd13f05ff612a01c3f59ba545433b034b6a070f3874af73f34377eabd2bcf67c82b85a9fdf7b85ccb1306e52750192ff14232f6f900769c6f3d17a5904451601 SHA512 b19fa048594dfd25c8fcc1d083c29f23f63a7580e4b79f17764956778604ad92190d6c489bbf3999514532ba6ec21f63f74e30c74cfe499d579c7f718a767645
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
index 7e10ca1cc039..a286b8eb8561 100644
--- a/app-text/xmlformat/xmlformat-1.04.ebuild
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit ruby-single
 
 DESCRIPTION="Reformat XML documents to your custom style"
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index f650a17b97ed..ee17f9aaf894 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,5 +1,5 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-EBUILD xournal-0.4.8.2016.ebuild 1181 BLAKE2B 7b7a68595c04f314cff458503eedfbcf7a4323d7f99d6b675f8bf08037a5170212d47449862721966ad0f6a0751f743c333842199ac2537ebd8ac18090ccc077 SHA512 bc9bd5408956f06a11f1f8e635ce958fc3e2ecf5f4a26602cfd67a223d50f1fe74edac78528203d389ee6c8a331565a3d4c8594c9181a9995033eaace768a885
+EBUILD xournal-0.4.8.2016.ebuild 1188 BLAKE2B c3803e8c9ed0cfd1e573568fc3de4351ac53d0e997f6e933d912325dad40e8949491e7ef060a9d2496a96c014df6ae98485e61142f57185c6b5651aa735c1928 SHA512 ad4d4ee2b734862b04997351b9aeeb1472a0562dcdfac9fc030d7759b5db5182756e1ebafead88f53c33b9baa58f9e26b86fdd8e827881c85669e73e037f0cda
 EBUILD xournal-9999.ebuild 998 BLAKE2B b040d45de8ab96b168607a97e249a5e92aec2b7e8a2f95f098ddd63c912e33e90679566fec6cbf03ae4b95d5b039ee7ee65d0249cc35303ff68e0b864cd77d54 SHA512 d45e91904ccc3f71297a79ae9dc2308b7cbc38b574d55dc3483789bb3320dcbcf2267a298dbd5f1c368698caf8750b32f6bae4ed887f5a9f6fd7debf6693f5d9
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
index c2f75dda057f..8ea556bd5054 100644
--- a/app-text/xournal/xournal-0.4.8.2016.ebuild
+++ b/app-text/xournal/xournal-0.4.8.2016.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 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
 	unset SRC_URI
 else
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi
 
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index d1b539e4f573..1972005fb528 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index 7e400765371c..7b2da39c96df 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
-EBUILD ntp-syntax-20031001-r1.ebuild 429 BLAKE2B 76c5983a9e7b30d19ee8d447cfa8f27511f787f812683ae8fd9ca83bd764952c0b4223534885d63b3d2930471d4591ae4bd9f7e1ce353a2aa16d7446f72a1780 SHA512 27a45af661338561dae638e26234bc461d36812c8bdd5e6a263c3f7e012fc9d3a60091cbcaa44a2a76e104fdb17f96eb92903301c395fc6268986f2e0ec14225
+EBUILD ntp-syntax-20031001-r1.ebuild 436 BLAKE2B c69cc517d35fd79e5e4caafb6422e12d64059740c13b30b57851a4e0d9477da8104a878d2c9be4300ce46972eb679c1eb8fd1ef0c6ebca7952097c102df4619f SHA512 1161993c7e787f8d8bf19d99cb38e7e86dcdcda76c8cfb005de51190784b87d901985946cd9ac532f010492d91038da6e76775fc499af94c5ffa54f5d4b42a92
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index 1440ffa45093..749cbbcb5d9f 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
 
 LICENSE="vim"
-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"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/rust-vim/Manifest b/app-vim/rust-vim/Manifest
index 0e1b8c8f2dfb..7c5ce12f5b3f 100644
--- a/app-vim/rust-vim/Manifest
+++ b/app-vim/rust-vim/Manifest
@@ -1,3 +1,3 @@
 DIST rust-vim-1_pre20210215.tar.gz 39541 BLAKE2B f29c43194a2c18731e6c4bb5e2ae92c00d07c85cc46e3a5136ae5a27a5c40d18e6969f3a73e01ea90620d09e77174061648a32b62444e400b5ba960cf79ce48f SHA512 7370f2752ebdcc16497f88da6f7bfd06e6fac8ed280661874cf8ad802704dbf5072d535972e7361d4ed5123724c0d4729eff1533573fa33a7ba05798fd0467b9
 EBUILD rust-vim-1_pre20210215.ebuild 580 BLAKE2B 681f5bdae871d9755c51f019825182f41697cf4b3ddecb34ef994cea3c49b5834a2bbcefabef8927f54bec946af4c83f035ca1839f5301967ea3b5190aad1996 SHA512 f371233fd6b7cd990069af394f5e8ca2c4795b54367d1d8de4a9cfb6ca9ae1d414a8aca964b10478db04665581e8f6ee22c7fff6211aa07d97829016676761ff
-MISC metadata.xml 612 BLAKE2B 934f6e7c34ca1cac4937411eb7fe629503f35389760c142dfa9ca0ef49b4c045732a737fd27720a4c0d0dbdd080f1a358d247201f4022768fa9b348c434c49f5 SHA512 acf271f4282d9ecdfc2dca3b4ee48f7ab98f8ec8e9568e2d474a3f5ca772c6581792b0c80ba35b15825381d54fea987f744360c1285f6c68d1c207ac74a54328
+MISC metadata.xml 356 BLAKE2B 6864d73549d73434014d35e9d5db92c74c2bca3837c509cd3654478ef23618bbe438140ce8d6d7cdd647f05bc5522f5995143e6ddbe9e524dbfb503dfa4396b5 SHA512 268c5339b84775e0a9392777402c5dba09c0a5d94f9f2a3b512a0739efef35d6fbe2615dd44fb61d6bcf9141deb94ad1983db9f14464ccf0b0d9c62ebc593e18
diff --git a/app-vim/rust-vim/metadata.xml b/app-vim/rust-vim/metadata.xml
index 12181c74367d..60e882ec29f4 100644
--- a/app-vim/rust-vim/metadata.xml
+++ b/app-vim/rust-vim/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">rust-lang/rust.vim</remote-id>
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index e0614c99c9b0..c97dc5101b69 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,5 +1,5 @@
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
 EBUILD vimoutliner-0.3.6-r1.ebuild 661 BLAKE2B 696d301988c28922e2a0ac21ae968cd7e839637c8f32feb9eaac0a0838d08cb258c62ef82bdf2e46982fada5a4bb96a2d5f4c60c542f7db69764588484527210 SHA512 4a6e991e78db3baf9650c4ced113f479dff68b6a81f12002b20c267fbdf8441da69851817c13601fbc308da32368da611b0b199f03f18c72f6acaf58c73779ab
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1258 BLAKE2B 2f5d01548bf83169e64ffbac3f4d91a247d4d18671da4259bb8a59667a639cce90c68bfb01521134bba612964c11dfec47221e83e8b51b981f95f10b38b3b04c SHA512 9ef0474a410b97eee83cdf2a49c3cde6c8dc4b366e8a2b46188d521024b93ff212fe1a06d44f2f90f142a2f1d909c70f1a8b90c02cd1ca856405ba37f5f18f7e
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1252 BLAKE2B 44f517be04e1c185975c54aa81e50de9eddd02df83d025d42a6fd97d3041fab8223ab981bed2f1090fb93798a8257c760ab8cf2191fa41c16a9823af41d3a721 SHA512 2d7c60a8bc274e0877584b9e5ee0c6388f9a3004dac76963e119eebfc2cc6a375c13dcb82d70bbb7a3bea600e9d1113676acf8150eabcc7590b9ab1c015d8614
 MISC metadata.xml 361 BLAKE2B fb9ec07c9fec7dedf5f8a5717a7b4eb875264294f5eb9a24fed191a1195bea800bb0f0fe9ff4d81d02f36f35910239d96e218f332bf9818e27a3f7af7a1ee502 SHA512 c65f2146f0ddf4d6c048f5e6f87db0ab5814fb05966a2b2a9f60999485125975dacb5d609ec9484f7b4c8c6ef7b128d59a4f7ed104d6cb582c8c42a88bfb1fe3
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
index 2478967b3053..93677fff20fd 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1 vim-plugin vcs-snapshot
 
@@ -24,7 +24,7 @@ VIM_PLUGIN_MESSAGES="filetype"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_USEDEP}]')
 "
 
 DEPEND="${RDEPEND}"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index e354eb5010fc..a7169de09ca6 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 285ba599faac..010d460f83b4 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -2,5 +2,5 @@ AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb8
 DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
 DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
 EBUILD aunit-2020.ebuild 1157 BLAKE2B dfff70a9ec5b111355f65f820529781aa5c2041109095310b31f5780738e330d5a0dd2228e889847f2d39f9db5a7d4a2fa13166a6f1fbd63b470dfdc944999a7 SHA512 165e1398966e92da28f0f8c23870b2827783471e735f545f0f62ae54b56a4c9179a769161f68eab407be35f676a19b9390e1986a4ac21cead3120d2e0a8a7815
-EBUILD aunit-2021.ebuild 1206 BLAKE2B c09b536abbebcf81cabdff54df9dfaf3130e49a4f0ce658c6205fded72a28eae269495ca3fda9fc0514ae397f811eae5aaca938eea0d9ba68ffeca16a6f5b692 SHA512 4533b71bafc14282ef0ef18205a87ee74e74421ed60197fe1b49e3f9ad78be9d45d4436e270240d1940abaf8575e7797522ed0abf8c20a5e1510635837af2d7e
+EBUILD aunit-2021.ebuild 1205 BLAKE2B e26780774bf852591f459c766b29aa336dd4dbc7d3163aa529dac15a3e553c4406ed82e420b71c941c93b2c88350542a229bc4e08f6454866976f5d58f502815 SHA512 20ff7a5126a02a1fa9406f599096dc2519655ed9e3ff20a01a01e17ea69e4769667da6f65850f3d0fd94d7377119a065ec3a696bf35c0d86291c01d76a72bff9
 MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9
diff --git a/dev-ada/aunit/aunit-2021.ebuild b/dev-ada/aunit/aunit-2021.ebuild
index 12757b958979..32626cbcbf1c 100644
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ b/dev-ada/aunit/aunit-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 965b7db3d072..4e4a37139ae1 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -9,5 +9,5 @@ EBUILD aws-2018-r2.ebuild 932 BLAKE2B 3fc7a96afbc603efc81339cea628ee55739a93859c
 EBUILD aws-2019-r1.ebuild 892 BLAKE2B a364986dd0a40544fb4915ce6484d517f62437468a55c01189751b3d9c0818acea43df3db2ff29de97736fc045da9c3346bbeff77ccf73e146cf80e68c433c7a SHA512 c394e76af5ba613cb8d817b563947f8d12a988f1e2d024ea31c95bd0f361a342ddf30a769bf77a8dc9c001d404e65afb609997130f3a08cdf63940497e0f3603
 EBUILD aws-2020-r1.ebuild 949 BLAKE2B 4e1c7cb3283d45871e84b3eb13d92e2dcf1a20ae3bf49c69fe1e028fa9f570e18e62238f62070c685695b5ef2ce1113caf3b66e8dec1a3a3cea0e03a04c07b64 SHA512 c72b085268de15d8373f1bb270f9171e483056532f90e79d1ae259943baa0354f37a6f31ee4fa11c8dc950cae830c689205451cc7990a4ead4a7176e78b2253c
 EBUILD aws-2020.ebuild 900 BLAKE2B 4e8e25a6008bab2738c23883c55680c99e068604f00f6f1900bb03e410295c6a591fc8ddc728d19f376c2539f0d6f31bce4bcb438c3b349b9b50bccdf55f18d9 SHA512 125aa34b8f5046cdd56e7111dbd2a53bd39b46ee2e6ead82fdbf04d0e62d1d62d570494fc6fb803e8f8864b443f8c1ea8b14b356be2b8e518b1aa1951ec8db60
-EBUILD aws-2021.ebuild 945 BLAKE2B d61772a4427b8700f99cc99faacafab22a27d420992d4b686c4c2470ac7593f84de7e0beafcb2e755fbabe4fd87e6175ebc111683ba6f6c7b5676916e9af2804 SHA512 d0d1aea4172582dc19166fb9db1cb31b5ddd72d311e710dd2bd6523ce7b470df5b8629d95396c4aba3075ca1a70d7089e9a2666d1c7f248bfe830134b2b43671
+EBUILD aws-2021.ebuild 944 BLAKE2B 9380715d4fd6011d36f87675cc1a5ad9ffc4eeae9218636068c35e7f74cd1aa33830e9eac4b8cca8c9eeb76f2dceb2bb2c6a7cc9ce3b0712253f4fb6c2fed967 SHA512 97dc2eebf62c2c25ed1ded30eb536f152199192aed8dcba8939de8c747b62ae1ede6ca3380b3bedebe399ffb7473b469674464cd6ee9d252391600dc16df746f
 MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2021.ebuild b/dev-ada/aws/aws-2021.ebuild
index 247f5e933d6b..a675e9f44099 100644
--- a/dev-ada/aws/aws-2021.ebuild
+++ b/dev-ada/aws/aws-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index dc7bb90602cf..1fdbf5866153 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -2,5 +2,5 @@ DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d58
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
 EBUILD gnatcoll-bindings-2020-r1.ebuild 1941 BLAKE2B 7a536cbeb74cc777d1313a6028c2459f73434eddc0419855ebab884b044cf17e724a5e97f590747e4ab5b10b306a8cbb95330adb0c15b839a063bb561089c0ff SHA512 48f4943ac35909e1b556054e1f4c69dca023f1e9123ed3fc0b20add8c7226b77a0498c63476bb5dd4a53e5190d6bb44353142adcbe03e98ede95c1db0d7c68f4
 EBUILD gnatcoll-bindings-2020-r2.ebuild 1958 BLAKE2B 151ab89cf5c6e0aacbf92c36be997727f6be69dd21a8079ae3023ca5911276b7545469872d952df2a0c88e4b838341e0dcc92533e7840f9ed3fa523e9c47c23b SHA512 c77a376be1e52ff62ca6a13e90d3054dfc61b02c651907e8e0daae7399a843e237df97f6438f50f74f365227404afb0d44d7a47702d63b3844594a9660c7aa5a
-EBUILD gnatcoll-bindings-2021.ebuild 2393 BLAKE2B 0b03e3a3c03399d44a5bda6ecf567eb37dcc1269cbfdc5b8220f19afd6e76f639e840a44d5b57f69d004baad33b2f5b88de9cc55cb5859c62c4e8ca6cee3c216 SHA512 eeca43fb2eeef35799db40c7ede79b8a7e526f3029195feafbc590a276ec7859f0f1317deced23f63028f20f2d5dba9e0f312d51ff95ec086b46bf49cd62e4bf
+EBUILD gnatcoll-bindings-2021.ebuild 2392 BLAKE2B 2015c62bf500e18245717391b626a24dd8cbced3dc6081da31fb52b98c7729ba76472534410f82e6c63cadf840aea28a0c48b9054184befa5c94b248d46c9b2c SHA512 a48630fe711726f029cf46552e059e58995f0b192eb97c9fc8bb594c1bd628b9c21c63098b1136c4a5178ea0c05e4334e72d4c1f70c0e9e73242049957894f12
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index d8d413bfabdd..078411675b1d 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 57d218d4a938..6edff852232a 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -3,5 +3,5 @@ DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62d
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
 EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B d91ea0e079e7c1d2d8c200a8c96bef3b3d157e6e8408b3f51e8c7a546389a186762939e3d5a9cb90c501441929fd50a2554774b30dfc3639aaa2ab19f1a70873 SHA512 b2b4c5df7f7eb3ca474963e1fb2ae793cf0a26b111e53c6fbf5a20df74f6d5c407e1742d6aecb66c8884f9f16a3b5c9c33b191df10b47de491d159243139b031
 EBUILD gnatcoll-core-2020.ebuild 1578 BLAKE2B 5481ee650d75cc3f963c0c8992c46133e5b9db29d95a850f915ae7183ee0c877e48e2247ab9e7a27cf80ad181557b64eadc3c71d3e4f1fd66005b90b61312f95 SHA512 310d4563b3f16f60a893ecfd4cf28cb2425b7d0c33c1b9402308c76876cd6f2dc0016cb4e1a3b74ec062ac7ad723ce4ff119dc9c16011dc2bd0469c4a294a7ee
-EBUILD gnatcoll-core-2021-r1.ebuild 1705 BLAKE2B ed8be0e86c943f0810202984c27df434b14713dc8b949017e97f41e8314b2c9ea9ae6a13d9036ceca4e3b20de0945ba8a6795adbdc35265dbe45b62dee474148 SHA512 ff2283f14b19c741252e622799bcc45b6a01b6bdf69417864a9e75fe0f009a83673ff47879a5583d3e455faa4fc11a16a2cdaee7a2f7ae4887cc467cded90c88
+EBUILD gnatcoll-core-2021-r1.ebuild 1704 BLAKE2B 97467428c37b61dc0546b8dd9885156492ad404cd7c4b7fc63fd25403174f0bae37103da809bddcdc3fa796deb9bbb363587a486f7353c09bc2a331ed5daa680 SHA512 78e5b08df25c8bfd8c60e8dcbdc7c13f0e6b2f00ba21731723678d28ff1bd5b4488ac24350f5a9efe17341ea2d7b388551b022d7cc6fb77cc068bb175f54d85a
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
index 4312e1c8404c..cb2c0985a82c 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 4096a725ea7b..8768b8029821 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -5,5 +5,5 @@ DIST gnatmem-2020-20200429-19911-src.tar.gz 80400 BLAKE2B 0367e4b40a3d0cde1002b4
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
 EBUILD gnatmem-2019-r1.ebuild 968 BLAKE2B b6e338b6c5d0d456594fe1d18f77ead2011783483b0144fcb102882e29bbc29efef08f85b26fae5a7610aac4772d56ef3bf51698c71db0c7db856898291aa28d SHA512 51a720b4badc759b66aee6923e506670a516da634ff7a20d16a04aa3e2d2daf9ac20226d46a528f02620039392e9c99d0019ba676827d875355fce1b1da0b880
 EBUILD gnatmem-2020.ebuild 1001 BLAKE2B 7366b48b6a930b755b4b414d826467912eb2d347d40fdf0c1f0aa8b9ee305162883febfddd41194327fee664a437b559630c3ad2ac5ca7c135a1652dd0474de8 SHA512 668b3d17b8cd32f990dbde400533b59bd7e2662d8442deaeabf9e954ff726d8ae5373495e4ae6002dd0be91de4ac3dcbaf539b1f66dc281d056fce440a560e4a
-EBUILD gnatmem-2021.ebuild 1036 BLAKE2B e0d86c6d2113946584a24732833d60fd8d2d83c788595e0fdc14d5caffb0b61367ccc8fcabb08e28c5220abb42a987ca38cbd84c83b0a5d3dab2b04a8145fe11 SHA512 2bd94e5353c56912aaa1439041df602422124dff1185849a85db3ffef9bf0aec2b3b2441a1ec112925af862f08a52948638dae2469449e758bdc68acd7d76465
+EBUILD gnatmem-2021.ebuild 1035 BLAKE2B c2495ebc9a31ca8f5b4af739541f870f607ecaf82ce58b1e811f5562fa37adf21caaea33deb35d6ce9a99f3035c66affab1b253689b6b8c6e7b816cb3fc83e22 SHA512 15c8aeea14068a6522ca5ef1b8a7eacb75a9103bc990afc3114c5f59a7bbc2d892020fe7c0c20b8f0f60e383e3ad6104035b4ae0c2f25ab5aba69c934fb5ddb7
 MISC metadata.xml 955 BLAKE2B fe2d45bebeeb3f23c6eae6b4b2fbc14156884636af28c5bf31bb946d9a8bd74280a426be7d5e003aa88d1c6bc390f8ddd96c864d4715ce1c034b44995eeba3d1 SHA512 f2fee13e2c491e0a0393b67aa558bac39c7f3ea5a186da421ceb3ebf092bc5acb74cd2076ae59abb81d28a83c07bf4561017164ab27558a1805653023877fa72
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
index bfa7f8890f2d..9bae3b87c458 100644
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 72e72b2c9755..a59a50d04850 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -3,5 +3,5 @@ DIST gnatsymbolize-2020-20200429-19987-src.tar.gz 14121 BLAKE2B f67e3735cacc56ea
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
 EBUILD gnatsymbolize-2019-r1.ebuild 684 BLAKE2B ba84f79bca690a353219a3a030a80720062e33337dc4e1a56eabc2f7f5f9879f8c212050078eb04b64179aa1bb3df8bf51711863d7ba7f0dca2a5cf052079086 SHA512 2be018da0d9bc07498ddb855e9cdcf167f884fcc914c03277e139547fcc22633f1e91d721499738cd74cd58335ac469c0b316d04dc622a2ba01e32e5a6ae86e0
 EBUILD gnatsymbolize-2020.ebuild 835 BLAKE2B acc5cadd2385959b6452e33c14df71fac11ff185a811643b3ac78d4ac98f6e886769c87beca5d4dcf515b1b6b836bd2bf53683284078d5af4a203ed6679533cf SHA512 381c1bbefb2ff01d6aca2529f74fb0249c4e307b9e740d23a19c45ffaaf318a7d4cbd6ccf54ca6928a850df090f09ea82fae867b7b2594f1e52ad2fabc1efdba
-EBUILD gnatsymbolize-2021.ebuild 779 BLAKE2B c603bf1b1e8d914189c23f566869e69cd3fe688ec03408b4a7ab181ed56006992ad151a44470c96ceef86c5899d46e1c2aa89648802edd349195f8078e79f34e SHA512 e5e22607fdc589acc2f5c3fd79147d3202a52dbbd207b7e7d831667a8ab9f309c6c9bbf05c089a912b25d3413d08a0ce3945c2be41e9257e3cf4d1cc6a3ae129
+EBUILD gnatsymbolize-2021.ebuild 778 BLAKE2B 87231fc58b2c2a49e3550e21424e7866fe3cbd825d8712e77d100f0b9ccb4a130312122fb5073f3ee54eb8d34f0f55f83b5ca4fb87e90a668d76e6f34242905a SHA512 a1e0bbf977e1de0011b8ea41226ab5b9384b04617b9c3cbd4d61136c270bca03bfdbe194a37d90070a8e3346764df672a77c56bdfe53fd8c5b1f12aa95d01ec5
 MISC metadata.xml 390 BLAKE2B e655e84d98e4db460d4a5ad93fbe44c1de69cccabca3e19640ce08bf159be414aa86096e7bdf79692f99a53f433ff83fb5cf82f01be3fc67d45fff4a01e2b72d SHA512 48aa4b2d37b38a602b064a6e312fad19c193239899d859e2558b1a9090cc927f9b9983cc0c7f9a2384bf3bb7665a342d6871c236b19ed2b695fb1618d525cc05
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
index efd0a2fbc487..1d0cfb3388a3 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index cdd423577356..a102a1913b6a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -6,5 +6,5 @@ DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c95
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 EBUILD gprbuild-2020-r1.ebuild 1944 BLAKE2B 89f815aa6ae31ecb34a58cadb246bd29f20c871b074b30b32999f57991e47346dead6133aeb2e61fcd3927cf775f752caec99f76070fe66806a8a3221673b8fd SHA512 624ad556d9c9349c983358032ba3b5a221104e462401e8c23776cb26318201ed2e9508d7e4cddbebfe8cbd8870d5e010f14205f6b02d130d79fee860ac8af626
 EBUILD gprbuild-2020.ebuild 1933 BLAKE2B ef95a4e2a94b502bbde2ea536ed846534fafc8ed0bc5138501118b668db31968019f61a523a250bfbc5207f1de79a99b9db2852a87b118a984d4685cf6dcc366 SHA512 5d2fcc275366e0408e2dbb14ef31ae00e6222610a98056376cf57f53f47b84725142352442fcf2c37c09bae05f78ba4bee347fed9b1b67349c2520ced36f35bf
-EBUILD gprbuild-2021-r1.ebuild 1956 BLAKE2B 19aec91243c1ee1de85ccf48e8d8da76bd54124de5c7cfe9bd3cd4d19ccdeb4f2327a54ca0b53c70ac499d6b18446ce95bce0ff4b3ea71a11e746c886577e8fc SHA512 713afaeeda52d4917cf252dd93018d80608729ac5b86544816cfd19dbfbf29430694dc9acb766da50bb704860550acfe265d66245474ad737b58f87fe8b4700d
+EBUILD gprbuild-2021-r1.ebuild 1955 BLAKE2B 780b1b00a9ebc9f2e6f1d90dbe67fb275dd441b987dcfcb5692fea704e84667c60cb5836df4b42fda9c37e8583f42e3b69936368976c31e673a457058613ef25 SHA512 48def23691fe4abcfbfd30f44ca77b3f7f01be26fc51f6a4bac063769af7db9342154df3d00086a5544c487943a8736ceed18f11555d87eee9316aa14eca2e97
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
index 47c4d46d14f8..9fae54f90be0 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 	${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 1725b05dc8e1..1e2883ac6ad9 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -6,5 +6,5 @@ DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6
 EBUILD gtkada-2019-r1.ebuild 1129 BLAKE2B b9804325b08da5a66a4423b5f8f2c987b374a8ec8e1153d0f5ad4b0ecdd619c076a3219ffa8a3d1ac55df34380ef8877064e7b74942e39ccc185d3f45feb796a SHA512 482b5b22512b81b6e2e7f26b488780a9c7eaa54fc3252ceef2b34174bd3f2eb71f108ac41a9408d37f735bc89750b2a946c9516ece39162e12bdf723e40feb32
 EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B 0e31527469b36e1194f2cd3eddb2e44f28bf93e5ebabd5b39ff24bbb778154f8190d63bb70f78028bbcb0e1260f8da64eb1f9ffa33afd9114774ebfbb32ac475 SHA512 ab530fcce187433da2db5e27530e8dd5b6919f4bdf6273fb808e62fef51115e30e7bc03a276bcce4c5406cf1b0279007d561df317277776d41627cbf5b676c70
 EBUILD gtkada-2020.ebuild 1236 BLAKE2B 57fdd5cbdfdde03705661dae4bb405c4aed6119d0057286a1774a820bbb9459b57f37da4eea54fb4b98e37aa5043d91d897363f07628936213fad47f7275929b SHA512 654d4ed98b2b528cbdd7d5df7cb45d0e5dcc0c1cded18946b1f950061347194af090f1c9f2f181e4d1d14be2f72eb817acb12b12399b399bdba49705cd79daee
-EBUILD gtkada-2021.ebuild 1236 BLAKE2B 49904e162bde97c7ea928fa7e3994c004703cb6fedcf877911e9ec3b234c4e8eadc5ec6289d971df1972b8e00737d3646283a893cc25ae0f05b625541acaa12d SHA512 09d13adb2f84567f11a9d53a8a6134abee22cd4954e15df0f385123b7ee542ee52dccdc4b9e0cf686e77cc5941f3540f3cd5cee4ecb4bbb3e9024327ae7ffbaf
+EBUILD gtkada-2021.ebuild 1235 BLAKE2B eb4393fa225fdd499068ad239a9ebf8ab43eaa8567fb6c2f36d98298268ff38beba942ac659c788767cdccff0eefe500ac488a331b349ec0ceff530f9110d4cb SHA512 e61c460c80f4623fab044677c7d74b96633af6713e16a26b6171d05a30c6296329a1c6419a89f039a2705c71d6e8fa85a8c7fd89aae5613605644c46d1dc31c2
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index 5c7bbffbef1e..1c9077302c5a 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+shared static-libs"
 
 RDEPEND="${ADA_DEPS}
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index fe5e02d7b5cb..3af8d1c7c317 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,5 +3,5 @@ DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af6
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 EBUILD libgpr-2020-r1.ebuild 1484 BLAKE2B 0ac331f5ce34fe6106fa0bba65fb086373e61d34ab8a4cd9480103ad8cfc14286dbbf545cc3a6b800905ec79e5841d95fa19646ba10b0edd29d01dd56d379d60 SHA512 339fad2a5679494a1f574799ee2aa0d87df4982fdf8f53f9e1c2d23c4c3272e1fab9f77b6aa2ac7d964162fd6d3826f6c2cd50f95d97c349812d0b49bd1b794a
 EBUILD libgpr-2020.ebuild 1472 BLAKE2B ce843e14df9e0c0d41c592547a2b21628d1eba1a10e6ee9b6ddbbd43196407a91ff2992898e691fd928528d81ef8334d03480dbbd674ae9dc8641581fef4e9f7 SHA512 55a1c88f5880b4607b8a3b6e1bcb9bd11291ca3ff45f4c51a83c9929ea339087cfb5305f2dc9b7bbe4e2bb8bb247b4fb58af1321827341f344bd0b700d614da8
-EBUILD libgpr-2021.ebuild 1511 BLAKE2B 803c1151393f4c78a06c87c9e607b4316c4e12a77540cc081e50b0425e3291f7da64ea796af76c9285d8c61aee5023ad1e1ccd1711bace057c4481ddd66ccb88 SHA512 e3f8bab6f891e4b274b6ed6435ff744d7d7d2b9e03db96a19464426ca91daf094e03977e101d16970e706c8f0780d3a2e92d445137e865bc429119ab4978ed7c
+EBUILD libgpr-2021.ebuild 1510 BLAKE2B 941eeb27010cbf520f67ecbd7a59e35733a101ffd6eeeebe66ee546128f084eb6729e1bef3912b5d695cd760e44de538a4a4254f423601e5ae29c56cc7f5e515 SHA512 00d7d0983e22c5a357a04c91eec999adcdbf215de5d05137ce19402c6f5bd62de637aedc353116600c0128b556536481595e4b5d06b05407cf30721f827cbc0e
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2021.ebuild b/dev-ada/libgpr/libgpr-2021.ebuild
index 398d0c79d959..3af89a364432 100644
--- a/dev-ada/libgpr/libgpr-2021.ebuild
+++ b/dev-ada/libgpr/libgpr-2021.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6ddb2a76b151..39c59e1a3569 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 6933fb436311..1a6f11298ba0 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -4,5 +4,5 @@ AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e4
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1558 BLAKE2B 3b429271b2448f85449e5ca90e7c69250902ac181176605a58792bb0fef8b1514a49c60b4406e8c99c608fb6ed838f7405c10580ea320d6768336cdc4f72b136 SHA512 311c6661d88c03a25eca2cee41483123d519b7390607dad040c116fdf3f527043d03f6d524b22d26cb7550ff3540885f36c9490f5bf3464ac34d970a1a7a248e
+EBUILD clucene-2.3.3.4-r6.ebuild 1537 BLAKE2B 58ec47185232e9128ccbc0c10101986265bf259ba1f6a933827a213ee876bbffbbb7ff13ba5960210ec2a9c3251df9d06b1e0541ae12c1b0cf79228d5d8c9fa8 SHA512 58c5614b945e1b92a5078761a42745c16801ca7b7417065d79fa30f593cbb6b05a25fa104f33eea83ec56c73d87e389591adcaf1d1537715e2638f6bcc6bfe11
 MISC metadata.xml 242 BLAKE2B 42f16f7a7f490260e103b34652b1751b3163c9fa9654b5f8eb155b209d6c57b93634afcb3203b4fdfe45fc8ac2c3e13182750a2ccfd9c8e726bb5d2ea26c69aa SHA512 8408d869c113d8c878e461e3c796233d353df9869af2424361aae629888ee96876cd2a6a00ee8a39ae2069477821c1c9150ca8169723e46167165c39fbc4ba19
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 45755a6557d1..89e1b97f6728 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="${PN}"-core
 MY_P="${MY_PN}"-"${PV}"
 
-inherit cmake-utils multilib
+inherit cmake multilib
 
 DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
 HOMEPAGE="http://clucene.sourceforge.net/"
@@ -14,14 +14,13 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="debug doc static-libs"
 
-DEPEND="
+BDEPEND="
 	doc? ( >=app-doc/doxygen-1.4.2 )
 "
-RDEPEND=""
 
 RESTRICT="test"
 
@@ -38,7 +37,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# patch out installing bundled boost headers, we build against system one
 	sed -i \
@@ -61,5 +60,5 @@ src_configure() {
 		-DBUILD_STATIC_LIBRARIES=$(usex static-libs)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0ae0ac4fa1d8..d33741f67b21 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 76a04025537c..68217b9e6ead 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -6,6 +6,5 @@ AUX resolve-config-softlinks.patch 846 BLAKE2B 257d552458e7d4b59d45fa6827e081dfc
 AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501dd58414f9815dc6b118d3f9de909953f88f1055ae1984ef3f9aee479c339920bf182f31f4265cdb6f1 SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
-EBUILD hsqldb-1.8.1.3-r2.ebuild 5503 BLAKE2B f60641d2e1803e463cd2847c6a71aba983b96d47e55c864f7370829df797ad41aa6b22eaf28ae6c722b42703a0eef1383d005d97578047b5a5803981d0ca5606 SHA512 8006dfcc2160aaf0d7f3d01ee872ec61d3842d3208c0d265d27aa245fde3460ab3e98970d14893e8e21f3b23962311b28d3a8e539f7752eb52a3636d93174f85
-EBUILD hsqldb-1.8.1.3-r3.ebuild 5447 BLAKE2B edb7b8daf637d17e2e56ec9b1993b639b5768b1e17262db39c214a97e9eee441a5d8feb7887dd2c1dc13ee30485f7320ab60653452f52f16eae7544010c6a0da SHA512 064e6f2342044eb07d4e88daa14c5acd752d211e89555fd28e0caa5f14dfbf99eaf92791c59cf1ef3f25dd9913aed8bfcdc95a65241d073b49ba2b7d6f5cdd46
+EBUILD hsqldb-1.8.1.3-r3.ebuild 5445 BLAKE2B ce7628d681e8345394d5a6331a3c669b5fb5dbfd2e31bdfb487c62e1622a4aadc6277563c11a6b955cdca8a4797b9475a56c7ca7a5df04a643a772b02e7022d8 SHA512 47843945a3aad0416f61620645d72a9ecc3a89332f4b3c023439f5c1cc080c28cd448f09b15be98e597d9066eb9ae9a7068f849ec912636a9f719007eab3afd5
 MISC metadata.xml 312 BLAKE2B 175d7bb3c54ffcc616117749062b16130ca8cf394ffd780991bd8bd5a21509527e2844cd4f1aaeba70b498274131d786b9a16d48d5ee8dca176e949e334093a6 SHA512 2b9fff35bd58701cd4992ddc02f6bc7a2027d90616a5b886ef352ad6c6781949a68478bb17bbc22382189ec73ddd1798f67c27941323cb0b727dfead38c7f975
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
deleted file mode 100644
index 72bc62a9b033..000000000000
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit epatch user versionator java-pkg-2 java-ant-2
-
-MY_PV=$(replace_all_version_separators _ )
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="The leading SQL relational database engine written in Java"
-HOMEPAGE="http://hsqldb.org"
-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"
-IUSE=""
-
-CDEPEND="
-	java-virtuals/servlet-api:2.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
-HSQLDB_HOME=/var/lib/hsqldb
-
-pkg_setup() {
-	enewgroup hsqldb
-	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
-
-	java-pkg-2_pkg_setup
-}
-
-java_prepare() {
-	rm -v lib/*.jar || die
-
-	sed -i -r \
-		-e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
-		bin/hsqldb || die
-
-	java-pkg_filter-compiler jikes
-
-	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
-
-	epatch "${FILESDIR}/resolve-config-softlinks.patch"
-	epatch "${FILESDIR}/${P}-java7.patch"
-
-	mkdir conf
-	sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${EPREFIX//\//\\/}${HSQLDB_JAR//\//\\/}/g" \
-		-e "s/^SERVER_HOME=.*$/SERVER_HOME=${EPREFIX//\//\\/}\/var\/lib\/hsqldb/g" \
-		-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
-		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
-		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
-	cp "${FILESDIR}/server.properties" conf/ || die
-	cp "${FILESDIR}/sqltool.rc" conf/ || die
-
-	# Missing source file - needed for tests
-	# https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
-	# https://sourceforge.net/p/hsqldb/bugs/815/
-	cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
-	cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-# EANT_BUILD_XML used also in src_prepare
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
-EANT_DOC_TARGET="javadocdev"
-EANT_GENTOO_CLASSPATH="servlet-api-2.5"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	eant -f ${EANT_BUILD_XML} jartest
-	cd testrun/hsqldb || die
-	./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
-	# TODO. These fail. Investigate why.
-	#cd "${S}/testrun/sqltool" || die
-	#CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
-}
-
-src_install() {
-	java-pkg_dojar lib/hsql*.jar
-
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/zaurus
-		dohtml -r doc/src
-	fi
-	use source && java-pkg_dosrc src/*
-
-	echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
-	doenvd "${T}"/35hsqldb
-
-	# Put init, configuration and authorization files in /etc
-	doinitd "${FILESDIR}/hsqldb"
-	doconfd conf/hsqldb
-	dodir /etc/hsqldb
-	insinto /etc/hsqldb
-	# Change the ownership of server.properties and sqltool.rc
-	# files to hsqldb:hsqldb. (resolves Bug #111963)
-	use prefix || insopts -m0600 -o hsqldb -g hsqldb
-	doins conf/server.properties
-	use prefix || insopts -m0600 -o hsqldb -g hsqldb
-	doins conf/sqltool.rc
-
-	# Install init script
-	dodir "${HSQLDB_HOME}/bin"
-	keepdir "${HSQLDB_HOME}"
-	exeinto "${HSQLDB_HOME}/bin"
-	doexe bin/hsqldb
-
-	# Make sure that files have correct permissions
-	use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
-	chmod o-rwx "${ED}${HSQLDB_HOME}"
-
-	# Create symlinks to authorization files in the server home dir
-	# (required by the hqldb init script)
-	insinto "${HSQLDB_HOME}"
-	dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
-	dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
-}
-
-pkg_postinst() {
-	ewarn "If you intend to run Hsqldb in Server mode and you want to create"
-	ewarn "additional databases, remember to put correct information in both"
-	ewarn "'server.properties' and 'sqltool.rc' files."
-	ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
-	ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
-	echo
-	elog "Example:"
-	echo
-	elog "${EPREFIX}/etc/hsqldb/server.properties"
-	elog "============================="
-	elog "server.database.1=file:xdb/xdb"
-	elog "server.dbname.1=xdb"
-	elog "server.urlid.1=xdb"
-	elog
-	elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
-	elog "======================"
-	elog "urlid xdb"
-	elog "url jdbc:hsqldb:hsql://localhost/xdb"
-	elog "username sa"
-	elog "password "
-	echo
-	elog "Also note that each hsqldb server can serve only up to 10"
-	elog "different databases simultaneously (with consecutive {0-9}"
-	elog "suffixes in the 'server.properties' file)."
-	echo
-	ewarn "For data manipulation use:"
-	ewarn
-	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
-	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
-	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
-	ewarn "  --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
-	echo
-	elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
-	elog "and Using Hsqldb' in the Hsqldb docs at:"
-	elog "  http://hsqldb.org/web/hsqlDocsFrame.html"
-	elog "If you intend to run it in the Server mode, it is suggested to add the"
-	elog "init script to your start-up scripts, this should be done like this:"
-	elog "  \`rc-update add hsqldb default\`"
-	echo
-}
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 af2617dc5ac2..fa8ac6606938 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/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index b1be51ed7298..79bce1194c62 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -7,7 +7,9 @@ DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd SHA512 61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
 DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33 SHA512 b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1
+DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c SHA512 33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
 EBUILD mysql-workbench-8.0.23.ebuild 2787 BLAKE2B fbc8bafa406b87b30467b11e61cebf5caf381f90ae2acf1c3afaf4e15c97d51698ca85be0fa8c370c37731026b7732587e255f3fcfa51b9e9949bee6efe5268a SHA512 2fe267d734478e7aad69d0f4f26c03779d806fb88772a6f330358db285196e1b8ea1063f1d8d6fd68981bc9cb8de8a50e7794813e37d181aae609eae2e4da3e7
 EBUILD mysql-workbench-8.0.24.ebuild 2825 BLAKE2B 09909039fd5f73bb2f618a8a68a5f152e339f6021afda8b5dd3aa704f2549f1df7964432c6cec3ebfd77cae06a6575cb9bbe38221e3e15d846da3f39e533ceb4 SHA512 97ef69840ec882282f09851681c945a5c83511e6338f50abb73263ad5a7be5156c07f898209f88c2e554632443ede1f3843123c0fd5213ccf671928ad005a881
 EBUILD mysql-workbench-8.0.25.ebuild 2781 BLAKE2B 3ae8f4b6d1952ae6d7a010579de9cbb5b2bfbcd2b26c9574da9b844cf13f4ae15532b613c983edb4276351de2feb48a93e285abd892a95d39073a99887c76cd5 SHA512 eb9b0919d71de74cddfd11d93ac6d81792c9752b40a8b106864bf9d5e669aab935a27b5b6c6508e75f39b9147b452a0e2583c97e212c232ef96581410273747e
+EBUILD mysql-workbench-8.0.26.ebuild 2781 BLAKE2B 3ae8f4b6d1952ae6d7a010579de9cbb5b2bfbcd2b26c9574da9b844cf13f4ae15532b613c983edb4276351de2feb48a93e285abd892a95d39073a99887c76cd5 SHA512 eb9b0919d71de74cddfd11d93ac6d81792c9752b40a8b106864bf9d5e669aab935a27b5b6c6508e75f39b9147b452a0e2583c97e212c232ef96581410273747e
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
new file mode 100644
index 000000000000..a565f9ac9900
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/"
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		app-crypt/libsecret
+		dev-libs/glib:2
+		dev-cpp/antlr-cpp:4
+		dev-cpp/atkmm:*
+		dev-cpp/pangomm:1.4
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		dev-libs/atk
+		>=net-libs/libssh-0.8.5[server]
+		x11-libs/pango
+		x11-libs/gtk+:3
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		>=dev-libs/rapidjson-1.1.0
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		dev-libs/libpcre[cxx]
+		>=sci-libs/gdal-1.11.1-r1
+		virtual/opengl
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		dev-python/pexpect
+		>=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+	## And avoid -Werror
+	sed -i -e 's/-Werror//' CMakeLists.txt || die
+	## Fix doc install directory
+	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if has_version dev-db/libiodbc ; then
+		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+	fi
+
+	append-cxxflags -std=c++11
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
+	local mycmakeargs=(
+		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+		${IODBC}
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index d1272f28272b..b8fa57bbcc8f 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,6 +1,6 @@
 AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
 DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615
 DIST pgadmin4-4.30.tar.gz 36490656 BLAKE2B 3e8e998b29b13ced40b38106a468d047dea92a0cc930150d153c473e78045278840f78b3bcbd41f20a5017e68c1980c05ccf734bf63d8f107e0e02c2df54162e SHA512 7ce12f65ce9dbfe4af9e92dd7f9327a05be8b8436ef495a0634043158417f3af5f457b88ee5422ede59f517c197668094454c6d7b7c33e255068479ce6ec13d9
-EBUILD pgadmin4-4.29-r1.ebuild 3921 BLAKE2B fee1e9acc4b834f380038e0ee7575b65f61429adf3c253510be1622a0e46f5c8b76e400f93b1d8ee5a219f0241db39bfd98fc114e1f83587d3c4bf11eace97fc SHA512 956d55aa74100025b20876b6df2307041aee31ad9a46e14ed7ee30eeb3ebff8d28ec53f4aa4c5345461a06086f7cb07b50a54f7d18cc1c76fafac4b65ae3ae19
-EBUILD pgadmin4-4.30-r1.ebuild 4026 BLAKE2B fd07d98cde16b80576889e10fc9e170c64a2ca3088f6fa89023f527980a46ec365c3f1952399f8d3db3cb31369959d43374d5fd2659a672d1742694a07b8d691 SHA512 cd14438ae823d2baad005e0c11d9255a946f5e7900f2c668cefba7374ea01bc4ab32d05ea64392bec45fead566833c7b9aace14190036f9d82ae801872df003b
+EBUILD pgadmin4-4.29-r1.ebuild 3739 BLAKE2B 4be2bf37f1898edfce56d3cfd1c74713a633b060bd947822f48a386fbce93870767e264e3d1501f20826556696e6574fa82ddb8b2ab754f63f28459c1debcc6d SHA512 afd31a7e4e9d40f858a570c0390f22ac42ddd09d49154d03acb46fbad73f8a52cfee62caae2fc488676acb719e56a46e8ee21e4adb0b6c71f509eed72590eaa7
+EBUILD pgadmin4-4.30-r1.ebuild 3832 BLAKE2B 91ca15cf5bedb15a044eb87859fe635424b7fd3bef7e5c1535c58fc995af492f777b2683e66887274ef3651fa17df73fe13a7e1319490c4818de139ab3b491e2 SHA512 cb19018eb7979a4f2e449a7c33425a52fdeda0e12711f752113eee1b7fb8ed1161763e7a095322542e8b43bce666764da213d564aac81914affbb687ea4055c0
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
index 0423fbc67937..496bc5bb398a 100644
--- a/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit desktop python-single-r1 qmake-utils xdg
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 	)
 	virtual/imagemagick-tools[png]
@@ -45,35 +45,35 @@ DEPEND="${COMMON_DEPEND}
 # Flask-Security-Too. This is still the same dev-python/flask-security.
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
-		<dev-python/flask-security-4.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/flask-security-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
index 0d94e48163f5..af1cdfb2dce0 100644
--- a/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit desktop python-single-r1 qmake-utils xdg
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 	)
 	virtual/imagemagick-tools[png]
@@ -45,37 +45,37 @@ DEPEND="${COMMON_DEPEND}
 # Flask-Security-Too. This is still the same dev-python/flask-security.
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-babelex-0.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
-		<dev-python/flask-security-4.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/gssapi[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/flask-babelex-0.9.4[${PYTHON_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/flask-security-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index b44dece7c82f..d3174ab71cd3 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -6,5 +6,5 @@ DIST phpMyAdmin-5.1.1-all-languages.tar.xz 7751820 BLAKE2B 95d54893b7a7d8743769c
 EBUILD phpmyadmin-4.9.6.ebuild 1527 BLAKE2B 44c50fbedba73ccb5db54780f7e6a698848ccdf4de82a94f491e7faa51679773bef3de0ef65fde6da0cb4a2baecfd24d6f72705406d4cd2f2b2d7de083ad2cc2 SHA512 756923a68be8ca1f9442d4ba227ae65184e046ce35fbd81c12da7a699ee24348c8ec6c4e7a40ec6cbc271fe75a2be21e3530471e3918db128c36127a089e6153
 EBUILD phpmyadmin-5.0.3.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
 EBUILD phpmyadmin-5.1.0.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
-EBUILD phpmyadmin-5.1.1.ebuild 1538 BLAKE2B 77815f785d11191f403e9384913343cab72b74507d55ec155989e799474857bed4e7b8bf8a1ae87aa5955bc1b79dd2f16277a03a8f36b269a59c2db7536e6dd3 SHA512 ee8ef32e7d47166276efaf68248d0a3b88c8a4e3ccac52878f300dc48e38e9484fbe7f830913d4aa65d0f55e909310dedc4d1260a288a6d5e08df99191be6f79
+EBUILD phpmyadmin-5.1.1.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
 MISC metadata.xml 725 BLAKE2B df8f3ed193f57543cdf9ed88e47025c86f4096126ee07f82a0f99b9980ca4d96364066e71955f85ac909f22b15c1ebbb530a128cf5f2cc4008f7ae32ab67c73e SHA512 99c7af80bf189cd4e197ce74c46e8ad15a1a9ada7610dd2c7fbd28bf82638549f4033dc17d79bf73e6c9a801099e0a6e0caa5198366ada6de2f335ac62d4d107
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
index 92b83232fe06..8cb21b3ed999 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 486e900b4d8f..c81b505630e7 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -22,9 +22,15 @@ AUX redis.service-4 255 BLAKE2B e51cfbb7ce6586e7c16003e3b470be036e9c28b408c4ad71
 AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15700cac329970f351cb9b9377aa82e6f4dae377b00c1710a1e0f54334f007cfed64551f761034d4 SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738
 AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d465ce097765308c7b7ea729526404120d04a79b547e865df93f7bfce1e63341c73563496f1dce691 SHA512 3de050ce044b7daf71219ec61dee2bc31acef161319b87ec2963b23c72e8a4807f1302c4932897664a63ef94507449f6ab75ce18d59f5e1a4558c330a7042e43
 DIST redis-5.0.12.tar.gz 1995069 BLAKE2B 03bb5956fb1206ecfa7f621b22b3101d1ebad62c40ce52157fb802ecfa5c32ca493ff03a1cf909a1b0f1acdac83b3a939ab2042fbf092fea983cabe35d00f4c3 SHA512 f0ab161762006926064ba2176ea63bb2fa416fa386b44ca55a8edad9169627fcd1c4bd9c699fec585aefc68506deb0796f6a89844c21e74d2bdb19ca1638bbe7
+DIST redis-5.0.13.tar.gz 1995566 BLAKE2B 1020b26162d212f980fd07bfe1879120306c7e796cde7e48dfcc1c3aa555a0a25299c17ad65515cc54be3c354bff58cefe67bba5dfc26f6b24d56a46debfa267 SHA512 9784193a53b459a2e4937e8f0d18652a0677d29746e359e5f8ffddeea4cea305f10c8eeae9007e49c0ba9ebedb9b603aced61592ba3302e5b64be78020b3b4bf
 DIST redis-6.0.14.tar.gz 2277029 BLAKE2B 1eeeae5243ca380e354dfe5c8ad5b869669dc94b9570c8151033f89a23025bf027267eea00549f411e019b3c79ffa5d2e29eacff660e9f4b614953b023824c04 SHA512 a1de2131420bc11f831ff48607be2cf4a7775702fcc4fc777e09ebdc36277f1b468b22a1d35758338c0b44f9b3ae7b119139a79eb2419d40acbbf49d8c4a7e77
+DIST redis-6.0.15.tar.gz 2282471 BLAKE2B b7f37a76d2a16e0f84f51a737e2c23ebc27750ece790cf800a0f70bfd481db01d82dc68511f80e5935dc73d70f02716a4f9005d4d177ecf3f2a0c5290ecd41ff SHA512 e7ba123798a11e1c68dd6d3ebb0586bed4f2bb33755871f1577f7e0229f826b468c2130c31bcc85a64ce7ff54e280df0a7c60e0882f3ed2a11d43e7819fe8b9e
 DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b01e33c63b6f5fa2f80fc72d8b8eaca4ecb7c57cdaf127956ba1a580ec851012b57426ebe7bb4cba890e1dcae SHA512 22db5b64de20a4823fd219b559c05f329e37fc86ce32099c64655dc50e60228706c99bffeae8d7080d8689910879318ec6621388bde23bf1486aefb881f33cb0
+DIST redis-6.2.5.tar.gz 2465302 BLAKE2B 51cc672ab432bb87560151521289d04e8fefb8e4df820f58a9b742131a0f1960c0019dec42a601bad827ec2a172375b88b6cf32a19aef42964e18f5a7a911c40 SHA512 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a
 EBUILD redis-5.0.12.ebuild 4616 BLAKE2B 230589c77919661022e95fa36143379c8e61d3cef8e4704d69762064eb04ddcf82a581bc9c32ff43c5443fc94ca65e24ccc7041340658c7cbb7f3b844b981d3e SHA512 ba4274c7cff7f2bf2340faec2ff53d8b8b1294797f4f361d23c059353d1ef60367a1353ae55970fd7a98d0532462914696988edfe4f610e47a5fab7b1ecb0fd8
+EBUILD redis-5.0.13.ebuild 4621 BLAKE2B a6bd0109941f6df30e7fd908daca8e0901ad71841b1603a6463ed3b3c77309a4a90275db321b0d8555604602e0ac72778e3b8c9a1222cef2783f777943adc76d SHA512 1e7d8b69968ae3fc5021c4662204669f903e382d035ec67225430dcec2c5514076f43506c65e47e5e5e3b70d4ce926709b368e80fae8ce1828b95fd0e345a29b
 EBUILD redis-6.0.14.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
+EBUILD redis-6.0.15.ebuild 5097 BLAKE2B d7ebdd03f4b9e92424f524e1f3341a9f6791f525e6444d4f19d98e2a91cdb91186aad75a1b0ddf7979829681868dbddfc07192a1b742bbdb9d50afed58bc6da2 SHA512 28b8cf8bc92582bbd8a59b3ad17b1917bb357bce4de00e4a9dbafbe42cf15531926739eee1431890fd7bf4e407dcf2514d676791cbf0ccc37b140c66cd2ef3c9
 EBUILD redis-6.2.4.ebuild 5092 BLAKE2B d169b930309b4058ab34550942d2ab564a8a3328f681b6e63fa6a9981d6b6003be3bf6640566039a22aa978839d8551ef828be3059dbaea0f4b742c2e48a778a SHA512 1b2cda1a385156a4d91aeed981a7f135f8c18f2baac45c150ef0906048bb66e4031805b24e8790f8b24681ee093a56d9d5bce7817ff52af2b9c581ef029b8b4b
+EBUILD redis-6.2.5.ebuild 5096 BLAKE2B d288768078f5375ef5d794d52fa844bd68117eb8db5fef96c39bf162f8932d187079864bc292dd8238c450042b1e3b44ee28ef3bd2d7382c73b6f8d94cf58148 SHA512 6e723fd118b2ea49e04874207cb599a6e021de2ae3a79fe87d969d3ecd5e224e3d6deda9c765a90e46b8f93e7c6b58e08218fc7a917386a2ba4f05df8088f65c
 MISC metadata.xml 364 BLAKE2B a997b9ef18f8efdcd191d4344898a373d3987cc8630d7d699af0666dac13261a06717e72320034fab170209ab2cc90db122e1a3756fa9ff9149fe7b7796328c3 SHA512 2d6a303748fd5cf5a3a12b382e0944046a7d200f19041a343603068a764f806fd748945c9d5ec2d0f4001f151bc66c1127a461abeefd7eb85a92d2238b74d521
diff --git a/dev-db/redis/redis-5.0.13.ebuild b/dev-db/redis/redis-5.0.13.ebuild
new file mode 100644
index 000000000000..c003fb7c0982
--- /dev/null
+++ b/dev-db/redis/redis-5.0.13.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+COMMON_DEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:5.1 )
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.3-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-5.0-sharedlua.patch
+	"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# don't call ar directly
+	sed -e '/^STLIB_MAKE_CMD/s/ar/$(AR)/g' \
+		-i deps/hiredis/Makefile || die
+
+	# Copy lua modules into build dir
+	cp deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c src/ || die
+	cp deps/lua/src/{fpconv,strbuf}.h src/ || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua
+	if false && has_version 'dev-lang/lua:5.3'; then
+		# Lua5.3 gives:
+		#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+		LUAPKGCONFIG=lua5.3
+	elif false && has_version 'dev-lang/lua:5.2'; then
+		# Lua5.2 fails with:
+		# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+		# Because lua_open because lua_newstate in 5.2
+		LUAPKGCONFIG=lua5.2
+	elif has_version 'dev-lang/lua:5.1'; then
+		LUAPKGCONFIG=lua5.1
+	else
+		LUAPKGCONFIG=lua
+	fi
+	# The upstream configure script handles luajit specially, and is not
+	# effected by these changes.
+	einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use tcmalloc; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-3" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
diff --git a/dev-db/redis/redis-6.0.15.ebuild b/dev-db/redis/redis-6.0.15.ebuild
new file mode 100644
index 000000000000..7a68f4a64853
--- /dev/null
+++ b/dev-db/redis/redis-6.0.15.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.3-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.0.12-sharedlua.patch
+	"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# unstable on jemalloc
+	> tests/unit/memefficiency.tcl || die
+
+	# Copy lua modules into build dir
+	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# effected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	# 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
+
+	if use ssl; then
+		./utils/gen-test-certs.sh
+		./runtest --tls
+	else
+		./runtest
+	fi
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/redis/redis-6.2.5.ebuild b/dev-db/redis/redis-6.2.5.ebuild
new file mode 100644
index 000000000000..7b9596a684a8
--- /dev/null
+++ b/dev-db/redis/redis-6.2.5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.1-sharedlua.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# unstable on jemalloc
+	> tests/unit/memefficiency.tcl || die
+
+	# Copy lua modules into build dir
+	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# effected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	# 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
+
+	if use ssl; then
+		./utils/gen-test-certs.sh
+		./runtest --tls
+	else
+		./runtest
+	fi
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index dbb18ff6388f..2448490cad13 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 7d2bb1248662..bcf7531d4d2d 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,5 @@
 DIST esptool-3.0.tar.gz 6628258 BLAKE2B 613bdc4c4d0df633c25c83d51a84ff9ca34d5c345f010d2e3e99bc126530d484bb1fb4818b3a10b10a6b9879b161817d5bc6288dab55368f1250a27e2418d641 SHA512 b522d30b11e9ab4e426009116bf1872e587116b7a3b517f841d34d3e860f6454345be89a2e28b8eef5aa5e59318e991504697644a3f4f90d7e63c037025716eb
 DIST esptool-3.1.tar.gz 6897273 BLAKE2B dcbba13e8775afd3cf10cdeafeee5e9e3c0d2e9722a95076a868b669ea3a11a56b48a053e1b19787c6da330af6d01f9f256a92c0be527d4a7d9848f646f194c3 SHA512 5edaaa376932acc9e7ba717fe931ec1e14b80d1eee415fcef4c69b30b375cd61887ac52a20dd1001d215b8d739019d6b9f624d294d8d76ff112e630d52f7f15b
-EBUILD esptool-3.0.ebuild 1244 BLAKE2B 90d3f79441a14aaf7f4e9eb1f7f324bff0fbd8904cef54415d0ac13cfb3f85fd43268327583ae2ca0b21d5461743b7dfbff259c18c72c30a5c5484c6e2882fbe SHA512 5dd476ef90c84038c4f5341606cb48ceb891ba4999152819fbec832be460c4fe7d6d6b92b550f1e0102fb18ff42802c23d9723e99f48b93ef5967e130733a2d0
-EBUILD esptool-3.1.ebuild 1450 BLAKE2B 48e147f02faa17b2336b5898c8322cf36225bf2905262ffbc4107dcc0d22c22dd90243c05f7a83960a6d33d16ebab70edf870a3ba9ce51f87ac539c309c13658 SHA512 8e429fe1cbb59649dad0b2770172ab5788576a1804e796ad2571b8ecfbe09670f3ddfbf9e6caaac454142a0fa10a1e5a27e38a1f934cf9fb4a52a8a7e471a767
+EBUILD esptool-3.0.ebuild 1208 BLAKE2B ccbbe18d08dfab7e4636544f077d3c9cf51ee915b57745be872d40e6cf5e778390d802f5b47cfa263aff2b1f14298add472ab5ad8ae68e09f925c56cbfb7a66d SHA512 5f52903748ff649c44fd8f7ef9355a9035155b1046f1c7f0551746322192639240f132b3a7814cd22ba9661cede045411cac4700a5b34ff193e2cfeda1f60dfd
+EBUILD esptool-3.1.ebuild 1402 BLAKE2B 96275ad749ea143b47ee1f59c520148bd6c5e5cf9a126cce0eea40fd2cdc7fca5dfb2f27e43a8bf3c4cdd2e97d33aa12a804e8882b15fcae3d7e9f9f7a534bb5 SHA512 e3a810262cb57707a435e37b3044fb5ae7ca5752ba50e3b92022a2a19fee87419d5c0815a6fcfd3a1a6773b20774a446aa9ea1103cc3302ec239de70f6937671
 MISC metadata.xml 503 BLAKE2B d759cecf4fde754abe8b01d95f2071281c463c1baba1df36e5e3e51dc39a92ec62f2d8411feb67435184a03cf0d80550b5ec213f0194d2ccf41941e9d86b2d89 SHA512 a878ade6c10267d45335db070603587c464d17dcd3cc2b4466e31695c8cafb6eafc46aad9d17f0fbc785d2f69542ce934ee8bd64974291744caace19ceb543bd
diff --git a/dev-embedded/esptool/esptool-3.0.ebuild b/dev-embedded/esptool/esptool-3.0.ebuild
index 6205142a51ff..a7b6c7288874 100644
--- a/dev-embedded/esptool/esptool-3.0.ebuild
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -20,15 +20,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
-	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
+	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_USEDEP}]') )
 "
 
 python_test() {
diff --git a/dev-embedded/esptool/esptool-3.1.ebuild b/dev-embedded/esptool/esptool-3.1.ebuild
index f59bf452592d..d83da8edda6b 100644
--- a/dev-embedded/esptool/esptool-3.1.ebuild
+++ b/dev-embedded/esptool/esptool-3.1.ebuild
@@ -20,20 +20,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	test? ( $(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
 	') )
 "
 
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index fb74b956314c..1e6b18a0173c 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
 DIST platformio-5.1.1.tar.gz 215305 BLAKE2B a7854138dec1b5b58c4f715dde98a273ed08c0da7fb305f89490944c210737c7c500731b21a5a9cb2bf3be3925f1666ef1084992b99df46d3ee83b449baaaa35 SHA512 f74ae3cb46065379b90c7ec3574d6ff0076085cd891bf41be2f38b6c6b59f87f4d013c1da6e4825f7d831ed17136e433385ab07c3f16b31342d5415192f87eff
-EBUILD platformio-5.1.1.ebuild 1340 BLAKE2B 24e6ebf9c6c960c18b41924aadfe097f4d63f30fa95f0ea8bbc1abedfacec93d7448dd49885e9b10f2aae684f26fcc64c96f59d4d2c6b5d47844067acfe30774 SHA512 7b29a1d6171fb09e3cad93ae8206d877fc17627496a40779d660042100c5d280a5f0349df83b18066ba40e6c2349f89111e176eb39fbeb68f9d560d680b20734
+EBUILD platformio-5.1.1.ebuild 1242 BLAKE2B f99ff082db8b2bd02ac3488a69b7a05d87701e625f34d6adf4cf077b83e9a2082f537a86dfe48834d532f9b8e1baf19381fdb4a1313a864a90d0c1a45a2ccdea SHA512 5fa00d15a0a1cfc3f850328c7e60de33c820c2b18b2e6e9944a65ea28d66ce02df11d6befc1aa36cfc4251f02e691dc98af340575263276248ce1365fb003ed9
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-5.1.1.ebuild b/dev-embedded/platformio/platformio-5.1.1.ebuild
index db09e62b1189..84f95fbddf11 100644
--- a/dev-embedded/platformio/platformio-5.1.1.ebuild
+++ b/dev-embedded/platformio/platformio-5.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -20,23 +20,23 @@ IUSE=""
 
 DEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	')"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		<dev-python/bottle-0.13[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/click-5[${PYTHON_MULTI_USEDEP}]
-		<dev-python/click-8[${PYTHON_MULTI_USEDEP}]
-		dev-python/colorama[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyserial-3[${PYTHON_MULTI_USEDEP}]
-		<dev-python/pyserial-4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.4[${PYTHON_MULTI_USEDEP}]
-		<dev-python/requests-3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/semantic_version-2.8.1[${PYTHON_MULTI_USEDEP}]
-		<dev-python/semantic_version-3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/tabulate-0.8.3[${PYTHON_MULTI_USEDEP}]
-		<dev-python/tabulate-1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyelftools-0.25[${PYTHON_MULTI_USEDEP}]
-		<dev-python/pyelftools-1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/marshmallow-2.20.5[${PYTHON_MULTI_USEDEP}]
+		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		<dev-python/click-8[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+		<dev-python/requests-3[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
 	')"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 9e5733f38d66..be94510af00f 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 83086ba2fed6..cacbdd48d52c 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -2,5 +2,5 @@ AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3
 AUX cegui-0.8.7-musl.patch 2017 BLAKE2B a7735ce19c17505be2ba1da5c0aa8fde00ed6cca9926a1586a426a6b56d0fa9bb402a54a8c99b79f58a8adde3edfb79856a2766ca28f8ac92930d4e4004b4dc1 SHA512 c9bece96a6f7600cc59b94391b774acc016e2f33fb608d33aa25ef603b5782f47d338cad6ad244224c861fa00a8ebc0f80f7aa1df4800a7c8347029f2b5e996d
 AUX cegui-0.8.7-python3.patch 1045 BLAKE2B 702c30e85d08e117888d56adaf2c131f9c6410916f08b03ac66efd69230e14b53ee05975e04489f3526fba964a372b340b86acf5a31dda36ddbab40d7f65d944 SHA512 9870e996697775938ca9ba6708dc93d5e59e8a640dd2542c1e8cc8b903ebd1738b11e733f2e9d012f932558a6f77ee8014f0d98133252e2cee2025e664a38e61
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7-r100.ebuild 3337 BLAKE2B 2e662fb4d0c9c5fbfd951149be629cc994c4f816e7308a080b9488ba8412d5e4ef9aeb8c52f3b5df07ae6bbac0c69c314f1f076499cbdd26f2edbbe16892f258 SHA512 084d6848a698eca918947ffa5fd5dd4c09ebd66deb03358c2bca46319409f99d05e22e4199f6427c4ee9a1120d40171d9ef147825cadc94b5a69b2f9b8c85097
+EBUILD cegui-0.8.7-r100.ebuild 3331 BLAKE2B 88f36754a909efa8589c34a9ea956f2e641df6b938ea6e8404e7f2eb76744cccacab8d5eec3a43b8fdc2e08914b1bd6fea621c4a667d7f2049635d52b1a33be8 SHA512 ffad30c3b4a8f8e28f964ffbb4c2b5c68f46a0040b276c3ccc340deb39de9643bc8057a807655c406ac3a41f886f38b6ad8143679ecf39388eb4dede99d17357
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7-r100.ebuild b/dev-games/cegui/cegui-0.8.7-r100.ebuild
index d47ffdaeeddb..808eccd66654 100644
--- a/dev-games/cegui/cegui-0.8.7-r100.ebuild
+++ b/dev-games/cegui/cegui-0.8.7-r100.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
 		')
 	)
 	tinyxml? ( dev-libs/tinyxml )
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index efe645a524c1..84f37ade2bb7 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,5 +1,5 @@
 AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf00d234f2d1e9fc874c146e3d8755733915ab2cf58472551f46115347678b92ee6b4d14453f051960f5076932bbb15b8a0337794 SHA512 dbb78cb9f67e2d0d71516d765020c91a074a9984a26b3d5d5baf031a852c4c35efebfd1e331aaa009a2a066bd303c405e60b84be690a1bfe86a94ac832281f2e
 AUX freecell-solver-6.2.0-no-git-clone-kthxbye.patch 752 BLAKE2B 651fa79006d38c2d93404221547bfbeac2d500a4c8fca6a5607ea288177639f91be9fc2a71670a4c97c690b054c9aca73e0c745ceec44630a29f5b1bafc833ee SHA512 1c41cf9b09ab1569f714c1f73372532bf533c0ccf25c37f8ee593415a459e6ff06791f5cd6a086037361293e4c556ca8bf427dcf4906f6998a13c8d35c4ccdb4
 DIST freecell-solver-6.2.0.tar.xz 426616 BLAKE2B f48d1b67c56a42f42e00e765a911944ae7d2eb97db81a8ebb58baa1603bd274c9ceb460bdf5c232c4f2b3f54d33acc0057e25c8c0bce897bb862eedc16613f05 SHA512 090f6b93c3f354b5c6bcb1ea67d9313639d23e81998cdc15316246a1cdac26450cf8fd04172bfd5539d875edf407dcdf7ce2c872221b7261f89dbbe309c27560
-EBUILD freecell-solver-6.2.0-r1.ebuild 1266 BLAKE2B e184979ed3fa1ec105eb0484c471cbac6894a734fef1434d84766a63e041c367cd36f8e40b9e7a20d1d61c5e1e4ef4db2a26075b8460aa39a1e7b5ba9c2ebaa0 SHA512 3a6e9733e42605090e9c3e0c38e86f110af90cd8cf96f3097da58118c7ead911595cdbd874d37c85fae1b0ad6e8772f166a10b56e44541e7d3fc8a3b41694b16
+EBUILD freecell-solver-6.2.0-r1.ebuild 1246 BLAKE2B 67d0c3f08ee33582ea1df8c8a8892cfc2529a637f35037c8e5e9f3ade3e9167004c38e4990086732fa8c102673946bec4b9122c3deef836d0d7e272b1293e55d SHA512 e2878507e05fda71e3ff6aef5320eb93d92e1d8edde3ca05d745cd27327b31f192a312890ec4849d243ebf75f7c70d20d06a027dbd47c2e5400f66e833467f39
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild
index 9631146ed21a..4d455fc37770 100644
--- a/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
@@ -20,9 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/rinutils
 	$(python_gen_cond_dep '
-		dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
-		dev-python/random2[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/pysol_cards[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
 	')
 	tcmalloc? ( dev-util/google-perftools )
 "
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index fc6c4d8f56e8..37dbfd8935c5 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,6 +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-r1.ebuild 1448 BLAKE2B cf58086027fd37c6a22e206d08f2fc106ca6ee1d7153ee67e0d7fd07a23c9b8e82001ae6a0a0df3d0d3f2ec20ebd5dfafcc0420bb54aa4812653423ddf53ebad SHA512 3feffff5b11742aad7d1e5cd0f685b6d07f227ec4a0d496cf6b13d3a292474e854242213ff790e4335882a26b0b3b167fcf2cbc25764982949d6f6230ce2e685
 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/physfs-3.0.2-r1.ebuild b/dev-games/physfs/physfs-3.0.2-r1.ebuild
index 0d225b66a069..1ce61f71da90 100644
--- a/dev-games/physfs/physfs-3.0.2-r1.ebuild
+++ b/dev-games/physfs/physfs-3.0.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
 	inherit mercurial
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
 	SRC_URI="https://icculus.org/physfs/downloads/${P}.tar.bz2"
 fi
 
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index a6e857feeb8d..cf1b1a4f5ea7 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index 8fc2da72bc79..aee60bb22297 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -1,3 +1,3 @@
 DIST delve-1.6.1.tar.gz 7686466 BLAKE2B 24ac5d3219ec5972a985b95a94c543af10c045d7ed7f3ea23234ef1284dd143ba719b2dd2a962c9fdbb2cf516cec65dac3a21c69500542db0ce8e6cf08ee2d31 SHA512 8665ecdad1cb27500ca5628ce0ef4cc5c23295fc3f67aa17fc1cd080d58fcd31c3a806b01e9cdf383907ae7fc07e9a57ce88f971205e43e069f26bf1cc3200cf
 EBUILD delve-1.6.1.ebuild 725 BLAKE2B e951d2410a500daef587658102c6a80d2ffed8017a260b96e537bcd4a73a6fbf779a014477c66baa1b5fb09b9e065b6ba6a5aeddb862792eff43ee4ca5f8ef75 SHA512 2db060724dc153e72bc6d8aef109a59d7f708f2f49968cd87daa190cc71ac205f7d9fd246a40bd64498c7ec835b7447c79829571555e012d84fe36f5e74c5495
-MISC metadata.xml 474 BLAKE2B 502ca4b83206934ad765de611341d647afdc42fa66087fbd1afdcaf19604c99c0f123cce3ff297a4374f0ea1188d45a55b38956ddcad621e92aee41be6ef88ff SHA512 61d0f90496d2fe765a02502d80a5adda31a8ddcf8c5bbdfd2dd9b284c28f5e8d7228c79d830f3e407880b5a5ee35b6e1da124cd27d8e659d122bf2b4f6ed6c08
+MISC metadata.xml 246 BLAKE2B 4f74c718f60100b9679ccbcc0bb5d9a7bd641cdb0fa6c00a9166e5ed7bfc6e9108fdc7c21f1854de6c07ca4f658cf6fa28be25cb79fe5fe4319191d449142d76 SHA512 5d0752d049bf50e6be717e6e39dfbf255446cf4dc51c08b69a43068a465d176554d163b4e94d8f5cce3430cd13555a58df780a3fff5e462ec5ef00b9c7e19f93
diff --git a/dev-go/delve/metadata.xml b/dev-go/delve/metadata.xml
index 2a9543b4b014..061938a531a9 100644
--- a/dev-go/delve/metadata.xml
+++ b/dev-go/delve/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">go-delve/delve</remote-id>
 	</upstream>
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 57da1d936079..19b42dd92c1b 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 602a5687f497..55e9f886a940 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,3 +1,3 @@
 DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
-EBUILD binary-0.8.7.0.ebuild 938 BLAKE2B b9aaff5d7d6d5ebf3ed55234e29b1d4a3e688069d7a9895d95e96857809a802a5fb05c6e78283913f4e14f384eac75b7289f74ad680839412dd2569086514341 SHA512 9b3210bede51a5d766ef8b751ce00e3a3f399751ab80aa9ee37541029e3361cdc1c77ba124a0f4021788b5d613bf5a6f588870237353236862c7394cb3cc3eb2
+EBUILD binary-0.8.7.0.ebuild 950 BLAKE2B fe86503232513fbcb944054b41e209fc6eaf9fb7a51e9a1908e15986eb18c92881ed17cdebd6fefa345633e916374f5d4bc7c7c92aecdfe9ed942e6a7f2e11fc SHA512 a3787355a0acbf4ea532f480752ae95e9def0f08b5ab62ed0b4ff3ea2bacfe270fa71cacb0994965efc80c041e5da4c994f9e771ba4fb9ecb2f3b0e978574880
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
index 5755eb819db0..a77c059d3e0b 100644
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.7.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
@@ -28,4 +28,4 @@ RDEPEND=">=dev-lang/ghc-7.8.2:=
 DEPEND="${RDEPEND}
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index eeb731153a32..aa85fc9181dc 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,7 +1,5 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
 AUX cabal-install-3.2.0.0-rankntypes.patch 415 BLAKE2B 8a0459bac359c3f53750f50131e8fb0fa30ae5346ab718f0471959b543d17c91a691649066349ea129777bfc238dcc66ef4df6b222e5e76ae65ccbef863a57b1 SHA512 1b650dcef65df682b7058f67d43664910f8ffdf558a81d1df033080df1255460e45a3685b5897129339c00fe20d8cff23e1b3d5bc0f08c041b4e177fac9fe9d2
-DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
 DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
-EBUILD cabal-install-3.0.0.0.ebuild 2474 BLAKE2B 30b95a329b7af6a57e1d3fd59dbf468f7addb010556e7dba0be7c51ce103b79f6f4abb640ac57fbd73a52dfb360e857c868cad5738dae9ee16e8b669bc19b468 SHA512 967298ab3af7495f4338763da78b5dcfeaed058740883ae54ebcda868b3307c16dd26f9277a7cf3dcc6a26cf4c697d34b354c6c49325c94c8c402c2d579c0a78
 EBUILD cabal-install-3.2.0.0.ebuild 2539 BLAKE2B bf9f97243a4f0ced09975d9f081e6bed4b697621e3dbc6413fb1f1490442502cfc4fd42abb4ad485a7a608ee34ac20a16b55f6405610d26d95542d3a414d76b9 SHA512 6456dd630f610b61be70aaa052497204062db38ba151f508e183b8fdcb9ba31ba3cbc57d14c2d0ee627fc595df585a7e7e59613b9bdee3925229018ba17ce683
 MISC metadata.xml 606 BLAKE2B c3d2bf45b3a96dc8d7245cccbeee3a49ba328afa5ce5efb1feaa6d76dec8063156c10451b65fb946a4de0c96b719ceb00e958400f607845d17df4ee8c7746681 SHA512 33177964ce5c096ea1d1557c3f2500ed999df3a4245a55d73c7b2ec04d42444089502de367f4b6fd84bf3c4012c7d430706b36f76461d6f1c5c6dc957dd2003d
diff --git a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
deleted file mode 100644
index 6e85d8ae9421..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
-
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-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:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.13' 'base       >= 4.8'
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-debug-conflict-sets \
-		--flag=-debug-expensive-assertions \
-		--flag=-debug-tracetree \
-		--flag=-monolithic \
-		$(cabal_flag native-dns native-dns) \
-		--flag=network-uri
-}
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 62dda66713cb..7b14c86afd73 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,6 +1,6 @@
 AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
 DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598
-EBUILD cabal-3.0.1.0.ebuild 1369 BLAKE2B a26e0c15af1fb6105768853eb790b19ddc8ef81a00de8bfaaf0aae45d2a410c0810ad46463cb66818372cb8cc56dd8b128d311a90047d001ca21a77afbd0e0a6 SHA512 e2da6fedf6e901f1bd5cd36a8aba2bc625d19c14d18233e433153f36ab1e7b2dbf1926be87956d64a3faa0ec3249700655f21be1bc6fe019098a0f9ed57df722
-EBUILD cabal-3.2.1.0-r1.ebuild 1886 BLAKE2B 6542138f6e409fdfe899c6ddd37e1d60a2fb1155203754e73f0e8cc9c3189310a32054fef5213df0e6802c911fbd75a1cbe3b2612461396681fd846a40dda9fc SHA512 79583918d97430ee4e11636a371d5b8c00a414ebb4450de0cceeea8bb7b7a1d2df6aacadba0f13afd9c91d53645620e651200e62dc882316a580d41c57818c42
+EBUILD cabal-3.0.1.0.ebuild 1381 BLAKE2B 8d0dba2e416ab0faa788e32e28d1375ea8f3135e77df31840ba240fa3cf41ab1917e53fca2d272bc3cc67a55caa3f12ca003350767e43191863929f91c0b2f6d SHA512 5714c3777575b90d40bccff1915bcd8ed382fbfe3efd6cd300dbacab5ee078bc562c040616b49dc5f3860dfb25fd08b07e506b8fa78b568b94ab211ecaedc4a1
+EBUILD cabal-3.2.1.0-r1.ebuild 1899 BLAKE2B c727a43c6727b22a134de6f5b40f7772cdd083ef3e2a6d72c7c6a5262da358359968346131bd023de02b2b41520dc68dfc370c1928a0f16fb60198bbd33e4777 SHA512 c3cdb628ed7c9b02d1bad31426a5b1cc4b4f01fd99cb765c5ed4fe600f447b4313169015ac931859e9a088ca125fda6d69cb5102f20c81352997177651e7dd67
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index ec738e686df4..7aa96e571d2a 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.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
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1"
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index d18123f7001e..0e4d42da0f0b 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -51,4 +51,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9999"
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index a3c9ab0b9ad7..1068957b6e34 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST exceptions-0.10.4.tar.gz 20819 BLAKE2B 16873edfeb540ddf5b950f81772c7d162e3fc37d286dcf6608c4c3017516a4255fb7cad247025aa9b0970508613038a3d0b42eccf22e74a0c4efffdfa22be5d3 SHA512 3df1edb4abab8e2e2dbd7387809d9768efca36c6840225ce33bee8679a4efdcf86d28beafb54a9a40e512163e4d088f94e788341bf614869bbdbd9d701bca4a2
-EBUILD exceptions-0.10.4.ebuild 1381 BLAKE2B 6721fd21f0528cd5416e00704e3b3d752805827834a7e2315d448e0d6d4170e643a6f3a270d517c870af94da5ebb85ecbe4466b4c66676d8c08fa240b5294cfa SHA512 350b63b4abbca67f9297d8b256eaa12514769d67ab8a72abf03844b91e0da8b172e925706dff1c13b03a234fed48361083674b6effb8db038d2f8ec77679187d
+EBUILD exceptions-0.10.4.ebuild 1406 BLAKE2B 4523042016334e1330ca1ee9fc26f21469eef63ab6cef23a6b2a036d548511a88ba045b733c3d724dd26b93e840b7c3483cf0466d79d5b351c5967e8e9774ea5 SHA512 044671597a69b30dcd8a13727bf9cd04e672a2591f6b7eaba4ef383fd27f865d343efa665a68029d76e948e224f93bdf94c08dff7590438d8a45f011212a8f70
 MISC metadata.xml 331 BLAKE2B 9bd180046d711ccf8021146ef216091dc6017e0c6a406c69eb15feef48d6242d53bea9ec43e975d64770b55c200a36c4f8fd595ae883dc041cf2a75b8a87d02b SHA512 205022d21e7c1fb5b6507b2807b6fa59cee4c7736a6ad1ebefe052052443e87fb8bebb8a8f283612811a777c2b7f8c210f4cc30db399c81e147ae0e220bd58f6
diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
index 987428590228..bfc8bbcbe39c 100644
--- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
 
 src_prepare() {
 	default
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index b041b2d78571..6447354f4c75 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1,3 +1,3 @@
 DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
-EBUILD haskeline-0.7.5.0.ebuild 1023 BLAKE2B c96cf5336f95e68466c744ddd7d40b7b5db60b84d77fc88149e0c6e85f27b4d88c46417da8299c24c54a1e6a1f7e954c5517aaa1c4f6284914b5fe41494f97d6 SHA512 1b30ce1e6aa13af6913ce09c00f44b8666aa095c1791a3e96e4538377647a175677034482426cb452e38d0edcaaac5480c3f50499591914b50aa8f6d0f04ce38
+EBUILD haskeline-0.7.5.0.ebuild 1035 BLAKE2B 7db977505bc7a19b9c3771a339bc9bbf5f95b29f6d07fb24cc783f4a42af3c8feeb00c91a70774792313e6faf0aca3f5a410791526a1c6be850852b2797e08fc SHA512 e64950846cff597ab4904b381166f07960310fe48f93e3724d27f5b380fd68cdf4a2b0ecf0ddfd986cdf0e541de968903441e81d9c052c0d95495a1d3eec2e28
 MISC metadata.xml 759 BLAKE2B 65db68f050406f7d67549c7ee59445c0048ccc8ef3d841fc0da8b03c20f30b7984c1bcd673890e304f64ab8dbfc6fd666d86282e96c22b0111a19fd8025f512a SHA512 ce39f6d65cc0830be627f0e79086c454fe55e371c70f1ebc18bf850c7490409f557d371d3b0fdf40cfb11dd31de561f515a3b78c2f6aa56de39d865b33bc481d
diff --git a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
index ea4773a729a8..2a793ea65887 100644
--- a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.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
@@ -38,4 +38,4 @@ src_configure() {
 		$(cabal_flag terminfo terminfo)
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
index 5bd2116bd48e..a63e90fe6530 100644
--- a/dev-haskell/language-ecmascript/Manifest
+++ b/dev-haskell/language-ecmascript/Manifest
@@ -1,3 +1,3 @@
 DIST language-ecmascript-0.19.1.0.tar.gz 56091 BLAKE2B f7f84703aaf6962164b8bfda5fc5ac624cd27e325b77db45cef058bcdb447fa54aa3462eb1ec6ef8318c6663418cfe5459880f31ba97fb89ecc0be97d6757e86 SHA512 07a562af8dcdb72f86466c2cd066252e289bfc253cefdec756dd68cfc4db867b9951ffde4d0edae492cd78feae426796273667a8fcdbf182489aaed415abb2b2
-EBUILD language-ecmascript-0.19.1.0.ebuild 1531 BLAKE2B ea67e3c16a44ecfa58b06f9414e4c8b6a1da8a81d6b659133475a9383b35f136bc83b862b4310f772a8f7514751a57e48273b322386bf405af5b61ab85c5c205 SHA512 14bd9d947d5078bf6e2a608e26dd3b88e36cea1f21ed66ff17f73c90ca88a5139fd4f1e60ae800091759c98a586d03ae4aea5076915026abf0cff211e6d7a78c
+EBUILD language-ecmascript-0.19.1.0.ebuild 1650 BLAKE2B 0b1fc08a2f01e93905bf650cdafecef735481934946ec1c73f039d172ed9dbba2cc9e1b8c6aa4b956d3b557be47fb7b3a5cd831f765779d83894773efdb6ca8b SHA512 d42ab2e2b9b3f448ce238b18da5a1013eb2459abdc7ac4e68188dea2367bc404daecd524fc06e2422525d7ed2afd49e47cfa8f0e086493d9472fcd05fdca0498
 MISC metadata.xml 596 BLAKE2B 787ae6259b762c93911394e5705222432772e615b6fc3c74a193d65d6f95a5f28e2020f9df5bb091a8aea0d0d16e15a58b2cddc490d2200a7af3dd4d7cddfd31 SHA512 5d34b8f0d441df1eb10c5bfaeb8b18d018c579b8d25d22ba50f87bf9f850c0309f9f5964f0ee5e2ccfb8447f8411dd1b18fac62a44c09db2223f1b29a3ddde80
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
index 9029755ed411..7d0cfedf528d 100644
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
+++ b/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.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
@@ -35,3 +35,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4
 		>=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 )
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4 && < 4.15' 'base >= 4' \
+		'base >= 4 && < 4.14' 'base >= 4'
+}
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 019d50c2b795..d295c8a6a794 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,3 +1,3 @@
 DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c
-EBUILD mtl-2.2.2.ebuild 921 BLAKE2B 6ce035f4a361e8d9daff8aab62718fb0366896ab010ed29c09712ac402ac4977201371de349befe2edc62fd95aea8ca3e0e6b8bde14c5482ecdbeadd2577dba9 SHA512 085a41929ffb0befab24b067f39b633b5fd21ce2b6ae766f50ca876bf0dd8d108ed17c997d304424adf39bd8f2c55ae8b20ee37be2f02f2408b8f871b0e18151
+EBUILD mtl-2.2.2.ebuild 981 BLAKE2B a646f1d2d867d76d6a16a566253081c6d3b1bd86ca35e980d251b0658ec182876d50deff88c7589af416e7a0c2c235cc72b5c82cfc76b220f4b1c44733b04253 SHA512 524a711120d379fbe769dc99054fe927f302e8f07d47b5f69ecc8722ea6262799ac6f7d84808b87a7edcaf89f45f37661e1e32061a320edc7b961385d2d0198a
 MISC metadata.xml 693 BLAKE2B da27e97919715cacee75756746262ee8706cd83f26967cf33bba060e85034cbc546a0c52093ba34dc9db7faa81db2fe0162adf4882cfb6fd7d86137915721ff9 SHA512 3f98568414ef1de6679c4d8a1f381bba6eff560b889830d711578252feb9dae978a60fdfd7e84f5ba71d09a2710a21cd464e1735b5bd139462d12694df8be781
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
index 573ea637bf81..83bb28e42722 100644
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.2.ebuild
@@ -24,4 +24,4 @@ RDEPEND=">=dev-lang/ghc-7.10.1:=
 "
 DEPEND="${RDEPEND}"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index cae581a8a374..47097f38b5a6 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,3 +1,3 @@
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
-EBUILD parsec-3.1.14.0.ebuild 1291 BLAKE2B abb8b57888a9486b05189997f79df5150116b0419a9b02dd9343d9be143e5df0a93da82fce38401aa9ee60d167b33e0ef0c5f36149df28359f46a9650b259d34 SHA512 d339cf1ae10a6e6d30983bc404cbf0d634a33f04a832ef24490200aa39c7843025dcd9fd4266820fe227392ca1f87d88696f5f3a25234a44fe06dc956e689da2
+EBUILD parsec-3.1.14.0.ebuild 1328 BLAKE2B a0f0d1ed8373ffb1b1df7b5888cacf9e53bb386ad7fc186559faf62d04e949dfa6f21778a7098c82615f0c860b74d3ae0361e37aff233d2d9a6439678a6cdcb6 SHA512 4a2b4f2470e8187466ebc0e506843df67c09d2417e37511c2332198b75b49808980466884af0865e79ed7b4fa027751c651a2f36b400f0f7d8e110f596a2c57f
 MISC metadata.xml 636 BLAKE2B 546955f2794df86c208026c6b3705535af628a8603ba09e942655c268684bf19e30f7c7b6b2965985cb5b8397a9e58ff278261bf08800f6ba7f0d2a74989d7e8 SHA512 ac9389b16e95e34ddbbcbf567449f2cdbd2247a2e419c58d8d07de32a782e29153271da8e80e4382f61e3af469894f80926acbc7f01ea172b53916cf1b32003d
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
index 0743f353eaf9..d2120fe88cb5 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
@@ -31,4 +31,4 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 "
 DEPEND="${RDEPEND}"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 43b73fa7ef6d..f28c547b303c 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -1,3 +1,3 @@
 DIST stm-2.5.0.0.tar.gz 12335 BLAKE2B 4b29efdb620e0528a42a34e0b98e2ba5a7e90f83009e1129f923a77abc427a5f0e3a32255f908d9771406983bbdfab6b9887b031cee7c1a98c99a7d810cccd0d SHA512 64516ff5eba42a469046af51f12cb55afca795c7a897b9ac16c3446d547ad3894d9b80be3716e86291825e8fa91335ee89e9c9c6738c95f3cbd8ee0739236651
-EBUILD stm-2.5.0.0.ebuild 869 BLAKE2B aaaea38e81f75b43e27a7828418acef8a0919f5b07594d9aaab0975fd93c07f5e39a16e2347fc71f99bb24065fc0169b595b14e26619d1613524ab5ae55a3435 SHA512 24c4c6a92fbd5e2d6f84e4da1184b24db457bb573688d73041a6a866f39d9f90f9d8e6031914422ca8fe0fbb77b55ca5b479a8415b3c3ba5502e63d629d00fad
+EBUILD stm-2.5.0.0.ebuild 906 BLAKE2B 938fbe2455e7d5d15edf0d232b2e421b6285d2a54ea71cc50bb4865d06ca45271e141a751ab8a8ff4434172262e80a876012e678cef69d084533b4a65418667a SHA512 18477fd2c44c5ec4007c082c4fdd2ab7bd02200aa4b3d9f97456e8dae5d22b402ccc388d209326be9876c16c496c31957d7772b717bf1c78666b88832896bfc4
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/stm/stm-2.5.0.0.ebuild b/dev-haskell/stm/stm-2.5.0.0.ebuild
index 8a5b50e5bfc9..5a143f915cf1 100644
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.0.ebuild
@@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 5a59232e3762..3c8fce77bb0c 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,3 +1,3 @@
 DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
-EBUILD terminfo-0.4.1.4.ebuild 733 BLAKE2B 5fbcb308b7f94b5095512221adb5c1172882ad9fa9f712f058c3431f2b4d175b28b8e76999b8ddabadae38dbf943f1e682fee4daec56280076bf81804f73b33c SHA512 91e51e105c1826ff03db92150375b4d34f165bf08172529094443cb9db1b0608e30d6095ee5d024778d84383f10f508ee8b45710eff404033f00a17ad8e95865
+EBUILD terminfo-0.4.1.4.ebuild 793 BLAKE2B 01cd10ce298ac638d7d5c24ec6523033ca7a4fee2a254ee4195e6a46f614b22a881e17f86a3d934923483fe942ad526eaf1e3d16b7d3308fa353ce5f1d413239 SHA512 d7559f37e03109c279c3186bda704d5a21e1259d5265807b93ee6a9623630810e173e96f7ac456a7573839a3e2cb9220031d91e4b62a6a1d469ddb1c35a77ced
 MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
index f7efeff63931..7fd6206e537d 100644
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
@@ -24,4 +24,4 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.0.0
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 7387f4d6d19b..cddea96d41ac 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,5 +1,7 @@
 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
+DIST text-1.2.4.1.tar.gz 148905 BLAKE2B 5e3429e3f83a2c12c5482e342fb4a1846538bdf453df23c2144af01d0df3f5a8b831fd76513aea6e303b5a36b38dec185fedf960060264fc49fe917e30964b41 SHA512 4170d9a463cebfbd80b7902e4d71ed1a1f29db96d2cc9045b79908509a633a239edb3b1ff8dac6970074c4d7e91c552e106756d8142709f8fee3a960428c23e7
 DIST text-1.2.4.1_rc1.tar.gz 166148 BLAKE2B c79bbd90c9ccf99668d5a4f0e66b4c75fa7a531d9851355be8a9d859d99578d2e22977ee9514f1743927a8a4fa49d29c252abc39509dd0b6d09bffd96e1f5289 SHA512 27d014d6b870e6cba16ac4a0ac146872d89c363ad1ca786642554bde0cf3ae4876d69ba8dd2655bbdcb88076bf4f5e13b45929ff86cd2bd90d24e607ad7221c6
-EBUILD text-1.2.4.0-r1.ebuild 1054 BLAKE2B e1b4f3555065e8f6a427bfcd94bfae59e75a6021c702963c01eca3e4e49c454935929890ed02f573b957e57e819df2f6c9b2137146c14c79cea6ac504f3361b4 SHA512 2feacaa426eb9c08e5d177994eb9e6edd435c6347c3d37d7a3d9f1ec0afede59d5fe63c19dfb9314243664c973c10dd3b8dceb59fbb4b63e33daf3fdb8861988
+EBUILD text-1.2.4.0-r1.ebuild 1066 BLAKE2B d764699918b96a033e77780be03558a43b2ddfd82944f63fc12d26f846531b5f2e49c736d12306c590df61fca1950b2e35d79c1cb4540c2837a3de2ada6a777c SHA512 50d1fbc6a5529b69c7b357995975fa7686bed94745a185c92ac7113fbd52da0f698c3071f479807a7111e9267236aa748d284ce61a24591c550c8d9ed5041548
+EBUILD text-1.2.4.1.ebuild 1050 BLAKE2B 73ce55c525264c64ea9e6d56c3032d33fc62d6e93508e55c4464e77d676075b82f649d93a1cd115275d6081d63655bccd4e3f66d307c39925d33776bd5dd66cd SHA512 3eaf5c6f68178dc8609b29266ad570459c9d72b59719ef1da281279be09f3e1d743a0e9985639278474801ace976a29e99e000c8810a8fd12c49383ca6512066
 EBUILD text-1.2.4.1_rc1.ebuild 1083 BLAKE2B 8de8aae0cc9edabd32e4e93860449f5be5fac18c8bdc87a055ca39f1a33f4224679c0169494081942479341774d5e710b78fbf97186ff547c91705d8b5b054be SHA512 92ddf11edd4f4d7b6d05c3b2fff421956e03b24e4f85fe67878b086db943158da395e6b59db34fda70fdd712cbf5b1eb5641cddcbe7f83e4a8825255affe3488
 MISC metadata.xml 1508 BLAKE2B 08f6bc5bf71673da2d537c07ef01ca787dd260e71ec011cb9b8c6940e0e0e5cfeed035a6d61d16bf4ac51eb6d32cd15915e25e478fc9e31c97e1d27fbd959412 SHA512 39745c75fe908c51a4c5a0f67b62c6fe65b41cc783753ba3217481b78b2a76f76d227b800310e67bbe95697bdbfc5594d082c699104eef463740f2e0c9a83c66
diff --git a/dev-haskell/text/text-1.2.4.0-r1.ebuild b/dev-haskell/text/text-1.2.4.0-r1.ebuild
index 32cb6fed33fa..07ef7a22437d 100644
--- a/dev-haskell/text/text-1.2.4.0-r1.ebuild
+++ b/dev-haskell/text/text-1.2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND=">=dev-lang/ghc-8.8.1:= <dev-lang/ghc-8.10:="
 DEPEND="${RDEPEND}
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-bytestring-builder \
diff --git a/dev-haskell/text/text-1.2.4.1.ebuild b/dev-haskell/text/text-1.2.4.1.ebuild
new file mode 100644
index 000000000000..e2fd338a0b39
--- /dev/null
+++ b/dev-haskell/text/text-1.2.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -bytestring-builder,-developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10.4
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+# break cyclic dependencies, test suite requires porting to >=QC-2.11
+RESTRICT=test
+RDEPEND=">=dev-lang/ghc-8.8:="
+
+DEPEND="${RDEPEND}
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		--flag=-developer
+}
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index 59a421b16ab0..72940836e92e 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -1,3 +1,3 @@
 DIST transformers-0.5.6.2.tar.gz 42370 BLAKE2B 317c8f557e0e37503546323096a9e2c880dd9331708b80b3041d4caa325b1c863b147abb433c0cdc15b1650a7412cb8579d96a8f819a93223b8588bffb440d8d SHA512 f871a910a5c31af77a4b9711f01b5780b1f657bbce0fb37234c97b8245d8504c514950f9e8673a606405484ae175cdb84c0aee7a05df8712cea02299c652cdf8
-EBUILD transformers-0.5.6.2.ebuild 840 BLAKE2B 521cf4616dca36b71b26f1ed27f79a8fa35d945e8fb234fb6951493646e12ded845388ccd5e80dcd3a1c0200dc9b1f26a79728375fd940924bd26bf81211afb3 SHA512 23f4d62f31f53bf5ba96bdf7f4c375334fbe59948161bbd59b00cfcd87b33cf43db6c42c83299efff0390db7ffbacafa1cc1d747752f7125864797ca1c0ada50
+EBUILD transformers-0.5.6.2.ebuild 877 BLAKE2B 6bb23fd366f738a1c9ef99fe060476ceee6af06a674b30b49d0b7e41bb3e6072ae790958f8798f28bcf5a60ef9bed9f76943344f39e070e4026a36838b453392 SHA512 d0f74fc93b832fb5688eed80bf7abd73065b0669bd20b123a3c0e5b5cea836c531913b28903e338e9a9dd2b7b873bbc442b319331c8486d778e169cab19b0c11
 MISC metadata.xml 877 BLAKE2B 0586dc1fc804e0bde37650495e3edcdc5a8725e34a0dbe9dec382438718c4fda1ee68f9bfe23e3467c8a86dea0b6483007d92648c51ae8339e0eebfd5a8c5725 SHA512 a010fb14b9affd54a82308f792aff1f28a5ed4bbe4f1ac8be99c4d4cbde84b78ad49c71d12979bd40fae84e19a429b93de50c64bb345ca188a16ee375f45ae84
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
index 2355d6f9f776..df29fa1c9afb 100644
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
@@ -24,4 +24,4 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 "
-CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index be5d576125a9..2b52483115ee 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,3 +1,3 @@
 DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
-EBUILD xhtml-3000.2.2.1.ebuild 724 BLAKE2B 06fa8d8e6dfeb5a4e690cf97022eaee020897ce37158fde4554d7add2998bccfe618dd6f08a600b5f1d233bf643a9a585df189f65ce8d6f01394214f6693eff1 SHA512 3d1de8e9797e43f0817bdce3fe75c769abd921c01ef2667918f4c5662e25c6a3079b9f5cc200117d6d6c630690adf944bc7448f15b21a831a338e2e1d405eb58
+EBUILD xhtml-3000.2.2.1.ebuild 784 BLAKE2B 0294cfaf8bf458e604acb0858609ed960602d8b7b10a382af1abfe670a74f607b7499cdba1cf2980a0c58dc10d8e6af629d205c7edfcef9ac6e31fd7da60d5cf SHA512 eb335365d8f39410c78e80c131b7658e89286d626b8981cb72ee49331df0eec151208b43153b52b2afeb2efa69b1e843f07b7090c1f8b501025887cf6967197c
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
index 373bbe200864..984aa1b8eac1 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
@@ -21,4 +21,4 @@ RDEPEND=">=dev-lang/ghc-8.4.2:="
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 470e30cbbd00..a7b4cdae926b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 15de79a6518a..c8284a792671 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -14,5 +14,5 @@ EBUILD antlr-2.7.7-r9.ebuild 1152 BLAKE2B 46708d1153f7d4bfc9a58f5e7f19b3c4129c23
 EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
 EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
 EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3-r1.ebuild 2522 BLAKE2B 57b57fb24b9066d3491036acc4ad8e95ff456866a51882f1de869b5b01a8a027521bd91194d458d3658593be3a8ae41e41839dcc27bfa69c5b828b39ea7985f9 SHA512 2be264b788fde22e8225d8b4b2979820bc9cfbebf59f874a2cb8f847a76d5ece8d699311794dd1e01fe17e262d16f02589d2730130fed1a64a13563c6f470c0b
+EBUILD antlr-4.5.3-r1.ebuild 2521 BLAKE2B 439d098a1ae5b7238d89f896723418a212ca4fc1c59ab4da70ede8f3d245fe63befc4ae1c81c8c41a5a1aa351b643e56be916cff04d213aad8ef044483a5ce2c SHA512 35fb47714fc1187138706791bee5f352c3c8df99a1e4efbce67df358a311d531be27c4a4214c2e7c114667e5de656b0130e45cfe2cbf47662c08aedaf6e83c10
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index 3c70f1210ae3..b9cfe8237899 100644
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 0f7922e30b0c..17683d390fe9 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -3,5 +3,4 @@ DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7e
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
 EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
 EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
-EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
deleted file mode 100644
index 3cb523c4cd89..000000000000
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-collections4:4.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-SLOT="4"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.7
-	test? (
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc RELEASE-NOTES.txt
-	docinto html
-	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 45472d5a010f..8cdffe228601 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-r1.ebuild 2224 BLAKE2B df78302c2e2a43e993ef8415ec9ba3a32871a50ead217eaf14c2b73707f7f561322f5f866ccadf94444b52ec4ca29eb60084d9a0c6f9148661909e06a1ee30dd SHA512 adfb02f15e6e5bd9aa9fc180e0e1ac8b60d5ce64a4dd5a3de865eb5b5781f246cf055bf876495a44489c3b370466c151cc0fa22dbc30c4c295d80f3fb6b5d2ce
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2223 BLAKE2B 0289176e10c609a13f173314f6aada1f74011c729309889a96e5485aa05c28517da26621988c962d1ff79c0bd5526d964ac9cf275021687c7c148536fd78eb63 SHA512 a2913be90a81fc105f2a1ea12faa38eb07ba0a52a16b2c65d2d3b0398fde21b4be4582818af3d1434934bba6cd177459efbeefd98c6d8dd4c599645b01390425
 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
index a9080209c2fd..c13ad1428399 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index f9020e6424b1..cd1283bfc878 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,7 +1,7 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
-AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095
+AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
 EBUILD commons-vfs-1.0-r1.ebuild 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd
-EBUILD commons-vfs-2.0-r1.ebuild 1555 BLAKE2B 6b63d2ba8e44911ee0bbb849b2818b9db99c7e054d5fa4c8f70d1a041f8ee6c32ce34ed94e4e5b6ea135c803b4b1cdf1b842f9a7fd1a6ed6fcac3ddf2d34a371 SHA512 717232ee5632658753e44637acd0edc9424782311bc370ffc2f3dd494ca46c188d79347dc67c1ea67c658809170fb452f4d522bd3d60029d0d3fa0a8b07f945b
+EBUILD commons-vfs-2.0-r2.ebuild 1631 BLAKE2B 9febe1a1166ca72b1d0c1804fe4713a265e02482091304f68ae1382141a32e8c1ff68ce8ccc07f2782896516b6bf3e3cdbda4bb3daa9f4bc7ea534b996cfc1a5 SHA512 7c315b76f89ca88c8a3d24f925eb4b6eb33413bc6873aa72b5cbdafacbf1764bba6c2aa06a107995b2f2e08c68071f6c95a13790552ae33745d5db4d54ee8539
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
deleted file mode 100644
index e8991f3641cf..000000000000
--- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A single API for accessing various different file systems"
-HOMEPAGE="http://commons.apache.org/vfs/"
-SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	dev-java/commons-net:0
-	dev-java/commons-httpclient:3
-	dev-java/jackrabbit-webdav:0
-	dev-java/jsch:0
-	"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}/core"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-incompatibility.patch
-
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	java-ant_rewrite-classpath
-	java-ant_ignore-system-classes
-}
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	commons-collections
-	commons-logging
-	commons-net
-	commons-httpclient-3
-	jackrabbit-webdav
-	jsch
-"
-EANT_EXTRA_ARGS="-Dlibdir=${T}"
-
-# The build.xml is generated from maven and can't run the tests properly
-# Use maven test to execute these manually but that means downloading deps from
-# the internet. Also the tests need to login to some ftp servers and samba
-# shares so I doubt they work for everyone.
-#src_test() {
-#	ANT_TASKS="ant-junit" eant test
-#}
-
-src_install() {
-	java-pkg_newjar target/*.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
new file mode 100644
index 000000000000..8f5598d5645b
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A single API for accessing various different file systems"
+HOMEPAGE="http://commons.apache.org/vfs/"
+SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/commons-net:0
+	dev-java/commons-httpclient:3
+	dev-java/jackrabbit-webdav:0
+	dev-java/jsch:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-incompatibility.patch
+)
+
+S="${WORKDIR}/${P}/core"
+
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	commons-collections
+	commons-logging
+	commons-net
+	commons-httpclient-3
+	jackrabbit-webdav
+	jsch
+"
+EANT_EXTRA_ARGS="-Dlibdir=${T}"
+
+# The build.xml is generated from maven and can't run the tests properly
+# Use maven test to execute these manually but that means downloading deps from
+# the internet. Also the tests need to login to some ftp servers and samba
+# shares so I doubt they work for everyone.
+#src_test() {
+#	ANT_TASKS="ant-junit" eant test
+#}
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	java-ant_rewrite-classpath
+	java-ant_ignore-system-classes
+}
+
+src_install() {
+	java-pkg_newjar target/*.jar
+
+	# [javadoc] No javadoc created, no need to post-process anything
+#	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
index 298503ec6153..59e2f287afdd 100644
--- a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
@@ -1,6 +1,5 @@
-diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:28:39.072739044 +0200
-+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:30:24.799404027 +0200
+--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:28:39.072739044 +0200
++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java	2013-07-05 15:30:24.799404027 +0200
 @@ -50,7 +50,7 @@
          {
              try
@@ -10,9 +9,8 @@ diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/Exception
                  if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
                  {
                      if (DomUtil.hasChildElement(error, "exception", null))
-diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:28:39.072739044 +0200
-+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:31:02.449403426 +0200
+--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:28:39.072739044 +0200
++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java	2013-07-05 15:31:02.449403426 +0200
 @@ -63,6 +63,7 @@
  import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod;
  import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod;
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 4121f570479d..f03898e5ef8e 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,11 @@
 AUX fontbox-1.7.1-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
+DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
+DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
 DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
+DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
 EBUILD fontbox-1.8.11.ebuild 1170 BLAKE2B a483121fdab73f9a92f4e9057114b92a90990f26cb3fbcfb3d28f8424af3b01a836b7eb7a8a2af11ba99dfa5db3e027f21761372d55cb00606b6bf626c79c2ea SHA512 dc7940fd45a410e30a147a7d4669aeabbbdcbbbf7415ffe59cce7c9130263980c375decde18aeab7e1956e78b2826ce6c4866393577ff7686b1b32c277dbd607
-MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
+EBUILD fontbox-2.0.24.ebuild 1765 BLAKE2B 602179a3ed887f0201cb62c7596380a486e89e2bc27248c8a1286511133a79ffb04da4326cf145694a13f43f342568cd477232198d75f0ce6509bffb258a225c SHA512 54f58693fe3a152d2cc99c7abc49dce282b44f162d04625c4d785f96ff4d43c0d397b79e370f91cf3118d3a372d6b119ed467c2b651a6cd7992b9261716abd01
+MISC metadata.xml 570 BLAKE2B 80071f93eb72253bed0abd8d049626e10c52327777a440a7325b81ceda3c11f095757c5833b9e572499760b389263824adbc4541787eb99a44faea79f193ecc6 SHA512 66595990acf09fb6e612cca3bffb7f42f3d11df4a08ba998121da77bd877373f36865bfafe43e17f7462a088849046c8c9dd8e1fd6c4e66d9216a2b0a3e8abd4
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.24.ebuild
new file mode 100644
index 000000000000..36fa75e64718
--- /dev/null
+++ b/dev-java/fontbox/fontbox-2.0.24.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="https://pdfbox.apache.org/"
+SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
+	test? (
+		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
+		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
+		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pdfbox-${PV}/${PN}/pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CDEPEND="dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/pdfbox-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	mkdir --parents target/pdfs || die
+	cp "${DISTDIR}"/DejaVuSansMono.ttf \
+		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+		"${DISTDIR}"/SourceSansProBold.otf \
+		"target/pdfs" || die
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
index fac651d95a59..fe29d9c6e1f8 100644
--- a/dev-java/fontbox/metadata.xml
+++ b/dev-java/fontbox/metadata.xml
@@ -5,7 +5,12 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		The Apache FontBox library is an open source Java tool to obtain low level 
+		information from font files. FontBox is a subproject of Apache PDFBox.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">apache/pdfbox</remote-id>
+		<bugs-to>https://issues.apache.org/jira/browse/PDFBOX</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 53f2e92efa58..7486d8910d11 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,3 @@
-DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
 DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
-EBUILD gson-2.7-r1.ebuild 571 BLAKE2B 4822c5d75ea5822d20a3b48e6ccd64e792efa32a2810fc1ccc88f430d5183b7b9a756744a8239d74a3fa3b550707ba9fe7d43d9180ae56638d814b4f1d76e1a3 SHA512 76945946101257ecfbef0c3cf97a3badc2a3e15a9def7e863a551b8ecd52f323fe8b2fdf7a4f4bf912a5d35503a5eefb0c7a71a658567b02d40f9767bf6d9fed
 EBUILD gson-2.8.7.ebuild 1122 BLAKE2B fe36a3255c95238213b909258c3b160d27e09629d14838d6684a3a4db273021434db1cf994093ff6134ee910c030d771ebaab45c045691a8696c4fc27d234f42 SHA512 e7a387f35ade78894858f138ce01e8e3e47a60e6506e7558a7fabd037eb46cac7759de4ffed37da345c94997e0e8abb911459b1ed37f674e2afa619b5476a721
 MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.7-r1.ebuild b/dev-java/gson/gson-2.7-r1.ebuild
deleted file mode 100644
index 54f042e16ae5..000000000000
--- a/dev-java/gson/gson-2.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-parent-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index 70c4c022014c..2615f873513b 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 1591 BLAKE2B 86b63de69b8803971a875fd7b1aaf34d7ac65cf2e9f4b7683f99d2d585c0896ea89304c28583dc3301d446d80872af535f69867fb57fb1e8b127a356a7b985c8 SHA512 a2f1b1a16d53d7b0ce562a752a567d951bbc02b1297d9e9cd44ed258891e7c2bee0c61699d2438c4d7d2a43536b1fb932ae2db33f31a2e239301ef70a5960a25
+EBUILD httpcore-4.4.14.ebuild 1590 BLAKE2B d60f9f57fa1d305c754fe2c7c41ba0b84d900f55392e96ba8f340d810ea6446e88893a3542a8668dbafb20f5f66fb0de006c472c33d3220a8bf370febc160ad7 SHA512 d1eb80fd5467a6a7150bbe83facdbaead1068660de3d923a553d2e2b794bc53140fba54702d298520f9f6da1cd00e4fcc0ebdec39d20dd10bcf5dc90f3f2eef1
 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 f5b9fdf5466a..8e3fe959caa0 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/jai-imageio-core/Manifest b/dev-java/jai-imageio-core/Manifest
new file mode 100644
index 000000000000..d44e8ee7ff50
--- /dev/null
+++ b/dev-java/jai-imageio-core/Manifest
@@ -0,0 +1,3 @@
+DIST jai-imageio-core-1.4.0.tar.gz 1542191 BLAKE2B 3dc8de7cd8e375eb3b4e5a6524e0280bf295ffb0d29b2989a35789f8974f27a6ba50f1b3b82c88af0992cf6ce7b5fba28e38f2892b3ac34b2c20d7245035f2ec SHA512 20d361cbb040b692717acad56d12034ff695859f125acbac080092fb0423f5338bfbd9a39a968b67712f4f0a62cc02a51dc9e2cffbb886efb379c8a923a11ad8
+EBUILD jai-imageio-core-1.4.0.ebuild 1190 BLAKE2B e105e437cc9b4e109556c88bc5c0314b2ac1cc6abe726694401c268cd51a76d6fc056b0f12ece1a16cebe0d59aec2ecbe716ea7906418332407f5a9b542d733a SHA512 1c5ce3dff76c5efa3fb20c1c93b3939610e4ab941acee828b6326a108248b70dfad9ea5c4ee3cfe59c6f457a55cbadbf65a266544df46afd433f44f8328d4745
+MISC metadata.xml 680 BLAKE2B 6e6e777fbbf2800def11c32044034286955b745222eaf2e8ee5b608b288d65f06ec887fc7f63d2d97a05f603e9e95ce8fab59c9cc206e9d816c9481664760629 SHA512 91dd07884ad85aceaf915d2754236033ae68da0845af456da91f2c052b861979d9cc147201f2a6c69b1bcf7685e8eda5e15e9a8db86593dae495015f61fa4f85
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
new file mode 100644
index 000000000000..98cb04b71840
--- /dev/null
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-core-jai-imageio-core-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-core-1.4.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jai-imageio:jai-imageio-core:1.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Advanced Imaging Image I/O Tools API core (standalone)"
+HOMEPAGE="https://github.com/jai-imageio/jai-imageio-core"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Sun-BSD-no-nuclear-2005"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
diff --git a/dev-java/jai-imageio-core/metadata.xml b/dev-java/jai-imageio-core/metadata.xml
new file mode 100644
index 000000000000..964c031aba2f
--- /dev/null
+++ b/dev-java/jai-imageio-core/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="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Java Advanced Imaging Image I/O Tools API core, but without the classes involved 
+		with javax.media.jai dependencies, JPEG2000 or codecLibJIIO, meaning that this 
+		library can be distributed under the modified BSD license and should be GPL compatible.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jai-imageio/jai-imageio-core</remote-id>
+		<bugs-to>https://github.com/jai-imageio/jai-imageio-core/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jai-imageio-jpeg2000/Manifest b/dev-java/jai-imageio-jpeg2000/Manifest
new file mode 100644
index 000000000000..7ebc2493369e
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/Manifest
@@ -0,0 +1,3 @@
+DIST jai-imageio-jpeg2000-1.4.0.tar.gz 499964 BLAKE2B 219b53d2264f819ed808495e5c559e8350f965ba100696f28e817ef27cf458fe2b05401957d81a3f4f208f59888a0607b72e4529fdfd37c6763cd1b8da1f2f5d SHA512 6c1129f735d1e6578e8feb233fe5462a62f503979d7afad9942acd749b39714e352df6133fad0b99f4fd84af82de10efbf91196eb0cc9d40c080c9546948f4eb
+EBUILD jai-imageio-jpeg2000-1.4.0.ebuild 1461 BLAKE2B 4fa9253ab83c270847d37edbdd23d27ef16e526b85085b83a224a54f15ff0f89eda0fc08ac2cd1b5cf05220cbea246bbcd68cc0fc9c58870dd7196a41745d5cc SHA512 e074879d9558520a284ca39e73d901400e6592731eec20df72240f69e06053a88194fa47b405949eb94081d3a69c7ef4e21412cf088f018a44e105dfc28e9ab2
+MISC metadata.xml 680 BLAKE2B 09b09844455bb544a14021eb4211bf2ce27133c8dfcf376a03eae85499ce00fc96d0752e18075cd064c77bbaabeb7036992002d9be2ac6de6327ffbd048bebf9 SHA512 8fac9c38dc6eefdd33148479d6e8b596484d3cd534a848463ba8358f2ba743817b3d3a95e66d38639fb47036284f4281e49304e3022dcfea3dc1e44e3ac9378e
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
new file mode 100644
index 000000000000..b3b0973e65d6
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-jpeg2000-jai-imageio-jpeg2000-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-jpeg2000-1.4.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JPEG2000 support for Java Advanced Imaging Image I/O Tools API"
+HOMEPAGE="https://github.com/jai-imageio/jai-imageio-jpeg2000"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Sun-BSD-no-nuclear-2005"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}-${P}/pom.xml
+# com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
+
+CDEPEND="dev-java/jai-imageio-core:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:* "
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="jai-imageio-core"
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
diff --git a/dev-java/jai-imageio-jpeg2000/metadata.xml b/dev-java/jai-imageio-jpeg2000/metadata.xml
new file mode 100644
index 000000000000..e0cf2ba2bd75
--- /dev/null
+++ b/dev-java/jai-imageio-jpeg2000/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	</maintainer>
+	<longdescription>
+		JPEG2000 support for Java Advanced Imaging Image I/O Tools API core.
+		This module is licensed under the [JJ2000 license](LICENSE.txt) and
+		is therefore NOT compatible with the GPL 3 license. It should be
+		compatible with the LGPL 2.1 license.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jai-imageio/jai-imageio-jpeg2000</remote-id>
+		<bugs-to>https://github.com/jai-imageio/jai-imageio-jpeg2000/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
new file mode 100644
index 000000000000..659d6ce9e967
--- /dev/null
+++ b/dev-java/java-diff-utils/Manifest
@@ -0,0 +1,3 @@
+DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
+EBUILD java-diff-utils-1.3.0.ebuild 978 BLAKE2B 3e286fe911d7ebad7f973913e5fa62571923ec55f621f7f08123a670a4647a6ce2e9ffc7c04b7b2f1d39130f0c57703d5b698f3fa69df4a0a05422a2e61e6d1e SHA512 bd523eb7c76ed3450bf1363f8168f0bb443330852db6d1dc7aeeb859c26f8db00dd22ca5f7fb745a378f82de2c5e925b53623bc87531ecbe1e6822ad19353c01
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
new file mode 100644
index 000000000000..5dd403738076
--- /dev/null
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom diffutils-1.3.0.pom.xml --download-uri https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild java-diff-utils-1.3.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view"
+HOMEPAGE="http://code.google.com/p/java-diff-utils/"
+SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/diffutils-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/java-diff-utils/metadata.xml b/dev-java/java-diff-utils/metadata.xml
new file mode 100644
index 000000000000..0d49beafc75d
--- /dev/null
+++ b/dev-java/java-diff-utils/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>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jbig2-imageio/Manifest b/dev-java/jbig2-imageio/Manifest
new file mode 100644
index 000000000000..9e2a45ad47d1
--- /dev/null
+++ b/dev-java/jbig2-imageio/Manifest
@@ -0,0 +1,3 @@
+DIST jbig2-imageio-3.0.3-src.zip 2079380 BLAKE2B bb05f81bfdef00b1a0ffcb7a2df2617fe5f5a83957249266917e775ceab57282ee289aedb198c6639201e85df83e89b8cfe8cf2d865fff863d1f2a5acd439721 SHA512 5350b4ce89af72eea5069f6ea5fc830238e4df711712506405aaf0e14546a1b07155b8c5225b47f0d40ce2821032426a2987adbe0df63c536cae4fb319b5c700
+EBUILD jbig2-imageio-3.0.3.ebuild 1321 BLAKE2B 134861334ed032c9b49c63ef69adc8747d7f0be358c4b9d9243bdbabf9d5ca6544684e0420396915d2979284b4b5d56cd415bb01502f5083ddd1f17dd4e2b822 SHA512 427a2e5f7a0d9c861fc94a67223f29c6279e7aa94669de2829d0d327670623243b7d4958cbb9b8d151cd04e7ddadf4a143cd05763d127a2b47c933e1bc03a6bf
+MISC metadata.xml 497 BLAKE2B 991d15b62eadd6ae2919d5c22902f08f93d2999c6d29ac670f11c4e21a0da8f9ed04abac1416d603a376b5021818e95c2e21f0a144605a890698a4e9bfff65bf SHA512 b0910a66f6b6bd091e080edf0673783fea45065cefa8ffc967b45f0d06a426275784fa0bc56dbf2839273e404bc5a597c5c2c0a951527c6951711ff52847229d
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
new file mode 100644
index 000000000000..f6ba1cf47e0c
--- /dev/null
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jbig2-imageio-3.0.3/pom.xml --download-uri https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jbig2-imageio-3.0.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.pdfbox:jbig2-imageio:3.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="PDFBox JBIG2 ImageIO plugin"
+HOMEPAGE="https://pdfbox.apache.org"
+SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${P}/src/main/java"
+JAVA_RESOURCE_DIRS="${P}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${P}/src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class
+	#  1. Test class should have exactly one public constructor
+	"org.apache.pdfbox.jbig2.util.TestServiceImpl"
+	"org.apache.pdfbox.jbig2.util.TestService"
+)
diff --git a/dev-java/jbig2-imageio/metadata.xml b/dev-java/jbig2-imageio/metadata.xml
new file mode 100644
index 000000000000..22254bd7257b
--- /dev/null
+++ b/dev-java/jbig2-imageio/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	</maintainer>
+	<longdescription>
+		Java Image I/O plugin for reading JBIG2-compressed image data.
+		Formerly known as the levigo JBig2 ImageIO plugin (com.levigo.jbig2:levigo-jbig2-imageio).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/pdfbox-jbig2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f589d06af0b0..407a5319a6ac 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -11,5 +11,5 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
 EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
-EBUILD openjdk-bin-8.292_p10.ebuild 2990 BLAKE2B 30fd8d4a745ec3f8635ec9186505f1b3affcec34afb2a78f5fd9daf104a093d70661ed77437e7917088fc1b0ecb7098ed0a9f5eacedf9bf7bea6ce15a16f0b71 SHA512 4a6de5b9d6ae9ad3b1db2352cbc4169839a0f371275d1fb1631c6b7eedebd51e82b4c00c1e65813aa12ee3061e37df29f2d74c6e06f920190d064f8a911bf085
+EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
index ed94c334091a..855c583cbcfc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
@@ -113,6 +113,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index cd5b1dbe5c81..d1c223c40903 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -3,5 +3,5 @@ AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
-EBUILD openjdk-jre-bin-8.292_p10.ebuild 1802 BLAKE2B d7b2300d8b5896e2aaaa17f67bd2b436aba77be2fbd68a0035dc66ee24ee48a220da5e609d2e2185509abc94ec5ba43bda9494bd205e1dc29505704a77551ac2 SHA512 7bb823c6144ec8aa219782cbae8b73a2ae662aa056ce79524cc4efd37a81ff65d3cf9f8364013b78c49419ac53f684ded95c8eb2ef0d1bb8b48c51c07eee6676
+EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
 MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
index acb70caacff7..49dddf130391 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
@@ -73,6 +73,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 4af4635d55c1..7b88f2fd548d 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,5 +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
+EBUILD swt-4.10-r2.ebuild 4314 BLAKE2B ba5c51b5a3b0d809ed5f4b258c973eed2fdb005af8c24a13d4de99d6e2ffb297431a91f9a1b67e6504a1fea1260c16e57ad9c08abbac558fcb51abbd2853b8fe SHA512 fdc24c724ba8e238140f1cee87b310fdd3c50faf805dd51776d6ae88615ec8467a1956def30be559af3d7c5ca5740ac515490daa44d6db770875aa3c6d8c9295
 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
index 8c3986977dbe..291a35848865 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -87,23 +87,17 @@ src_compile() {
 	# 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
+	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+	for libpath in "${ldpaths[@]}"; do
+		if [[ -f "${libpath}/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}"
+			break
+		fi
+	done
+
+	if [[ -z "${AWT_LIB_PATH}" ]]; then
 		eerror "${JAWTSO} not found in the JDK being used for compilation!"
 		die "cannot build AWT library"
 	fi
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 9f70e66f72cc..fb00bda45bec 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,7 +14,7 @@ DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a136319
 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
 EBUILD tomcat-servlet-api-10.0.6.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.7.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+EBUILD tomcat-servlet-api-10.0.7.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c
 EBUILD tomcat-servlet-api-10.0.8.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
@@ -23,6 +23,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 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
+EBUILD tomcat-servlet-api-9.0.48.ebuild 3011 BLAKE2B 4208db9782f6ba2354476bca2b134ba104bd5cf12a33ff1fc133b914fee21ee5016699da48305e7fbe7c76d4d324192b361d66983c0ac977899fb3050ca1a4b7 SHA512 89a6cfb80295f0a9fc4b6bd87e6d6dcbcd7acc5ec660050796ccfd2d13723804d0e5cd25c531da8ec6174c76e24139dda051e6f771630990558c1b9da3fd949d
 EBUILD tomcat-servlet-api-9.0.50.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
index fb739b89bf7a..c5339740e594 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
index 4a8d22d12869..eb33dde54b1d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ec4f55e51bd7..81ceb27c1b7a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a0f7f4011fec..dc08c951cc0c 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -7,6 +7,6 @@ DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83eddd
 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
-EBUILD R-4.1.0-r1.ebuild 7080 BLAKE2B 312412a327e25891d3b4236f648d4958b0d7ffcada36add367baeced3f325af645cb21c5126190643bfd92eba34d169c14a68e2cdfdc3b9c98de7e7254171e3b SHA512 978cf3808415dbcea5fcbf81a3e9877e236317bb89a821b2f812f0673631fee2e4be63a66c9b26ced3f85ef429ddca4482624e7e8d87b9c9172e87707d7325c8
+EBUILD R-4.0.5-r1.ebuild 7314 BLAKE2B 8b5d585e08797e7990b1e4fb4cb26e111b6e264798a62c06ba826524258e6f76e8c80b16d6a807b7e0b1fc04c04e41965fcf3ac16766364b3066e6220a62c577 SHA512 6280b8f1482fc997b9a4719056a9e404c2114c48d2488c422fa0eedc94ceb0d1b3fd126eb9927ebf4066b49d5bfe32f2ac3098395c4d0afde0bd5e6e68cad805
+EBUILD R-4.1.0-r2.ebuild 7080 BLAKE2B 312412a327e25891d3b4236f648d4958b0d7ffcada36add367baeced3f325af645cb21c5126190643bfd92eba34d169c14a68e2cdfdc3b9c98de7e7254171e3b SHA512 978cf3808415dbcea5fcbf81a3e9877e236317bb89a821b2f812f0673631fee2e4be63a66c9b26ced3f85ef429ddca4482624e7e8d87b9c9172e87707d7325c8
 MISC metadata.xml 1260 BLAKE2B eb0399a7ff9cb5c8a2f26944065ea176fb379bfd509fe2f6115dc0deb625d0c92a6cf62736572024f9c1342865cbd8a6ed43f8c427939a08ded55dd73f5514df SHA512 71c20b8afc3a72627e89bf032db5c19369738bfe35fc6d3a2550f21bf70be1eec1a697ec13690f48a1f2604cd3973140311af6b745719fd724dea595b964e6ae
diff --git a/dev-lang/R/R-4.0.5-r1.ebuild b/dev-lang/R/R-4.0.5-r1.ebuild
index 330656c3f483..e8bfafd7f0a7 100644
--- a/dev-lang/R/R-4.0.5-r1.ebuild
+++ b/dev-lang/R/R-4.0.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
 
 # One test required profiling in v4.0.2, check the upstream bug:
diff --git a/dev-lang/R/R-4.1.0-r1.ebuild b/dev-lang/R/R-4.1.0-r2.ebuild
index ebf4b5c27c2e..ebf4b5c27c2e 100644
--- a/dev-lang/R/R-4.1.0-r1.ebuild
+++ b/dev-lang/R/R-4.1.0-r2.ebuild
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index 2caec3881523..e507294247c2 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -1,4 +1,7 @@
+DIST cfortran_20110621-1.debian.tar.xz 13352 BLAKE2B 0039dd4b5973e5cd13a136c51e8719ffa8e104db0d716cbd247fe440643dfce5308767d182abbcbafbd1de791e8cb4384c479660fe8b592477968d40c54078e8 SHA512 51387a17e4f69e5f5e53e188b5397a08d578aba42fdc446d4901e59be32bb0e5f07d871daa809e9de6051b4d9213b4312e25f70970db9173e4f33a0e66b4b44b
+DIST cfortran_20110621.orig.tar.gz 129061 BLAKE2B 16c0cae1675923c1f6f13fe5a2a65ff86a2a80e4b3c3956c04cbc2df562dad8426b90c8a3a34919c28a7bee29f7430ffe8b415e28a484421aa8f58430456b934 SHA512 59b4285bb5392916880503bdd1cead5602944ebbf615d3c40bb7232770d6a74d3138a0b2abbab4fed9ea9bd2a56b2d3097d9609833c07d773dc43b8be0a3258a
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
+EBUILD cfortran-20110621.ebuild 1413 BLAKE2B 4a79bb61fae0ab837671ad1f8d50a9b31a88d76434f1335b03be6df720ea39f48f3b0996a9fb9a3ba5ded6e071cc36f4219d3d52c216650288ffcbe6ae25eb96 SHA512 d088d2169aa60108cd1c10f22d3d5262ed7782b1f11078f5b2fbbbdf4bc3553f4c81e29723a760e9520f2152cd24d6bdba515900d3ab95041faafa8f7511c879
 EBUILD cfortran-4.4-r3.ebuild 1129 BLAKE2B 04a566375e2089865956a4ef33cfda8be590a6fc35aef7fc67574083aabaf2d8f1efedf32fdb752ab2f1e3b2d52f784b17fa17f2c6a208ffb77eeeff3b204c24 SHA512 c5fd742c7add66334fcbdefe1e595748ca59b9c28869735ae12e8f1300933f5d657315c8b036233b86d14f1f38d913383622de9b8e90436aec656f74d143b333
 MISC metadata.xml 588 BLAKE2B 9e2c3b0818a3bbc250153d807eb81d08f24d5568fc34eb83aef2a9344c59ca998fe488d27e8d23bc1381e21580015df60519698369394c17361111e470a9313b SHA512 4cc9d7ec3c44afc7e8ca2b43c04ea67c88fa1be09f9c594d83d1d011823566efd4e6b889fc4e95b019885be4223de32d94e0126acf70fe5e7cabf753a9923d40
diff --git a/dev-lang/cfortran/cfortran-20110621.ebuild b/dev-lang/cfortran/cfortran-20110621.ebuild
new file mode 100644
index 000000000000..feb93f85b1d4
--- /dev/null
+++ b/dev-lang/cfortran/cfortran-20110621.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=test
+
+inherit autotools fortran-2
+
+DEB_PR="1"
+
+DESCRIPTION="Header file allowing to call Fortran routines from C and C++"
+HOMEPAGE="https://www-zeus.desy.de/~burow/cfortran/"
+SRC_URI="
+	mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( cfortran.doc )
+
+src_prepare() {
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	default
+	eautoreconf
+
+	if use examples; then
+		# The examples are also used as tests and it's tricky to clean up
+		# afterwards, just save a clean copy (sans Makefiles, as they only
+		# cover the test phase) before the tests are run.
+		cp -ar eg eg_src || die "Failed to preserve a clean copy of examples"
+		rm -f eg_src/Makefile{,.am,.in}
+	fi
+}
+
+src_install() {
+	default
+
+	# For compatibility with older versions
+	dodir /usr/include/cfortran
+	dosym -r /usr/include/cfortran.h /usr/include/cfortran/cfortran.h
+
+	docinto debian
+	dodoc "${WORKDIR}"/debian/{NEWS,changelog,copyright}
+	docinto html
+	dodoc cfortran.html index.htm
+
+	if use examples; then
+		docinto examples
+		dodoc -r cfortest.c cfortex.f eg_src/*
+	fi
+}
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index f0b92e850e77..914036b529fb 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -4,10 +4,9 @@ AUX crystal-0.27.0-extra-spec-flags.patch 493 BLAKE2B 84270f431db778bfe4b3b9b291
 AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4ba89a2ccc2c7a2ac3ff4994cd687191470f2d481f9a6e3a91aaaf705f92f7600118a9cda015a9554056520502df7ae6462e111665c7330 SHA512 d840ac343ef566e404dc84e908bead5a020dfd88b8c0432f17bceea8d710d435626dc72b4be6622dbcd683a149bca16e781320cf74fc3f2598f84d169c6f7faa
 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
 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
+MISC metadata.xml 910 BLAKE2B 9d07b880c1e1780ad7faa4421eb7621f1385d282b17e8b33b1db9ae26bdaf77aca4a99b1f61327945ded75295fef34b55058e67d915ebca19d4ca65dd5045fb5 SHA512 c786809187d76dca77dcbde53d5758d1acc5bd4600a746fc7ffe5ec497bc3d957e19582685b89bd72292f999f6d41c7bf09e3b65c3f4a27e332fe877471aac36
diff --git a/dev-lang/crystal/files/crystal-0.31.0-verbose.patch b/dev-lang/crystal/files/crystal-0.31.0-verbose.patch
deleted file mode 100644
index f381704ba0d9..000000000000
--- a/dev-lang/crystal/files/crystal-0.31.0-verbose.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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)" )
-+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 $(verbose),--verbose )
- SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 372dd996e6ec..dd69de87393b 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Crystal is a programming language that resembles Ruby but compiles to
 		native code and tries to be much more efficient, at the cost of
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 0e0c6b1ea612..9abbd603c85c 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -8,4 +8,4 @@ DIST elixir-1.12.2.tar.gz 2460047 BLAKE2B eebcb4b828bf445ece6bfceb40b228406a15b0
 EBUILD elixir-1.11.4.ebuild 922 BLAKE2B 718117a8aee4294e70930d45d6b39d6522026c48165b9af54eae4b612458509e456586e8c6a256175ed4e66a6e36293d22d65d69b1fb40ec28efb6ee1b511fbf SHA512 e77cad093155fbcbab5247c18c4c45db407df167c296d9587c19826d303c0e38f431bb4c3ea61537dbfd0c211d4917ce08a38c6f6a2c7fb1c6040c0e279c9b8a
 EBUILD elixir-1.12.1.ebuild 883 BLAKE2B aced08cbe2bf019d89d11d0fb85a884e96ff211d348f8af7cf9699bc1793a85850e736d7c2fa35cf9e026875b5771bb06d99a6a03ef2cbfb7aa9033eeff0d0c9 SHA512 544bea168a5dbd07b7820e1e18c71221379785434a59350d5e2434dcb0f9c3f0447a0644dfc3a656555c261c2f290684c7131e0ada4e73884b016e7b69bc29e9
 EBUILD elixir-1.12.2.ebuild 886 BLAKE2B 946c6fb8fc5b2500ff4a58bda868b3ed5beacd1065e49ca410a0fb38c3411482843dce90a4eab87ae8ac96567cd167ffcafcbf960dd059d8411744e3fd125597 SHA512 8256f2f7d0d3e064b99059f5d9b2defb4275bbaf81529e44bd761b28e035e11dfcba21c8f446b9368198d9047980fc955c3c6faa9bd03a9c818ccd2e26dd0c49
-MISC metadata.xml 820 BLAKE2B 7fd55cc9f7450d46060069909506fb74e93234ccd319b5f5b428580fd4f55c59c2ada78770ae744d784838574d87522d3e94f101eba06b5a64ebcb513db4eef3 SHA512 11300d8d6d6cbb73b55d4dfb44d04fc087867bab1fc3fcb0564473d911844d3be148170c03a9247c6a407d8de88442ca6017c00177d93be46b37166d3ba42593
+MISC metadata.xml 708 BLAKE2B a342fbcb336b7eaa8d21fb35c6c663d9cbd3037c5696b3a7c39ec6a029bf820422eab2d86fbb75fcdb492059aae23ed03d5e25fb0b820aa038e3008018b75205 SHA512 cdb41615688b07478c909677331eced59c2f5337e6cafb6b57239886fa90d84a9f522c59ccda17dea4cf2ee99a8d6351dcde23a62588222cb32ccc69a84424b7
diff --git a/dev-lang/elixir/metadata.xml b/dev-lang/elixir/metadata.xml
index 3220cf329e6c..af13b746e971 100644
--- a/dev-lang/elixir/metadata.xml
+++ b/dev-lang/elixir/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>
 			https://github.com/elixir-lang/elixir/issues
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index cc15bd48f7c4..49c5618ef072 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -15,4 +15,4 @@ DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9
 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
-MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
+MISC metadata.xml 752 BLAKE2B 6f18f49b163e69e7748b1dceceaec772499acab795b6c2a80e69a9520387a529d27a781c87e0c59708020d667428d3cace2798a4ebdac792b2db1863151593ce SHA512 b9c5cc32e73c33f3b3d40498c3e9c2937f3a5f06ac7b52d15c4239948d7a7dd95051d8364cd55820ca267a605d156976bd9f03f4534f15b49bf10fa7dcd8f2bb
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 580f0687c1a7..7481b07532ae 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 6f3403c9c204..23f477b4971f 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -5,4 +5,4 @@ AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2
 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-r2.ebuild 1639 BLAKE2B 9a9b3b2d0e1ba2a16426b5ae090f1d8ea19fd07bd02c09b3b0073cbb47de3d35c4ebc0138d88554a2895c086f0b229c8bb4cf70a00201ac5696e878a811272fb SHA512 5c03928607c6a0f5459590f667f966c6a8a9414841c7e5b54ce471139a53049e5f57d0b9e65749d929a36f54fe105778107cf854d5e8b395f12c15bbadc0b4c9
-MISC metadata.xml 326 BLAKE2B 6da20ce2a24c972471a238851ab8507c86dbadeb31012151be42584e9d57bebdce2756f559de384330dc046643f488d5c1113a14ee062c3876af781ec06bd0de SHA512 ddc827fdf3ad56400315226a9a396689925918c60a9bfec1c3f927a3408b16da0c2df51e987fd8943e5575446f98fe7a83547fa168fc6863f7bbff0bc5272dae
+MISC metadata.xml 242 BLAKE2B 5c8fa04c19e2c9f32ccc30f8b44b65cf6ca76304ef3f2c61d9538c70bedc13e7f1315b68082dd824aa85bc1e0b84032b1599e759eb8eec8f36e62711f45b26b5 SHA512 cd837c34e3eaba6a3d7306f022f3b7ba1d917c10f01a701a1ec70d734f07365b570fbd07f64d2683c65ae4f3d0ebe55941d1b5c7039c56935b0363f5d464198d
diff --git a/dev-lang/gforth/metadata.xml b/dev-lang/gforth/metadata.xml
index c14f5a586840..01a3a7a0716b 100644
--- a/dev-lang/gforth/metadata.xml
+++ b/dev-lang/gforth/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="check">Enable build-time sanity check.</flag>
 	</use>
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 9ab89553a533..088ae7165109 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -27,8 +27,8 @@ DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 55dfbb90d5e55c2af5e9
 DIST ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 118897883 BLAKE2B a180b2dd1a3bc222044ece809ad700aee29d0c3e75b57ee9af3ca33c9c0f59dbf36f68202f746d99f80915cb717a9c41fc12db507f1cb469981732703a06b9cc SHA512 9d4be02dbd9704c93ef18feb92ea30bd5d590df31f288bf1b364818424c5019ca9ada26eec88418199f90ae8f4459d0a9352104e3f3186bbdc241891eb1b66c4
 DIST ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 122955511 BLAKE2B b870f46cc78fcc1d715aafe7108951582cfd12495b4e9d804d4b66562c66a6a2b2d9513031aedc8f3630a0cdbb3257943304b05732301a084f89487452f2f2d9 SHA512 aafd4233c40f93b71e6ac1acc8a75e30d49b826e4bce6d9832836966fd5f6c4898963bd4c2f34577f4199c1d9a3f537ac1e7d87eab11e9fb5e849573580ed3fb
 DIST ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 121542968 BLAKE2B 837870e68138f8d97dc8b2aae90090cf02416628602ca4ba4417ac92b49155f10028b05ac465665b8872b32372a5cee075616983f2eacdebb0188bd2ce6a93d2 SHA512 0e8c6d2e6f32fac95588f7323a4e02dddfc9ec2476a82b97bf5a106d3810f7e638fda7124c53b5bbc563fce70f4436553c282d8ea2f1f5fdf4fcccfb15a2b079
-EBUILD ghc-8.10.4.ebuild 26139 BLAKE2B 89fd04e383dce946a9751d47003216f97eaced39a484aae56cdf319fb73624ee0508525f03feda0c8c03b67f8dde2c46f2b8b1dad207eac0c5c8dd7a82427280 SHA512 60c27bd5d2c398bc6964fc33ed75cf69089a72d55a8fae8d94d097d11c4368160cfdfeb52199debb98ba55821089629aadd6951b521c3a033f179a9129b37991
-EBUILD ghc-8.10.5.ebuild 26073 BLAKE2B 97b71c95f14bde30023126f8a0737c30cdaea2fa2e5dd7f71632def5c5b45ab6f1d7312a9b134283d5b4c53b61ad1623fe35b9ab3bca2178f6b2e63d25e45431 SHA512 e94525efe03c2207e930ecc116f5500d1f1a3d1122536f5d3ceae9afc96f2a2cb093538a9cf7f9f76570798df9f77d56d5670faa6d4461ce9f013aadefc6e9f6
-EBUILD ghc-8.8.4.ebuild 26728 BLAKE2B a76849dca6fbc706b6afc5f05076d6f78bf332ce33b612bcfa3d6121a2f19d93fff157e698f17e397f01f974e2a9f4cbfaedd3b0153bd26f80a6f75d491da4d2 SHA512 15733d0c916c10bd8bb62be2de8cde63d52966ecd4bef9fc0187e804d281fe96626baff40584a926faa7dc7d5db8a9de10ded9d5ca12f9aa61a6898120bd215c
-EBUILD ghc-9.0.1.ebuild 26043 BLAKE2B 2e1e3c37c9f1a09678e252cecaa32f1342b55a80b0c2b749a9b00a4d8fa079358661012d74354a2528816dde2ab44f596ac5d025f09e4c9cdbe7d445fd5fdd72 SHA512 6ec6887f1e83150de5fa92779dca500346cc3cd0137ac3ce6acd34f1b55a5fb3e746dd004c969ae43ffe9136105ce1144141da22f68a94bc150287f40be6ed2c
+EBUILD ghc-8.10.4-r1.ebuild 26143 BLAKE2B 8476b6ed1671f2b7ba5d1a202eab94299f12804af89e7626917a970a658b63e8988c0f9d38140ed1e823f4574d5230c038610662dd04ab82aefa9f5516cfc59f SHA512 272a8a08096b437bd73eab7a3b38576f1c373f0c21352c340d27516755c5eb1c061806b204948dec0df325819213414d575bdb28c060750714ba16bfdc05e7d1
+EBUILD ghc-8.10.5-r1.ebuild 26077 BLAKE2B c81a9599ec300b0ec3264f1016bd3dfb692a5ccb2f5fe85e4763accf2327179164dc32ca52fefd64ef5cf680426d05a5afef2e2043def5f1b334f70f1c7004d0 SHA512 c84517d16762dd379aec574a4381fd2f5ab895c1ba162618e147f418cdb8439bda1054a9752b72c2c688835e4546f267d581d76b62ea74ffed6144f748ab6626
+EBUILD ghc-8.8.4-r1.ebuild 26732 BLAKE2B 0ce893b3987c17490048c6af365fc783a21c00c54aca09abd9a940dca291dbffb97739cf900dbd3a1ae59c8fbd20ab63194d2295777922451006e827bbe0fdf0 SHA512 0adb531579435c4e73c7132668540a476889c62cf15b1ad20df4235127867ca3a8ed4f3df318f8f79bad044a626133cf559c6f87741ba645c8c0e25b74ff53a7
+EBUILD ghc-9.0.1-r1.ebuild 26047 BLAKE2B 320a76fcc9f8ccad091535fcea42e630fe7b52483969e05b947c0bb64ffa7561d81ae55fdd9823067e2647321e531bbf12a2a3a679e79f541a1ec6fcadea32be SHA512 a6cac26a91b0eb08862dfea253ae53c7bc36c8eea3a8a46f115fd77e68f13d5c50d480002192fee2b15dcc7ec3becc6e11e3fe3e47dd7d1b77150eb3615304ad
 MISC metadata.xml 877 BLAKE2B 763db2ffce8c241ef55110ca08aa9f7383f14bbe7f96a443b438f027214e04f56f8216b0cd0d871e516a13f07a8a5a52835b0f75ddd3eb9ebd7faccd3a6b03d9 SHA512 516ad3cdb3b26b242668ae2bbf48628c8fb95fdc84ab3dc00afc940c68c2b78a7aa85634c228e9b3427963f0b86263d24ba043d0fd9ae57752e5075392a0322c
diff --git a/dev-lang/ghc/ghc-8.10.4-r1.ebuild b/dev-lang/ghc/ghc-8.10.4-r1.ebuild
new file mode 100644
index 000000000000..0e4472b1c7d4
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.4-r1.ebuild
@@ -0,0 +1,815 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 0
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:=[unicode(+)]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
+		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild
deleted file mode 100644
index af942b11cd06..000000000000
--- a/dev-lang/ghc/ghc-8.10.4.ebuild
+++ /dev/null
@@ -1,815 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
-
-# various ports:
-#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
-
-# 0 - yet
-yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		#arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		#ppc64)
-		#	use big-endian && return 0
-		#	return 0
-		#	;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? (
-	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
-	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
-)"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
-IUSE+=" binary"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	elfutils? ( dev-libs/elfutils )
-	!ghcmakebinary? ( dev-libs/libffi:= )
-	numa? ( sys-process/numactl )
-"
-
-# This set of dependencies is needed to run
-# prebuilt ghc. We specifically avoid ncurses
-# dependency with:
-#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
-PREBUILT_BINARY_DEPENDS="
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-"
-# This set of dependencies is needed to install
-# ghc[binary] in system. terminfo package is linked
-# against ncurses.
-PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
-	sys-libs/ncurses:0/6
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
-"
-
-needs_python() {
-	# test driver is written in python
-	use test && return 0
-	return 1
-}
-
-# we build binaries without profiling support
-REQUIRED_USE="
-	?? ( ghcbootstrap binary )
-	?? ( profile binary )
-"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-is_native() {
-	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
-}
-
-if ! is_crosscompile; then
-	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-fi
-
-# returns tool prefix for crosscompiler.
-# Example:
-#  CTARGET=armv7a-unknown-linux-gnueabi
-#  CHOST=x86_64-pc-linux-gnu
-#    "armv7a-unknown-linux-gnueabi-"
-#  CTARGET=${CHOST}
-#    ""
-# Used in tools and library prefix:
-#    "${ED}"/usr/bin/$(cross)haddock
-#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-
-cross() {
-	if is_crosscompile; then
-		echo "${CTARGET}-"
-	else
-		echo ""
-	fi
-}
-
-append-ghc-cflags() {
-	local persistent compile assemble link
-	local flag ghcflag
-
-	for flag in $*; do
-		case ${flag} in
-			persistent)	persistent="yes";;
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				;;
-		esac
-	done
-}
-
-# $1 - lib name (under libraries/)
-# $2 - lib version
-# example: bump_lib "transformers" "0.4.2.0"
-bump_lib() {
-	local pn=$1 pv=$2
-	local p=${pn}-${pv}
-	local f
-
-	einfo "Bumping ${pn} up to ${pv}"
-
-	for f in ghc.mk GNUmakefile; do
-		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
-	done
-	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
-	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
-}
-
-update_SRC_URI() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
-	done
-}
-
-update_SRC_URI
-
-bump_libs() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		bump_lib "${pn}" "${pv}"
-	done
-}
-
-ghc_setup_cflags() {
-	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
-	if ! is_native; then
-		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
-		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
-		einfo "Crosscompiling mode:"
-		einfo "   CHOST:   ${CHOST}"
-		einfo "   CTARGET: ${CTARGET}"
-		einfo "   CFLAGS:  ${CFLAGS}"
-		einfo "   LDFLAGS: ${LDFLAGS}"
-		einfo "   prefix: $(cross)"
-		return
-	fi
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-
-	# Cmm can't parse line numbers #482086
-	replace-flags -ggdb[3-9] -ggdb2
-
-	GHC_FLAGS=""
-	GHC_PERSISTENT_FLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Sometimes it's handy to see backtrace of RTS
-			# to get an idea what happens there
-			-g*) append-ghc-cflags compile ${flag};;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	for flag in ${LDFLAGS}; do
-		append-ghc-cflags link ${flag}
-	done
-
-	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
-	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
-	# options to gcc.
-	if is_native; then
-		# prevent from failing to build unregisterised ghc:
-		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	fi
-}
-
-# substitutes string $1 to $2 in files $3 $4 ...
-relocate_path() {
-	local from=$1
-	local   to=$2
-	shift 2
-	local file=
-	for file in "$@"
-	do
-		sed -i -e "s|$from|$to|g" \
-			"$file" || die "path relocation failed for '$file'"
-	done
-}
-
-# changes hardcoded ghc paths and updates package index
-# $1 - new absolute root path
-relocate_ghc() {
-	local to=$1 ghc_v=${BIN_PV}
-
-	# libdir for prebuilt binary and for current system may mismatch
-	# It does for prefix installation for example: bug #476998
-	local bin_ghc_prefix=${WORKDIR}/usr
-	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
-	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
-
-	# backup original script to use it later after relocation
-	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
-
-	if [[ ${bin_libdir} != $(get_libdir) ]]; then
-		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
-		# moving the dir itself is not strictly needed
-		# but then USE=binary would result in installing
-		# in '${bin_libdir}'
-		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
-
-		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
-			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-
-	# this one we will use to regenerate cache
-	# so it should point to current tree location
-	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
-
-	if use prefix; then
-		hprefixify "${bin_libpath}"/${PN}*/settings
-	fi
-
-	# regenerate the binary package cache
-	"$gp_back" recache || die "failed to update cache after relocation"
-	rm "$gp_back"
-}
-
-ghc-check-reqs() {
-	# These are pessimistic values (slightly bigger than worst-case)
-	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
-	# numbers on various arches.
-	CHECKREQS_DISK_BUILD=8G
-	CHECKREQS_DISK_USR=2G
-	# USE=binary roughly takes
-	use binary && CHECKREQS_DISK_BUILD=4G
-
-	"$@"
-}
-
-pkg_pretend() {
-	ghc-check-reqs check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ghc-check-reqs check-reqs_pkg_setup
-
-	# quiet portage about prebuilt binaries
-	use binary && QA_PREBUILT="*"
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages."
-
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	else
-		if ! yet_binary; then
-			eerror "Please try emerging with USE=ghcbootstrap and report build"
-			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
-			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
-		fi
-	fi
-
-	if needs_python; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	# the Solaris and Darwin binaries from ghc (maeder) need to be
-	# unpacked separately, so prevent them from being unpacked
-	local ONLYA=${A}
-	case ${CHOST} in
-		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
-	esac
-	unpack ${ONLYA}
-}
-
-src_prepare() {
-	ghc_setup_cflags
-
-	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
-		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
-		# See bug #313635.
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
-
-		# allow hardened users use vanilla binary to bootstrap ghc
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
-	fi
-
-	if use binary; then
-		if use prefix; then
-			relocate_ghc "${EPREFIX}"
-		fi
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-		eapply_user
-	else
-		if ! use ghcbootstrap; then
-			case ${CHOST} in
-				*-darwin* | *-solaris*)
-				# UPDATE ME for ghc-7
-				mkdir "${WORKDIR}"/ghc-bin-installer || die
-				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
-				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
-				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
-				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
-				popd > /dev/null
-
-				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
-				# fix the binaries so they run, on Solaris we need an
-				# LD_LIBRARY_PATH which has our prefix libdirs, on
-				# Darwin we need to replace the frameworks with our libs
-				# from the prefix fix before installation, because some
-				# of the tools are actually used during configure/make
-				if [[ ${CHOST} == *-solaris* ]] ; then
-					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-				elif [[ ${CHOST} == *-darwin* ]] ; then
-					local readline_framework=GNUreadline.framework/GNUreadline
-					local gmp_framework=/opt/local/lib/libgmp.10.dylib
-					local ncurses_file=/opt/local/lib/libncurses.5.dylib
-					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
-						install_name_tool -change \
-							${readline_framework} \
-							"${EPREFIX}"/lib/libreadline.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${gmp_framework} \
-							"${EPREFIX}"/usr/lib/libgmp.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${ncurses_file} \
-							"${EPREFIX}"/usr/lib/libncurses.dylib \
-							${binary} || die
-					done
-					# we don't do frameworks!
-					sed -i \
-						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
-						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
-						rts/package.conf.in || die
-				fi
-
-				# it is autoconf, but we really don't want to give it too
-				# many arguments, in fact we do the make in-place anyway
-				./configure --prefix="${WORKDIR}"/usr || die
-				make install || die
-				popd > /dev/null
-				;;
-				*)
-				relocate_ghc "${WORKDIR}"
-				;;
-			esac
-		fi
-
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${S}/ghc/ghc.wrapper"
-
-		cd "${S}" # otherwise eapply will break
-
-		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
-		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
-		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
-		eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
-		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
-
-		# a bunch of crosscompiler patches
-		# needs newer version:
-		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
-		popd
-
-		bump_libs
-
-		eapply_user
-		# as we have changed the build system
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if ! use binary; then
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
-		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-
-		# We also need to use the GHC_FLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
-		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
-		# Speed up initial Cabal bootstrap
-		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		# app-text/dblatex is not in portage, can not build PDF or PS
-		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
-		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
-		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
-
-		# this controls presence on 'xhtml' and 'haddock' in final install
-		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-
-		# not used outside of ghc's test
-		if [[ -n ${GHC_BUILD_DPH} ]]; then
-				echo "BUILD_DPH = YES" >> mk/build.mk
-			else
-				echo "BUILD_DPH = NO" >> mk/build.mk
-		fi
-
-		# Any non-native build has to skip as it needs
-		# target haddock binary to be runnabine.
-		if ! is_native; then
-			# disable docs generation as it requires running stage2
-			echo "HADDOCK_DOCS=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-		fi
-
-		if is_crosscompile; then
-			# Install ghc-stage1 crosscompiler instead of
-			# ghc-stage2 cross-built compiler.
-			echo "Stage1Only=YES" >> mk/build.mk
-		fi
-
-		# allows overriding build flavours for libraries:
-		# v   - vanilla (static libs)
-		# p   - profiled
-		# dyn - shared libraries
-		# example: GHC_LIBRARY_WAYS="v dyn"
-		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
-			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
-		fi
-		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds toolchain it was built by and uses it later.
-		# Don't allow things like ccache or versioned binary slip.
-		# We use stable thing across gcc upgrades.
-		# User can use EXTRA_ECONF=CC=... to override this default.
-		econf_args+=(
-			AR=${CTARGET}-ar
-			CC=${CTARGET}-gcc
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-			# we set the linker explicitly below
-			--disable-ld-override
-		)
-		case ${CTARGET} in
-			arm*)
-				# ld.bfd-2.28 does not work for ghc. Force ld.gold
-				# instead. This should be removed once gentoo gets
-				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
-				econf_args+=(LD=${CTARGET}-ld.gold)
-			;;
-			sparc*)
-				# ld.gold-2.28 does not work for ghc. Force ld.bfd
-				# instead. This should be removed once gentoo gets
-				# a fix for missing --no-relax support bug:
-				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
-				econf_args+=(LD=${CTARGET}-ld.bfd)
-			;;
-			*)
-				econf_args+=(LD=${CTARGET}-ld)
-		esac
-
-		if [[ ${CBUILD} != ${CHOST} ]]; then
-			# GHC bug: ghc claims not to support cross-building.
-			# It does, but does not distinct --host= value
-			# for stage1 and stage2 compiler.
-			econf_args+=(--host=${CBUILD})
-		fi
-
-		if use ghcmakebinary; then
-			# When building booting libary we are trying to
-			# bundle or restrict most of external depends
-			# with unstable ABI:
-			#  - embed libffi (default GHC behaviour)
-			#  - disable ncurses support for ghci (via haskeline)
-			#    https://bugs.gentoo.org/557478
-			#  - disable ncurses support for ghc-pkg
-			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
-			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
-		elif is_native; then
-			# using ${GTARGET}'s libffi is not supported yet:
-			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		einfo "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} \
-			--enable-bootstrap-with-devel-snapshot \
-			$(use_enable elfutils dwarf-unwind) \
-			$(use_enable numa)
-
-		if [[ ${PV} == *9999* ]]; then
-			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-			GHC_P=${PN}-${GHC_PV}
-		fi
-	fi # ! use binary
-}
-
-src_compile() {
-	if ! use binary; then
-		# Stage1Only crosscompiler does not build stage2
-		if ! is_crosscompile; then
-			# 1. build/pax-mark compiler binary first
-			emake ghc/stage2/build/tmp/ghc-stage2
-			# 2. pax-mark (bug #516430)
-			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-			# 2. build/pax-mark haddock using ghc-stage2
-			if is_native; then
-				# non-native build does not build haddock
-				# due to HADDOCK_DOCS=NO, but it could.
-				emake utils/haddock/dist/build/tmp/haddock
-				pax-mark -m utils/haddock/dist/build/tmp/haddock
-			fi
-		fi
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_test() {
-	# TODO: deal with:
-	#    - sandbox (pollutes environment)
-	#    - extra packages (to extend testsuite coverage)
-	# bits are taken from 'validate'
-	local make_test_target='test' # can be fulltest
-	# not 'emake' as testsuite uses '$MAKE' without jobserver available
-	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-		[[ -f VERSION ]] || emake VERSION
-
-		# -j1 due to a rare race in install script:
-		#    make --no-print-directory -f ghc.mk phase=final install
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
-		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
-		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
-		#    /usr/bin/install: cannot create regular file \
-		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
-		emake -j1 install DESTDIR="${D}"
-
-		# Skip for cross-targets as they all share target location:
-		# /usr/share/doc/ghc-9999/
-		if ! is_crosscompile; then
-			dodoc "distrib/README" "LICENSE" "VERSION"
-		fi
-
-		# rename ghc-shipped files to avoid collision
-		# of external packages. Motivating example:
-		#  user had installed:
-		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
-		#      dev-haskell/transformers-0.4.2.0
-		#  then user tried to update to
-		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
-		#  this will lead to single .conf file collision.
-		local shipped_conf renamed_conf
-		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-		for shipped_conf in "${package_confdir}"/*.conf; do
-			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
-			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
-			mv "${shipped_conf}" "${renamed_conf}" || die
-		done
-
-		# remove link, but leave 'haddock-${GHC_P}'
-		rm -f "${ED}"/usr/bin/$(cross)haddock
-
-		if ! is_crosscompile; then
-			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
-			newbashcomp utils/completion/ghc.bash         ghc
-		fi
-	fi
-
-	# path to the package.cache
-	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-	PKGCACHE="${package_confdir}"/package.cache
-	# copy the package.conf.d, including timestamp, save it so we can help
-	# users that have a broken package.conf.d
-	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
-
-	# copy the package.conf, including timestamp, save it so we later can put it
-	# back before uninstalling, or when upgrading.
-	cp -p "${PKGCACHE}"{,.shipped} \
-		|| die "failed to copy package.conf.d/package.cache"
-
-	if is_crosscompile; then
-		# When we build a cross-compiler the layout is the following:
-		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
-		# but
-		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
-		# containst host binaries (modulo bugs).
-
-		# Portage's stripping mechanism does not skip stripping
-		# foreign binaries. This frequently causes binaries to be
-		# broken.
-		#
-		# Thus below we disable stripping of target libraries and allow
-		# stripping hosts executables.
-		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
-		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
-	fi
-}
-
-pkg_preinst() {
-	# have we got an earlier version of ghc installed?
-	if has_version "<${CATEGORY}/${PF}"; then
-		haskell_updater_warn="1"
-	fi
-}
-
-pkg_postinst() {
-	ghc-reregister
-
-	# path to the package.cache
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-
-	# give the cache a new timestamp, it must be as recent as
-	# the package.conf.d directory.
-	touch "${PKGCACHE}"
-
-	if [[ "${haskell_updater_warn}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ewarn "You have just upgraded from an older version of GHC."
-		ewarn "You may have to run"
-		ewarn "      'haskell-updater'"
-		ewarn "to rebuild all ghc-based Haskell libraries."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-	rm -rf "${PKGCACHE}"
-
-	cp -p "${PKGCACHE}"{.shipped,}
-}
-
-pkg_postrm() {
-	ghc-package_pkg_postrm
-}
diff --git a/dev-lang/ghc/ghc-8.10.5-r1.ebuild b/dev-lang/ghc/ghc-8.10.5-r1.ebuild
new file mode 100644
index 000000000000..79ac41c9b9db
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.5-r1.ebuild
@@ -0,0 +1,814 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 0
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:=[unicode(+)]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/ghc/ghc-8.10.5.ebuild b/dev-lang/ghc/ghc-8.10.5.ebuild
deleted file mode 100644
index 6e97c40b4576..000000000000
--- a/dev-lang/ghc/ghc-8.10.5.ebuild
+++ /dev/null
@@ -1,814 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit python-any-r1
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
-
-# various ports:
-#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
-
-# 0 - yet
-yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		#arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		#ppc64)
-		#	use big-endian && return 0
-		#	return 0
-		#	;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? (
-	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
-	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
-)"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
-IUSE+=" binary"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	elfutils? ( dev-libs/elfutils )
-	!ghcmakebinary? ( dev-libs/libffi:= )
-	numa? ( sys-process/numactl )
-"
-
-# This set of dependencies is needed to run
-# prebuilt ghc. We specifically avoid ncurses
-# dependency with:
-#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
-PREBUILT_BINARY_DEPENDS="
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-"
-# This set of dependencies is needed to install
-# ghc[binary] in system. terminfo package is linked
-# against ncurses.
-PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
-	sys-libs/ncurses:0/6
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
-"
-
-needs_python() {
-	# test driver is written in python
-	use test && return 0
-	return 1
-}
-
-# we build binaries without profiling support
-REQUIRED_USE="
-	?? ( ghcbootstrap binary )
-	?? ( profile binary )
-"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-is_native() {
-	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
-}
-
-if ! is_crosscompile; then
-	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-fi
-
-# returns tool prefix for crosscompiler.
-# Example:
-#  CTARGET=armv7a-unknown-linux-gnueabi
-#  CHOST=x86_64-pc-linux-gnu
-#    "armv7a-unknown-linux-gnueabi-"
-#  CTARGET=${CHOST}
-#    ""
-# Used in tools and library prefix:
-#    "${ED}"/usr/bin/$(cross)haddock
-#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-
-cross() {
-	if is_crosscompile; then
-		echo "${CTARGET}-"
-	else
-		echo ""
-	fi
-}
-
-append-ghc-cflags() {
-	local persistent compile assemble link
-	local flag ghcflag
-
-	for flag in $*; do
-		case ${flag} in
-			persistent)	persistent="yes";;
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				;;
-		esac
-	done
-}
-
-# $1 - lib name (under libraries/)
-# $2 - lib version
-# example: bump_lib "transformers" "0.4.2.0"
-bump_lib() {
-	local pn=$1 pv=$2
-	local p=${pn}-${pv}
-	local f
-
-	einfo "Bumping ${pn} up to ${pv}"
-
-	for f in ghc.mk GNUmakefile; do
-		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
-	done
-	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
-	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
-}
-
-update_SRC_URI() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
-	done
-}
-
-update_SRC_URI
-
-bump_libs() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		bump_lib "${pn}" "${pv}"
-	done
-}
-
-ghc_setup_cflags() {
-	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
-	if ! is_native; then
-		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
-		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
-		einfo "Crosscompiling mode:"
-		einfo "   CHOST:   ${CHOST}"
-		einfo "   CTARGET: ${CTARGET}"
-		einfo "   CFLAGS:  ${CFLAGS}"
-		einfo "   LDFLAGS: ${LDFLAGS}"
-		einfo "   prefix: $(cross)"
-		return
-	fi
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-
-	# Cmm can't parse line numbers #482086
-	replace-flags -ggdb[3-9] -ggdb2
-
-	GHC_FLAGS=""
-	GHC_PERSISTENT_FLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Sometimes it's handy to see backtrace of RTS
-			# to get an idea what happens there
-			-g*) append-ghc-cflags compile ${flag};;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	for flag in ${LDFLAGS}; do
-		append-ghc-cflags link ${flag}
-	done
-
-	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
-	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
-	# options to gcc.
-	if is_native; then
-		# prevent from failing to build unregisterised ghc:
-		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	fi
-}
-
-# substitutes string $1 to $2 in files $3 $4 ...
-relocate_path() {
-	local from=$1
-	local   to=$2
-	shift 2
-	local file=
-	for file in "$@"
-	do
-		sed -i -e "s|$from|$to|g" \
-			"$file" || die "path relocation failed for '$file'"
-	done
-}
-
-# changes hardcoded ghc paths and updates package index
-# $1 - new absolute root path
-relocate_ghc() {
-	local to=$1 ghc_v=${BIN_PV}
-
-	# libdir for prebuilt binary and for current system may mismatch
-	# It does for prefix installation for example: bug #476998
-	local bin_ghc_prefix=${WORKDIR}/usr
-	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
-	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
-
-	# backup original script to use it later after relocation
-	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
-
-	if [[ ${bin_libdir} != $(get_libdir) ]]; then
-		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
-		# moving the dir itself is not strictly needed
-		# but then USE=binary would result in installing
-		# in '${bin_libdir}'
-		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
-
-		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
-			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-
-	# this one we will use to regenerate cache
-	# so it should point to current tree location
-	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
-
-	if use prefix; then
-		hprefixify "${bin_libpath}"/${PN}*/settings
-	fi
-
-	# regenerate the binary package cache
-	"$gp_back" recache || die "failed to update cache after relocation"
-	rm "$gp_back"
-}
-
-ghc-check-reqs() {
-	# These are pessimistic values (slightly bigger than worst-case)
-	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
-	# numbers on various arches.
-	CHECKREQS_DISK_BUILD=8G
-	CHECKREQS_DISK_USR=2G
-	# USE=binary roughly takes
-	use binary && CHECKREQS_DISK_BUILD=4G
-
-	"$@"
-}
-
-pkg_pretend() {
-	ghc-check-reqs check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ghc-check-reqs check-reqs_pkg_setup
-
-	# quiet portage about prebuilt binaries
-	use binary && QA_PREBUILT="*"
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages."
-
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	else
-		if ! yet_binary; then
-			eerror "Please try emerging with USE=ghcbootstrap and report build"
-			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
-			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
-		fi
-	fi
-
-	if needs_python; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	# the Solaris and Darwin binaries from ghc (maeder) need to be
-	# unpacked separately, so prevent them from being unpacked
-	local ONLYA=${A}
-	case ${CHOST} in
-		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
-	esac
-	unpack ${ONLYA}
-}
-
-src_prepare() {
-	ghc_setup_cflags
-
-	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
-		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
-		# See bug #313635.
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
-
-		# allow hardened users use vanilla binary to bootstrap ghc
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
-	fi
-
-	if use binary; then
-		if use prefix; then
-			relocate_ghc "${EPREFIX}"
-		fi
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-		eapply_user
-	else
-		if ! use ghcbootstrap; then
-			case ${CHOST} in
-				*-darwin* | *-solaris*)
-				# UPDATE ME for ghc-7
-				mkdir "${WORKDIR}"/ghc-bin-installer || die
-				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
-				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
-				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
-				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
-				popd > /dev/null
-
-				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
-				# fix the binaries so they run, on Solaris we need an
-				# LD_LIBRARY_PATH which has our prefix libdirs, on
-				# Darwin we need to replace the frameworks with our libs
-				# from the prefix fix before installation, because some
-				# of the tools are actually used during configure/make
-				if [[ ${CHOST} == *-solaris* ]] ; then
-					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-				elif [[ ${CHOST} == *-darwin* ]] ; then
-					local readline_framework=GNUreadline.framework/GNUreadline
-					local gmp_framework=/opt/local/lib/libgmp.10.dylib
-					local ncurses_file=/opt/local/lib/libncurses.5.dylib
-					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
-						install_name_tool -change \
-							${readline_framework} \
-							"${EPREFIX}"/lib/libreadline.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${gmp_framework} \
-							"${EPREFIX}"/usr/lib/libgmp.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${ncurses_file} \
-							"${EPREFIX}"/usr/lib/libncurses.dylib \
-							${binary} || die
-					done
-					# we don't do frameworks!
-					sed -i \
-						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
-						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
-						rts/package.conf.in || die
-				fi
-
-				# it is autoconf, but we really don't want to give it too
-				# many arguments, in fact we do the make in-place anyway
-				./configure --prefix="${WORKDIR}"/usr || die
-				make install || die
-				popd > /dev/null
-				;;
-				*)
-				relocate_ghc "${WORKDIR}"
-				;;
-			esac
-		fi
-
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${S}/ghc/ghc.wrapper"
-
-		cd "${S}" # otherwise eapply will break
-
-		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
-		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
-		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
-		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
-
-		# a bunch of crosscompiler patches
-		# needs newer version:
-		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
-		popd
-
-		bump_libs
-
-		eapply_user
-		# as we have changed the build system
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if ! use binary; then
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
-		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-
-		# We also need to use the GHC_FLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
-		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
-		# Speed up initial Cabal bootstrap
-		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		# app-text/dblatex is not in portage, can not build PDF or PS
-		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
-		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
-		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
-
-		# this controls presence on 'xhtml' and 'haddock' in final install
-		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-
-		# not used outside of ghc's test
-		if [[ -n ${GHC_BUILD_DPH} ]]; then
-				echo "BUILD_DPH = YES" >> mk/build.mk
-			else
-				echo "BUILD_DPH = NO" >> mk/build.mk
-		fi
-
-		# Any non-native build has to skip as it needs
-		# target haddock binary to be runnabine.
-		if ! is_native; then
-			# disable docs generation as it requires running stage2
-			echo "HADDOCK_DOCS=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-		fi
-
-		if is_crosscompile; then
-			# Install ghc-stage1 crosscompiler instead of
-			# ghc-stage2 cross-built compiler.
-			echo "Stage1Only=YES" >> mk/build.mk
-		fi
-
-		# allows overriding build flavours for libraries:
-		# v   - vanilla (static libs)
-		# p   - profiled
-		# dyn - shared libraries
-		# example: GHC_LIBRARY_WAYS="v dyn"
-		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
-			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
-		fi
-		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds toolchain it was built by and uses it later.
-		# Don't allow things like ccache or versioned binary slip.
-		# We use stable thing across gcc upgrades.
-		# User can use EXTRA_ECONF=CC=... to override this default.
-		econf_args+=(
-			AR=${CTARGET}-ar
-			CC=${CTARGET}-gcc
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-			# we set the linker explicitly below
-			--disable-ld-override
-		)
-		case ${CTARGET} in
-			arm*)
-				# ld.bfd-2.28 does not work for ghc. Force ld.gold
-				# instead. This should be removed once gentoo gets
-				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
-				econf_args+=(LD=${CTARGET}-ld.gold)
-			;;
-			sparc*)
-				# ld.gold-2.28 does not work for ghc. Force ld.bfd
-				# instead. This should be removed once gentoo gets
-				# a fix for missing --no-relax support bug:
-				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
-				econf_args+=(LD=${CTARGET}-ld.bfd)
-			;;
-			*)
-				econf_args+=(LD=${CTARGET}-ld)
-		esac
-
-		if [[ ${CBUILD} != ${CHOST} ]]; then
-			# GHC bug: ghc claims not to support cross-building.
-			# It does, but does not distinct --host= value
-			# for stage1 and stage2 compiler.
-			econf_args+=(--host=${CBUILD})
-		fi
-
-		if use ghcmakebinary; then
-			# When building booting libary we are trying to
-			# bundle or restrict most of external depends
-			# with unstable ABI:
-			#  - embed libffi (default GHC behaviour)
-			#  - disable ncurses support for ghci (via haskeline)
-			#    https://bugs.gentoo.org/557478
-			#  - disable ncurses support for ghc-pkg
-			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
-			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
-		elif is_native; then
-			# using ${GTARGET}'s libffi is not supported yet:
-			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		einfo "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} \
-			--enable-bootstrap-with-devel-snapshot \
-			$(use_enable elfutils dwarf-unwind) \
-			$(use_enable numa)
-
-		if [[ ${PV} == *9999* ]]; then
-			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-			GHC_P=${PN}-${GHC_PV}
-		fi
-	fi # ! use binary
-}
-
-src_compile() {
-	if ! use binary; then
-		# Stage1Only crosscompiler does not build stage2
-		if ! is_crosscompile; then
-			# 1. build/pax-mark compiler binary first
-			emake ghc/stage2/build/tmp/ghc-stage2
-			# 2. pax-mark (bug #516430)
-			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-			# 2. build/pax-mark haddock using ghc-stage2
-			if is_native; then
-				# non-native build does not build haddock
-				# due to HADDOCK_DOCS=NO, but it could.
-				emake utils/haddock/dist/build/tmp/haddock
-				pax-mark -m utils/haddock/dist/build/tmp/haddock
-			fi
-		fi
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_test() {
-	# TODO: deal with:
-	#    - sandbox (pollutes environment)
-	#    - extra packages (to extend testsuite coverage)
-	# bits are taken from 'validate'
-	local make_test_target='test' # can be fulltest
-	# not 'emake' as testsuite uses '$MAKE' without jobserver available
-	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-		[[ -f VERSION ]] || emake VERSION
-
-		# -j1 due to a rare race in install script:
-		#    make --no-print-directory -f ghc.mk phase=final install
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
-		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
-		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
-		#    /usr/bin/install: cannot create regular file \
-		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
-		emake -j1 install DESTDIR="${D}"
-
-		# Skip for cross-targets as they all share target location:
-		# /usr/share/doc/ghc-9999/
-		if ! is_crosscompile; then
-			dodoc "distrib/README" "LICENSE" "VERSION"
-		fi
-
-		# rename ghc-shipped files to avoid collision
-		# of external packages. Motivating example:
-		#  user had installed:
-		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
-		#      dev-haskell/transformers-0.4.2.0
-		#  then user tried to update to
-		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
-		#  this will lead to single .conf file collision.
-		local shipped_conf renamed_conf
-		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-		for shipped_conf in "${package_confdir}"/*.conf; do
-			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
-			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
-			mv "${shipped_conf}" "${renamed_conf}" || die
-		done
-
-		# remove link, but leave 'haddock-${GHC_P}'
-		rm -f "${ED}"/usr/bin/$(cross)haddock
-
-		if ! is_crosscompile; then
-			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
-			newbashcomp utils/completion/ghc.bash         ghc
-		fi
-	fi
-
-	# path to the package.cache
-	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-	PKGCACHE="${package_confdir}"/package.cache
-	# copy the package.conf.d, including timestamp, save it so we can help
-	# users that have a broken package.conf.d
-	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
-
-	# copy the package.conf, including timestamp, save it so we later can put it
-	# back before uninstalling, or when upgrading.
-	cp -p "${PKGCACHE}"{,.shipped} \
-		|| die "failed to copy package.conf.d/package.cache"
-
-	if is_crosscompile; then
-		# When we build a cross-compiler the layout is the following:
-		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
-		# but
-		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
-		# containst host binaries (modulo bugs).
-
-		# Portage's stripping mechanism does not skip stripping
-		# foreign binaries. This frequently causes binaries to be
-		# broken.
-		#
-		# Thus below we disable stripping of target libraries and allow
-		# stripping hosts executables.
-		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
-		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
-	fi
-}
-
-pkg_preinst() {
-	# have we got an earlier version of ghc installed?
-	if has_version "<${CATEGORY}/${PF}"; then
-		haskell_updater_warn="1"
-	fi
-}
-
-pkg_postinst() {
-	ghc-reregister
-
-	# path to the package.cache
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-
-	# give the cache a new timestamp, it must be as recent as
-	# the package.conf.d directory.
-	touch "${PKGCACHE}"
-
-	if [[ "${haskell_updater_warn}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ewarn "You have just upgraded from an older version of GHC."
-		ewarn "You may have to run"
-		ewarn "      'haskell-updater'"
-		ewarn "to rebuild all ghc-based Haskell libraries."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-	rm -rf "${PKGCACHE}"
-
-	cp -p "${PKGCACHE}"{.shipped,}
-}
-
-pkg_postrm() {
-	ghc-package_pkg_postrm
-}
diff --git a/dev-lang/ghc/ghc-8.8.4-r1.ebuild b/dev-lang/ghc/ghc-8.8.4-r1.ebuild
new file mode 100644
index 000000000000..6254a54371ae
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.8.4-r1.ebuild
@@ -0,0 +1,826 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 1
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.6.0.20180810 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:=[unicode(+)]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# hardened-gcc needs to be disabled, because our prebuilt binaries/libraries
+		# are not built with fPIC, bug #606666
+		gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
+		tc-is-gcc && ver_test $(gcc-version) -ge 6.3 && if ! use ghcbootstrap; then
+			# gcc-6.3 has support for -no-pie upstream, but spelling differs from
+			# gentoo-specific '-nopie'. We enable it in non-bootstrap to allow
+			# hardened users try '-pie' in USE=ghcbootstrap mode.
+			append-ghc-cflags compile link -no-pie
+		fi
+
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+		eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
+		eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch
+		# fixed in 8.8.4. See https://gitlab.haskell.org/ghc/ghc/-/blob/ghc-8.8.4-release/configure.ac#L1273
+		# eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch
+		# rumors say this is fixed properly in 8.8.3. Let's check!
+		#eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use elfutils && echo --enable-dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/ghc/ghc-8.8.4.ebuild b/dev-lang/ghc/ghc-8.8.4.ebuild
deleted file mode 100644
index a9315b6c5264..000000000000
--- a/dev-lang/ghc/ghc-8.8.4.ebuild
+++ /dev/null
@@ -1,826 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
-
-# various ports:
-#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
-
-# 0 - yet
-yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		#arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		#ppc64)
-		#	use big-endian && return 1
-		#	return 0
-		#	;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.6.0.20180810 # uncomment only for -alpha, -beta, -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? (
-	https://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-src.tar.xz
-	test? ( https://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
-)"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
-IUSE+=" binary"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	elfutils? ( dev-libs/elfutils )
-	!ghcmakebinary? ( dev-libs/libffi:= )
-	numa? ( sys-process/numactl )
-"
-
-# This set of dependencies is needed to run
-# prebuilt ghc. We specifically avoid ncurses
-# dependency with:
-#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
-PREBUILT_BINARY_DEPENDS="
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-"
-# This set of dependencies is needed to install
-# ghc[binary] in system. terminfo package is linked
-# against ncurses.
-PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
-	sys-libs/ncurses:0/6
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
-"
-
-needs_python() {
-	# test driver is written in python
-	use test && return 0
-	return 1
-}
-
-# we build binaries without profiling support
-REQUIRED_USE="
-	?? ( ghcbootstrap binary )
-	?? ( profile binary )
-"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-is_native() {
-	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
-}
-
-if ! is_crosscompile; then
-	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-fi
-
-# returns tool prefix for crosscompiler.
-# Example:
-#  CTARGET=armv7a-unknown-linux-gnueabi
-#  CHOST=x86_64-pc-linux-gnu
-#    "armv7a-unknown-linux-gnueabi-"
-#  CTARGET=${CHOST}
-#    ""
-# Used in tools and library prefix:
-#    "${ED}"/usr/bin/$(cross)haddock
-#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-
-cross() {
-	if is_crosscompile; then
-		echo "${CTARGET}-"
-	else
-		echo ""
-	fi
-}
-
-append-ghc-cflags() {
-	local persistent compile assemble link
-	local flag ghcflag
-
-	for flag in $*; do
-		case ${flag} in
-			persistent)	persistent="yes";;
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				;;
-		esac
-	done
-}
-
-# $1 - lib name (under libraries/)
-# $2 - lib version
-# example: bump_lib "transformers" "0.4.2.0"
-bump_lib() {
-	local pn=$1 pv=$2
-	local p=${pn}-${pv}
-	local f
-
-	einfo "Bumping ${pn} up to ${pv}"
-
-	for f in ghc.mk GNUmakefile; do
-		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
-	done
-	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
-	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
-}
-
-update_SRC_URI() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
-	done
-}
-
-update_SRC_URI
-
-bump_libs() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		bump_lib "${pn}" "${pv}"
-	done
-}
-
-ghc_setup_cflags() {
-	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
-	if ! is_native; then
-		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
-		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
-		einfo "Crosscompiling mode:"
-		einfo "   CHOST:   ${CHOST}"
-		einfo "   CTARGET: ${CTARGET}"
-		einfo "   CFLAGS:  ${CFLAGS}"
-		einfo "   LDFLAGS: ${LDFLAGS}"
-		einfo "   prefix: $(cross)"
-		return
-	fi
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-
-	# Cmm can't parse line numbers #482086
-	replace-flags -ggdb[3-9] -ggdb2
-
-	GHC_FLAGS=""
-	GHC_PERSISTENT_FLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Sometimes it's handy to see backtrace of RTS
-			# to get an idea what happens there
-			-g*) append-ghc-cflags compile ${flag};;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	for flag in ${LDFLAGS}; do
-		append-ghc-cflags link ${flag}
-	done
-
-	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
-	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
-	# options to gcc.
-	if is_native; then
-		# hardened-gcc needs to be disabled, because our prebuilt binaries/libraries
-		# are not built with fPIC, bug #606666
-		gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
-		tc-is-gcc && ver_test $(gcc-version) -ge 6.3 && if ! use ghcbootstrap; then
-			# gcc-6.3 has support for -no-pie upstream, but spelling differs from
-			# gentoo-specific '-nopie'. We enable it in non-bootstrap to allow
-			# hardened users try '-pie' in USE=ghcbootstrap mode.
-			append-ghc-cflags compile link -no-pie
-		fi
-
-		# prevent from failing to build unregisterised ghc:
-		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	fi
-}
-
-# substitutes string $1 to $2 in files $3 $4 ...
-relocate_path() {
-	local from=$1
-	local   to=$2
-	shift 2
-	local file=
-	for file in "$@"
-	do
-		sed -i -e "s|$from|$to|g" \
-			"$file" || die "path relocation failed for '$file'"
-	done
-}
-
-# changes hardcoded ghc paths and updates package index
-# $1 - new absolute root path
-relocate_ghc() {
-	local to=$1 ghc_v=${BIN_PV}
-
-	# libdir for prebuilt binary and for current system may mismatch
-	# It does for prefix installation for example: bug #476998
-	local bin_ghc_prefix=${WORKDIR}/usr
-	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
-	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
-
-	# backup original script to use it later after relocation
-	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
-
-	if [[ ${bin_libdir} != $(get_libdir) ]]; then
-		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
-		# moving the dir itself is not strictly needed
-		# but then USE=binary would result in installing
-		# in '${bin_libdir}'
-		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
-
-		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
-			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-
-	# this one we will use to regenerate cache
-	# so it should point to current tree location
-	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
-
-	if use prefix; then
-		hprefixify "${bin_libpath}"/${PN}*/settings
-	fi
-
-	# regenerate the binary package cache
-	"$gp_back" recache || die "failed to update cache after relocation"
-	rm "$gp_back"
-}
-
-ghc-check-reqs() {
-	# These are pessimistic values (slightly bigger than worst-case)
-	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
-	# numbers on various arches.
-	CHECKREQS_DISK_BUILD=8G
-	CHECKREQS_DISK_USR=2G
-	# USE=binary roughly takes
-	use binary && CHECKREQS_DISK_BUILD=4G
-
-	"$@"
-}
-
-pkg_pretend() {
-	ghc-check-reqs check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ghc-check-reqs check-reqs_pkg_setup
-
-	# quiet portage about prebuilt binaries
-	use binary && QA_PREBUILT="*"
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages."
-
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	else
-		if ! yet_binary; then
-			eerror "Please try emerging with USE=ghcbootstrap and report build"
-			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
-			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
-		fi
-	fi
-
-	if needs_python; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	# the Solaris and Darwin binaries from ghc (maeder) need to be
-	# unpacked separately, so prevent them from being unpacked
-	local ONLYA=${A}
-	case ${CHOST} in
-		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
-	esac
-	unpack ${ONLYA}
-}
-
-src_prepare() {
-	ghc_setup_cflags
-
-	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
-		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
-		# See bug #313635.
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
-
-		# allow hardened users use vanilla binary to bootstrap ghc
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
-	fi
-
-	if use binary; then
-		if use prefix; then
-			relocate_ghc "${EPREFIX}"
-		fi
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-		eapply_user
-	else
-		if ! use ghcbootstrap; then
-			case ${CHOST} in
-				*-darwin* | *-solaris*)
-				# UPDATE ME for ghc-7
-				mkdir "${WORKDIR}"/ghc-bin-installer || die
-				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
-				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
-				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
-				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
-				popd > /dev/null
-
-				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
-				# fix the binaries so they run, on Solaris we need an
-				# LD_LIBRARY_PATH which has our prefix libdirs, on
-				# Darwin we need to replace the frameworks with our libs
-				# from the prefix fix before installation, because some
-				# of the tools are actually used during configure/make
-				if [[ ${CHOST} == *-solaris* ]] ; then
-					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-				elif [[ ${CHOST} == *-darwin* ]] ; then
-					local readline_framework=GNUreadline.framework/GNUreadline
-					local gmp_framework=/opt/local/lib/libgmp.10.dylib
-					local ncurses_file=/opt/local/lib/libncurses.5.dylib
-					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
-						install_name_tool -change \
-							${readline_framework} \
-							"${EPREFIX}"/lib/libreadline.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${gmp_framework} \
-							"${EPREFIX}"/usr/lib/libgmp.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${ncurses_file} \
-							"${EPREFIX}"/usr/lib/libncurses.dylib \
-							${binary} || die
-					done
-					# we don't do frameworks!
-					sed -i \
-						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
-						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
-						rts/package.conf.in || die
-				fi
-
-				# it is autoconf, but we really don't want to give it too
-				# many arguments, in fact we do the make in-place anyway
-				./configure --prefix="${WORKDIR}"/usr || die
-				make install || die
-				popd > /dev/null
-				;;
-				*)
-				relocate_ghc "${WORKDIR}"
-				;;
-			esac
-		fi
-
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${S}/ghc/ghc.wrapper"
-
-		cd "${S}" # otherwise eapply will break
-
-		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
-		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
-		eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch
-		eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch
-		# fixed in 8.8.4. See https://gitlab.haskell.org/ghc/ghc/-/blob/ghc-8.8.4-release/configure.ac#L1273
-		# eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch
-		# rumors say this is fixed properly in 8.8.3. Let's check!
-		#eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
-
-		# a bunch of crosscompiler patches
-		# needs newer version:
-		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
-		popd
-
-		bump_libs
-
-		eapply_user
-		# as we have changed the build system
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if ! use binary; then
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
-		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-
-		# We also need to use the GHC_FLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
-		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
-		# Speed up initial Cabal bootstrap
-		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		# app-text/dblatex is not in portage, can not build PDF or PS
-		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
-		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
-		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
-
-		# this controls presence on 'xhtml' and 'haddock' in final install
-		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-
-		# not used outside of ghc's test
-		if [[ -n ${GHC_BUILD_DPH} ]]; then
-				echo "BUILD_DPH = YES" >> mk/build.mk
-			else
-				echo "BUILD_DPH = NO" >> mk/build.mk
-		fi
-
-		# Any non-native build has to skip as it needs
-		# target haddock binary to be runnabine.
-		if ! is_native; then
-			# disable docs generation as it requires running stage2
-			echo "HADDOCK_DOCS=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-		fi
-
-		if is_crosscompile; then
-			# Install ghc-stage1 crosscompiler instead of
-			# ghc-stage2 cross-built compiler.
-			echo "Stage1Only=YES" >> mk/build.mk
-		fi
-
-		# allows overriding build flavours for libraries:
-		# v   - vanilla (static libs)
-		# p   - profiled
-		# dyn - shared libraries
-		# example: GHC_LIBRARY_WAYS="v dyn"
-		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
-			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
-		fi
-		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds toolchain it was built by and uses it later.
-		# Don't allow things like ccache or versioned binary slip.
-		# We use stable thing across gcc upgrades.
-		# User can use EXTRA_ECONF=CC=... to override this default.
-		econf_args+=(
-			AR=${CTARGET}-ar
-			CC=${CTARGET}-gcc
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-			# we set the linker explicitly below
-			--disable-ld-override
-		)
-		case ${CTARGET} in
-			arm*)
-				# ld.bfd-2.28 does not work for ghc. Force ld.gold
-				# instead. This should be removed once gentoo gets
-				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
-				econf_args+=(LD=${CTARGET}-ld.gold)
-			;;
-			sparc*)
-				# ld.gold-2.28 does not work for ghc. Force ld.bfd
-				# instead. This should be removed once gentoo gets
-				# a fix for missing --no-relax support bug:
-				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
-				econf_args+=(LD=${CTARGET}-ld.bfd)
-			;;
-			*)
-				econf_args+=(LD=${CTARGET}-ld)
-		esac
-
-		if [[ ${CBUILD} != ${CHOST} ]]; then
-			# GHC bug: ghc claims not to support cross-building.
-			# It does, but does not distinct --host= value
-			# for stage1 and stage2 compiler.
-			econf_args+=(--host=${CBUILD})
-		fi
-
-		if use ghcmakebinary; then
-			# When building booting libary we are trying to
-			# bundle or restrict most of external depends
-			# with unstable ABI:
-			#  - embed libffi (default GHC behaviour)
-			#  - disable ncurses support for ghci (via haskeline)
-			#    https://bugs.gentoo.org/557478
-			#  - disable ncurses support for ghc-pkg
-			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
-			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
-		elif is_native; then
-			# using ${GTARGET}'s libffi is not supported yet:
-			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		einfo "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} \
-			--enable-bootstrap-with-devel-snapshot \
-			$(use elfutils && echo --enable-dwarf-unwind) \
-			$(use_enable numa)
-
-		if [[ ${PV} == *9999* ]]; then
-			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-			GHC_P=${PN}-${GHC_PV}
-		fi
-	fi # ! use binary
-}
-
-src_compile() {
-	if ! use binary; then
-		# Stage1Only crosscompiler does not build stage2
-		if ! is_crosscompile; then
-			# 1. build/pax-mark compiler binary first
-			emake ghc/stage2/build/tmp/ghc-stage2
-			# 2. pax-mark (bug #516430)
-			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-			# 2. build/pax-mark haddock using ghc-stage2
-			if is_native; then
-				# non-native build does not build haddock
-				# due to HADDOCK_DOCS=NO, but it could.
-				emake utils/haddock/dist/build/tmp/haddock
-				pax-mark -m utils/haddock/dist/build/tmp/haddock
-			fi
-		fi
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_test() {
-	# TODO: deal with:
-	#    - sandbox (pollutes environment)
-	#    - extra packages (to extend testsuite coverage)
-	# bits are taken from 'validate'
-	local make_test_target='test' # can be fulltest
-	# not 'emake' as testsuite uses '$MAKE' without jobserver available
-	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-		[[ -f VERSION ]] || emake VERSION
-
-		# -j1 due to a rare race in install script:
-		#    make --no-print-directory -f ghc.mk phase=final install
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
-		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
-		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
-		#    /usr/bin/install: cannot create regular file \
-		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
-		emake -j1 install DESTDIR="${D}"
-
-		# Skip for cross-targets as they all share target location:
-		# /usr/share/doc/ghc-9999/
-		if ! is_crosscompile; then
-			dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
-		fi
-
-		# rename ghc-shipped files to avoid collision
-		# of external packages. Motivating example:
-		#  user had installed:
-		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
-		#      dev-haskell/transformers-0.4.2.0
-		#  then user tried to update to
-		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
-		#  this will lead to single .conf file collision.
-		local shipped_conf renamed_conf
-		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-		for shipped_conf in "${package_confdir}"/*.conf; do
-			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
-			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
-			mv "${shipped_conf}" "${renamed_conf}" || die
-		done
-
-		# remove link, but leave 'haddock-${GHC_P}'
-		rm -f "${ED}"/usr/bin/$(cross)haddock
-
-		if ! is_crosscompile; then
-			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
-			newbashcomp utils/completion/ghc.bash         ghc
-		fi
-	fi
-
-	# path to the package.cache
-	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-	PKGCACHE="${package_confdir}"/package.cache
-	# copy the package.conf.d, including timestamp, save it so we can help
-	# users that have a broken package.conf.d
-	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
-
-	# copy the package.conf, including timestamp, save it so we later can put it
-	# back before uninstalling, or when upgrading.
-	cp -p "${PKGCACHE}"{,.shipped} \
-		|| die "failed to copy package.conf.d/package.cache"
-
-	if is_crosscompile; then
-		# When we build a cross-compiler the layout is the following:
-		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
-		# but
-		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
-		# containst host binaries (modulo bugs).
-
-		# Portage's stripping mechanism does not skip stripping
-		# foreign binaries. This frequently causes binaries to be
-		# broken.
-		#
-		# Thus below we disable stripping of target libraries and allow
-		# stripping hosts executables.
-		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
-		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
-	fi
-}
-
-pkg_preinst() {
-	# have we got an earlier version of ghc installed?
-	if has_version "<${CATEGORY}/${PF}"; then
-		haskell_updater_warn="1"
-	fi
-}
-
-pkg_postinst() {
-	ghc-reregister
-
-	# path to the package.cache
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-
-	# give the cache a new timestamp, it must be as recent as
-	# the package.conf.d directory.
-	touch "${PKGCACHE}"
-
-	if [[ "${haskell_updater_warn}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ewarn "You have just upgraded from an older version of GHC."
-		ewarn "You may have to run"
-		ewarn "      'haskell-updater'"
-		ewarn "to rebuild all ghc-based Haskell libraries."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-	rm -rf "${PKGCACHE}"
-
-	cp -p "${PKGCACHE}"{.shipped,}
-}
-
-pkg_postrm() {
-	ghc-package_pkg_postrm
-}
diff --git a/dev-lang/ghc/ghc-9.0.1-r1.ebuild b/dev-lang/ghc/ghc-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..6feaed8be49e
--- /dev/null
+++ b/dev-lang/ghc/ghc-9.0.1-r1.ebuild
@@ -0,0 +1,814 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 0
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:=[unicode(+)]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		#needs a port?
+		#eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/ghc/ghc-9.0.1.ebuild b/dev-lang/ghc/ghc-9.0.1.ebuild
deleted file mode 100644
index 579bd861424d..000000000000
--- a/dev-lang/ghc/ghc-9.0.1.ebuild
+++ /dev/null
@@ -1,814 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# to make make a crosscompiler use crossdev and symlink ghc tree into
-# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit python-any-r1
-inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
-inherit multilib multiprocessing pax-utils toolchain-funcs prefix
-inherit check-reqs
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="https://www.haskell.org/ghc/"
-
-# we don't have any binaries yet
-arch_binaries=""
-
-BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
-
-# various ports:
-#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
-
-# 0 - yet
-yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		#arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		#ppc64)
-		#	use big-endian && return 0
-		#	return 0
-		#	;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
-	esac
-}
-
-GHC_PV=${PV}
-#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
-GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
-
-SRC_URI="!binary? (
-	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
-	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
-)"
-S="${WORKDIR}"/${GHC_P}
-
-[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
-
-BUMP_LIBRARIES=(
-	# "hackage-name          hackage-version"
-)
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
-IUSE+=" binary"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-libs/gmp:0=
-	sys-libs/ncurses:0=[unicode]
-	elfutils? ( dev-libs/elfutils )
-	!ghcmakebinary? ( dev-libs/libffi:= )
-	numa? ( sys-process/numactl )
-"
-
-# This set of dependencies is needed to run
-# prebuilt ghc. We specifically avoid ncurses
-# dependency with:
-#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
-PREBUILT_BINARY_DEPENDS="
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
-"
-# This set of dependencies is needed to install
-# ghc[binary] in system. terminfo package is linked
-# against ncurses.
-PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
-	sys-libs/ncurses:0/6
-"
-
-RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
-"
-
-needs_python() {
-	# test driver is written in python
-	use test && return 0
-	return 1
-}
-
-# we build binaries without profiling support
-REQUIRED_USE="
-	?? ( ghcbootstrap binary )
-	?? ( profile binary )
-"
-
-# haskell libraries built with cabal in configure mode, #515354
-QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-is_native() {
-	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
-}
-
-if ! is_crosscompile; then
-	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
-fi
-
-# returns tool prefix for crosscompiler.
-# Example:
-#  CTARGET=armv7a-unknown-linux-gnueabi
-#  CHOST=x86_64-pc-linux-gnu
-#    "armv7a-unknown-linux-gnueabi-"
-#  CTARGET=${CHOST}
-#    ""
-# Used in tools and library prefix:
-#    "${ED}"/usr/bin/$(cross)haddock
-#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-
-cross() {
-	if is_crosscompile; then
-		echo "${CTARGET}-"
-	else
-		echo ""
-	fi
-}
-
-append-ghc-cflags() {
-	local persistent compile assemble link
-	local flag ghcflag
-
-	for flag in $*; do
-		case ${flag} in
-			persistent)	persistent="yes";;
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
-					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
-				;;
-		esac
-	done
-}
-
-# $1 - lib name (under libraries/)
-# $2 - lib version
-# example: bump_lib "transformers" "0.4.2.0"
-bump_lib() {
-	local pn=$1 pv=$2
-	local p=${pn}-${pv}
-	local f
-
-	einfo "Bumping ${pn} up to ${pv}"
-
-	for f in ghc.mk GNUmakefile; do
-		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
-	done
-	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
-	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
-}
-
-update_SRC_URI() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
-	done
-}
-
-update_SRC_URI
-
-bump_libs() {
-	local p pn pv
-	for p in "${BUMP_LIBRARIES[@]}"; do
-		set -- $p
-		pn=$1 pv=$2
-
-		bump_lib "${pn}" "${pv}"
-	done
-}
-
-ghc_setup_cflags() {
-	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
-	if ! is_native; then
-		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
-		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
-		einfo "Crosscompiling mode:"
-		einfo "   CHOST:   ${CHOST}"
-		einfo "   CTARGET: ${CTARGET}"
-		einfo "   CFLAGS:  ${CFLAGS}"
-		einfo "   LDFLAGS: ${LDFLAGS}"
-		einfo "   prefix: $(cross)"
-		return
-	fi
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-
-	# Cmm can't parse line numbers #482086
-	replace-flags -ggdb[3-9] -ggdb2
-
-	GHC_FLAGS=""
-	GHC_PERSISTENT_FLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Sometimes it's handy to see backtrace of RTS
-			# to get an idea what happens there
-			-g*) append-ghc-cflags compile ${flag};;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	for flag in ${LDFLAGS}; do
-		append-ghc-cflags link ${flag}
-	done
-
-	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
-	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
-	# options to gcc.
-	if is_native; then
-		# prevent from failing to build unregisterised ghc:
-		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
-		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
-	fi
-}
-
-# substitutes string $1 to $2 in files $3 $4 ...
-relocate_path() {
-	local from=$1
-	local   to=$2
-	shift 2
-	local file=
-	for file in "$@"
-	do
-		sed -i -e "s|$from|$to|g" \
-			"$file" || die "path relocation failed for '$file'"
-	done
-}
-
-# changes hardcoded ghc paths and updates package index
-# $1 - new absolute root path
-relocate_ghc() {
-	local to=$1 ghc_v=${BIN_PV}
-
-	# libdir for prebuilt binary and for current system may mismatch
-	# It does for prefix installation for example: bug #476998
-	local bin_ghc_prefix=${WORKDIR}/usr
-	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
-	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
-
-	# backup original script to use it later after relocation
-	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
-	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
-
-	if [[ ${bin_libdir} != $(get_libdir) ]]; then
-		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
-		# moving the dir itself is not strictly needed
-		# but then USE=binary would result in installing
-		# in '${bin_libdir}'
-		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
-
-		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
-			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-			"${WORKDIR}/usr/bin/hsc2hs" \
-			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-			"$gp_back" \
-			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-	fi
-
-	# Relocate from /usr to ${EPREFIX}/usr
-	relocate_path "/usr" "${to}/usr" \
-		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
-		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
-		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
-		"${WORKDIR}/usr/bin/hp2ps" \
-		"${WORKDIR}/usr/bin/hpc" \
-		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
-		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
-
-	# this one we will use to regenerate cache
-	# so it should point to current tree location
-	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
-
-	if use prefix; then
-		hprefixify "${bin_libpath}"/${PN}*/settings
-	fi
-
-	# regenerate the binary package cache
-	"$gp_back" recache || die "failed to update cache after relocation"
-	rm "$gp_back"
-}
-
-ghc-check-reqs() {
-	# These are pessimistic values (slightly bigger than worst-case)
-	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
-	# numbers on various arches.
-	CHECKREQS_DISK_BUILD=8G
-	CHECKREQS_DISK_USR=2G
-	# USE=binary roughly takes
-	use binary && CHECKREQS_DISK_BUILD=4G
-
-	"$@"
-}
-
-pkg_pretend() {
-	ghc-check-reqs check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ghc-check-reqs check-reqs_pkg_setup
-
-	# quiet portage about prebuilt binaries
-	use binary && QA_PREBUILT="*"
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages."
-
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	else
-		if ! yet_binary; then
-			eerror "Please try emerging with USE=ghcbootstrap and report build"
-			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
-			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
-		fi
-	fi
-
-	if needs_python; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	# the Solaris and Darwin binaries from ghc (maeder) need to be
-	# unpacked separately, so prevent them from being unpacked
-	local ONLYA=${A}
-	case ${CHOST} in
-		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
-	esac
-	unpack ${ONLYA}
-}
-
-src_prepare() {
-	ghc_setup_cflags
-
-	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
-		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
-		# See bug #313635.
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
-
-		# allow hardened users use vanilla binary to bootstrap ghc
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
-	fi
-
-	if use binary; then
-		if use prefix; then
-			relocate_ghc "${EPREFIX}"
-		fi
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-		eapply_user
-	else
-		if ! use ghcbootstrap; then
-			case ${CHOST} in
-				*-darwin* | *-solaris*)
-				# UPDATE ME for ghc-7
-				mkdir "${WORKDIR}"/ghc-bin-installer || die
-				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
-				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
-				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
-				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
-				popd > /dev/null
-
-				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
-				# fix the binaries so they run, on Solaris we need an
-				# LD_LIBRARY_PATH which has our prefix libdirs, on
-				# Darwin we need to replace the frameworks with our libs
-				# from the prefix fix before installation, because some
-				# of the tools are actually used during configure/make
-				if [[ ${CHOST} == *-solaris* ]] ; then
-					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-				elif [[ ${CHOST} == *-darwin* ]] ; then
-					local readline_framework=GNUreadline.framework/GNUreadline
-					local gmp_framework=/opt/local/lib/libgmp.10.dylib
-					local ncurses_file=/opt/local/lib/libncurses.5.dylib
-					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
-						install_name_tool -change \
-							${readline_framework} \
-							"${EPREFIX}"/lib/libreadline.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${gmp_framework} \
-							"${EPREFIX}"/usr/lib/libgmp.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${ncurses_file} \
-							"${EPREFIX}"/usr/lib/libncurses.dylib \
-							${binary} || die
-					done
-					# we don't do frameworks!
-					sed -i \
-						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
-						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
-						rts/package.conf.in || die
-				fi
-
-				# it is autoconf, but we really don't want to give it too
-				# many arguments, in fact we do the make in-place anyway
-				./configure --prefix="${WORKDIR}"/usr || die
-				make install || die
-				popd > /dev/null
-				;;
-				*)
-				relocate_ghc "${WORKDIR}"
-				;;
-			esac
-		fi
-
-		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
-			"${S}/ghc/ghc.wrapper"
-
-		cd "${S}" # otherwise eapply will break
-
-		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
-		#needs a port?
-		#eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
-		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
-		eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
-
-		# a bunch of crosscompiler patches
-		# needs newer version:
-		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
-
-		# mingw32 target
-		pushd "${S}/libraries/Win32"
-			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
-		popd
-
-		bump_libs
-
-		eapply_user
-		# as we have changed the build system
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if ! use binary; then
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
-		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
-
-		# We also need to use the GHC_FLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
-		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
-		# Speed up initial Cabal bootstrap
-		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		# app-text/dblatex is not in portage, can not build PDF or PS
-		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
-		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
-		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
-
-		# this controls presence on 'xhtml' and 'haddock' in final install
-		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
-
-		# not used outside of ghc's test
-		if [[ -n ${GHC_BUILD_DPH} ]]; then
-				echo "BUILD_DPH = YES" >> mk/build.mk
-			else
-				echo "BUILD_DPH = NO" >> mk/build.mk
-		fi
-
-		# Any non-native build has to skip as it needs
-		# target haddock binary to be runnabine.
-		if ! is_native; then
-			# disable docs generation as it requires running stage2
-			echo "HADDOCK_DOCS=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-		fi
-
-		if is_crosscompile; then
-			# Install ghc-stage1 crosscompiler instead of
-			# ghc-stage2 cross-built compiler.
-			echo "Stage1Only=YES" >> mk/build.mk
-		fi
-
-		# allows overriding build flavours for libraries:
-		# v   - vanilla (static libs)
-		# p   - profiled
-		# dyn - shared libraries
-		# example: GHC_LIBRARY_WAYS="v dyn"
-		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
-			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
-		fi
-		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
-
-		# don't strip anything. Very useful when stage2 SIGSEGVs on you
-		echo "STRIP_CMD = :" >> mk/build.mk
-
-		local econf_args=()
-
-		# GHC embeds toolchain it was built by and uses it later.
-		# Don't allow things like ccache or versioned binary slip.
-		# We use stable thing across gcc upgrades.
-		# User can use EXTRA_ECONF=CC=... to override this default.
-		econf_args+=(
-			AR=${CTARGET}-ar
-			CC=${CTARGET}-gcc
-			# these should be inferred by GHC but ghc defaults
-			# to using bundled tools on windows.
-			Windres=${CTARGET}-windres
-			DllWrap=${CTARGET}-dllwrap
-			# we set the linker explicitly below
-			--disable-ld-override
-		)
-		case ${CTARGET} in
-			arm*)
-				# ld.bfd-2.28 does not work for ghc. Force ld.gold
-				# instead. This should be removed once gentoo gets
-				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
-				econf_args+=(LD=${CTARGET}-ld.gold)
-			;;
-			sparc*)
-				# ld.gold-2.28 does not work for ghc. Force ld.bfd
-				# instead. This should be removed once gentoo gets
-				# a fix for missing --no-relax support bug:
-				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
-				econf_args+=(LD=${CTARGET}-ld.bfd)
-			;;
-			*)
-				econf_args+=(LD=${CTARGET}-ld)
-		esac
-
-		if [[ ${CBUILD} != ${CHOST} ]]; then
-			# GHC bug: ghc claims not to support cross-building.
-			# It does, but does not distinct --host= value
-			# for stage1 and stage2 compiler.
-			econf_args+=(--host=${CBUILD})
-		fi
-
-		if use ghcmakebinary; then
-			# When building booting libary we are trying to
-			# bundle or restrict most of external depends
-			# with unstable ABI:
-			#  - embed libffi (default GHC behaviour)
-			#  - disable ncurses support for ghci (via haskeline)
-			#    https://bugs.gentoo.org/557478
-			#  - disable ncurses support for ghc-pkg
-			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
-			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
-		elif is_native; then
-			# using ${GTARGET}'s libffi is not supported yet:
-			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
-			econf_args+=(--with-system-libffi)
-			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
-		fi
-
-		einfo "Final mk/build.mk:"
-		cat mk/build.mk || die
-
-		econf ${econf_args[@]} \
-			--enable-bootstrap-with-devel-snapshot \
-			$(use_enable elfutils dwarf-unwind) \
-			$(use_enable numa)
-
-		if [[ ${PV} == *9999* ]]; then
-			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
-			GHC_P=${PN}-${GHC_PV}
-		fi
-	fi # ! use binary
-}
-
-src_compile() {
-	if ! use binary; then
-		# Stage1Only crosscompiler does not build stage2
-		if ! is_crosscompile; then
-			# 1. build/pax-mark compiler binary first
-			emake ghc/stage2/build/tmp/ghc-stage2
-			# 2. pax-mark (bug #516430)
-			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
-			# 2. build/pax-mark haddock using ghc-stage2
-			if is_native; then
-				# non-native build does not build haddock
-				# due to HADDOCK_DOCS=NO, but it could.
-				emake utils/haddock/dist/build/tmp/haddock
-				pax-mark -m utils/haddock/dist/build/tmp/haddock
-			fi
-		fi
-		# 3. and then all the rest
-		emake all
-	fi # ! use binary
-}
-
-src_test() {
-	# TODO: deal with:
-	#    - sandbox (pollutes environment)
-	#    - extra packages (to extend testsuite coverage)
-	# bits are taken from 'validate'
-	local make_test_target='test' # can be fulltest
-	# not 'emake' as testsuite uses '$MAKE' without jobserver available
-	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
-}
-
-src_install() {
-	if use binary; then
-		use prefix && mkdir -p "${ED}"
-		mv "${S}/usr" "${ED}"
-	else
-		[[ -f VERSION ]] || emake VERSION
-
-		# -j1 due to a rare race in install script:
-		#    make --no-print-directory -f ghc.mk phase=final install
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
-		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
-		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
-		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
-		#    /usr/bin/install: cannot create regular file \
-		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
-		emake -j1 install DESTDIR="${D}"
-
-		# Skip for cross-targets as they all share target location:
-		# /usr/share/doc/ghc-9999/
-		if ! is_crosscompile; then
-			dodoc "distrib/README" "LICENSE" "VERSION"
-		fi
-
-		# rename ghc-shipped files to avoid collision
-		# of external packages. Motivating example:
-		#  user had installed:
-		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
-		#      dev-haskell/transformers-0.4.2.0
-		#  then user tried to update to
-		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
-		#  this will lead to single .conf file collision.
-		local shipped_conf renamed_conf
-		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-		for shipped_conf in "${package_confdir}"/*.conf; do
-			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
-			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
-			mv "${shipped_conf}" "${renamed_conf}" || die
-		done
-
-		# remove link, but leave 'haddock-${GHC_P}'
-		rm -f "${ED}"/usr/bin/$(cross)haddock
-
-		if ! is_crosscompile; then
-			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
-			newbashcomp utils/completion/ghc.bash         ghc
-		fi
-	fi
-
-	# path to the package.cache
-	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
-	PKGCACHE="${package_confdir}"/package.cache
-	# copy the package.conf.d, including timestamp, save it so we can help
-	# users that have a broken package.conf.d
-	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
-
-	# copy the package.conf, including timestamp, save it so we later can put it
-	# back before uninstalling, or when upgrading.
-	cp -p "${PKGCACHE}"{,.shipped} \
-		|| die "failed to copy package.conf.d/package.cache"
-
-	if is_crosscompile; then
-		# When we build a cross-compiler the layout is the following:
-		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
-		# but
-		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
-		# containst host binaries (modulo bugs).
-
-		# Portage's stripping mechanism does not skip stripping
-		# foreign binaries. This frequently causes binaries to be
-		# broken.
-		#
-		# Thus below we disable stripping of target libraries and allow
-		# stripping hosts executables.
-		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
-		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
-	fi
-}
-
-pkg_preinst() {
-	# have we got an earlier version of ghc installed?
-	if has_version "<${CATEGORY}/${PF}"; then
-		haskell_updater_warn="1"
-	fi
-}
-
-pkg_postinst() {
-	ghc-reregister
-
-	# path to the package.cache
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-
-	# give the cache a new timestamp, it must be as recent as
-	# the package.conf.d directory.
-	touch "${PKGCACHE}"
-
-	if [[ "${haskell_updater_warn}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ewarn "You have just upgraded from an older version of GHC."
-		ewarn "You may have to run"
-		ewarn "      'haskell-updater'"
-		ewarn "to rebuild all ghc-based Haskell libraries."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
-	rm -rf "${PKGCACHE}"
-
-	cp -p "${PKGCACHE}"{.shipped,}
-}
-
-pkg_postrm() {
-	ghc-package_pkg_postrm
-}
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 06d3ceacf020..6796e01d55bd 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -14,6 +14,7 @@ AUX gnat-gpl-2021-gentoo.patch 1631 BLAKE2B 445343bcc5e12ada65090ba9f9a77bcf63f0
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
+DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215cef6b59032e4b4a62c8622a7b735c660f42ec4135dba628a2080a7540d407186a4e4b1eb373e937374bc4e407dc9afe97d SHA512 bf8f786b5ad28a6b7d184fb5263424b7ed62154e308e259b61c24a577efdae56939fbaabc1fc53a0f467702c1e6d8598dc6e489ce074724799130a793cfb146e
 DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
@@ -37,6 +38,7 @@ DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6be
 EBUILD gnat-gpl-2017-r1.ebuild 3871 BLAKE2B c4ccc2e03f13202ca0fe7c6bdecab7e17bdd28a866b088bc51b7915620cadbed1d35ff8dd3e134cee94b4bd960f02cb86d3154599c4779ed6daba5c7574f78d4 SHA512 7d8a81004f4332d4fed01a79edce3503cb1055797341f956f585935dedf54543eb4eecd72793c902a273c1b11ff9dea8cdab6e44ad074bab84dbe907f041c2d9
 EBUILD gnat-gpl-2018-r3.ebuild 3833 BLAKE2B 81698959e5e8cca3e58981132d0bee06473d935310abfebd808128eaeadc032b6b88bb13b529f653e92cf1e7009aaa3936f47c2aef4048071971f04a4921311d SHA512 1933f29978b0a9000ae9b5bb6cf38d186f912fce8d5e89a97a4c6386680ca02fdcaad71e18f36599f3d0974613c2de229776dbd2398bc2875e3c15885e8b7c18
 EBUILD gnat-gpl-2019-r2.ebuild 3578 BLAKE2B a2bb2a094b2c47620ca08156962425ec8210a27ad2ef712ab99f6e759a4a4f41a8b59c09230de8d12abebcce8b271c992c3a83a129b5ef93f1e8f71462f6c217 SHA512 7fccd20ad3b6cee151b8f7a4ea3b1d6b2d882aaac3a0903502f14df7d292ebf984fe72ebeffb8fda8f36288380669da5d4da6fceec795090a36eb01b9de2b833
-EBUILD gnat-gpl-2020.ebuild 3699 BLAKE2B e04eca37d7f42aa6586a97742d7c7cc05ff90450a166acc040c1d9a697826dc8cb021816207398e42dae67f5b287a4be1791d2019b4512861ff0aa53b1808259 SHA512 93fcd321a9c23a988e4110fdd59026e6e745dc3d7cb6c58a13e9169d639e23008433a20f73c568b6c57932be41d32aa19abbbe16a75b3496255c5799bb18fb5c
-EBUILD gnat-gpl-2021.ebuild 3584 BLAKE2B 1d3bdd544bbd540ea6aa300966b149bf9551c03944eb640cf1353a76685ee33449a3e419ff750c74be4f473cae92d9507d4dc25618e05817e79770a75aa2c93b SHA512 70c538924beaab920d28e51ef1da4c26669f74c1af0bcfe2224e1c9601e388a88c043f001cd7340057520daaa3547188f8214d6a62579d62d84cac58314a2fb4
+EBUILD gnat-gpl-2020.ebuild 3698 BLAKE2B 730861399d70fea2a78ef911cdcc366ac75b9e406190d549f9ea4df3e483f1abbec099d2a29a64dd91428a5ee68b55395dc087877500ddc8b96417332ff2a364 SHA512 bc0b8bc473a40122a18f756c81597dbecd503e45d21b03e91dfd7b4679d3006a268d452031ffa8c63ebe189de5700a237b5c609f321f436dac019b192569c376
+EBUILD gnat-gpl-2021-r1.ebuild 3584 BLAKE2B 81add2321a9a46ad35fc6c74bf6e7fcfdb5e3fcaafded5156ff78213e6d7092ca0f9c4396124ab901d3182c62a637d96ffb37c1336502056dd4629335803bf74 SHA512 6da07e79c6e56aee33ae1ed5530a3742b3528ebbe83d3aa180846666bdf0051c89ae6f64b703b06364cf29979a9865e2779f4ce665d7a41dbd8562743615e712
+EBUILD gnat-gpl-2021.ebuild 3583 BLAKE2B 6904f410201e36e970f39c86ea866c2552b662d46268d7c64cba5be2c19fad4f0345629144692292d39d5c1a25a319efe35cac71610185e0e7ec66a70a8bad02 SHA512 b3acd9a07743eb4486a0f5db34b31713cddadcf2735c675b7f9e1d525da0b6b4f86457d953c3595b1d25974e53b4fa5f516974929191a8bada096cb8544dd540
 MISC metadata.xml 2215 BLAKE2B 54423260af69b60aa5ee70a03210ac597b3c4a4e1d944a3548f9a999d048866f4708f27090b5715c915e46b71f3690768abd4bc8490fda966a1849dc4a3c0a26 SHA512 1b0472f273f75973b8ed1d72bb9678985af7136434eb5fbbe7584f7adb6b93d3d1c345705e5b4412bc016da4cb9f1b09ab4d5329eb1547b92e588ddb20082407
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
index 10317ef96f88..89b5e673cd23 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+ada +bootstrap"
 RESTRICT="test"
 
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
new file mode 100644
index 000000000000..14203f6029d5
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_GCC_VER=10.3.0
+PATCH_VER="3"
+
+TOOLCHAIN_GCC_PV=10.3.1
+
+REL=10
+MYP=gcc-${REL}-${PV}-20210519-19A74-src
+GNATDIR=gnat-${PV}-20210519-19A70-src
+INTFDIR=gcc-interface-${REL}-${PV}-20210519-19A75-src
+
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+BASE_URI=https://community.download.adacore.com/v1
+# we provide own tarball below
+GCC_TARBALL_SRC_URI="
+	${BASE_URI}/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=${GNATDIR}.tar.gz
+		-> ${GNATDIR}.tar.gz
+	${BASE_URI}/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=${MYP}.tar.gz
+		-> ${MYP}.tar.gz
+	${BASE_URI}/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=${INTFDIR}.tar.gz
+		-> ${INTFDIR}.tar.gz
+	bootstrap? (
+		amd64? (
+			${BASE_URI}/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=${BTSTRP_AMD64}.tar.gz&rand=1193
+			-> ${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			${BASE_URI}/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=${BTSTRP_X86}.tar.gz&rand=436
+			-> ${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+inherit toolchain-funcs toolchain
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+
+LICENSE+=" GPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ada +bootstrap"
+RESTRICT="test"
+
+RDEPEND="!~sys-devel/gcc-${TOOLCHAIN_GCC_PV}"
+BDEPEND=sys-devel/binutils
+
+S="${WORKDIR}"/${MYP}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	toolchain_src_unpack
+}
+
+src_prepare() {
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+
+	gnatbase=$(basename ${GCC})
+	gnatpath=$(dirname ${GCC})
+
+	GNATMAKE=${gnatbase/gcc/gnatmake}
+	if [[ ${gnatpath} != "." ]] ; then
+		GNATMAKE="${gnatpath}/${GNATMAKE}"
+	fi
+	if use bootstrap; then
+		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+	fi
+
+	CC=${GCC}
+	CXX="${gnatbase/gcc/g++}"
+	GNATBIND="${gnatbase/gcc/gnatbind}"
+	GNATLINK="${gnatbase/gcc/gnatlink}"
+	GNATLS="${gnatbase/gcc/gnatls}"
+	if [[ ${gnatpath} != "." ]] ; then
+		CXX="${gnatpath}/${CXX}"
+		GNATBIND="${gnatpath}/${GNATBIND}"
+		GNATLINK="${gnatpath}/${GNATLINK}"
+		GNATLS="${gnatpath}/${GNATLS}"
+	fi
+	mkdir bin || die
+	ln -s $(which ${GCC}) bin/gcc || die
+	ln -s $(which ${CXX}) bin/g++ || die
+	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(which ${GNATBIND}) bin/gnatbind || die
+	ln -s $(which ${GNATLINK}) bin/gnatlink || die
+	ln -s $(which ${GNATLS}) bin/gnatls || die
+
+	cd ..
+	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
+	mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	cd -
+	sed -i \
+		-e 's:$(P) ::g' \
+		gcc/ada/gcc-interface/Makefile.in \
+		|| die "sed failed"
+	toolchain_src_prepare
+}
+
+src_configure() {
+	export PATH=${PWD}/bin:${PATH}
+	downgrade_arch_flags "$(gcc-version)"
+	toolchain_src_configure
+}
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild
index 42c764ca8fd0..3aecf73af600 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild
@@ -41,7 +41,7 @@ DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+ada +bootstrap"
 RESTRICT="test"
 
diff --git a/dev-lang/go-bootstrap/Manifest b/dev-lang/go-bootstrap/Manifest
index 0d01a9063b0a..ca937aa4e886 100644
--- a/dev-lang/go-bootstrap/Manifest
+++ b/dev-lang/go-bootstrap/Manifest
@@ -1,11 +1,22 @@
 DIST go-darwin-amd64-bootstrap-1.13.6.tbz 119340642 BLAKE2B 93d1d2fdd24e6a56d9583d90e64788fe28284302d1e1346a2009dcba8f80917bf113398f269922277bd066b068f62fffa146523bd57a5b7b178f0008f3c4d154 SHA512 1f27885d454963e88f73d3b6ef4d0167a5df6ad81c4725fb3b2be19e2c7bad13ef36ff6c100b8788fa2085285e462f0d2b3dfaf8bd67b0804a137969054cb5ae
+DIST go-darwin-amd64-bootstrap-1.16.6.tbz 127674985 BLAKE2B 1addecf6c3c59771d27c9ae38bb1348632b0840a5fc5a8f88ef37f3882e37810f6851d56c64a171c47d2ba9da6c00e5876aa10d207d8a6e907aa53861c0ff54b SHA512 4d1107cbf2b467a3cf7ebeb868d300df1955f376f016dc1aa0ec6b823c69d4cd80f327f90819f54b235ea9e6d4c4fa8a355325c28c5149aabd7af72fb563a493
 DIST go-linux-386-bootstrap-1.13.6.tbz 116991833 BLAKE2B e15c4dd3c9bfb233f81d318591df5cb2a73e033a088cd652371f6933b8732c7d5c1292ec8110b23f85b30d5afdea97e798b264c61f5651db08c7ac903e8dcbb6 SHA512 114c2f670f21624f0dfefabb99b7263e2133e58c2072ce341a6ea604278e22361779f2e0d3771b7a427e979d7e34f3fc3afcd0f8297d778c3552858ce64ec0c8
+DIST go-linux-386-bootstrap-1.16.6.tbz 125879388 BLAKE2B e0813b451b41c474617543688d105b19aa7cdd6984be40b0fddf12709af4c6e4382d3b3e1f65c0a12ca24896bb2ad25fe0a2cd3b7aeefa4f55354e939aef4c29 SHA512 eb4a013b7f53f9b6580afcae75b98df32982f19c113be58540871f36570e00fced1672ad85894660ef6c72c10392fec21c3d8e3db98ea8074e00b07e6ca160f3
 DIST go-linux-amd64-bootstrap-1.13.6.tbz 116924754 BLAKE2B 3a28ded6df7e04081c727ad90ad2c8b67e1171aea8cd86b9570d65b275c2a4f1a84084d65a6c3e2efbece5594ba1aad3efc1a2fba36aa2dc68902c5c228c05e8 SHA512 3ade49da050d132309357a190628c3ff3a93cffa88f56e1d771f53358c825f210b6870870a96fdbc27717f1b464d904a6f605073377de2f0516cf635a1ce8241
+DIST go-linux-amd64-bootstrap-1.16.6.tbz 125758119 BLAKE2B fe653fbb47d22624a24bbf1fc52f5158830726e3bc93a8b0c5ab4811daf082b02130b834031af19dfc929860417b4b734f54125fbbaaeed0e3c35fdd686e4991 SHA512 6feb11c3326199db296ebcb68b81bcd21d456c3cffca1e8f30dd6303c3bdccde410b38d49f0ccec47e397e5d7a84aba91b91e85afd44a14150c6e20046bff8df
 DIST go-linux-arm-bootstrap-1.13.6.tbz 112324731 BLAKE2B 18166e279b1d30f48e08007df8639775b58081805a7e5799dae14e0b357330cf69997f4a5c844bd10a9eeef44225d52f26197e07d16bb7a42fe5a6185634f4b5 SHA512 4d502e2231c1822dacb62cd00b435d52710b1511715385c0b3ddf9f66a446ae90e9b1628b501ba8e1d1a94ca5c28249a323da56f869e88480aa6c249ca001c6e
+DIST go-linux-arm-bootstrap-1.16.6.tbz 121505187 BLAKE2B d732fcd1b8c9696aca70608813be1d99aa097aa51a709c3580bb1c5b3548e38b52bbcae7e958b00632dcaec6c1083d90f13a3bc2682e0a743bfae9055164d15b SHA512 25ed02b4a1c3b42a6b97a7d1fbfd0c6304ab784b69cadac15ae0fb1d701767ff2614fa7ebf070b8430510745e2d0d3f612a3f383e836fda4ca80c3398175c46c
 DIST go-linux-arm64-bootstrap-1.13.6.tbz 110290994 BLAKE2B dc8985a305d1ef3ae683de9787333f0be3d43d5e642a3b5a315cf003311fb47e55588eb1acf816e5eb4215802832a43445ebecedfd2d680d350cb65e0ce7394f SHA512 bc5f4c4554987a5df735bb96c9b8ae78624169d847ab17ea9b0e969ecaab109311892cf1985d576cd46bf271562b724c6a3796472e197a2c8bb48da0d51128a9
+DIST go-linux-arm64-bootstrap-1.16.6.tbz 119471617 BLAKE2B 518ed7baf7c74aface2f458e5f3ed6e8c0f9aa2314d59f83688818fda8acb1d15e8d9288210eef916f09773868253661c30ffc259570e2f2e3de829cc49e91c4 SHA512 4e3b968188c6d7882568d24919baa1a80b07097a0ec8cf87c40e012db61eba58107edcedf67801868c93e5263cbf62eccfb2c2163d33018e6a82ffcd61e2872d
 DIST go-linux-ppc64-bootstrap-1.13.6.tbz 110762916 BLAKE2B 19d44da5bcd1f4832772469beed509475f9a38ab55b386490faf1b270ffd7cc13d315dfe4746b3b9ca6a324c0e6f2e0144a3146d43bd6210d0479063f8627e34 SHA512 2a76c6168d7ba0c7eb020a1af4eccb2a5aee510a1f8e4bb438f5ea769677724c1450209c2fc9a4ccff1084f1a091a568e667ec33a5d537539a09ece426cf82d8
+DIST go-linux-ppc64-bootstrap-1.16.6.tbz 119549132 BLAKE2B 26131877025faf0a1b09abab9d229940532b52c7d994d001b7e91dbde0fe760a520e3337f6fe3e413aa3abc49096fb47883fba0cc247d8e0c93a6698947a4567 SHA512 a55d1a5da5a7b6360485101fc051aa34aecdc2e73be3690df16d132068c390a522114c890f942f504d197e7d00b97a95ea7cca6e74ae23719c6ab80deea4e7da
 DIST go-linux-ppc64le-bootstrap-1.13.6.tbz 110086770 BLAKE2B a3f2c1b840f85d7726336285a56d1850fd10f32d90341836a4124a7d181778c3a1cff1d576e4a19a4f3556e961d84fa77202891725b5237121040bdd020af339 SHA512 6c4bd54fafea65fbb16a3e6c57b721c10654a5f18879c164f6889a01ec6581b13b450622e83897032ab3ed43a9ff4a7edb6d30c56d41dd23991e8453c1bae359
+DIST go-linux-ppc64le-bootstrap-1.16.6.tbz 118880332 BLAKE2B 364f193b0e21ba330effc07ff8fd6b8e1b63519fdcd44c0c0c5a655a95739263a5a31771f04f3b682097bef41144ae7b31d28eaeae9c95505c187673a7289e3f SHA512 56ed74c7b6a189fd477c8ec6a5d5af1cc628fe3816f562dfb0702bea743a55e61d36a06f3d8314576ab690eeaab09a6d076549c74cd8f2a99cd2531e82c09e7e
+DIST go-linux-riscv64-bootstrap-1.16.6.tbz 125444157 BLAKE2B 67829fcab383445a228e9e5f6d55f5c17869394201ff818ef9f15143225d889ca82da0e2e7d11f11d6b1dd37af3ef0070784eb1d832c8d11c9c41cea9082f368 SHA512 97fcc6b061e8819d6e0876521457c344306927c9fe04ccde2b43bba143255feb2eddbc2416df6e44c9b5477dee6491c25fc7da2800a8fa40cedf1f21089d4816
 DIST go-linux-s390x-bootstrap-1.13.6.tbz 115641137 BLAKE2B 7ab94a8f7c839ee8fb58673ed5ad00a569a0bae7a13bb214098154aedb1c272837d0903c226cb87b5eb46475589ddcd56e1afafc81ddaea988ce3c3ddca686d1 SHA512 794b72f48634a7f7dfb41c64607d66974ef9413a68e39a3959a981e2aaf356fd2cec9e2eb0c25d1b7b3d179c0a72ce053dc9c69463bde0ec893ab472f7076204
+DIST go-linux-s390x-bootstrap-1.16.6.tbz 123611555 BLAKE2B b60509d2475640be6d029fe9abe2a244f9e5f7d050b9d62648817f5868bd70850a28494703e51116d2c00a99ddfd7e899b26f6d9a1d9fb18347ab958749014a8 SHA512 519dea7328ce5bf4f5ef769dcc22bd5b09537b3d796b682d094326260385c50ca41a3bbb9cb33a45d4ec979e572ef082cdb5c82ecb595faa8fcd2aa984403154
 DIST go-solaris-amd64-bootstrap-1.13.6.tbz 116214396 BLAKE2B 3f5d6fcf2131a0944b2846eab2fc069f5d90fea1e7d98e8bd50ba5091d4b2ae01964fa71c29310fa7ff7c990ca0dd1afc83577174a46552d58d611716fedb854 SHA512 2d2c281c196729dd97f338fe3bd7396268c0b6fcfc8241b99a939f647201ed39929a5b0a096b9d1f7ffb20f79fd7b3cc25127d7a93f9836f6f0d1e5dbc2c6235
+DIST go-solaris-amd64-bootstrap-1.16.6.tbz 125045916 BLAKE2B ab3645495b7bc17fd5d1612e1ddbc86f8053b393185909526eadd74158215664119849a8727d5e8b3142a4302dbb38aea505a4f6864d7d129b4d8f6d6fce174b SHA512 ee9bcf0a118935083c306b800adb1bdd51d77d40e8158dc0f7a16a37dd5d04ec78495b0467042d60e9165117ab53831b839640ed2adb5a8f7468c0b86ddc27f5
 EBUILD go-bootstrap-1.13.6.ebuild 1142 BLAKE2B b7d1fcca63621309b8203874f49ef152fe441b0415229b4cf97488f379e801d8bc0716b5325e9e81588af212073bc58fcae32a0ad94cb676a30891403dcc1f08 SHA512 31642857136205dedb259282c6ea69c9c0a9a5aea45f4d9b57f60c1e25c78e7a8289a354a70ef709c1cd71e6cea722cb6da5083136be8b6d9ef502c9d889dd81
+EBUILD go-bootstrap-1.16.6.ebuild 1229 BLAKE2B 8abbb08ffd251c2092234a7b17687eb2025692d0fd3f00322748c39106fb73c577928c5efc0aa54e4e487abecc8cc1ebd59165d017b0dbc9396967fe3e656e90 SHA512 bcfdddb6915620d3203ea3481d13194ba04ba891d43ce9373eb1927287952c85939457c06f5eb61a9fef503e6cbc75efccc7d9840fc167966b8a1d926bb1c48f
 MISC metadata.xml 415 BLAKE2B c99598f99c4641694f4855251e64805ea804a722bfd74224682318b28dd409375c2c561516c7961748d5c6cb8dcfb1d91dc0c04615516abc216c31084710077a SHA512 b019c242cc054e7c3fcdfd9254f0f6742f9250d154436f6d43d0b124fb6d87acf8ca09d00eb7491eb75be84b55e78f1179382bbb2a45db0e18560d4f2272e4f9
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
new file mode 100644
index 000000000000..e6f569584853
--- /dev/null
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Bootstrap package for dev-lang/go"
+HOMEPAGE="https://golang.org"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+SRC_URI="
+	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap-${PV}.tbz )
+	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap-${PV}.tbz )
+	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap-${PV}.tbz )
+	ppc64? (
+		big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap-${PV}.tbz )
+		!big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap-${PV}.tbz )
+	)
+	riscv? ( ${BOOTSTRAP_DIST}/go-linux-riscv64-bootstrap-${PV}.tbz )
+	s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap-${PV}.tbz )
+	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-${PV}.tbz )
+	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap-${PV}.tbz )
+	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap-${PV}.tbz )
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="big-endian"
+RESTRICT="strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+src_install() {
+	dodir /usr/lib
+	mv go-*-bootstrap "${ED}/usr/lib/go-bootstrap" || die
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index bfb264a8343e..4a5526932b91 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -6,6 +6,6 @@ DIST go1.16.6.src.tar.gz 20923044 BLAKE2B 7a46d33f947c1d7f2c6f5e0085cba89520fdb8
 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
+EBUILD go-1.16.6.ebuild 4675 BLAKE2B 828cf6f1262c715239df8e4e256c7276776304a3e994fb38081e7c50cb8e5765eca112b3286346de79d43ac7dd48da3d5063087f9c7b2f59a390ece821594eb8 SHA512 9e51ba49c341e907eef5f232f34d6f1c95bddd53e672fa9d76872296bfe0fa7d1b18713eca7af88b4bd126555e0dd179db18ff03c6293e89e8f3bde51d68eaf2
+EBUILD go-9999.ebuild 4647 BLAKE2B 79c9377bc5c5d160ac01597fa2dad4ca3cb8952095942e07f8c8c28796ca0a09b2266bdfaceec14f1d1cf8098d1b94cd7366cecc18b5d8193ff9f174a41a9685 SHA512 6ab9c23dd0854aac6d3601b856ac30d131d42a4656eb5233a0d8bd062772d63db865df5cfa40dd4bff2fb4a035d6c66161c3b39f6fc8996a54fc4f1233d682db
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.16.6.ebuild b/dev-lang/go/go-1.16.6.ebuild
index 4c8f5c8fbc88..895ddad58f5e 100644
--- a/dev-lang/go/go-1.16.6.ebuild
+++ b/dev-lang/go/go-1.16.6.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -63,6 +63,7 @@ go_arch() {
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
 		*)		echo "${portage_arch}";;
 	esac
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 9d3bb807e833..135a6fe19a98 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -31,6 +31,7 @@ HOMEPAGE="https://golang.org"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
 
 BDEPEND="|| (
 		dev-lang/go
@@ -114,7 +115,7 @@ src_compile() {
 	fi
 
 	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
+	export GOROOT="${PWD}"
 	export GOBIN="${GOROOT}/bin"
 
 	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
@@ -126,9 +127,8 @@ src_compile() {
 	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
+	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"
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index 5f0efbde2dc8..746e936a0a44 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,5 +1,6 @@
-DIST janet-1.13.1.tar.gz 584998 BLAKE2B f1bfd9e62dde786127a1307d38f48fc7e75b9fb09f009f9d01eeefa593b67c2469e213fd366fac7c52e0372e61b1a9afdb558e8a1be1ab2f4f538b5fb39075f3 SHA512 8022ecbaf7680855611202a3c17b8e5f6dc61a9302508c9de5312dbd9e80d40c24786bb5e8ae653ab5a7b00191a2d7c44cc3e305d31245e3e8c53be0e1c80372
+AUX janet-1.16.1-make.patch 435 BLAKE2B a8d038c83a051e8d93dbdaa3456a9c93403a11dbe6b38cc2283c2b1884235ad76a42707d1c19bd5db2f66a86cdbacfd36196a12abea9fc66c4ac78fba5dcea50 SHA512 a9fab424e33d50e56c9ab3090a0b1a6c5b477e459128f1529deaf2452705345829c23d8a86b7e37bf1e7fc24fc37dffe293cc67550b24b065b439e0b5a9ead5e
 DIST janet-1.15.5.tar.gz 601033 BLAKE2B dfc8c2a2d238f2554aae667f706e84905ba15c732fa2f06b3c537f08d064375dcb00043117dfc56328365627e2e8f4e2a8f171731d9d6bc0d48206cea58f127c SHA512 ebdc090de6fbea0c94f0618957a4b36776fa0009298df77b279b79064d4524e73f42723ba2c315167cb6f3a40f2a4dffbb2a865fa2d479ba196aa9f0aa24cbf6
-EBUILD janet-1.13.1.ebuild 1748 BLAKE2B d33aedc446e1692e0c39aace488070501e3cff1efff6545fd0d43710efa16d7a5a5cc52d0fbc360756b04d78dd8f015c12526cab986bad05bd75de5326fae923 SHA512 9d41ab1921792cfc549d1bb8b9bebe3b8080de6ade08ca189ea8422bfa3a7106e722374b31d240caee2d00656b85dca99bf69608218ee20e2c2677b43083b09d
+DIST janet-1.16.1.tar.gz 493490 BLAKE2B 7542644a647d9d2ddd73d8e284f749cdad1900b8df2797c99a2f176c93eca412427b7f571493cfe62f64dd9c90bd12d8506b0f4b6b485ab2d3633e989e735cd9 SHA512 f4be0703676acad8896e41b46d79c4f6d99990c487028f1fd1abd681f756db119a06a5d6a0653b9301afcd62f45d6f1bb7876b9613c0ea28d7199e310a52895d
 EBUILD janet-1.15.5.ebuild 1748 BLAKE2B 50067fd265f5e08344fe43f59628c1a5b9c5f1a735f85e9a1d8eee680af21443915d66120dcb07dcc3c317e20201168261bd9b65ae883fcfaae74448d6ec746f SHA512 957db602a769368862904df84deb119eea06b70fe46c07a41af3cef0bbe3bd66c6dc64885440da73fe44572fd522cb6e0b5a8cd5f9560c29f228802823cdd74d
+EBUILD janet-1.16.1.ebuild 1790 BLAKE2B 09702dccd44f59a809bb2e001d9197e83d7196b8cfe17e7659a931ba3b6d83920b68a102ff9289b23539c5be1cd470fc263fcda36186f47991cbef1a30888783 SHA512 c4343c4135e929d30d78e0f9f76573c3fabb11f5760343ab833e366e0b6089fcf70fd65783ad5b79570cb2d98f2ca64e304e96c6f74780c938cf5a0f949e5d62
 MISC metadata.xml 990 BLAKE2B 7e8a261e9007ef46da4944eb81ff4ea35cde6c9c510e63f5407215974302fa0410d9c38ce1356fb7ce1648c81e0c42cb16dd74b46c2d9f277c7bf1044c5a44e3 SHA512 35291cbd14a89e3ce9b6ed31eee97253dcc7e82f6a6310f669449518778eb137a1240d04a55e5f30d5de479c50ca7eec6e0bee5e64d035e8e0705746de6cfe3d
diff --git a/dev-lang/janet/files/janet-1.16.1-make.patch b/dev-lang/janet/files/janet-1.16.1-make.patch
new file mode 100644
index 000000000000..09429f4ff08b
--- /dev/null
+++ b/dev-lang/janet/files/janet-1.16.1-make.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 7efef93b..12758ab0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -254,7 +254,7 @@ build/doc.html: $(JANET_TARGET) tools/gendoc.janet
+ 
+ build/jpm: jpm $(JANET_TARGET)
+ 	$(JANET_TARGET) tools/patch-jpm.janet jpm build/jpm "--libpath=$(LIBDIR)" "--headerpath=$(INCLUDEDIR)/janet" "--binpath=$(BINDIR)"
+-	chmod +x build/jpm
++	chmod +x jpm
+ 
+ .INTERMEDIATE: build/janet.pc
+ build/janet.pc: $(JANET_TARGET)
diff --git a/dev-lang/janet/janet-1.13.1.ebuild b/dev-lang/janet/janet-1.13.1.ebuild
deleted file mode 100644
index eafa5bbb9208..000000000000
--- a/dev-lang/janet/janet-1.13.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
-HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
-SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-MY_RELEASE="${PV::-2}"
-
-src_configure() {
-	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
-	append-cflags -fPIC
-}
-
-src_compile() {
-	# janet_build is the git hash of the commit related to the
-	# current release - it defines a constant which is then shown
-	# when starting janet
-	local janet_build='\"1.13.1\"'
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/jpm JANET_BUILD="${janet_build}"
-}
-
-src_install() {
-	dobin "build/janet"
-	dobin "build/jpm"
-	insinto "usr/include/janet"
-	doheader "src/include/janet.h"
-	doheader "src/conf/janetconf.h"
-
-	dolib.so "build/libjanet.so"
-	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.${MY_RELEASE}
-	dosym libjanet.so.${MY_RELEASE} /usr/$(get_libdir)/libjanet.so.${PV}
-
-	if use static-libs; then
-		dolib.a "build/libjanet.a"
-	fi
-	doman "janet.1"
-	doman "jpm.1"
-
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "build/janet.pc"
-	dodoc -r examples
-	dodoc "build/doc.html"
-	# required for jpm
-	keepdir /usr/$(get_libdir)/janet/.cache
-}
-
-pkg_postinst() {
-	elog "Enable use flag \"static-libs\" for building stand-alone executables with jpm"
-}
diff --git a/dev-lang/janet/janet-1.16.1.ebuild b/dev-lang/janet/janet-1.16.1.ebuild
new file mode 100644
index 000000000000..16f31087d1a9
--- /dev/null
+++ b/dev-lang/janet/janet-1.16.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
+HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
+SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+MY_RELEASE="${PV::-2}"
+
+PATCHES="${FILESDIR}/janet-1.16.1-make.patch"
+
+src_configure() {
+	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
+	append-cflags -fPIC
+}
+
+src_compile() {
+	# janet_build is the git hash of the commit related to the
+	# current release - it defines a constant which is then shown
+	# when starting janet
+	local janet_build='\"'${PV}'\"'
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
+	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/jpm JANET_BUILD="${janet_build}"
+}
+
+src_install() {
+	dobin "build/janet"
+	dobin "jpm"
+	insinto "usr/include/janet"
+	doheader "src/include/janet.h"
+	doheader "src/conf/janetconf.h"
+
+	dolib.so "build/libjanet.so"
+	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.${MY_RELEASE}
+	dosym libjanet.so.${MY_RELEASE} /usr/$(get_libdir)/libjanet.so.${PV}
+
+	if use static-libs; then
+		dolib.a "build/libjanet.a"
+	fi
+	doman "janet.1"
+	doman "jpm.1"
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "build/janet.pc"
+	dodoc -r examples
+	dodoc "build/doc.html"
+	# required for jpm
+	keepdir /usr/$(get_libdir)/janet/.cache
+}
+
+pkg_postinst() {
+	elog "Enable use flag \"static-libs\" for building stand-alone executables with jpm"
+}
diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index 9bb85837e91c..4bc229c62df1 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,4 +1,4 @@
 AUX jwasm-2.11-types-test.patch 1761 BLAKE2B b719bb79504e708925bfa407e72df7a37044b834bc3118fa9baf1a0cb478a0ab852872147148462188324954ef958af30cbcbca28fc992660276a15100ecb1b6 SHA512 0a4f3e613c8e724939ce9e23f8f4ce10ca89bf6c1579929719b3ccad62ac66cceecc3f8799c20c2875b7d4dcc7390bf0e4ca64aa08aab0b39bd7a4ab381b150b
 DIST jwasm-2.13.tar.gz 578365 BLAKE2B 8c6fbe3e6cb56c0fe8135c30c629534d2b6e2a2ed534249834e0e2674bf6635cb15ab94d4fa05c5378cb0db8569ddc3ba49d2d7c9615b7ddb769cba1a2d5b715 SHA512 03f80f4a74b39c6093f5cd5334364f7458836a52ad01279c95683e7053cb4211c40235e16f6f2ee40bc7316dcd8a4fbcb57bf3606d31249d96d01933a8aa0563
 EBUILD jwasm-2.13.ebuild 730 BLAKE2B c54d0438b6fcb0d339ae7b8d10a9948b2099c8db3b5f3e68a521d75979d3b6b51eab780530eb67d6e84af6ebe6e9b9c76464cebf1fb7a0d7e6a2d8dfd8c91464 SHA512 7269d7e817d3348b794878bc57fc729d14142c97adc0022adf1fd82eb3447a037127e0d44ae90f1baaa44a4966053f1b41e3043e8e009aa61594a4876df59807
-MISC metadata.xml 326 BLAKE2B 74fb3400512995784ba11f7f23a7730233a6c6698ad0c4c620f29a1f0d2f4c249e19e1e61664ab88f65e7f617cbe320780248527acd911daf69b4717140d454e SHA512 c319281a95b48cba52da17bdbf084fda50f0da5cc9c4fe50f135a8d8cadad4f4ba37755ac781335b14257b72f6ada693308ca05e6e8740285a4f1cea308b67a2
+MISC metadata.xml 242 BLAKE2B df9303c7f4e350c6e65a6aaa16b5f41df7cd14e201821b24b5c36180a265015914a41cb6751a23b4b69d3b5fefe1e01d26bd702829ad0e3fae49d534578afa0e SHA512 d38b072d8f34a0def8a89e9bd27effc1235b60b06ffb9a2771af5b3825e3311ec1902345939159b05c8c47590e211ffeab8f526397158dd961b247a462aa6f95
diff --git a/dev-lang/jwasm/metadata.xml b/dev-lang/jwasm/metadata.xml
index d1d88c49d6fc..7485b609060d 100644
--- a/dev-lang/jwasm/metadata.xml
+++ b/dev-lang/jwasm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">jwasm</remote-id>
 	</upstream>
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 784789ff562e..e1a65c55d382 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -3,7 +3,13 @@ AUX maude-2.6-search-datadir.patch 1124 BLAKE2B 620382dd567eb4bf2c944af83a209cc0
 AUX maude-2.7-AR.patch 206 BLAKE2B a43c072a46543f877afd4d7c809e1a9760fa3011a12eff16dfd68f254f007c3294a187af293643fba866ea105bb8b27fbe65553618571b24735beae0203c2465 SHA512 4cd4931b3dbfca8b3972a130fd710c7b3535e1f2ceb80fd610b7c9afb2ece3dbaec3dec4c6a7c806f6a411b748d7c911b00cc572bd3343bbf953b80028987173
 AUX maude-2.7-bison-parse-param.patch 1027 BLAKE2B b8144c07c219987cd09d3555f05868d91c0727d905efd63ffe6cbdd0d9265c91a470db424b9f9719f7b0edb9f186656b6bab61e44cb40166c9d7802bd98ce368 SHA512 553c1e96fd72687025b71d04c476d853e0e2c8bab48f91f98ce1cb515562d27b7bbcb4e20ffb56c2dc3c7ee9cdbfe7c2da1d6d609b4bba34823c0637375f012c
 AUX maude-2.7-fix-build-with-gcc11.patch 2017 BLAKE2B 392125bbe74805b75cdf3b7465525cc73654028b5ced5064436d9107f5bc5e58bdc8a450a4fa97f1142a21d9bb242c8c914e7f7567cfadd38fd2901011c8e5cc SHA512 08b76d9dec638bb129c166695ffc0095bbe3001a337ce19e11a53a87e5ffcf45e750d075a5c91fc10c0a754c8153d1cc9e559066178b88b0e2f63ae40758b2a7
+AUX maude-3.1-prll.patch 537 BLAKE2B 52e74b5e0bee9a8a82d8b2bb3d6274e19c9aa74eba87efeb064592ffcaa44186e4e61fd47387f9c4958ccfd3549b22e5512f008a560c36dbaf55881c6ff33c1a SHA512 d528eb34b369cd796d2f41ef788543333911a39f0e13e1ab8deabe6886f33ee812b95d603bc65101dde28051f0a458e0c1160b0c734cc727f70df4244e33232e
+DIST Full-Maude-3.1.zip 161211 BLAKE2B 2aad284e1f2bc6e701154bd72c6eff1433fd040fd0f97252485c954b5e1fb33f71555c5587ceec2f3f3e44c8d7b760c9f62f40f53577f19c4cc51a2159b01674 SHA512 fb0c0e30d3df830b60ece67c2fc5655c5e3f1377a269ce8acfc45fdfa0d42f3fe3fbf4038758b35598d82e7f47af5f24507b3ebe2a30dcb8722e61e6315248c3
 DIST Maude-2.7.tar.gz 1663708 BLAKE2B 5fd87cbd7ef2f86f4a7095334fd996109c72caaed44a894138803b76220325400920654924cb8645ed846b4d997dd2cf827d489ef7c4eef73ee22cb4e6e5a5dc SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070
+DIST Maude-3.1-manual-book-examples.zip 267629 BLAKE2B cb4c5d067b8b6787a575ec1e00bfdbfb846c787f4c48b207d9609db57c968acdd97f431110103aa16d764e8e1b59f0eb1f66df53d3b78562cf430f3a57b5541c SHA512 69980145a41afd49e4a2c77a596d7fa91ed8e5acca049d799cdb0f265d95f1c3215776edb3a3ae94d84309c94735c7a187f681c2a2d3aa2fe0a7563634d34efa
+DIST Maude-3.1-manual.pdf 2916925 BLAKE2B da7f0d5bef8bff2e1f1afecd4bc7d062992d6a27e5437f488a50d35bce144a3ddb029bed3271d9696a36e6ab13b5a4f815e1a257a81005eb65d2927526630a29 SHA512 8b4b9bff8d266fad7b42b37c79cd72e4b642483298631f35a52b8bd669f318654382232b0da62485dc198789215fd5a364b583320789754eac9159d4cc2689ca
+DIST Maude-3.1.tar.gz 2335693 BLAKE2B 3bc9744d95448e4dfc2f818944ab66dad84b026ad18a4324b25eafc82f6c2c637b81fa73d03da61ee7f3753bb3c650e1838b56c502c85c91e2507a697bcfbbc0 SHA512 34dba3c3b7eed48d0c82c6d5e4dade08bd11dc57b436f04e94842000809b9b6086f8077bccbfac0313e4a4f361b03c3ef3d56e6df6242ae42427dd674566a3bc
 DIST maude-2.6-extras.tar.xz 3157004 BLAKE2B d735366071194eb7fd22c11628672aba38cc8c7f4460e4ec8806e27c2e1416e1a2a5fa93efd01c305bf36e0ce799578688c5ac87b5459e979323df6f60305902 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd
 EBUILD maude-2.7-r1.ebuild 1403 BLAKE2B 8cafabe903ec3449810d2e806432a8deb96682dbc9e12f904fd5cdf5088f767084287a2cc257b82d57932d4eaf6934817f43cd7e4c7a7d1e025ec6fc483a3aed SHA512 393cef3c42762a13b2dd3df0f1084675c487c51eff72bf454931db4f1276f5fd167bee336522192eab1d9a04351927a5885ab4ddaaaac76f65b95d2e4324a8a4
+EBUILD maude-3.1.ebuild 1455 BLAKE2B 9475bf3afe5ec351c27620f1898ee7fbf3f7ae1a6f586883db0dd57eca225cbb0e939658aa8e7647f283e431aebc525619837f1bd979a8be1e765cf7df01c072 SHA512 549de110093582f93bf5f96f47b761d1dbc82a1d6ec69d317c32279204337ebdf2f37bf030355933365e49cfcc2a32bda4bea92d830f971db0e7b7b84a8cc9b3
 MISC metadata.xml 708 BLAKE2B 45ec7072bcd0509e34ef2b5d3abd3a67abe84cf91f6dbc9e45fdc3d07bf4bebe520c40440b977e2eabdd06ec1d9fede487c74cc69df57819975cd75f8ca75016 SHA512 da572363e08716b890656c160e415a4e01bd0a0effaaa3a535108295fdbbc67210315b9c0f81e4fd4c9dc8a8b8a3cc454f5d2225be0d666dbc630752ea0e2cc2
diff --git a/dev-lang/maude/files/maude-3.1-prll.patch b/dev-lang/maude/files/maude-3.1-prll.patch
new file mode 100644
index 000000000000..22af2889913f
--- /dev/null
+++ b/dev-lang/maude/files/maude-3.1-prll.patch
@@ -0,0 +1,22 @@
+--- a/src/Mixfix/Makefile.am
++++ b/src/Mixfix/Makefile.am
+@@ -82,7 +82,7 @@
+ EXTRA_libmixfix_a_SOURCES = \
+ 	compiler.cc
+ 
+-BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc tokenizer.cc
++BUILT_SOURCES = surface.cc lexer.cc tokenizer.cc
+ CLEANFILES = surface.yy surface.cc surface.h lexer.cc tokenizer.cc
+ 
+ surface.yy: \
+@@ -97,7 +97,9 @@
+ 	$(srcdir)/bottom.yy \
+ 	> surface.yy
+ 
+-surface.cc surface.h: surface.yy
++surface.h: surface.yy
++
++surface.cc: surface.h
+ 	$(BISON) -dv surface.yy -o surface.c
+ 	mv surface.c surface.cc
+ 
diff --git a/dev-lang/maude/maude-3.1.ebuild b/dev-lang/maude/maude-3.1.ebuild
new file mode 100644
index 000000000000..2fa97a9809b1
--- /dev/null
+++ b/dev-lang/maude/maude-3.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P^}"
+
+DESCRIPTION="High-level specification language for equational and logic programming"
+HOMEPAGE="https://maude.cs.uiuc.edu/"
+SRC_URI="
+	https://maude.cs.illinois.edu/w/images/d/d3/${MY_P}.tar.gz
+	https://maude.cs.illinois.edu/w/images/0/0a/Full-${MY_P}.zip
+	doc? ( https://maude.cs.illinois.edu/w/images/6/62/${MY_P}-manual.pdf )
+	examples? ( https://maude.cs.illinois.edu/w/images/4/4f/${MY_P}-manual-book-examples.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/gmp:0=[cxx(+)]
+	dev-libs/libsigsegv
+	dev-libs/libtecla
+	sci-libs/buddy"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6-search-datadir.patch"
+	"${FILESDIR}/${PN}-2.7-AR.patch"
+	"${FILESDIR}/${PN}-3.1-prll.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}/usr/share/${PN}"
+		--without-yices2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# install full maude
+	insinto /usr/share/${PN}
+	newins "${WORKDIR}"/full-maude${PV//./}.maude full-maude.maude
+
+	# install docs and examples
+	use doc && dodoc "${DISTDIR}"/${MY_P}-manual.pdf
+	if use examples; then
+		dodoc -r "${WORKDIR}"/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index b942a4dbcb65..7679401e4f92 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 1901 BLAKE2B a0ae1459797b184ee970f8ea43a0609bf92e0c20c233a1272f3d44a03ba772e2cfd590430d1e8594243dc8003274060cc24b5230ee629c176bbec0f13f7a4a46 SHA512 d4ed6e3383b2b6cdd0556589c1c5ba7f8db60b42c30f9ba89db107bc8bf5afd119354eabe5e354c37a3f6b1bda53a04d391633323665adda0b0fbd599e5a5048
+EBUILD mujs-1.1.3.ebuild 1908 BLAKE2B 676ce6c4864af0aa6cb3a3e7a55ae6a7bf1ccbc867896bf3289c46b766dcf6a17c25838b1ab04b8629b672061277f2f3350948a2be4127013db92a90c3fc2910 SHA512 a3cd15c295ec3334d3550b63abae94762ac986a4251c0f03bf8ea9160b9f06666935931f4e8c09a8ad846491e441b1c4d236a9fd5a4dffd6cd452e6a451b4003
 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 4f18b888b470..aed92dbebee5 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 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 84fbd86e7e0b..358623c420f4 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,6 @@
 AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
 AUX perl-5.30.3-darwin-macos11.patch 6367 BLAKE2B 5fb6a34bf5e422ba4a5f76d9462328fb81e44e6de7dc363ad595d9315ac622d5eb2973700e3eb209f630bfd2d002adfe33f1a3a10f7c5818ed44fc3a26bd55d5 SHA512 c8d88c2f21b781e777ca19115eedecdf4d8bc0f93b01da6da578be489e0151f3ab7d3204e6b7a28848f9286bad90bcf6f33edc63be82949060e06fc6c739fb7f
+AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee
 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
 DIST perl-5.30.3-patches-1.tar.xz 20292 BLAKE2B 34ca8dbdf08650deaaa59bba634c3a40c6da7d91b282365eec217cc421b17678837b1ae02de5d6b0b632858a0251b796ce28ddbdd7a86aca6697f18a527fcb62 SHA512 ba9aafcaff405c931b61ffc917be8ef71e538fd5277a3bcfafbaffc965b53f9c1811670558a0bc75c538586a30f11aba3ce59bd2214982eaad3b5afa64e67999
 DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
@@ -16,5 +17,6 @@ EBUILD perl-5.30.3-r2.ebuild 26146 BLAKE2B e0756d8250acfd3dbbdeac414f2515270820a
 EBUILD perl-5.30.3.ebuild 20132 BLAKE2B a244f590c7be7a1f078e8117d3b2745c4118c8a7ec264caf950a0e4c051090b38d4fae431187486fa4b527b7a5ba1cf7000134e9cc2a25bc1a8397b72bd882ac SHA512 d32292624e29ad20f41a9c688b663297246c868455bc4c3d079b12ff90f4fd89f88623e3ca270c58e92ffefe1fcdd6a38910da18efee5954fc1d24de0c104a87
 EBUILD perl-5.32.0-r1.ebuild 25913 BLAKE2B a97f41da180ee9e0beeb163ffbbc1c1f944d8dae32954603c9a3a9bf24d9623db6146b8440917dc891ce24ddb41c6c782e04630e4cfa68649f526d7a3e57def3 SHA512 1223ca91df30ccdc247f8a9659376e4407920c1223753b00da91859935117f5361c128b3b1f5d38596f70a4d0ec0e6e6fda58f1b135525c67183fe906bbb2cd4
 EBUILD perl-5.32.1.ebuild 25758 BLAKE2B 581401462e8ea39175e4a2796a70aea34eaf0a7f7f31c49edf00c95b99f42bfd000faf2e12911198d8d48a07a552d0c95cf3574077919bd3e24f6c8fa46baccd SHA512 3c66bc03faf56fc1c812a26ce39839b9a679cdbb3c5a41efe0f5f4b94348956550c576be32dd01e180f34692f11ed963c3497f2e501b8bde0e53290065bf5002
-EBUILD perl-5.34.0.ebuild 25653 BLAKE2B cb392ab5d39318163b0350eb8006051e1bd7863d1de1967a5f7bf316a7854ef90a4d53ccab63c46081aaa95fbbbaee4824b6d709be7be83e15959f6542e884c8 SHA512 5ee4888ec452761065fedf1cc2851616694b78867994ce561a841c96cc6408501bb88d55162a97aa5a45ae6536bf94ebd7a9afb4c48ba4f2a6ed0cfe7f823c34
+EBUILD perl-5.34.0-r1.ebuild 25768 BLAKE2B 3421fa96f9d9cb3a8ece75dca3c5c174f739773a2180ba521976b0ba842ed748d4b06ed1320720b9c218ff37accc170f15462084c2e5193427860da5132af1bd SHA512 50e300eb0cf8a2b8212062acbd55f3007a609d0f4dcfdd30a426649e23ead7fe98787acb5e1ca7955f962ee65521cd6db9c2f624eae39cc368410da9897b95d3
+EBUILD perl-5.34.0.ebuild 25645 BLAKE2B 453e460de4ea3ef5a9a3218df8df262d88f7f2d5f92f6ede86329c0c617059d4d96277e43205b690285b96339adb9f145f2bc128e88292c0a1d639ae8e2ff5ad SHA512 5640301ba0e61a9dc181a7aefb07ad74f6f4b0e908d2d90b1cfb02a6b6aa070f93c7bb60236927ce31ee4419a227f4a27b4fed9e4cae58e30ea51489c9d1c23a
 MISC metadata.xml 430 BLAKE2B 65949096d565c5754b25bb708f80ab17e95d21b252f6a3b7a1104b01bed26db1f9351c100d1cc59cbf4161d662bba6fb17d232d146165e97f82681c410feb98d SHA512 b3aaad1820fb62287c8da2806ad385e1ced8d8d2a05fbcd2448214120a4682d503c3dcba60d03a5d02cd8e1b4f5b13568759a096a5d8a3a5ecc5c35c5680b670
diff --git a/dev-lang/perl/files/perl-5.34.0-crossfit.patch b/dev-lang/perl/files/perl-5.34.0-crossfit.patch
new file mode 100644
index 000000000000..e33e6d01845e
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.34.0-crossfit.patch
@@ -0,0 +1,13 @@
+diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh
+index fe7eac7..f55317f 100644
+--- a/cnf/configure_path.sh
++++ b/cnf/configure_path.sh
+@@ -67,6 +67,8 @@ define d_inc_version_list 'undef'
+ define otherlibdirs ''
+ define d_perl_otherlibdirs 'undef'
+ 
++define d_gentoolibdirs 'undef'
++
+ define siteman1dir "$man1dir"
+ define siteman3dir "$man3dir"
+ define sitehtml1dir "$html1dir"
diff --git a/dev-lang/perl/perl-5.34.0-r1.ebuild b/dev-lang/perl/perl-5.34.0-r1.ebuild
new file mode 100644
index 000000000000..6d709db3098e
--- /dev/null
+++ b/dev-lang/perl/perl-5.34.0-r1.ebuild
@@ -0,0 +1,817 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.3.6
+PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+# Yes we can.
+PERL_SINGLE_SLOT=y
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="berkdb debug doc gdbm ithreads minimal"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PDEPEND="
+	!minimal? (
+		>=app-admin/perl-cleaner-2.5
+		>=virtual/perl-File-Temp-0.230.400-r2
+		>=virtual/perl-Data-Dumper-2.154.0
+		virtual/perl-Test-Harness
+	)
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.280.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
+	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
+	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+	# This ENV var tells perl to build with a directory like "5.30"
+	# regardless of its patch version. This is for experts only
+	# at this point.
+	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
+		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${MY_PV}"
+		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+	else
+		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	fi
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 794463, needs further analysis what is exactly wrong here
+	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local src_name dest_name desc
+	src_name="$1"
+	dest_name="$2"
+	desc="$3"
+	shift; shift; shift;
+	einfo "Adding ${dest_name} to patch bundle"
+	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+	if [[ -n "${desc}" ]]; then
+		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+	fi
+	if [[ $# -gt 0 ]]; then
+		# Note: when $@ is more than one element, this emits a
+		# line for each element
+		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+	fi
+}
+# Remove a patch using a glob expr
+# eg:
+#	 rm_patch *-darin-Use-CC*
+#
+rm_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local expr="$1"
+	local patch="$( cd "${patchdir}"; echo $expr )"
+	einfo "Removing $patch ($expr) from patch bundle"
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+	else
+		ewarn "No ${expr} found in ${patchdir} to remove"
+	fi
+}
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+	local slash dquote
+	slash='\'
+	dquote='"'
+	re_slash="${slash}${slash}"
+	re_dquote="${slash}${dquote}"
+
+	# Convert \ to \\,
+	#         " to \"
+	echo "$1" |\
+		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+	c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local patchoutput="patchlevel-gentoo.h"
+
+	# Inject Patch-Level info into description for patchlevel.h patch
+	# to show in -V
+	local patch_expr="*List-packaged-patches*"
+	local patch="$( cd "${patchdir}"; echo $patch_expr )";
+	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+	else
+		eerror "No $patch_expr found in ${patchdir}"
+	fi
+
+	# Compute patch list to apply
+	# different name other than PATCHES to stop default
+	# reapplying it
+	# Single depth is currently only supported, as artifacts can reside
+	# from the old layout being multiple-directories, as well as it grossly
+	# simplifying the patchlevel_gentoo.h generation.
+	local PERL_PATCHES=($(
+		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+			grep -E '[.](diff|patch)$' |\
+			sort -n
+	))
+
+	for patch in "${PERL_PATCHES[@]}"; do
+		eapply "${WORKDIR}"/patches/${patch}
+	done
+
+	einfo "Generating $patchoutput"
+
+	# This code creates a header file, each iteration
+	# creates one-or-more-lines for each entry found in PERL_PATCHES
+	# and STDOUT is redirected to the .h file
+	for patch in "${PERL_PATCHES[@]}"; do
+		local desc_f="${infodir}/${patch}.desc"
+		local bugs_f="${infodir}/${patch}.bugs"
+
+		printf ',"%s"\n' "${patch}"
+		if [[ ! -e "${desc_f}" ]]; then
+			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+		else
+			local desc="$(c_escape_file "${desc_f}")"
+			printf ',"- %s"\n' "${desc}"
+		fi
+		if [[ -e "${bugs_f}" ]]; then
+			while read -d $'\n' -r line; do
+				local esc_line="$(c_escape_string "${line}")"
+				printf ',"- Bug: %s"\n' "${esc_line}"
+			done <"${bugs_f}"
+		fi
+	done > "${S}/${patchoutput}"
+	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+src_prepare() {
+	local patchdir="${WORKDIR}/patches"
+
+	# Prepare Patch dir with additional patches / remove unwanted patches
+	# Inject bug/desc entries for perl -V
+	# Old example:
+	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+	#		"Fix broken miniperl on hppa"\
+	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		rm_patch "*-nsl-and-cl*"
+	fi
+
+	apply_patchdir
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+#  /usr/lib64/perl5/<NUMBER>
+#  /usr/local/lib64/perl5/<NUMBER>
+#  /usr/lib64/perl5/vendor_perl/<NUMBER>
+#
+# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
+# is enabled, where it will also allow numbers like "5.x"
+#
+# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
+# if you used that.
+find_candidate_inc_versions() {
+	local regex='.*/5[.][0-9]+[.][0-9]+$';
+	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+	fi
+	local dirs=(
+		"${EROOT}${PRIV_BASE}"
+		"${EROOT}${SITE_BASE}"
+		"${EROOT}${VENDOR_BASE}"
+	)
+	for dir in "${dirs[@]}"; do
+		if [[ ! -e "${dir}" ]]; then
+			continue
+		fi
+		# Without access to readdir() on these dirs, find will not be able
+		# to reveal any @INC directories inside them, and will subsequently prune
+		# them from the built perl's @INC support, breaking our compatiblity options
+		# entirely.
+		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+			eerror "Bad permissions on ${dir}, this will probably break things"
+			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+			eerror "Recommended permission is +rx for all"
+			eerror "> chmod o+rx ${dir}"
+		fi
+	done
+	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
+}
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+	local vexclude="${DIST_VERSION%-RC}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		vexclude="${SUBSLOT}"
+	fi
+	einfo "Normalizing/Sorting candidate list: $*"
+	einfo " to remove '${vexclude}'"
+	# Note, general numeric sort has to be used
+	# for the last component, or unique will convert
+	#  5.30.0 + 5.30 into just 5.30
+	printf "%s\n" "$@" |\
+		grep -vxF "${vexclude}" |\
+		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+			echo -n "${v}/ ";
+	done
+}
+versions_to_gentoolibdirs() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	local root
+	local v
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+			local fullpath="${EROOT}${root}/${v}"
+			if [[ -e "${fullpath}" ]]; then
+				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+				printf "%s:" "${fullpath}"
+			fi
+		done
+	done
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+	fi
+
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		# myconf -Dinc_version_list="${inclist}"
+		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__
+
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	# setting -Dld= to tc-getLD breaks perl and all perl things
+	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Dar="$(tc-getAR)" \
+		-Dnm="$(tc-getNM)" \
+		-Dcpp="$(tc-getCPP)" \
+		-Dranlib="$(tc-getRANLIB)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-lang/perl/perl-5.34.0.ebuild b/dev-lang/perl/perl-5.34.0.ebuild
index e63c754d6d1b..6af9e5af88fe 100644
--- a/dev-lang/perl/perl-5.34.0.ebuild
+++ b/dev-lang/perl/perl-5.34.0.ebuild
@@ -53,7 +53,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads minimal"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index bb7263a99930..ee1187b5dc88 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 22684 BLAKE2B 01b33272a2dc23e573f4307c6beb33e7f9254cbed3853c09d61e012d004512bab2246391fa1b0ab59cca4eabefea915db28ebf49c145afd666a289c00d94cd67 SHA512 c7d30784876b88f8dff91e27899ed2f7e122a6adc5f723c74ca08ca4ab3771898fcb01cb6fa15108b715d38f7a2d2c1d7bf6f397569813df3523c284175634ab
+EBUILD php-7.3.29.ebuild 22683 BLAKE2B c9a62b09e00619d5e9ddfbd20abcb2f424d1e6d6f702fae36854b4a0bb3e5a1ef49f1584aae2d2b5d225c4df763687ff3e319c720b3946766bd57fe07842a185 SHA512 69a574958c2b644a3c14d39dd8068af550547e4a86c685539fe6c82b9d4b9883fd22b03fae5e04d0a7df4970ba82a82e127afd4609cde177165d734fb1ad116e
 EBUILD php-7.4.19-r1.ebuild 21384 BLAKE2B f4a6d16ee301992c670ecb9e729a7cdb94cc012b5f825210be9a020bb12edd1ec05b9b3437575898f1825d91fdaa10e3164ae422e73fcbc60e0108e899c9cbaf SHA512 ac6f6956c8d253f2653f2b9f4e27940eae3af0f63c61175ec2a6ef7f87c95a4ecf51a77f6ad5a62eb161a2c7a6a697392f6bd75c9a0227653b910b867579a368
-EBUILD php-7.4.21-r1.ebuild 21395 BLAKE2B 439c76eec889275c57f321c7b4f8c97fe79db63ac6795cd7ed4042dcf62ee01dc457d7b9ca97b59cfc5421fe4ffc7a6cd6652424aa296464624d6e623307f920 SHA512 6e3c43627b83f3b08d52ff9e534747d2a837ebf60dfb1b512c91a5a6b2167f9aaeb06caf43050f674d3cdba7999a24c3f24c560b617120542590335e6c82a84b
+EBUILD php-7.4.21-r1.ebuild 21394 BLAKE2B fb0dae734fdafad89d17b823c5a4b5e5956f821c73a9cfadd29d3b5fe163ffc412b19d6ba57c53873e7c165fbad1fcc45b8218f9f8a319e1be622aa1256d2eb1 SHA512 ece48ffcc67868e8745e62a207d00967eb47aed140f0ab631b97ec22ace9e3d650b2385da728997a266fa063b33c4f552b840485d6bfde937722064ed393932c
 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/php-7.3.29.ebuild b/dev-lang/php/php-7.3.29.ebuild
index e903f2dfd696..43b75511c0b0 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 e7a978ee081e..0c7caced122c 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/ruby/Manifest b/dev-lang/ruby/Manifest
index 9535c8ec2dcc..067c1da0f764 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -19,30 +19,21 @@ AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9
 AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd
 DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed54d42cd79899b7d5cfe9dbc29ca708d12c630b3f52ff85b0c6a4011ae7ff0483d64b2fd445700a72a91028035 SHA512 2886be764a454425c5beef2777c64a70ee0d048b07896b327633d904f5077fea4299526689f9e2ac4dcd2fc4811cf9a6c8ce75367ed35d29dfe1a54222872e0d
 DIST ruby-2.5.9.tar.xz 11314448 BLAKE2B ed3c698f076066b0ca771d69ffeb92bf10de6fe051a36d373445ce071af850cb707344becf610657b473d14c7d4dcfb6a814b9d69ed6999e69c6dc3bfb3eaee4 SHA512 239f73eb4049ae2654b648ab927b1f74643d38a5f29572e4bd4e6aa3c53c1df29e0a995fd90d4ab9d4b2ff073fd809b12df820ccb1ddf395684bba6be1855b7a
-DIST ruby-2.6.6.tar.xz 11567284 BLAKE2B 45e910dd9b128c46bff3003834c4fdcbbc2e2e4d3e44f298ff4356a285de2c375d6b6021a3aa28d89336b32a1655fa4a7c086d07f4a0f6bcd578a11dd4a894da SHA512 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62
 DIST ruby-2.6.7.tar.xz 11591404 BLAKE2B 4578f29111fe7845265290dfa9d0146e85f3feb646160d96c1ea04aadb6f0fe8992bf3c7708624132106fdd674978ac21ca24eb2ba13d85572a9467f90417615 SHA512 ba6fc0a36af2a08cf1b008851e805f59ea1047724fc7b61d4bc674533b8f123cb12fa0969e9a3f57290477c0d75f974ca7e304836e4905bd96a737211df9bd21
 DIST ruby-2.6.8.tar.xz 11599488 BLAKE2B e5b2949233d8540f72d4d8b9c246f9bd0d1342426d2a1c19cb240b7c86f37299e9dc1dfc98ef2a86d1d91055865b4542d690de5567c71189bf2973a4989fa0fd SHA512 d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d
-DIST ruby-2.7.2.tar.xz 12037052 BLAKE2B a4ad22295b3fed4e8064fc6e77adb8642d1fa7ae1f4ef912d7bde19c735cb25b1a3e3aefba53dad944046d844d608bcefba61c314cf1e52747f50d7d91f4c436 SHA512 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
 DIST ruby-2.7.3.tar.xz 12073568 BLAKE2B ee6a7fc8ea611c3204efb32634743bc6b2df46cf3ae7310fc6895a22d0404256911e8d7141ee0a0f1c4cf7cf3b2fdccef12d9fb23eb7916c6fec48c411034dc3 SHA512 b755d418b3bab2f9f6a8893afd13869269f17065643dde78b9e85ae3538a6d0617893db6e9c3908e00a40c7577a5c912a7c822d8f245cdcfb857be76dfb66c1e
 DIST ruby-2.7.4.tar.xz 12067588 BLAKE2B 2680a7ccd1daf3d156d9519d9132853e68f5f1aad592abce3e73fdd03314a6c28e7d94590153aead86af8952ff51f804ee029f8100b0137919cc27373cb8b9cd SHA512 2cbb70ecfdd69120e789023ddb2b25cab0d03bc33fdc367a8f74ca8a3ee785c18c8ded9de3ecee627c7e275ffb85147e6abf921b6a61e31851b37c7fedf45bf9
-DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3dd5366a17da709a55797c798d099424a5628c78c842b825fb336c6a769ac9c371ef276f42bf3550fd0761ebe SHA512 2a23c2894e62e24bb20cec6b2a016b66d7df05083668726b6f70af8338211cfec417aa3624290d1f5ccd130f65ee7b52b5db7d428abc4a9460459c9a5dd1a450
 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.9-r1.ebuild 7030 BLAKE2B 3ccf395a5f5bf5a4c84c45ad5ac1e86201c471776207f0f03e05508bf0c8cb75c700c3ea9570f86b9af2c0c0936503d0d56127083b54533969b1a226574bda07 SHA512 4ebf5e39da37cc48e318ba70237336a1abf98ce209168e334d2dfce0b03e171f427dd1d285ec1d4da72cace005914f0111e1407f2a5c794e4305b8456eefe269
-EBUILD ruby-2.6.6-r4.ebuild 7447 BLAKE2B a9fea6aa6b0ec34c24fbafbbb822d439c31a322363feea029d3b158dbfe1b538f48e63883ff12003f292f2becbf8a7ea3f7fe38b55bb9d5b5cff5a39c16ff96d SHA512 bea1f6a4d148de144c581472e65df46e536dbbed1ae6864fb66a1f868d0b3379ce58e13f9784c13f068e9ea26cef83ee2a10a5e16ef430100d32597460a3e018
 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.6.8.ebuild 7481 BLAKE2B c37e80c3f6debd1befd5d8b5cfff7ffa547557e94fecfb51c962a7a4ce6052fd047d9f5f143302d5d53887bac0463b65f2649b199625430fd5a49e32c565884a SHA512 b3be72cde078972a1e6dd9969dd7dd085d4fed10d2c7a87128773962955e788cd11868a93f44adb2887a23bffebca3a4155309bb9cb0af55fa2df851f48410c0
 EBUILD ruby-2.7.3-r3.ebuild 7739 BLAKE2B 20eddedbf10c3eef2f6a284bdabc25d8e14935b03983c2bc74d2bda7a49ff24fd48914e99ba7f3c09d448d676390b0cf14da133c0d529796dfe2c5e09de29ac5 SHA512 08494d03019f3e3993c0a087e7a59a3393089d7cdda1b433fff6a23cae1c9c63108fc801cdb7ebeb1228a603d0f05b5fe5ed5e46f2410094beb597ff2ef522c9
 EBUILD ruby-2.7.3-r4.ebuild 7899 BLAKE2B ac1a8fc45698e01b4937cb5c17ca6645fc296b4d9862ee799f947ae8a822f1680b0fbe717cbb81f7882b0da4fdd8b2fa5062fb7c2e66de9f68b0e43c899cab0d SHA512 d5e8c9bd617b505d65498eb3982feb497c94d2bdc6fe018a23d8fcfcaa37382f9599a26abefeacd00b3a6c83e307fe2dfbf1613e5597d7c4f260057337276522
 EBUILD ruby-2.7.3-r5.ebuild 7838 BLAKE2B fef125f53bf853fe6c79ff3146cf75c8b5ab721702db3fcafeabdb04974ce01f303ed031facc76f07eff4f7652701d7cf52fd5fc90346f8c2158b74cf116fb54 SHA512 c57435381872fbd0ecc1b54fc59543dbbef11f46fb48a806a3ca4f6eb6637397935098c2fc488f3ec5d39e8c181b1e0fd1a4c7540938eecd016e911be3ee23ba
-EBUILD ruby-2.7.4.ebuild 7713 BLAKE2B 631b4c580203bc8fca0ae71652c3e072b30d349c29e782f1c6bd32ef04f4bed5de607192eeff95bea72ecbeeeefd7f7f3a45ae3a0ae7b6a22cbe15fb672a5ac2 SHA512 c902d31cf3597516da6fbfaffd3895b5f077ae1a9554ff2443ecdd4a0175ba3b6022d1655e0c314c4877b30f33fb2454618ae15dd70b1279925aa3d9d22c833d
-EBUILD ruby-3.0.0-r3.ebuild 7616 BLAKE2B 9e6cfce5df9759ec2c0aa4b3ae9215fbfa029b4794a80d0f6fa583ee9b00aff198a37b86ca48ed979ecab887c69384201ee520d5748c41d97c584bd7f4cf80fc SHA512 a2edd315fc7dd51914f6d008fddf2a12f41dab4a421b669b337df8f9cc2effdb4e0f9db421c02942312e4f800b7da7857ab789d0ab4a82e2a611f1e0d83a7c13
-EBUILD ruby-3.0.0-r4.ebuild 7622 BLAKE2B 756304d0eb17f3827a66b3f4e4e6c156fca153e0fbfe6c2f70c94b252040c46eee50730596b4f09b2a393dd10dc0c6496b536311bff55625d2540310ffe67073 SHA512 1752ceb498be0c95815fc710b23eea8cf5a6db74e0268cfc551d034a0b5f67ca6b82c13d316b524f2fc171d420891f7940350505c1a468b7f142f933a6e9764f
-EBUILD ruby-3.0.0-r5.ebuild 7743 BLAKE2B 1eea0364f16c3a680e0dd93d7057c4a221b4a6bf2310356a3c8cec37515e5629b555dfeb225f0bfafdbd8d651aa8fdc336c2a071e2513023a44a18305dc26703 SHA512 5bd033a9d6c50910b682ad3bc8ddd997d02db45457ea2ce27b5f8071d9d5a332caef82d7dbac7637009a0fec6c83a2cc71d1ef5f7148f1c5e299163b5eaa9167
+EBUILD ruby-2.7.4.ebuild 7720 BLAKE2B fd322cb2b1e580e2bc64c273f5bd6983b267dec2f3b3cd5a13aef3ef3406936f5a24802f0403afa787a92a803f98a9b17bf2323ae1b9f2357c2c9ee500d001c1 SHA512 3e438dededf89ee6ad6d7e7e9c842714c6f904023ebcd11de25ddf8520170c3057515392640503264d3c7041e19fbdc81a990eb032e09c7f7af28ab80779b832
 EBUILD ruby-3.0.1-r1.ebuild 7738 BLAKE2B ff432fcb07d1d8ed6d788a3772dae1868d245b55bbf4a15f31c8c504a762a79313d0e4c688a5ab123564c72d14687eac208088812975f24b4c5beeb6046ce3f9 SHA512 dc701f91003ac062e83e3043432011cf78bb95abcc76d72f0ffcc18d15573c2de729772feb9bf70b1960e912f22f400786c7ff20cf94954185d0f807645b00cb
 EBUILD ruby-3.0.1-r2.ebuild 7677 BLAKE2B 4d38f4c3fd1d04406da48b6e7738a616c793c9cec7487412985d7ca4a7a21cb94bffc80c1b1e9ac6063a5810199acb87b4f2d2f44027f10097338cb9ae54bc56 SHA512 3b2acecd34ceba0759a07d2dc7f7bf60f9787754e06b56e757ef48a97d055e5430b08c0de883f9c5b7db26e498a5168a6f54088d30e6dbe4e233ac6e0cabf47b
-EBUILD ruby-3.0.2.ebuild 7677 BLAKE2B 4d38f4c3fd1d04406da48b6e7738a616c793c9cec7487412985d7ca4a7a21cb94bffc80c1b1e9ac6063a5810199acb87b4f2d2f44027f10097338cb9ae54bc56 SHA512 3b2acecd34ceba0759a07d2dc7f7bf60f9787754e06b56e757ef48a97d055e5430b08c0de883f9c5b7db26e498a5168a6f54088d30e6dbe4e233ac6e0cabf47b
+EBUILD ruby-3.0.2.ebuild 7684 BLAKE2B 8783bf44e0da28ea94b68b65795d551e88e25628284ae1671074b38843a39d52a908e82ae6ce6e4ad91e7c1ef37d307ded17c153a0cbbc15bae6f92222351b0e SHA512 582bf0a50b4d0f00bfaba643ea2ef79a22c354b8650da1dde2d05e11689d0ac0f8e67b79793451f6a246e8f30be4760188e5f08164169a91a1e1ee90aa62574c
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/ruby-2.6.6-r4.ebuild b/dev-lang/ruby/ruby-2.6.6-r4.ebuild
deleted file mode 100644
index 96442510f258..000000000000
--- a/dev-lang/ruby/ruby-2.6.6-r4.ebuild
+++ /dev/null
@@ -1,258 +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.
-	rm -rf 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.8.ebuild b/dev-lang/ruby/ruby-2.6.8.ebuild
index bc4af4326b6c..4046ef396c97 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.7.2-r2.ebuild b/dev-lang/ruby/ruby-2.7.2-r2.ebuild
deleted file mode 100644
index f798dc8d5157..000000000000
--- a/dev-lang/ruby/ruby-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,261 +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-20191222
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
-	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
-	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
-	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby27]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
-	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-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.7/{002,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || 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.
-	rm -rf 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.7.2-r3.ebuild b/dev-lang/ruby/ruby-2.7.2-r3.ebuild
deleted file mode 100644
index d0bd2d0867a1..000000000000
--- a/dev-lang/ruby/ruby-2.7.2-r3.ebuild
+++ /dev/null
@@ -1,263 +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-20191222
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
-	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
-	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
-	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby27]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
-	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-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.7/{002,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || 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
-	rm -rf lib/did_you_mean* || 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.7.4.ebuild b/dev-lang/ruby/ruby-2.7.4.ebuild
index caf894658b87..c067a680a09b 100644
--- a/dev-lang/ruby/ruby-2.7.4.ebuild
+++ b/dev-lang/ruby/ruby-2.7.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.0.0-r3.ebuild b/dev-lang/ruby/ruby-3.0.0-r3.ebuild
deleted file mode 100644
index 993097d71ceb..000000000000
--- a/dev-lang/ruby/ruby-3.0.0-r3.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 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-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || 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.
-	rm -rf 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.md 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-3.0.0-r4.ebuild b/dev-lang/ruby/ruby-3.0.0-r4.ebuild
deleted file mode 100644
index c42410d89840..000000000000
--- a/dev-lang/ruby/ruby-3.0.0-r4.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 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-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/{001,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || 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.
-	rm -rf 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.md 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-3.0.0-r5.ebuild b/dev-lang/ruby/ruby-3.0.0-r5.ebuild
deleted file mode 100644
index 219a641a6d3f..000000000000
--- a/dev-lang/ruby/ruby-3.0.0-r5.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/{001,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || 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
-	rm -rf lib/did_you_mean* || 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.md 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-3.0.2.ebuild b/dev-lang/ruby/ruby-3.0.2.ebuild
index 1641c8e62f28..baa8d04f1336 100644
--- a/dev-lang/ruby/ruby-3.0.2.ebuild
+++ b/dev-lang/ruby/ruby-3.0.2.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ef227456bd56..6a1fe7cce566 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest
index 9e27dddea37e..ef2270eb0d5e 100644
--- a/dev-libs/aml/Manifest
+++ b/dev-libs/aml/Manifest
@@ -1,4 +1,4 @@
 DIST aml-0.2.0.tar.gz 20358 BLAKE2B 4be63726ea9069cbfe36fbf04e3a0b2229066d7df039aea1a41fdca27700d012fda9eda348115f8c0ef9d3f201640123722d0b96bc7b171841d920357a292152 SHA512 196cd891fdbaad47340d8b4ca9eb62a7f9e6b0969ae9ad744a3c9ea110a532691d53a1e39fde583bad0f8fdae4b51c3a4243bbdab65e952e5fc79ceb6efc3262
-EBUILD aml-0.2.0.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
+EBUILD aml-0.2.0.ebuild 547 BLAKE2B 69e6def9bcd3f4cd7c1974f37e1d82a5cd27d0dda1844d101f9561eac3c97b6ca02f41a78d7e48002749b83c6595ec62e3e921ceca4b33d0575be26b3b701e27 SHA512 62b1069313afe519ae724d78e6fef94a7427a31e5faa2d5924c972d5b9b684b689c5b1beab181c88ab26daeb351c3c2f7af838e69707917d54323cece303f70f
 EBUILD aml-9999.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
 MISC metadata.xml 462 BLAKE2B 1c1838f2f464d371ccb3a48603a27369cb26f7ba44f35d68e2b892ccbe5e738701192c71b150e013dd9bb3ceb2b80123a4c385e79d8e3deb82957bee13b3e3ec SHA512 e761cac28b27f3616965dc90439f7f43f3bf887f84fcb9c810f579f6ee3cb672b0382da667db5887f4503730c85b03925fb2ad4b41f432db23b67e0ff1cfbc19
diff --git a/dev-libs/aml/aml-0.2.0.ebuild b/dev-libs/aml/aml-0.2.0.ebuild
index db62c0b53724..0a91a702137c 100644
--- a/dev-libs/aml/aml-0.2.0.ebuild
+++ b/dev-libs/aml/aml-0.2.0.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 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/aml.git"
 else
 	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 147aa8cc03bb..5c0206ebfd1d 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,5 +1,5 @@
 AUX bglibs-2.04-stack-buffers.patch 1676 BLAKE2B 356ef239c23178b5f07d80776279c0e91a35af07623c977d051217317496e796a337dd81df5bffa828296e78a007bdb043d73d195a3bfb74116b7751b1c2f42d SHA512 0000b26a5c781b3e68253b6aa8642f1b8d0fe99d4c6cef4a776a33b83272c1ea218ae91845ccd7ba291be6a17b719513317dba32fbeedcba42f469ea65b85b85
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
 EBUILD bglibs-2.04-r1.ebuild 1686 BLAKE2B e54a329c71f42760d20e7b1b0327b99030ef144472eeca6a167154bf8e9ac1e53f5601ef1499b5a91d85ecf68265a6462202ad1b5aae7ff6e28672caac0387e1 SHA512 466298718dfff3cb09a1bd18100ebe97eb4db210988e798c126dac0c2f3107fcdc8ba1c47c80957bd2f4d3dbdcb35f124a371d43e1385d457bd8785200162916
-EBUILD bglibs-2.04-r2.ebuild 1802 BLAKE2B 97ca0f1bc6f622fe26f9f15ac46af422ee5130466d0db6a867a5a58dd4f101ab2464f86591a5c3ad40769007dedea63a96a099e5afeb49bac6e660f3f2413859 SHA512 ee4d7a9b135e22acea601a28b8722673e4c82020fc1bf3a40d9a5480591545642bc7929f9f836d56762a0672076060b0c7de540721d090f568b378fafdb6b6d7
+EBUILD bglibs-2.04-r2.ebuild 1809 BLAKE2B 1f9eeed207ca0e03c7f8090e46f1bcdf1be2eb40a353d53f4de9f76491875b207b1bd32b4e738c4d41e61db099483a8fa079b69d68688a90ed3c9f3da08a2df3 SHA512 7d4d970e9ffd3baf1875aea016b43f0fa3cc7a164a7b2c2f794fe349df59243d74b9df89d96eba67e89a8b4d8a0b332915e54edbe95f61c51af51b0862387fe5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-2.04-r2.ebuild b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
index 2ec52132c373..d4451b3dde2d 100644
--- a/dev-libs/bglibs/bglibs-2.04-r2.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-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="https://untroubled.org/bglibs/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 36fea0ca131e..144db510c5a3 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 EBUILD capstone-4.0.2-r2.ebuild 1527 BLAKE2B 1afcf5963366645ae26665381d21655b2445b3a8cb11d864453571332acd48a421d9f9d6a936833fc1c3f80da10d39e70661971bc65d4abf5e8eeca98b2a3345 SHA512 bb6f532018d891fb4155fe869b8ce41b61deb1d84b133507bc42c98217273e6e75aba355708e6693372292de662655951fdd908bcae87c8c891ec1b750261211
-MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
+MISC metadata.xml 247 BLAKE2B b525987287ff88d452c8613b12ffba15f27ff0589d1a819f9e0db6e428d9627e4be2e6d40e0104627228cb66b5af5a98471966effb069dc7f9e99015143c335f SHA512 16387584191a882c7d76c971aabcc8796c0bcba7bd213f5d4952c34c5939c8b426f6a8cd32c1b3b2ac386c2fac13a855af14e385e1235fe138791c54ceef500b
diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
index 506ec45bd2c7..a75ba5dd10cf 100644
--- a/dev-libs/capstone/metadata.xml
+++ b/dev-libs/capstone/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">aquynh/capstone</remote-id>
 	</upstream>
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index c0ee3a70243e..ece5d1d7295b 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,6 +1,6 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
 DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
-EBUILD cdk-5.0.20160131.ebuild 1188 BLAKE2B 8d21e272edf3f5f2aaeabbad9cfca3c109f29f97cc3a5e32c1a944d0313aeaa058ccd1f9920112c2771619574f15382e368ed967dbc719e328fba05c86e9dd95 SHA512 e368a257d963bf96b67796306abff10d9d2c3a0812b04e35f6f0be2d8302890c450d4c38114bf2431fbdd0d92d3f6c9c9689aa145159bd075c789ae94c9ef488
-EBUILD cdk-5.0.20210324-r1.ebuild 1371 BLAKE2B e11d215408de731a943950f9ae1c9c40e41f4c72db57efb7b13a82877cf96f1ee0165241d6eb90c78cd100e6215dec4063ce6b58851bd5851e44753213f0d4c7 SHA512 b272b94c8843b79243d6ec30d7ea6e49af6c0e070bc0cfd5a58e5e2e38a1a9bf3c4a169253eaa8fbee1753b70a7e36337cc264e2d706b36c7a735fafde6c4f65
+EBUILD cdk-5.0.20160131-r1.ebuild 1184 BLAKE2B e291fd42419df39f3dedf3482235634d0841d0fcea6188c2f248bb6ed346482c2c47b6e2e2995cc66d2705811bfd805a82accaadcbde06c190f51e302c03ede7 SHA512 5ff631f36aa0a2c53d189556236e084b8b76fc8d7ab423d8874319f511b4fe05a96b41f4840824764979fcc33bf798f71f18b9fdb4715604a40d8be1f044fc69
+EBUILD cdk-5.0.20210324-r2.ebuild 1364 BLAKE2B 8e6e6d527b0e25ee45394ce0a8565422661f02114b518c37487f98e03b3c1cc66f99c3d98a0f57cb5b172543db021d57703838f8e7f8844b014f906f1b0000eb SHA512 4ca91d3f9f62a7eb6482405fe528c23b43dbced89d7c75ac254b362bf06fd7bcc359d394abad85fce0a9d6a7ee8d79792ee690e1a5a80cf1dbec20f83af417dd
 MISC metadata.xml 257 BLAKE2B 79047e3de318b37a708a9b29a4f029450dec552f2fa99fc580cea6050eb164eabb0abba972a6fc77bfe21c1c2f4ae437b4753239953c9af1875159c6a39d1519 SHA512 2406cd8512460b934f3b6caa65f52b454fb3946491481e04ba3e11c45206dd9dc38df1d8881c459e9e518e19dfac798388dbb11339e274e75f88b3e3d5f9d057
diff --git a/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
new file mode 100644
index 000000000000..7f12ab36a255
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples static-libs unicode"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
+
+src_configure() {
+	econf \
+		--with-libtool \
+		--with-shared \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${ED}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
+
+	if use examples ; then
+		for x in include c++ demos examples cli cli/utils cli/samples; do
+			docinto $x
+			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
+		done
+	fi
+
+	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
+}
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
deleted file mode 100644
index de65e39fe0d5..000000000000
--- a/dev-libs/cdk/cdk-5.0.20160131.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
-
-inherit versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
-
-src_configure() {
-	econf \
-		--with-libtool \
-		--with-shared \
-		--with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
-	# parallel make installs duplicate libs
-	emake -j1 \
-		DESTDIR="${ED}" \
-		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
-
-	if use examples ; then
-		for x in include c++ demos examples cli cli/utils cli/samples; do
-			docinto $x
-			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
-		done
-	fi
-
-	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
-}
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild
deleted file mode 100644
index 6aee2fbce644..000000000000
--- a/dev-libs/cdk/cdk-5.0.20210324-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
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
-
-src_configure() {
-	if [[ ${CHOST} == *-*-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	# --with-libtool dropped for now because of broken Makefile
-	# bug #790773
-	econf \
-		--disable-rpath-hack \
-		--with-shared \
-		--with-pkg-config \
-		--with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
-	# parallel make installs duplicate libs
-	emake -j1 \
-		DESTDIR="${D}" \
-		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	if use examples ; then
-		local x
-		for x in include c++ demos examples cli cli/utils cli/samples ; do
-			docinto ${x}
-			find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
-		done
-	fi
-
-	find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
-}
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
new file mode 100644
index 000000000000..fc2b2af9182f
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples unicode"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
+
+src_configure() {
+	if [[ ${CHOST} == *-*-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	# --with-libtool dropped for now because of broken Makefile
+	# bug #790773
+	econf \
+		--disable-rpath-hack \
+		--with-shared \
+		--with-pkg-config \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	if use examples ; then
+		local x
+		for x in include c++ demos examples cli cli/utils cli/samples ; do
+			docinto ${x}
+			find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
+		done
+	fi
+
+	find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 0e215a8dbe62..967920dc3184 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 764 BLAKE2B 56ebf126c5ef4afdea1cf16305fa663248ccbb43a6994ee43cd0e4025b9feccb348bb127f5a3be93e82db8d622a2f4d57012283c2cd269b080910966ef736373 SHA512 95a2808f91c2d6d639ed63f3c5a3a578d39dde0bec657ecb30a32498c292bff8ebfb90a93ea77bdb403cfff8a9b5f290f50438220bc59b73732a533c0c03e8e2
-EBUILD collada-dom-9999.ebuild 768 BLAKE2B 445d45af488bcb04be8b5bf919826d6196eca8166c6833044962fa523a73efce07e5e9f13e1e8f171d6d8d05a3926138947b25e32053eb5db729abe788e789f1 SHA512 eea520b3c82603ef29d117a127b7055c27c48880045704f43e070e90a1bf0bf2270880926c5299489351773910bda245a7533b9c5981e977b42e24bb4cc1ac45
+EBUILD collada-dom-2.5.0.ebuild 769 BLAKE2B dca7e0ce0b524c1f5705f70cbf839ea2848e8ccae522750d51fcc98c435b42b28386d30259da4c4c8d349a29387b9173b0d995904da3d5585dbacc867c7dda6c SHA512 829c1f7a5915da1daeb48e98b20245f1f5a59f9164038f40c2de04facab8b2fa99d34b2c88200b2486cd91793ecf9d00f75cc6b49bd83af6c3c5a07df03edb2e
+EBUILD collada-dom-9999.ebuild 815 BLAKE2B f3763344d2c9d316b441e9d3e17895e08234db223997c66a31ea7b09f1a87f6979fe1f30fd465367a8525b570eaebceb51618708773b12d59ee4ff720822628b SHA512 58fcbf44de6f3856bec8a9938012419735dd3c200f1800222290ea927fb977dfab40c0d16ec25c8356df6146a637ea29b31922c27fc8de41696f009e80263b86
 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 f6d4152a5a7a..dcecedd6ab00 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 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	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 e9f30a02de0f..2aa42f8ecd6c 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index cd901dba21b4..de595cfd31a4 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,3 +1,3 @@
 DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7
-EBUILD concurrencykit-0.7.1.ebuild 730 BLAKE2B 22ac382e83982281ee3c8c0104949fe0ab7addb98307e675b408cad11d01ff83bc6e01b98bc09fe7b855dcbeadc53b2e15559e5a51a8ce84787339d58a1be958 SHA512 a19040a3ff4c709f531e81c8edcbfc36ee5a7efcf6c0f4a995a6093d7fde36a5df2db0f4e86da99274e733721256b6ee9289ba501bb1610deb63181b2ce57461
+EBUILD concurrencykit-0.7.1.ebuild 697 BLAKE2B 7fdca10f1783de1478600d79b21845c563fbccba1965e41524380a582d635b9088596ac5aae293c85fc7e9cf2a9f18016a1ef5cb7a6b19eaf262b5483f63e943 SHA512 46683f039a119d8c680b6766ca9449a90f30bae15821a0d8690242e923cff083dae9ab35c9997292e96478b5f548fca97f149c5969847c1fcf3fe19211fcd57e
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
index f1b6903eb0a4..110318f4711d 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
@@ -18,12 +18,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # The 'libck.so' has a name collision.
-# See #616762 for more information.
+# See bug #616762 for more information.
 RDEPEND="!sys-cluster/charm"
 
 src_configure() {
 	tc-export AR CC LD
-	$(usex x86 'export PROFILE=x86' '')
 
 	local myeconfargs=(
 		"--disable-static"
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 50b3a7b22178..9e3902c5e8c1 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,3 @@
-DIST dqlite-1.7.0.tar.gz 157454 BLAKE2B 3eeaaf5bbadfc09803e70d38fcd3ab23c212dc2700ad8ecdde720932b0ad2e32016503eaa8a738139a178bb926a7818497629699ec68eec8c2111f377b40b4a3 SHA512 bf94568b1b52b0d94ddf78a3f975e277a5baa0f553c5c1d175b7e58db3d44478a1b3f8ef962259175b29d774b2eb6ed6765874dd0d461126b3268abbdd57949e
 DIST dqlite-1.8.0.tar.gz 158026 BLAKE2B 0e3bc8badf6b7e0447eebd86069785dca51c4dfda527ee7b838da971830ad65e443c130484b25c901aee5ac4e14c81df84756734aac3fd58a2fdbc67a664c1fb SHA512 4b32a8f8414aabfcc53d7f6ac0d121201076d7021a7d244b7cda316c3e3349e1b4da04cca31f2e3ca7605a9357895374fce0cce076b40eaebfc29a94d42fb38f
-EBUILD dqlite-1.7.0.ebuild 812 BLAKE2B bc674d8d9d5527bde955a7b37881b4ae06f5c7e70cd5ac41ace2f61a446639744042537919119ba1b9411743e265080472c051bf9f928815fcd4944e24fc018b SHA512 d10191b3fcb221d1302f2acbd7ed1632e4a5c077094a9b53a8c3e1315dd083e373e3e3ae3c4bc8da1eb0f6b08b7ac2510a37ae288a463203b0824a7879dfb9af
 EBUILD dqlite-1.8.0.ebuild 825 BLAKE2B 626c27cbab3ecc4404db2a11be24ef9580d22fdf591cee5cde46f96af5cb22b8e342c4fa61dffe9cbd93ce2950e528a7ad7749451a27f85ef100697278539e4d SHA512 7f8be2214215586c26ababbdfb88a9ef65ed5bb95b308223ab0accef58391ed7baeef49549380515ca6c36a9f6d2f99a300e020aae257962f72939c13250d7f1
 MISC metadata.xml 864 BLAKE2B d4b41f296b83ca318affe7df6ae3eba7b470d75bcdf343ea701890e43d62de317aefc1b4f47a939cd909ddc002201a6f77cb7662afdd8ad601f010ba0a8d16e9 SHA512 086eea8b0a1e5c58b26321bc4db1466437bda4e7129757efadc49b751a9ff2b9472b72ab83881c8e9aea171a052f9434723f27b4ccd3ae4ca15f21f165a1ca92
diff --git a/dev-libs/dqlite/dqlite-1.7.0.ebuild b/dev-libs/dqlite/dqlite-1.7.0.ebuild
deleted file mode 100644
index 68b083517b59..000000000000
--- a/dev-libs/dqlite/dqlite-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv
-	dev-libs/raft"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/raft[test] )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index cfde982c3c61..605909b2c391 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 1255 BLAKE2B 2f1cab8b6a2f77c85d80dee309aab8c74984638556a7eb88142dddff5c339014046bc981205c70b6401e5181ea3b8134356e2fd831a315822db894bf3898e03d SHA512 908ecb88433c7ddac197aafe986edac040a944a73bc46ac9c0c4fdc56c6f0a029ec15b1974754a9295acc91355ec22c5be520ddda8ab8a18cfdbf3a27a3efe9a
+EBUILD ell-0.41.ebuild 1254 BLAKE2B 12d13783c1202d3979cb998aa11f2a26266c5bffb7ba9d21e9ef2c9a2871edc2bd77ff9471436876ac2974e5570131b96b0d58bdb29b983bae904791388249cc SHA512 8249eb77f7fca4a6594a24cb436382019884c0eb04ebc447e8bfbc0339729e4390ce8bb7cdba57f10a6fffbea886c7eee8d9e4344443069cd983de1e5e50addb
 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 1275d91a1a22..80020563ed51 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/folks/Manifest b/dev-libs/folks/Manifest
index 394cb34aee91..69e101aa2cca 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,5 @@
 DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
+DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
 EBUILD folks-0.15.2.ebuild 2208 BLAKE2B 9bfcddb38405b7f34d2b9f6f032d44aeb1c8409b6fa34ec27dd95dc220bde2c3d8780f746b381c3321d588c6c3a8611f59165cfcc2a35a2ba57943d61983a803 SHA512 776f71fdeb56953d5160098482a649d08c1e15723d941263fd017bf1c46f807abcd3ce8d7e8b4651e646e1d919cdadb042b2888a1f904c3839492ddec8cbd1f5
+EBUILD folks-0.15.3.ebuild 2316 BLAKE2B 637616d6bab73a5703193937030e7587b47d7cdb73092da3bd01374c7aebb71e93e667c2c8c712dcd19251ad87dd639a943801a66f1aba951381f93dd14a49f2 SHA512 d59eba53c12a660b14332adebbca2a43d7bae978fe96d593848a14d4838cf51c4528c9b0202a847729f8ec4ca86c71594d124cbc2eb78ec380a7341edd73c749
 MISC metadata.xml 395 BLAKE2B 3d62bb67ea7cfa05371530d79d4953a1b8c33a1c17e6545dea2bc5736c5f751180f495d1966a403a77c84247a4b96a752d9505c6412138df382162520d235f2a SHA512 9097dde175eab9cc701a05ab5435ce6aedaeef984ec05392f60806ac12d16563f837b916cab1018a9440d427e17722381e27763060073d329704291910873cc1
diff --git a/dev-libs/folks/folks-0.15.3.ebuild b/dev-libs/folks/folks-0.15.3.ebuild
new file mode 100644
index 000000000000..dce27502ec32
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? (
+		>=net-libs/telepathy-glib-0.19.9
+		dev-libs/dbus-glib
+	)
+	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+	test? (
+		sys-apps/dbus
+		bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+	)
+"
+
+python_check_deps() {
+	if use test && use bluetooth; then
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 5f0133b850fe..2562b089c783 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
-EBUILD gobject-introspection-1.68.0.ebuild 1985 BLAKE2B 47669d04241b47e67472aacb1a11d3b0224bdb0f35b718f3b7a644b2393f4646986f3c67c5d181a9d0be1dd77bd8cd235a28209f85727466deda9a9921868b2d SHA512 132e50447d4443f867030a953a33bd56daceceec282ba3068b62d7fbb0fc9bb8436d0d56ef6a58c3ad5b94adfaf9c3a32429c9211d259ad67d175bb2918caf8b
+EBUILD gobject-introspection-1.68.0.ebuild 1961 BLAKE2B 55f144f8d0590b66cbf656efccf5c97bab4f4c2bf1da0df6bb900705a1ba4d50e7f710ad761b4ab09d9efbe17238ff92f476f86926eb21cac9b1c2cceed5b6fa SHA512 5e2dc9919beefdccaa9914ab144d64e7b5bea1f0355eddf4c24300853828b026ebaa9c580ee22dcb7947f3dcb394059944db5570692529815180db5e972b1c6c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index ebd5522e0fd9..fec54fa1772f 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
 	dev-libs/libffi:=
 	doctool? (
 		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 	)
 	virtual/pkgconfig
@@ -42,8 +42,8 @@ DEPEND="${RDEPEND}
 	test? (
 		x11-libs/cairo[glib]
 		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index e76ad4d54c91..f6b080d16655 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-EBUILD gumbo-0.10.1.ebuild 979 BLAKE2B b9bc5db4466ed5304c153c959d648178503c911133dd361f9ceb0e546950aea09eecafec69fdfef9670a848f7baed8ba72457e8416317e1410580ffe837b884a SHA512 d4abdf75b0d5a983525a96e47fd139ce9b41597fee9e7792d50249f8b382e4702e916281ee8c8540eb609893425390b2796861d2247378ebf3a845656798f666
+EBUILD gumbo-0.10.1.ebuild 986 BLAKE2B 9ede93e1d7d87dc5ad7b9f4fd39e2536ead35591d79530ed8bd5bd438347a6346ed090ef32419c25d282b1bba37a701478e7de42010fc34c9a1592a172642c09 SHA512 0744e9084faa6909ccb45b32e170d02da1c060d3a4de1be653736cf9cfc7732f77b65ee0f4b2fedc23b0db9027cef453e689895ae28adcb86bfe8415ba903455
 MISC metadata.xml 316 BLAKE2B f653d0ab857f07f4dc00630d5c795c86920514c04e51d0e86eb761d3f8298b8a4aa6ece91fe387fb1ec1e94b46cd8429405dbfd9303d1c591d155a0521e1547c SHA512 64d8505048d0a0eaae29a8078d340ae290f9bcd2971028e069fdca2f3dc503cec644109a9d695f7e63ce4cfdb6a1e6375e49292580aad1b4e61a46612cfc7c25
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 697dac747048..95eaeca08e51 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index c236ccdf0feb..f3b07e9f21e8 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,4 @@
-DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
-EBUILD imath-3.0.1.ebuild 2020 BLAKE2B d5262619ae26b056fd9a928d2d4b93c42903f08f05071a4ab80d01976bca76608804c449efea366b58bee1b202fe0eef18ca898748ed3f2209bab88f9d7c539b SHA512 273ad60e56c3818056361c537d100a7a534ca1a20b5f515df4c00cd2eac2200675be76d71da66dbcbc960d80cd0315829b482255bc29f5e40b3facfc0701da84
+AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4
+DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
+EBUILD imath-3.0.5-r1.ebuild 2289 BLAKE2B 4262a992f53e670824e0976453694ed8e7d5b478455f1e3ab9d8f77ac74f092af448304b0ed30d826c37a8c6dcb4d6be38627307b5e05ebca7ac3fd838f90e91 SHA512 01a5b0ef91106c795c6a9c94654b3a82747671fac4458c48d29122d60182526cdf0f113958ca72eaa6de1f4f784e7a7e17539e5920bb686981c67688c77fdd58
 MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 000000000000..74d0f2dff7d7
--- /dev/null
+++ b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,161 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 20 Jul 2021 19:18:20 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/CMakeLists.txt                  | 6 +++---
+ config/Imath.pc.in                     | 4 ++--
+ config/LibraryDefine.cmake             | 8 ++++----
+ src/python/PyImath.pc.in               | 4 ++--
+ src/python/PyImathNumpy/CMakeLists.txt | 2 +-
+ src/python/config/CMakeLists.txt       | 4 ++--
+ src/python/config/ModuleDefine.cmake   | 6 +++---
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index d51c25b..63cc98d 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
+ 
+ configure_package_config_file(ImathConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Targets.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/config/Imath.pc.in b/config/Imath.pc.in
+index df11cfd..6eb4f40 100644
+--- a/config/Imath.pc.in
++++ b/config/Imath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ Name: Imath
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lImath${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
+index e9ff904..00e5176 100644
+--- a/config/LibraryDefine.cmake
++++ b/config/LibraryDefine.cmake
+@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     PUBLIC_HEADER
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
+@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+       install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
+     else()
+-      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
++      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+     endif()
+     set(verlibname)
+     set(baselibname)
+diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
+index 8e8de6f..1902660 100644
+--- a/src/python/PyImath.pc.in
++++ b/src/python/PyImath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ 
+@@ -13,4 +13,4 @@ Name: PyImath
+ Description: Python bindings for the Imath libraries
+ Version: @IMATH_VERSION@
+ Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
+index 7b4f6b2..8f7fd70 100644
+--- a/src/python/PyImathNumpy/CMakeLists.txt
++++ b/src/python/PyImathNumpy/CMakeLists.txt
+@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
+-  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+ endif()
+diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
+index 4f796df..15d7026 100644
+--- a/src/python/config/CMakeLists.txt
++++ b/src/python/config/CMakeLists.txt
+@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+   COMPATIBILITY SameMajorVersion
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Config.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
+index d9a8907..ebe1a95 100644
+--- a/src/python/config/ModuleDefine.cmake
++++ b/src/python/config/ModuleDefine.cmake
+@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+   )
+ endfunction()
+ 
+@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
+         LIBRARY_OUTPUT_NAME "${modname}"
+         DEBUG_POSTFIX ""
+       )
+-      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+     endif()
+   endif()
+ endfunction()
+-- 
+2.32.0
+
diff --git a/dev-libs/imath/imath-3.0.1.ebuild b/dev-libs/imath/imath-3.0.1.ebuild
deleted file mode 100644
index 72f012bffe05..000000000000
--- a/dev-libs/imath/imath-3.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cmake python-single-r1
-
-MY_PN=Imath
-
-DESCRIPTION="Imath basic math package"
-HOMEPAGE="https://imath.readthedocs.io"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords):
-# ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0/27"
-IUSE="doc large-stack python static-libs test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# libImath.so conflicts with ilmbase
-RDEPEND="
-	!media-libs/ilmbase
-	sys-libs/zlib
-	python? (
-		!dev-python/pyilmbase
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_MULTI_USEDEP}]') )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_USE_CLANG_TIDY=OFF
-	)
-
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON=ON
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DPython3_INCLUDE_DIR=$(python_get_includedir)
-			-DPython3_LIBRARY=$(python_get_library_path)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		pushd "${S}"/docs 2>/dev/null || die
-		doxygen || die
-		emake html
-		popd 2>/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		HTML_DOCS=( "${S}/docs/_build/html/." )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/imath/imath-3.0.5-r1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..dadfa6007aa2
--- /dev/null
+++ b/dev-libs/imath/imath-3.0.5-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="${PN^}"
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+# re-keywording needed for (according to ilmbase keywords):
+# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="3/28"
+IUSE="doc large-stack python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# blocker due to file collision #803347
+RDEPEND="
+	!dev-libs/imath:0
+	sys-libs/zlib
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
+	python? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local majorver=$(ver_cut 1)
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
+		-DIMATH_USE_CLANG_TIDY=OFF
+	)
+	if use python; then
+		mycmakeargs+=(
+			# temp. disable for finding libboost_python310, #803032
+			#-DBoost_NO_BOOST_CMAKE=OFF
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR=$(python_get_includedir)
+			-DPython3_LIBRARY=$(python_get_library_path)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		pushd "${S}"/docs 2>/dev/null || die
+		doxygen || die
+		emake html
+		popd 2>/dev/null || die
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
+	cmake_src_install
+
+#	if use python; then
+#		rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die
+#	fi
+}
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 2889dce55817..5480c0d9e81e 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,3 +1,3 @@
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.2-r300.ebuild 1076 BLAKE2B d62530a41be87998e0e32901852bb08797ff6457774cd49e9fcf6e582a4ca89456ff2d7b35a5cfe09d393a90dceb9039ab454050ab0addf1acfb9f9c03ac06fd SHA512 1142db1016034ebafdaa85765df21e35380bdf127d0a2311494f0cea73d1972a4314696890e9262b1a88877375d7d04e39311268d215681da8ef0839072bc6ab
+EBUILD keybinder-0.3.2-r300.ebuild 1083 BLAKE2B 5772ddc971d3977f9fcd369315c1e7224ad1a0462f357bd4c252fd057395377b25104ca939326735e38fba028068b7a87eafb72a31300a4ce6d43531d9cfc3ef SHA512 092a90118acf2310ee6ee1b70f839139fb70eeb9e5f5cf5bac27d507c35c354bdced44d1564d30cbaf525120c72e507bf7d1457d6502ae410fa429cba6c9d413
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index 832566c0f6c0..5e606445e31c 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 2df55cbacd84..d3ce1dcd2173 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,4 +1,4 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 DIST kopeninghours-21.04.3.tar.xz 63212 BLAKE2B 8f16566559b529ca44aaa0cb6b8267cc4d253c82e336d210cd240191ea5b60e029d6acd914053707c010bf94628cfb43e9fa0cc5625f275808426f75ecaf8e6a SHA512 d368cdbfe9dfcd82a847b932ddd244bdabfabdf1d44dbf6fb371f3af294f538d77d9f955fdbf1d9a34a2f18e84e649ac32e4b6e296cd7a8cc84d0238ca89bd6d
-EBUILD kopeninghours-21.04.3.ebuild 1270 BLAKE2B dfb8a0fa97a7b193fec15c3576fff63bd2dc253c31dfa44a10852b1aba57e95e3df170a518df482b46c929eb5f25644756f61643de4005a04a65e1badf0222e6 SHA512 b8c2fd7aa936f4d14eb73208d7cb5362786cf7087c3b333adb990a723638513c3a12254395045612a873b30adb01c5d4d1dcb979fd7034448541700f44aeb861
+EBUILD kopeninghours-21.04.3.ebuild 1264 BLAKE2B ef8b08e6a92d355253e141eb183b51201ced6d5f10e5de8211f3670839b1cd028473bc32f3c1111afe7dc218644fddd874ff817aaf5a9439781c839e6b253030 SHA512 3d17d9b782ac4ba28310b991e5ced032acaf12df68e6cba68392089f40d8f0a09d02e189a5789fce48856f4bcc25b707e4bdf97fadfc5e3eaf9ffad332557132
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
index 711c6c4bcfd3..63347f08801b 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	sys-libs/zlib
 	python? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index bcf549ef1ed6..5db1d36e6fb3 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
-EBUILD libarcus-4.9.1.ebuild 1371 BLAKE2B 12a630a06120be5e05d505e33b3978399f484c7608885c06d41add4f9e121e8465749403fe30c2694643f01534f119b0963c6379a707df91af263fb56acaf75c SHA512 d73af44d77a3bbe1ab08ce1f50ceadd55cbeebd3fa44690112150fa8bb33339aa2b6a226d211d326ccef43f9442c9fe493b66bb450156c26e0068016431f903b
+EBUILD libarcus-4.9.1.ebuild 1357 BLAKE2B 9c7cf901543a6e13c8e1cf6861a028c81cc98048dd725b5981c1dc0a1c023d5482fde9d4188d971057454e175b60b8619158bcf387900e6eba7e0a7f113e1a79 SHA512 b165f573c87c6daa209b225686d0a12081a0f69b2feac846ea3d00017529f8164f00855b7476ad031ad425954f6636f4e542966046e02ed35c503d604e67a977
 MISC metadata.xml 1285 BLAKE2B 49a2e165b06fde2a648dcd05d2d4da13bf0205fa5ceeee17f7e71672913747b44e82bedaf4e8bb8f12d58c2678ed20366325ac6b396d4c833a69fd94b5b946d0 SHA512 762d61333089b3bf0800ed9578c7d231e0a996cd0c8577c794cc8e745fa46caf9f3e2ab21465a84273c0185c598ec55875e11345d982382020d002f277382117
diff --git a/dev-libs/libarcus/libarcus-4.9.1.ebuild b/dev-libs/libarcus/libarcus-4.9.1.ebuild
index 79e8a85d03be..8a82c33b9bb0 100644
--- a/dev-libs/libarcus/libarcus-4.9.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake python-single-r1
 
@@ -22,8 +22,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 04759dc181da..b56ef52f9753 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
-EBUILD libcharon-4.9.1.ebuild 1780 BLAKE2B 548f44d9e88c4dffb7e8fb33b07f1f14919cb8782606de09a981b9b02943599d18913aeb4ff522c686a6d7ccd2d137d7f93dc1c2e15b5c86f46db554788fd7e8 SHA512 f90f3be2952f83df4b6f36b97aaeee492f1b4c74e72384fc89320f69a7c3c45358e2435fbe6579f5cbf952f83292b538b0e01cb936c8c468e7d858c1552a4bfe
-MISC metadata.xml 1209 BLAKE2B 358ab202ad4dcc96b472845c6f853cce633599231488d21b7cf86b90ff31e07378877679c7942d17c9c019743a326faa01951b50a9dffcf2d46e461920d5f615 SHA512 d3f74eb75b386d226e802179ebd66cc528ece495b2da4ef9c5bc75e98f988891b737eada2b86cb51863e5ccff7aad87af9dda4212f53b75d6f388db82578726f
+EBUILD libcharon-4.9.1-r1.ebuild 1746 BLAKE2B 46a4e224043798f5f327d6b0d6b3033145a210cc5f3b80e4387d7e39cee3e8a9bcf8ff707c0fe76c6b1b20a00318eb4153002d7a89417572a8a117f4d5163447 SHA512 fe4d49ecb8b11c9e814755711628eaa3d52d5be73c24bf0c88b909d4c11d868831b360309c7072a4a6b4e746fd8526338a0287da640fa277cc6d2fc5e8fc7ab1
+MISC metadata.xml 1139 BLAKE2B e7c439e1dcf4a3b38db358da52f8efd013bcd71034607ce83e71eef05a43545cb39292ec49fc63b9eab5e00801d4c6f20894a8a2e497a5949a718677489a5366 SHA512 ca081c25e18b793fd91101fe5dd94420a7f9483ad76135b944b9d05c425bc2855c17fa58626c951cf27936f4d941c23110424255b71a980c974af62c41943ddc
diff --git a/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..8bb7404534a2
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit cmake python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+client +dbus test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="
+	${PYTHON_DEPS}
+	dbus? (
+		acct-group/ultimaker
+		acct-user/ultimaker
+		sys-apps/dbus
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# use current python version, not the latest installed
+	# fix python install location
+	sed -i \
+		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
+		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
+		CMakeLists.txt || die
+
+	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CLIENT=$(usex client ON OFF)
+		-DINSTALL_SERVICE=$(usex dbus ON OFF)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	if use dbus ; then
+		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
+		elog "    systemctl enable charon"
+	fi
+}
diff --git a/dev-libs/libcharon/libcharon-4.9.1.ebuild b/dev-libs/libcharon/libcharon-4.9.1.ebuild
deleted file mode 100644
index f7557d509131..000000000000
--- a/dev-libs/libcharon/libcharon-4.9.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="+client +dbus test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="
-	${PYTHON_DEPS}
-	dbus? (
-		acct-group/ultimaker
-		acct-user/ultimaker
-		sys-apps/dbus
-	)"
-
-DEPEND="${PYTHON_DEPS}
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# use current python version, not the latest installed
-	# fix python install location
-	sed -i \
-		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
-		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
-		CMakeLists.txt || die
-
-	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CLIENT=$(usex client ON OFF)
-		-DINSTALL_SERVICE=$(usex dbus ON OFF)
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_optimize "${D}/usr/$(get_libdir)"
-}
-
-pkg_postinst() {
-	if use dbus ; then
-		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
-		elog "    systemctl enable charon"
-	fi
-}
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index f522947e90f4..572a52741db4 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -21,9 +21,6 @@
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
-	<slots>
-		<subslots>soname major version number</subslots>
-	</slots>
 	<longdescription>
 		Library to read and write several 3D-printing related file formats including G-Code and Ultimaker File Package (UFP).
 	</longdescription>
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index db60f0ece15e..88b99e997ef3 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,4 +1,6 @@
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
 DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
+DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
 EBUILD libfido2-1.7.0.ebuild 981 BLAKE2B 492d7d3e41da8cf0102d55c9684f476e734101085ae8b3db2ebd440a0d0f7a4e892e45f2ee632f3dd9192a9df8edbd464f2f601a7f7b65129b7bfd0b8e78755a SHA512 b8156159a0a503a94eb5b80f24baeb7ec94f08d5beb8f60ec09e761f280371743447cb9883de4b36bf14900264d620acf843b2640330ed8d15e832dee3d48860
+EBUILD libfido2-1.8.0.ebuild 988 BLAKE2B 7fa3f17d035bb8a6c68c561b8c53b7d414a39e5649250fc7aa1afc3d724930537bfe8516625283b571b79fd08004f1a0c8f16b17f55ae03b060f1ff65c23442b SHA512 9b34b0926ca1210ac1d62e59894b3dfbd25fdf8bdd882a986bb2adf7cdb72ae04d5fc8a07f0d2081d908b095b1f0a9633c1b01a0091a369fd6b7314a21417fcc
 MISC metadata.xml 330 BLAKE2B fe16e7735c17510c8a41691a7dd619d9d62c96f58508979936877acf1c261f402e5219decc02dafb97e7b171047b62981c616abdaafe24a3acad1a6893da3725 SHA512 4eb35ebcdd1831a7fbd6e00336dfbcf6e8697ff95e68b68686032b1251fec090c22d3096666ed48833c5b9a8e9afe10bfbddf592834095a3ee9e95f1ec594c52
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
new file mode 100644
index 000000000000..21c57df89552
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nfc +static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:0=
+	virtual/libudev:=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
+
+PATCHES=(
+	"${FILESDIR}/libfido2-1.7.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNFC_LINUX="$(usex nfc)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm -f "${ED}/$(get_libdir)"/*.a || die
+	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
index cf13b9cfd8cc..6a662e920023 100644
--- a/dev-libs/libnest2d/Manifest
+++ b/dev-libs/libnest2d/Manifest
@@ -1,6 +1,7 @@
 AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508
 AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c07059f4b2b9d58715a799395943560ebd7a738f585f43907bd21115e3f297fe6df7f0b3b1801c5b04d7e2e16eb09aff642a26edb5b35339dc2440eb9 SHA512 1d367a09a9f0ac51347c3a3dc440eb772b877abf00acd92a9ce166ecc4a9b537dbdbbab254c3b742c20b48fc5bee58b79811504921ec15a19700d8bcacee0d4b
 AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855
+AUX libnest2d-0.4-gnu-install-dirs.patch 812 BLAKE2B 98072c6fd6547ed138a23a8aa0d48df17d588b773d7ef16ac382da18fa1328c975c843d897829db4a1d043b4845a453ab86cd5d2d9686444422e651c996bee35 SHA512 4f0785271dd62d241ff38954daa77603121ae0f434fdd1644823caecdcc794202f11608527ed27f4d63815dc5ff435aefb98cbbbba79cdce6ed0ce2f2805fbb8
 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
-EBUILD libnest2d-0.4-r1.ebuild 990 BLAKE2B e90a03cff6a4404503bf34f0e75427de49df2791079bc31f3861f1a5e08121495d92cf28873b053aa35cbf23895c20c222d79a9104a64ef88e561c1382d20564 SHA512 0e7c2be102f24169570fbabbb0ae28fc9caba371f60a85e65244dc8dc36f0355402e28848e413a2807cff3c6d27f2bb6fbb31b893c2fa73856be96cf8a2c803e
+EBUILD libnest2d-0.4-r2.ebuild 1072 BLAKE2B e11178120bf9d91b67fa81079be0b0f697e9a834a3c8488d926003ec741ce58413279b6633b6518571e8c6239f0d36ebfabaabc323014ca21827a5eab0938fe8 SHA512 3348f9019b95f7537ec4aa38e8620ff0baff53c6603159ba63c21f3741eda445800738ecee855500245672b1e14ea503a9ece140bd7589e40c2f85f70996c362
 MISC metadata.xml 1406 BLAKE2B 013e0c6f04e1ebe734d744f1d31924404c43523e73697f9897a9e3b2eed6cf7e8e82722e98eadb7e7416b9a58823c3879ae51190ff211dbad13a295eb209b170 SHA512 36b1316bead34cdf259a8de5834f9d95b6b1fd4a7b65fc979da51a0f725762c5ebe1b9300a7c7826a6dd2ce30affb4b42f10f59e7d590b31fcfa49c6e375ffe9
diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch
new file mode 100644
index 000000000000..34484426f302
--- /dev/null
+++ b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,6 +114,7 @@
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ 
+ write_basic_package_version_file(
+     "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}ConfigVersion.cmake"     
+@@ -123,10 +124,10 @@
+ 
+ install(TARGETS libnest2d libnest2d_headeronly ${LIBNAME} 
+   EXPORT ${PROJECT_NAME}Targets
+-  RUNTIME DESTINATION bin 
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
+-  INCLUDES DESTINATION include)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ export(EXPORT ${PROJECT_NAME}Targets 
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}Targets.cmake" 
diff --git a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
deleted file mode 100644
index 721bfa9f47c3..000000000000
--- a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Library and framework for the 2D bin packaging problem"
-HOMEPAGE="https://github.com/tamasmeszaros/libnest2d"
-SRC_URI="https://github.com/tamasmeszaros/libnest2d/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/clipper
-	sci-libs/nlopt
-	"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/catch-2.9.1 )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-disallowed-areas.patch
-	"${FILESDIR}"/${P}-add-soversion-to-shared-library.patch
-	"${FILESDIR}"/${P}-fix-cpp-version.patch
-	)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLIBNEST2D_BUILD_EXAMPLES=$(usex examples)
-		-DLIBNEST2D_HEADER_ONLY=$(usex static-libs OFF ON)
-		-DLIBNEST2D_BUILD_UNITTESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
new file mode 100644
index 000000000000..88a93621c9d5
--- /dev/null
+++ b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library and framework for the 2D bin packaging problem"
+HOMEPAGE="https://github.com/tamasmeszaros/libnest2d"
+SRC_URI="https://github.com/tamasmeszaros/libnest2d/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/clipper
+	sci-libs/nlopt
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/catch-2.9.1 )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-add-disallowed-areas.patch
+	"${FILESDIR}"/${P}-add-soversion-to-shared-library.patch
+	"${FILESDIR}"/${P}-fix-cpp-version.patch
+	"${FILESDIR}"/${P}-gnu-install-dirs.patch
+	)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLIBNEST2D_BUILD_EXAMPLES=$(usex examples)
+		-DLIBNEST2D_HEADER_ONLY=$(usex static-libs OFF ON)
+		-DLIBNEST2D_BUILD_UNITTESTS=$(usex test)
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 8c715558defd..d5a882f1051d 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,5 +1,5 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
 EBUILD libp11-0.4.10-r1.ebuild 722 BLAKE2B e14c3b3aeba1c543d44eaf0f20a86aafe71f98708611f19ff0976dcc7f6268f5483de65061cbb9ca95990c3cdd9897505d2a1b444dee0e9dd2894a2824cbab83 SHA512 4e0453e386b440591cf95e47b335a9817c014dfdd4a084eedcd86e2b57443fbd334cf521c8325a473bdb645c03693ac487944f6219bad6915f0f0c13d7d8b35f
-EBUILD libp11-0.4.11-r1.ebuild 729 BLAKE2B 64e4db925136c268df67aea58c593d42f6b1737f42068c6a0c004f6032388db6fb1378b4356bbd44784e0ddffda0157e43c09d1a02999c8fcff083ddb169a695 SHA512 e38c13b78d61009df4d0e2d706f06e3d7b2ca5820ead60f73a62ce53f176b9cc84d68c2fbc7ffb57ce0115d848da888b6a77928b85cfc3dfda1e29b25113eee9
+EBUILD libp11-0.4.11-r1.ebuild 736 BLAKE2B 75ecc0ba01da649bebddc4ffce44f1c6286dc76007587ffa088be89b7d0942897001f0c348da3f74afb9782c4cb43d751bbd54872cc26d436b6ebfd61a24c552 SHA512 a37627dc1a05cbe053b0d4928c4858505969e412b20d01698326d92ec9740f006bcc14de5ef5af90d0014559a3645c14930199b84d5df742a48e7addcfb1290c
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.11-r1.ebuild b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
index 17e3b7767447..084aa509f96d 100644
--- a/dev-libs/libp11/libp11-0.4.11-r1.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
 IUSE="bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 37aa22a13f8f..a515448831a3 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1967 BLAKE2B 7341b999788c5f064aeb6c9c5a230603196b4dfd4a4c8280cfd9dbb6fa2406bdec4fd2594c60b23a925ea48bab9a29b7c2a0bdc80ab838e5cc7ab2a0fbb6a8ba SHA512 09f8a95941f6dafa3dfb524a05188507ff8d3dbe743acbb6366ba39ff0fbe28f01a2fd06a6eca86a479d5f0f8d58724b88db4ef2a3d57f99bdc8dac8e4670d29
+EBUILD libpeas-1.30.0.ebuild 1961 BLAKE2B 10d5d84a8efbf5c79fd9ad1035bcd8166c12092832632d562204cfb3ea1710b37d7515f0d9862c982e73c40f950ac6a238c297f3574425817171077257da43c1 SHA512 f10067feafc3522603b273d85c2c6fb236ba5f0c771e5e32ceac2956b611eee3cb98e87518d97d3a1ddc13de90fdd17399a710628826958d172eb5747e7e3aba
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index ae87e0986133..3f2417f8d987 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
@@ -33,7 +33,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index e03a480f175e..1d1430bc731f 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,6 +1,6 @@
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
 DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
-EBUILD libratbag-0.15.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
-EBUILD libratbag-0.16.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
+EBUILD libratbag-0.15.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
+EBUILD libratbag-0.16.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
 MISC metadata.xml 623 BLAKE2B 9927622eaaa6c1dac2628439bf9b923ae0707fa6cb8d5ec7869bed62d8630d4ca10d9ed0f7a330e887fb4683467928c6280decbd6aa2f3fe25cacd24dec7425f SHA512 ffb3bae021b48df16e0a0123e0d74d6ba2152bdef2fc8e9512ec3218430b0b4090811fa25d9200a3868700b8ddb0cd2a59047765952a577b0315bb62c74944a7
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
index 91fa0ecda28d..b46974b3385e 100644
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -31,8 +31,8 @@ BDEPEND="
 		dev-libs/gobject-introspection
 		dev-util/valgrind
 		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-evdev[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -43,8 +43,8 @@ RDEPEND="
 	dev-libs/libevdev
 	virtual/libudev
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.16.ebuild
index 91fa0ecda28d..b46974b3385e 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -31,8 +31,8 @@ BDEPEND="
 		dev-libs/gobject-introspection
 		dev-util/valgrind
 		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-evdev[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -43,8 +43,8 @@ RDEPEND="
 	dev-libs/libevdev
 	virtual/libudev
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 98039ea24399..798178034ea9 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
-EBUILD libsavitar-4.9.1.ebuild 1756 BLAKE2B f0972d130215142144664b4837d9eb1918e49d723080e418f69e935684bf9f86ea47b3aa234e04b28313af1f80e27e51c97ac9a0b9ce24e95012ef9cd62fda4a SHA512 56aeb94f96fbf8fe9987663842c57a702a3b85cd6de9fd0b4749c64d6f6932dde408b0908acb795087a1e7002a3d60fede1f9a402487b8a7b48bf8b5b3fdd8e2
+EBUILD libsavitar-4.9.1.ebuild 1750 BLAKE2B 10d57551bd2703e242b1c8b3a3baac10de4975d9983f3d7f4acd83e29f89134d280385699a3bc95faf8ec289c2d7d068f8938af6f2ea863ae301482f98202086 SHA512 6df6f66f81c11a6d8c5b70a175dfb2070ed1d29aa64ecac11077fbbe37a86e8a706162f431b0473324d87e86d07306736c74aacd978345b28956d559330fbe76
 MISC metadata.xml 974 BLAKE2B ac8e144ae33fea171c6a64d8a04f1876a3a3145b952e285fdc3f0553b8c5cf9c03a36a3e3982b88fdcacf69d668b9df8d156292a687fbcb65171700517bcd772 SHA512 8ee0d54dc6f627e57ea7b980df32aab3fb49bf73888c0d69a91c9f8962df159d6145f19892d4b922e8fdd673dd489fa72f4f3128bb04d0089d4204a6f060d0b5
diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
index 999341bf1c3c..c2659976510a 100644
--- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
 	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
+		<dev-python/sip-5[${PYTHON_USEDEP}]
 	')"
 
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index ec9c0743e6bc..8f3e3b46b561 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,11 +1,8 @@
 AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
-DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
 DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
-DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
 DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
-EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
 EBUILD libutf8proc-2.6.1.ebuild 1421 BLAKE2B 2181d7b0fb6e532bf5699d855c4c6d7035c352c3110a8498dc64e0655e28b577c8d5c8e7b4a5cc6c501685b80ae6255b40d7c491e585032287a6d177785859ad SHA512 dff03a28363082c6b2b1441ef4bfa6bb1f86b97aabd68d40378e4ced3cfd6dab87684e4f42bf23218829b71321d286f8b4278cbd5bb2ca24ad8861ffead572dd
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
deleted file mode 100644
index 38e2c5e109a9..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
-HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
-SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-12.1.0.xz )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="cjk static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( =app-i18n/unicode-data-12.0* )"
-S="${WORKDIR}/${P#lib}"
-
-PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch )
-
-src_prepare() {
-	if use cjk; then
-		einfo "Modifying East Asian Ambiguous (A) as wide ..."
-		cp "${WORKDIR}"/${PN}-EastAsianWidth-12.1.0 ${PN#lib}_data.c || die
-	fi
-
-	default
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		install
-	use static-libs || find "${ED}" -name '*.a' -delete || die
-	# This package used to use netsurf's version as an upstream, which lives in
-	# its own little world. Unlike julia's version, it puts its header file
-	# in libutf8proc/utf8proc.h instead of utf8proc.h. The problem is that
-	# revdeps are *already* patched to ajust to this. As a transitionary
-	# measure until we unpatch revdeps, we add a symlink to utf8proc.h.
-	dodir /usr/include/libutf8proc
-	dosym ../utf8proc.h /usr/include/libutf8proc/utf8proc.h
-}
-
-src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
-
-	emake CC="$(tc-getCC)" check
-}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 8d09639ea026..b0403632b476 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -2,6 +2,5 @@ AUX openct-0.6.20-automake.patch 786 BLAKE2B f37d39bdbc0c1db10ec7058536d0d34ac30
 AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f177e202490c162594aec6559f13c65e562b887e6c8d056c1ce5ab247e80c51ca6610654e61b2c593e7b13e22e458b43a SHA512 34ab2345b44424d9868c95a9af862d03603647b824e1d84a1f35a8171249b2beba7fae9ae3a4d0468d9029cf6c748c02fb2032e30462640eb42ff08d3cdd3868
 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 1855 BLAKE2B ba2a8828594d5784ca5af3ea60b36a7eb634b4cedda257b471d46da4fa171b7bd3b0e49eef192481a97480d229a36141708425611cfd89a11b73d9906bf4d777 SHA512 b71aed457d41defdfac52b1a98832dcfe38b9fdb5bd92148aee8baa2193f97b8e0d57d309fc62b7bb598007877c6e6c3ab161a033e33d311b2e947eab3f86533
+EBUILD openct-0.6.20-r5.ebuild 1853 BLAKE2B 430ca0c8412c357c5287b1a0b330e0d4d49cd0d1630c8ea1435ca60f6ae69867c7953011ca079dea330da43e9d201439d8a27f57947e767effd75cfb27577c13 SHA512 753336d9c282ff6675a3af83068d4e94c56d5ba291cefdf57f4671d76514ba20c268e01f9c95bd142f75351022aa150953ce10e0583e5b905d21d457b11938bd
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
deleted file mode 100644
index f73005a37633..000000000000
--- a/dev-libs/openct/openct-0.6.20-r4.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 flag-o-matic udev user
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc debug pcsc-lite usb"
-
-RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
-	usb? ( virtual/libusb:0 )
-	dev-libs/libltdl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automake.patch
-	"${FILESDIR}"/${P}-slibtool.patch
-)
-
-pkg_setup() {
-	enewgroup openct
-	enewuser openctd
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_IFDH
-
-	econf \
-		--localstatedir=/var \
-		--with-udev="$(get_udevdir)" \
-		--enable-non-privileged \
-		--with-daemon-user=openctd \
-		--with-daemon-groups=usb \
-		--enable-shared \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable doc api-doc) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_with pcsc-lite bundle /usr/$(get_libdir)/readers/usb) \
-		$(use_enable usb)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/$(get_libdir)/openct-ifd.* || die
-
-	udev_newrules etc/openct.udev 70-openct.rules
-
-	newinitd "${FILESDIR}"/openct.initd openct
-}
-
-pkg_postinst() {
-	elog
-	elog "You need to edit /etc/openct.conf to enable serial readers."
-	elog
-	elog "You should add \"openct\" to your default runlevel. To do so"
-	elog "type \"rc-update add openct default\"."
-	elog
-	elog "You need to be a member of the (newly created) group openct to"
-	elog "access smart card readers connected to this system. Set users'"
-	elog "groups with usermod -G.  root always has access."
-	elog
-}
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index d72b32674b28..b240704e94ee 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/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 17db0c72f352..53e96cc410dc 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -9,6 +9,6 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab86433795
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
-EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4945 BLAKE2B 68b7267977a3fb5319c05af867706c2929df497b76732059d9d95dbf4af9110f6949574771a58220aa92e281d6d2581fdba639225eade564619e44d47a793897 SHA512 e3f5c1f2998b7e0c0dc4cd0c0e068e1c0ddae237a2a7852b497f9492ade24b6ebf8134bc433035accc3a7d9467cf615e20d0a2b79da9e33bf46c6f80d34b18c2
-EBUILD openssl-compat-1.0.2u-r1.ebuild 7756 BLAKE2B 807839a953f771a269573eee0dcdbf0f25434aeb98c958adf40a53ed0abf773b3b0563149353084026d273a48aad6d5cf925adfd9e72f2caccb2cc2f02e8013d SHA512 76d29fbefdcb46989cbd84e52769996c3faf14547b765ca1d2ec3a549652ed95ba695a93b8c6ec0c914eee00f8728ae04f5757fa4bac520bbb95591914cadabc
-MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
+EBUILD openssl-compat-0.9.8z_p8-r2.ebuild 4983 BLAKE2B d1d4e37b0b7f0226cc5c76894c28e14319882948621f9afb55979c3714894bf0bdbb4cabce3eb7b9070f353714c93fdbdfbd7fa4a368c9f50d49cc941c4d79df SHA512 85535f889a0fd5cd0d623beaa9b9b1df9efc6147e15e381985b5fd394614d5a52b350675f124425f2ae94b73f8303a0877bb26b2e09b998349b5fb5a942abb7b
+EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
+MISC metadata.xml 1051 BLAKE2B a60ae074a8c078361de540fa05f6fdb66755e3857a710b4bf921bf784b3779804d9a054677c8032c776fda2863641d02d728b78c9041195fa259ed09d31e25b8 SHA512 204bf9326b8c119be034be5f028c5d69b066ab04de04417ff12c81f01e52980341ba3a86f3dc9ccee63e97acc3f905f458967800f2a88fc035b1ee7c9d51feea
diff --git a/dev-libs/openssl-compat/metadata.xml b/dev-libs/openssl-compat/metadata.xml
index 8419c576d834..5dfd9a9f2f95 100644
--- a/dev-libs/openssl-compat/metadata.xml
+++ b/dev-libs/openssl-compat/metadata.xml
@@ -11,6 +11,7 @@
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
+ <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
deleted file mode 100644
index e683f59fccfc..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-#PLEVEL=$(printf "\\$(printf '%03o' $((${PV##*_p} + 96)))")
-PLEVEL='h' # _p8 -> tr '[1-9]' '[a-i]' -> 'h'
-MY_PV=${PV/_p*/${PLEVEL}}
-MY_P=openssl-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
-RESTRICT="!bindist? ( bindist )
-	test"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-0.9.8*:0
-	!dev-libs/openssl:0.9.8"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-# Do not install any docs
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/openssl-0.9.8e-bsd-sparc64.patch
-	"${FILESDIR}"/openssl-0.9.8h-ldflags.patch #181438
-	"${FILESDIR}"/openssl-0.9.8m-binutils.patch #289130
-	"${FILESDIR}"/openssl-0.9.8z_p8-perl-5.26.patch
-)
-
-src_prepare() {
-	default
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
-		Makefile{,.org} \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared || die
-	# update the enginedir path.
-	# punt broken config we don't care about as it fails sanity check.
-	sed -i \
-		-e '/^"debug-ben-debug-64"/d' \
-		-e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
-		Configure || die
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags -Wa,--noexecstack
-
-	sed -i '1s,^:$,#!/usr/bin/perl,' Configure || die #141906
-	sed -i '/^"debug-bodo/d' Configure || die # 0.9.8za shipped broken
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-
-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		enable-idea \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
-		--prefix=/usr \
-		--openssldir=/etc/ssl \
-		shared threads \
-		|| die "Configure failed"
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts
-	emake -j1 depend
-	emake -j1 build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.0.9.8
-}
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
new file mode 100644
index 000000000000..3b77fd0b9f48
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+#PLEVEL=$(printf "\\$(printf '%03o' $((${PV##*_p} + 96)))")
+PLEVEL='h' # _p8 -> tr '[1-9]' '[a-i]' -> 'h'
+MY_PV=${PV/_p*/${PLEVEL}}
+MY_P=openssl-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0.9.8"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression"
+RESTRICT="!bindist? ( bindist )
+	test"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-0.9.8*:0
+	!dev-libs/openssl:0.9.8"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+# Do not install any docs
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/openssl-0.9.8e-bsd-sparc64.patch
+	"${FILESDIR}"/openssl-0.9.8h-ldflags.patch #181438
+	"${FILESDIR}"/openssl-0.9.8m-binutils.patch #289130
+	"${FILESDIR}"/openssl-0.9.8z_p8-perl-5.26.patch
+)
+
+src_prepare() {
+	default
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile{,.org} \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared || die
+	# update the enginedir path.
+	# punt broken config we don't care about as it fails sanity check.
+	sed -i \
+		-e '/^"debug-ben-debug-64"/d' \
+		-e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
+		Configure || die
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags -Wa,--noexecstack
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure || die #141906
+	sed -i '/^"debug-bodo/d' Configure || die # 0.9.8za shipped broken
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+
+	tc-export CC AR RANLIB
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl tls-compression zlib) \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		shared threads \
+		|| die "Configure failed"
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts
+	emake -j1 depend
+	emake -j1 build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.0.9.8
+}
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
deleted file mode 100644
index 4ba9941176cb..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.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 flag-o-matic toolchain-funcs multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-
-MY_P=openssl-${PV/_/-}
-
-# This patch set is based on the following files from Fedora 25,
-# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)
-	https://dev.gentoo.org/~whissi/dist/openssl/openssl-compat-1.0.2u-versioned-symbols.patch.gz"
-
-LICENSE="openssl"
-SLOT="1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-
-RESTRICT="!bindist? ( bindist )
-	test"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-1.0.2*:0
-	!dev-libs/openssl:1.0.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-# Do not install any docs
-DOCS=()
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/openssl-compat-1.0.2u-versioned-symbols.patch "${WORKDIR}"/patch || die
-
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.${SLOT}
-}
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
new file mode 100644
index 000000000000..ee152f0d89e7
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=openssl-${PV/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)
+	https://dev.gentoo.org/~whissi/dist/openssl/openssl-compat-1.0.2u-versioned-symbols.patch.gz"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
+
+RESTRICT="!bindist? ( bindist )
+	test"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0
+	!dev-libs/openssl:1.0.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+# Do not install any docs
+DOCS=()
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/openssl-compat-1.0.2u-versioned-symbols.patch "${WORKDIR}"/patch || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl tls-compression zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 95fbdc138dc6..c3e0997dacce 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,7 +7,7 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d
-EBUILD openssl-1.0.2u.ebuild 9895 BLAKE2B e3120c9bacee4a6cf6e00f1fdc0e480df1e28ca38c9c901d14f679a4a6a5cab074f1bdefbd9e94a28399e2ce7f14fafcc7261146a3fd95bca92427fff46ab361 SHA512 ccb2f8c173cfac5adf5aef9d61a5894168f3092f626d6e6b09cc91e29592765975eef243cd1d42b4693abbd568bc836cc875242476ab6ec00df143cfd394a080
-EBUILD openssl-1.1.1k.ebuild 10292 BLAKE2B 65992f0284bae36b470dae1c979ed0cd6794d147e9c5981f43822e32be87ac4cb51db517141d20b77c5fba104a068893b838f91cefbb24e57af22d1377534c3c SHA512 cb43106f639e268230e406bba3eb0e742c8daf6bc6584faf72a7138ef82213ac92d4400360957a444d981b09edae091081a84425feb76156095d11449f4a4962
-EBUILD openssl-3.0.0_beta1.ebuild 8188 BLAKE2B 78941fb8fade63cc6201cc9e22d3ccd3f277080e97768f9fd7f4c7d0395d793e10072778ceb2488ad2cb6c4be0918f54c61ab60ac08435503cf9344f4a78f0e1 SHA512 61cf8a9e41cabd08526c9b1e7b7cc0e20e6ba839f2dfe85aef4773e950b41eb31642c8092ddb0c1a1bd3f4b6260d8c6f91552c064cb77fb4c2208dabef16c6c7
-MISC metadata.xml 1354 BLAKE2B d18c8fdbc725d1c3dc63d7431f739267e4932a42e5a6df706abc0e77e96fee79d4b18679e52ce6f8db3afe6c33bcbc88c43b866a3136856800510abe4b359050 SHA512 15846b4760a40d2e36759c09cc00329d1cebbbdf7f7ed779fe9e9d3e81e5a1641458566baac753ad99380024056c54611502f07c6b8335f51025131060857e70
+EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
+EBUILD openssl-1.1.1k-r1.ebuild 10330 BLAKE2B aa105dcbc590f454e98b83f8fd72dfd2e8a88eaf9eaabde4c4fd97aa746cabfda1bb66c3752e5288b41bb83caf9e3feb571d848e81dc7348bb08e16748370dfa SHA512 1395224f18af894ea0da4b2191d3ba006d23de4d5d9917590e6c426977dde260149b72278cec3ef1bd437ea2ee84b6c9003bd5fde5afc8b892e82869397ac563
+EBUILD openssl-3.0.0_beta1-r1.ebuild 8226 BLAKE2B c402e43b11b5bba8245c3ca473fd09a643c405d11e87f78c0cb9e410362f5329d8c61a42b41de429ac7a552f1c116f53a77611e38013cfd83d65e49a48df28bb SHA512 87c308d72b48dead282bd92a9ad981480a60ca12e93c528982607d94649571139c15eb480b5a80750fce8709ae2dbed08216274ac756452bd69ca683b532312c
+MISC metadata.xml 1438 BLAKE2B 2a55417670eacb436b450bd2075e6fca79413a6fa16947efed6dd824b465b81b1ab5869ba33e0ea734e644d5c51cd686b3f950b6787b4cdaad5b2e6feb42fab0 SHA512 8031ae2212e7d8217dd4a50be2564a1102f4ea067af07b722a22ca02f779f7973932fde66e69f957f0c1a9ac88b6f868b12c42f2172835e432b6eba9033cb633
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 44e5433a4857..350be7c07b0f 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -12,6 +12,7 @@
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
+ <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
diff --git a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
new file mode 100644
index 000000000000..a54fa8fc1b08
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test tls-compression +tls-heartbeat vanilla"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-compression zlib) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
deleted file mode 100644
index 65c297883822..000000000000
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ /dev/null
@@ -1,310 +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 multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 25,
-# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake INSTALL_PREFIX="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1k-r1.ebuild b/dev-libs/openssl/openssl-1.1.1k-r1.ebuild
new file mode 100644
index 000000000000..d212bef1be76
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1k-r1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-compression zlib) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
deleted file mode 100644
index 1e98af8f7039..000000000000
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ /dev/null
@@ -1,328 +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 multilib-minimal
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 31,
-# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-# force upgrade to prevent broken login, bug 696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if has test ${FEATURES} && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		local known_failing_test
-		for known_failing_test in \
-			30-test_evp_extra.t \
-			80-test_ssl_new.t \
-		; do
-			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
-			rm test/recipes/${known_failing_test} || die
-			eend $?
-		done
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
-		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-		rm test/recipes/80-test_ssl_new.t || die
-		eend $?
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist sm2) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..f07fa0d1b072
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5
+	dev-perl/Text-Template
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	local myeconfargs=(
+		${sslout}
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use_ssl tls-compression zlib)
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= echoit \
+		./${config} \
+		"${myeconfargs[@]}" \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile \
+		|| die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]] ; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m} || die
+
+		# locate any symlinks that point to this man page ...
+		# we assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1.ebuild
deleted file mode 100644
index 396083b136aa..000000000000
--- a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
-
-IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test vanilla zlib"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-
-BDEPEND="
-	>=dev-lang/perl-5
-	dev-perl/Text-Template
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if has test ${FEATURES} && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user
-
-	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	local myeconfargs=(
-		${sslout}
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use_ssl zlib)
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= echoit \
-		./${config} \
-		"${myeconfargs[@]}" \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile \
-		|| die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]] ; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m} || die
-
-		# locate any symlinks that point to this man page ...
-		# we assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 1d0858ea5344..67b2724a17f6 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,5 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
-DIST raft-0.10.1.tar.gz 318911 BLAKE2B 42ef22dfc89f05a3a9f130011c0f906201126a1615f9a60648587e014bbb63e038b3afd1593c2c07b046c3c35ef07deaa45cdce58062707409e4dbd3a9f7516e SHA512 6fa99d9dbb5895299c5124f5c8cfb544cf1bccae4ee196bc8011cd4cf9c632cd896f8cd93181409fbaf7da115235c72a4e10568080dd9957eceb978784dc0f9d
 DIST raft-0.11.1.tar.gz 324285 BLAKE2B 10e62a392bdbb98f262068ad2bcfbcd24488918fbb7d4c3b13101c3d771ff8b9d592bad31bfe69cfcb4d6e9c93e1d38da24d11a3167d37208906af4e354c9280 SHA512 5afbf0f7e325ed242c5a37a39038818395c1b39184e2440bf89db6662dee73b9abaa8fac0efc28dbc3478267aa66fd94e908e320a061fb5b343735e111dbea86
-EBUILD raft-0.10.1.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
 EBUILD raft-0.11.1.ebuild 994 BLAKE2B 7c284762875ea9e977a7f4ac566aafff54b97e0fca8689b9393a1978a26cdbf63dbedef15649b239e68070b5bf9a5ab8465e1deda62d4b420cc276c489b11c39 SHA512 f7fa73af072b80fd5dfef7eb7ded840a8780bcaa37b03f3cd8e88ae9c1557da7af117d70e2f60c2a7c921b087c20b8378540b093fc195757a26b625799b8e46b
 MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/raft-0.10.1.ebuild b/dev-libs/raft/raft-0.10.1.ebuild
deleted file mode 100644
index 7d5c828a261c..000000000000
--- a/dev-libs/raft/raft-0.10.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="C implementation of the Raft consensus protocol"
-HOMEPAGE="https://github.com/canonical/raft"
-SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test zfs"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libuv"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
-	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-uv
-
-		--disable-benchmark
-		--disable-debug
-		--disable-example
-		--disable-sanitize
-		--disable-static
-
-		$(use_enable test fixture)
-
-		$(use_with zfs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 170600789845..1bf0b39de5ca 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -11,10 +11,10 @@ DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
-EBUILD rocm-opencl-runtime-3.10.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
-EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
-EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
-EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
-EBUILD rocm-opencl-runtime-4.1.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
-EBUILD rocm-opencl-runtime-4.2.0.ebuild 1796 BLAKE2B 493013e856298206f753e33891220313e106e37faccca7678a2668cff70e25e60f1a8c2b5455f533d28056c86c55c4e57fa1a0a4ff51679c137d73f96821ba99 SHA512 f5dafbe33a855287be71923f0eeb34dac309500af75b71ad8909628611a85d6e856308c4c179dc719a0fc9d0573a4083fe7f648da96306810d1dbd5d51391ad1
+EBUILD rocm-opencl-runtime-3.10.0.ebuild 1975 BLAKE2B 1be32b341a154e80d5fa01f5a4e963a08d9cb11b98dec5b5424d456055c7c8293d5a96de1a857058b439a2efe049460e184a5b91a25ca8b44c8f9e917870cb12 SHA512 9c74ffffeb237346f0e96d8ec3a396ce1311a2224cc10c2b68ac789a6c7c67a9c0a5a3a37a43cc1860f63989c67e5fcef143010e1594002de14e294188cdc845
+EBUILD rocm-opencl-runtime-3.8.0.ebuild 1974 BLAKE2B e04cd94dbf0b11b0068d5d6e9aa3e259f2cd170278abca539befb8dd116bade2524f5e52ebad59ed4edec9ef1af05cc48bba96462c1bd41e01db6b4eb4da8aba SHA512 81727360ed14a6883697f915193771747e2922b87c5f47eb9acfc8a968fc7363a2b195d89407dec114d1ab7d2372ea6b0d1cb2a1844ef0fb7f95e5172c3ef077
+EBUILD rocm-opencl-runtime-3.9.0.ebuild 1974 BLAKE2B 95636ee89b8056cf81abd44a5458fc135fc81d17b3a8802cf060dbaa5247542651c674ad2b84316ffa2912b4b56ad7bbcc661ed6e268e2366806631dad054369 SHA512 42c743b29a80d62040ddf2d140c128c10e8aa39daa63b7d62604d8df04a37298d54a461b506cea9495a640b9ff60b858cdd1aa2cb5926c9240d1a4316ed4aa5b
+EBUILD rocm-opencl-runtime-4.0.0.ebuild 1739 BLAKE2B 4af344262491b692e45535184c33201a7085b395909449d5a2cca815a35b1040aaa3bdbb6271aee93e9e6da041869942781224374c5fae2c2b5a8df0fa5d8e3e SHA512 d08a9770744f18d6d606f6b0daad2ac66dcb65e1a87a421f799b04050bfd8e62171a1d3fc89034fa66b38e239c36b60ea7fadc18dbf687d4ae8b9e449e1b63ac
+EBUILD rocm-opencl-runtime-4.1.0.ebuild 1739 BLAKE2B 4af344262491b692e45535184c33201a7085b395909449d5a2cca815a35b1040aaa3bdbb6271aee93e9e6da041869942781224374c5fae2c2b5a8df0fa5d8e3e SHA512 d08a9770744f18d6d606f6b0daad2ac66dcb65e1a87a421f799b04050bfd8e62171a1d3fc89034fa66b38e239c36b60ea7fadc18dbf687d4ae8b9e449e1b63ac
+EBUILD rocm-opencl-runtime-4.2.0.ebuild 1780 BLAKE2B ba3430b4bab99d266abeccaf4d76eee043ab531305b40a77fcefb85d985de8bbc21c67ab605523af6876230596e6000e923033b8b55e4ecba9612b8893fd4604 SHA512 6439753e5d7d071f9917d5b88f5ef4699a6d3ce06cf9ba32f001722cd943b1db75fc54c13e8b2b356b203709bfe93af1b8f6a660f892bfb5dd50a366e85ad79c
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
index 125321094992..380f4a17847c 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.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
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
index a340ec574c82..f8c3f470dda6 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.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
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
index cd1f935e955a..9f7e86747252 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.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
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
index d3a5d3f5ef89..dfce52688c20 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
index d3a5d3f5ef89..dfce52688c20 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
index 45d99cb43091..43fc5daf8b59 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 2bf886429748..a60ff72161eb 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,5 +3,5 @@ AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r3.ebuild 3135 BLAKE2B 266e28cb632ae61ab52fa68e8007572d412e207adca047c3043c84c9a66367ca788db3d28b739c9fdc83511487c12b4af9b471998b43c5c08eeadf51a16694b8 SHA512 45e9ecf8795606a11199a5964f0a392912c76292eb3d3567c76f2e0b5030b090ae036087a9fad0ed50acebeb507884c2f26dcbc7913cb204c8addbd161df1c0e
+EBUILD stfl-0.24-r4.ebuild 3137 BLAKE2B 63e9a0e0ba6caea6b0adb8987ea96a2ea65d13f26b47178fbbe0b3020ae249f2b7250f2e4b258fec2a16d12484a42064f5ad16437d1c9595a8551e7529ee3e2e SHA512 688d7d2d1d779e8e9ee52107038fbb7945bc7078345a8c571975a4cd39ab16f16140f58ca0572dece066eaf66b01218e66b91064eeb791e1f9c51d31baddfa05
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r3.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
deleted file mode 100644
index fb1a4eb91c6c..000000000000
--- a/dev-libs/stfl/stfl-0.24-r3.ebuild
+++ /dev/null
@@ -1,127 +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} )
-GENTOO_DEPEND_ON_PERL=no
-inherit perl-module python-r1 toolchain-funcs
-
-DESCRIPTION="A library which implements a curses-based widget set for text terminals"
-HOMEPAGE="http://www.clifford.at/stfl/"
-SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="examples perl python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( >=dev-lang/swig-1.3.40 )
-	ruby? ( dev-lang/swig )
-"
-RESTRICT="test"  # Upstream does not provide tests #730112
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.21-python.patch"
-	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
-	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
-	"${FILESDIR}/${PN}-0.22-pc-libdir.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	sed -i \
-		-e 's/-Os -ggdb//' \
-		-e 's/^\(all:.*\) example/\1/' \
-		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
-		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
-		-e 's/-lncursesw/-lncursesw -pthread/' \
-		-e 's/\<ar\>/$(AR)/' \
-		-e 's/\<ranlib\>/$(RANLIB)/' \
-		Makefile || die "sed failed"
-
-	if ! use static-libs ; then
-		sed -i -e "/install .* libstfl.a/d" Makefile || die
-	fi
-
-	if use perl ; then
-		echo "FOUND_PERL5=1" >> Makefile.cfg
-	else
-		echo "FOUND_PERL5=0" >> Makefile.cfg
-	fi
-
-	if use ruby ; then
-		echo "FOUND_RUBY=1" >> Makefile.cfg
-	else
-		echo "FOUND_RUBY=0" >> Makefile.cfg
-	fi
-
-	echo "FOUND_PYTHON=0" >> Makefile.cfg
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-
-	if use python ; then
-		local BUILD_DIR="${S}/python"
-		python_copy_sources
-
-		# Based on code from python/Makefile.snippet.
-		building() {
-			pushd "${BUILD_DIR}" &>/dev/null || die
-			echo swig -python -threads stfl.i
-			swig -python -threads stfl.i || die
-			echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
-			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die
-			popd &>/dev/null || die
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_install() {
-	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
-
-	if use python ; then
-		local BUILD_DIR="${S}/python"
-
-		installation() {
-			pushd "${BUILD_DIR}" &>/dev/null || die
-			python_domodule stfl.py _stfl.so
-			popd &>/dev/null || die
-		}
-		python_foreach_impl installation
-	fi
-
-	dodoc README
-
-	local exdir="/usr/share/doc/${PF}/examples"
-	if use examples ; then
-		insinto ${exdir}
-		doins example.{c,stfl}
-		insinto ${exdir}/python
-		doins python/example.py
-		if use perl ; then
-			insinto ${exdir}/perl
-			doins perl5/example.pl
-		fi
-		if use ruby ; then
-			insinto ${exdir}/ruby
-			doins ruby/example.rb
-		fi
-	fi
-
-	perl_delete_localpod
-}
diff --git a/dev-libs/stfl/stfl-0.24-r4.ebuild b/dev-libs/stfl/stfl-0.24-r4.ebuild
new file mode 100644
index 000000000000..5a3ba87236dc
--- /dev/null
+++ b/dev-libs/stfl/stfl-0.24-r4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+GENTOO_DEPEND_ON_PERL=no
+inherit perl-module python-r1 toolchain-funcs
+
+DESCRIPTION="A library which implements a curses-based widget set for text terminals"
+HOMEPAGE="http://www.clifford.at/stfl/"
+SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+IUSE="examples perl python ruby static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)]
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( >=dev-lang/swig-1.3.40 )
+	ruby? ( dev-lang/swig )
+"
+RESTRICT="test"  # Upstream does not provide tests #730112
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.21-python.patch"
+	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
+	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
+	"${FILESDIR}/${PN}-0.22-pc-libdir.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+
+	sed -i \
+		-e 's/-Os -ggdb//' \
+		-e 's/^\(all:.*\) example/\1/' \
+		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
+		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
+		-e 's/-lncursesw/-lncursesw -pthread/' \
+		-e 's/\<ar\>/$(AR)/' \
+		-e 's/\<ranlib\>/$(RANLIB)/' \
+		Makefile || die "sed failed"
+
+	if ! use static-libs ; then
+		sed -i -e "/install .* libstfl.a/d" Makefile || die
+	fi
+
+	if use perl ; then
+		echo "FOUND_PERL5=1" >> Makefile.cfg
+	else
+		echo "FOUND_PERL5=0" >> Makefile.cfg
+	fi
+
+	if use ruby ; then
+		echo "FOUND_RUBY=1" >> Makefile.cfg
+	else
+		echo "FOUND_RUBY=0" >> Makefile.cfg
+	fi
+
+	echo "FOUND_PYTHON=0" >> Makefile.cfg
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+
+	if use python ; then
+		local BUILD_DIR="${S}/python"
+		python_copy_sources
+
+		# Based on code from python/Makefile.snippet.
+		building() {
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			echo swig -python -threads stfl.i
+			swig -python -threads stfl.i || die
+			echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
+			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die
+			popd &>/dev/null || die
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_install() {
+	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
+
+	if use python ; then
+		local BUILD_DIR="${S}/python"
+
+		installation() {
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			python_domodule stfl.py _stfl.so
+			popd &>/dev/null || die
+		}
+		python_foreach_impl installation
+	fi
+
+	dodoc README
+
+	local exdir="/usr/share/doc/${PF}/examples"
+	if use examples ; then
+		insinto ${exdir}
+		doins example.{c,stfl}
+		insinto ${exdir}/python
+		doins python/example.py
+		if use perl ; then
+			insinto ${exdir}/perl
+			doins perl5/example.pl
+		fi
+		if use ruby ; then
+			insinto ${exdir}/ruby
+			doins ruby/example.rb
+		fi
+	fi
+
+	perl_delete_localpod
+}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 38f013c74825..8dde0db8b6d1 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,5 +1,5 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1718 BLAKE2B 66c98cdf7cc8e794e4118cc83d9ac787b09208951dbcc838c4587ba1f741e6a2f449362edef396d97c8acdc4d0bf9a3e2e34ac6c7c02490eeee0c3ffc038eaee SHA512 9f2750ec9e26af20dee2cde2088c5e67632364054f23445244ea8eb45a1ff960afc3f5602b2c5de3b69010f9cb818768d9c861cc35791f8cd533894f7009ecdc
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B c8a5807133b732b2f6803ecfc94cd2f659d8beb639a3ebf076f91d74e724774f3b9e2dd7e02e02ea5557714fab0c78c7b2401147478b7fa0cf3fa6c7191291db SHA512 9cf93d1630b2214613b93b3c03524a37a853aa0ed196591db777ec40221dd663a1d1c4d450996864330b203791ca09c94764ac99df2869da88460b57a45410bc
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 7cde2a6d3e58..c369b6ebb419 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="sys-devel/libtool"
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 1516387a04bb..c653da56f9d0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,5 +1,5 @@
 DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
 DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
 EBUILD userspace-rcu-0.12.2-r1.ebuild 779 BLAKE2B bfc53650395398c8ebb43ad109e5df7c88a734f5cc7fed739773ab809633b7e17539917c0c5ed5343011a4f55445793282a10c9746af50a1663bc86d32e3819a SHA512 1fb8b6b228730da7ae4424c5032b340670ad50a55bcfbb46314d0baea017300bbf3c568095912b23c40974ad9bfb78faaef192a67eab466e8e1605a736327aaf
-EBUILD userspace-rcu-0.13.0.ebuild 786 BLAKE2B e596980c7b6e89853289cf2585eda6e4e1b534ff7742e48fdadba1a386bc5048d70293cfe63e5fa00ff04e5b9d4a8d2541b540a72947775f35c7e288bf2c15bc SHA512 6062091a19b76fdd14ae51eb4580bb183b0b945fd399aecf7c55c7d5cbd1cc6ff01128ee098cd9996a8bd49bbc89d02e640530dc8af791bc03e9a22b529c28e7
+EBUILD userspace-rcu-0.13.0.ebuild 793 BLAKE2B 1a890de11a1b39086214c29512a54b9f116b028d07d852d6871bb15adfa9c5a70f0547302298fe966354d7c249dc96a9f2f9a14b1dfd35aa2bdf4b3f88d28fb8 SHA512 910a2d2957ba773ab3956e21f3eddbe2ea19b89fe86d0511dca298749c2483861a5dad19ea996185069e5fffd60cd73413ea8c6c742dc1e159e590622457a035
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
index d5a84522a542..d4daaa3c8906 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 279c79345e91..5555a931b7cd 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 073f44b27635..38d227bdd08f 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -32,30 +32,12 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
-DIST sbcl-2.0.10-source.tar.bz2 6522183 BLAKE2B c8717f85dfcbf3fc960e91efc884ebd3e825041c4916181c6dc690fda2704dfb92a5c46332d4b1ae4d0d304532436a444c4ee0404b4927d3fdbd77d2e5a3e86f SHA512 441418719a236853ae316c4d8a74e05fb31d5b27775e17ff4383ea1b5671786378231fc4d5a2908416d8fde3704e6d2737e58d6e76b119c19a9e0d81444f3277
-DIST sbcl-2.0.10-x86-64-linux-binary.tar.bz2 10179170 BLAKE2B c3fd9b5ee73db1152bf02ec6f67b7d8ad190557990bb28b32088687fc68173aaa300738f35c7a7bbdc6b5a743a30d0aa78220ea73aafd5f94948534a7be190f7 SHA512 a4d410655626a4c247e9b6505508df8f0ecae7726dd474fc19b259ed1f4507953bec0a7ff876ea97dd86150b08e8d8ad12a5d701f77a5a2cb3b367d5ae4af8f2
-DIST sbcl-2.0.11-source.tar.bz2 6532079 BLAKE2B 8015262c407f731ef4bec8d002d37f0ad865d0b8c0aa5f2d6da339182fdcd4b29c5b66e47dc7e50a46b8387f490729b5afd2f284d727020806fffbe8feeebb28 SHA512 e8f0f03592be6adf570979a48e02650f6efa089b1e05451cd33f5389abb5c41f0028332702f0e25872bff14dda3ca65b443bf08a4b0c5cc2b58f3b55350c356e
-DIST sbcl-2.0.11-x86-64-linux-binary.tar.bz2 10154687 BLAKE2B 60d246c066e6fb95e1de8117da02bd52eb5464877a5f0642bdf211d5da5787f0e67d950269f6a629dcae7f9129eea5dbaa78d8d4b00e51fac1e85f02b4899cae SHA512 122411215d75ef31d6f537660b29c7e69fc47f2eaf4339009ee53ea71a119715b0da17e3eb7a3bc3e997fe147e2eb163a7f838a18ff5edbc266ac4f0dea4f877
-DIST sbcl-2.1.0-source.tar.bz2 6534157 BLAKE2B 575638084c208104bc782e7f6419b92e89d6b9e4e31cc668f21cb5be6a234a1f97726ea7f3e54903e229df94d89a10c60e887c19aa00c1bcc57e62229f75b764 SHA512 57283540ffa43184f7f805dc9654292ac9e93ba735772e00c6b0e695c61041647106a0a167836e571a3d97af2952cf26ca523fb7bf1dc0f9c62345d76a0ccec3
-DIST sbcl-2.1.0-x86-64-linux-binary.tar.bz2 10121503 BLAKE2B 4ee74c18316e863ed030dcbf88f9c0997e362f158eae1be856cea2b7001e9cff213a09179c0c1c925db5de991902a19d838adc9bf5683552310a57a3debf465f SHA512 dea33b800223505b6912c78d4233b82ab544100a64506e827ff78ccef1776dace2af14856d5e37c33659928afa823c4500ada34cd3759c46e72dc91cfa23f40d
-DIST sbcl-2.1.1-source.tar.bz2 6543910 BLAKE2B a567e30ea03d2a19f85afeda385d1d8af84e87b1f0afe436c47865e8d67d3a7d3008e7353d7bef0b139ffaba6278ceb985178361ba50f82db2683637f1e2a834 SHA512 4346318bcbd28916d107d004f7da62cd4a23545432369819f1d5c25d512d89343318f4acb857f6dd59bda59b58e88979663e882455f941e81edd9002b58f68e4
-DIST sbcl-2.1.1-x86-64-linux-binary.tar.bz2 10116591 BLAKE2B f9e4d2772b23cf03af6f7e8a44192bc48269990c4c7f4a89885497044855f8b637346704aafef54998942184bd58eeb1775cb2e8ef147b4d470cbbc7d44b8773 SHA512 0bf5e8e50e172debba70216e207a8b7d0caf53ccc8d2e682f52622740dfda2320d7c69fa5f966e5c4a5838252447f3704d6b31d0dfaf0b95503ec38c5d18afca
-DIST sbcl-2.1.2-source.tar.bz2 6539563 BLAKE2B 601331d82c00a153bf7a8e5c556aea1e03eabf9bcd6c6ff874b3e96e3cf96aa8f780297eed3c87411fc1902a0ec36ee9a6b8b8ce51a4a6a8d8f0aa3491270c7e SHA512 53b7be18753bf6e2a4811d47afee3a7b1ece9c1205f73d783880f420870b784a34c07320575a1b5c6bbaf3eca2f7a82f51382f857b6a27fc19e02348ea8bdd70
-DIST sbcl-2.1.2-x86-64-linux-binary.tar.bz2 10131524 BLAKE2B 7edb4be77623ac09e650716026f1ecdc8808e9545a658b6c7ebdf0d13ea147217b65f35cfccc3682f303638ef672b822112d13c25cc809ec9b153eaaa7003085 SHA512 e491905fe4929b2dd35080acc1d67f03e7584c36580334be995f6eeec144a87d7c32f19bcc84bcb14fc3157fce0bdc37b7f1f531b1873b1bbddf365932542385
-DIST sbcl-2.1.3-source.tar.bz2 6546338 BLAKE2B 7253a97fe57c9f3bfd3fd094d75dd1d028c077272cb3f1ae76935736ec69fc7b0d94568dfa1ec8000aaf72ececb505d84650b2a7350af617bfab5cce514ac253 SHA512 bd3d66d4257200a14fd0ac350aea8c26dcfd5d3f9d00a2175f5714ed8179e293e1687fc50b79ca111df7f24fb65804fdf220faaad5c1c76886f5c181af36b5d5
-DIST sbcl-2.1.3-x86-64-linux-binary.tar.bz2 10141041 BLAKE2B 724786d03e53b86da38cff705d3d3c3b13cbd92375a3841bbf5f1e410d765b7ca4c451e73c4f6f46dd813d4e121f4b641ac70e8cf88599c157bb66c4d3e40b9d SHA512 9209ecaedab3fc16b877970dc72f6cbf611906cb25e6980fedd7234990f5d2b4b49572942e6a11f638688802dc804b27e114877fd1d17478db9441593629e70e
-DIST sbcl-2.1.4-source.tar.bz2 6550812 BLAKE2B 2d0d05a5b3bd26b2902b9178c426d76556395bf84c7ea476b3815883ddc16e7f5381dacb70370868af21f802646b4611ba05c245b53d00fb6501f64cba427264 SHA512 ed24fdfb1ab5bfbad5c22f938e2450e16ee558defc458ac4dfe24fbc7d57b9eade052ea119544e6e123979eb5048b6c776dada8c5aa6dba459c582a60fc7d943
-DIST sbcl-2.1.4-x86-64-linux-binary.tar.bz2 10144909 BLAKE2B ef83027d043de576211dbc3c188272a082993d12bf448304ab2f0434463de74ea232a0abaf98c71a4cf5a689d33da78bba5c749503b559942deae79aa76fcd5d SHA512 79dcc2ce153464f7d2510424591367af60b3168c6fbda864f2f49121fd88b5b688c5eeecab73f859fafb8c4a7f941bef039a065cf6c0f2e25463737323f87e47
 DIST sbcl-2.1.5-source.tar.bz2 6566902 BLAKE2B 3e98a3d996120baf7cbddbe595aacc07615cd8471e9bb87fc73e8cf0621988e5dd549a58425f7c569588833f9a4b1bbe43af40472fa9a287a3780e40e86536bd SHA512 5e208b3a1b3ff1a589c9ae0398e40086d979342c11fa7bb251797d0266618801b525dddb6998cebae3fc2a88547f7a71bdc43c5418f5edc2cf9bf699ed725334
 DIST sbcl-2.1.5-x86-64-linux-binary.tar.bz2 10155269 BLAKE2B 8456fbe477d6afc4becf4ec2fadb296e40532f02ea0ad5de61891cf68384450028e85e52d44164323c1a40b5f67c591114cd1a077de305b3f1b20484310bf5a6 SHA512 cb90c2bc6bed5f5f3af9831cd520580d4e8207ee45ae3572a17cf0da21563ce8e03d1c0e22099d05b750e0f76b2a0701918c80e25e2b7a9846d8cc5169f82f7c
+DIST sbcl-2.1.6-source.tar.bz2 6579274 BLAKE2B bb3c915b1f3889575065d0737eaadb5a19b00748ab508d90bb30218c8ef09527ee2533271700b68fedb28030727cde86aaa7b7ed1d2e6b02cecc79b6e6ed0376 SHA512 fa8088e5275451863b9aa908c0718e03801340fc87c514caed8a67df6fd443a0cdc1eb90f90605c0de757c4be5e9e502a944c4856fea98d719f5135457ca41c7
+DIST sbcl-2.1.6-x86-64-linux-binary.tar.bz2 10106836 BLAKE2B d362f22402cfc183b6b8a9251e20d51672a4870bbc427e9f718bcfb02ae3e459f426b8f4bf4b568c864b56602e5d7b285ab5f1c5aece397385e17439934d23fa SHA512 3382829bfe6bd85b00eeaed04830de7e966d014dd626c7d5635c916a4fa9517f4404af4e5498cc6b4b8e00db9079e350db7cb6860c0c4a4921e99ba221f2ba6e
 EBUILD sbcl-1.3.11.ebuild 7866 BLAKE2B 88e6b869fe4655f2a971a53213844fb08a4c6b59bc42a57dd2616c39df93e9721304f6a94b457ed3ac07ee7abb1f8321a747901f42f211b87e6a5041624c4e90 SHA512 41dfd91a56ee2dd4e2421c4fac03cd4263f4fdaee60db9e81745ec552199a7a97083194f72e1585bee7241e593a10eab3c57cbd300858e1752b909412ffca1d7
 EBUILD sbcl-1.4.9.ebuild 8213 BLAKE2B c227898102be21a2ef44b906e4316f07ad6711ef4bfd662fe391aaebbe6a515158fd41a05db644604f6fd494c04af7cb08b93e4a1dd40aa146ccbe08115be247 SHA512 674cfadbccca53a1cc4f665aa935cbc7a65cefbdd70bfb3f9b14f3b813706b2b5273380e67ca4a76b81aaa5363423feeb74fafe423121ff7e8c7427b48cc39c1
-EBUILD sbcl-2.0.10.ebuild 8092 BLAKE2B cfab383590eba050bb133cfe73d62200e8fe9da76e62715c9df5ba1f4a38e7ece69bff7de4baefbb54fc5cefb0904f8ae9ae679ef2c91c86ae3044d80fcc2c67 SHA512 a4ce4763d4e817290483fa34fcbe5eb8fd97078c54d791c0625caae5d5734aaed574a08235a46c461f9b3b80e115b22caa838ce0bdbe8a374f9a4c567ea68586
-EBUILD sbcl-2.0.11.ebuild 8092 BLAKE2B 056da1b2de1c8482a08b0d32845cf558096709520875d32c59599523bb23c72db6a193d634c48cefdfa6f83e9be64b02cd7679ad49483894220a957d513febef SHA512 1474fc7399e54b4ce6e8de4e88abe60e5031cfc7796abe110a9d21858bf32239ea5de98ae267c4eaf272acf7c8038519eeb3bd1612ca3f02892c2f2feb095205
-EBUILD sbcl-2.1.0.ebuild 8146 BLAKE2B 51e4d951d4400d4fbe9b429697c3aa8c9fde66c1fa5671e08caf77dfb966c357a269ef45832f75638d12f21935e2186a498faa73922b7c6610b91649730b283c SHA512 1760131147dd70828f95e55960cd179949b706255050fa95b944c910152c491cedebbbcea17f1bf2e918947e8419ad8a237afb2c0d69df2b0caf18f179c94cd9
-EBUILD sbcl-2.1.1.ebuild 8146 BLAKE2B 7e9f0d0d8d3d789d0df8e4c381121743a202570fc11d1b72b7280ee6ed9967c25e51151d823ba6e851b24a369e88e0af2e781aa391dce68b37cac47ad822076c SHA512 110323bea6e5dbc755fd3a06e5ba7bc27d7de279662a4559265af37d696274c28b78af6ef5677dfd0a7333f74bf2feb8ac3e610a0bfb2a5de2aa4c3b3ace6f8c
-EBUILD sbcl-2.1.2.ebuild 8146 BLAKE2B 62aad53fe5dc5660662de909128189ebdb6d7fa669f38be24a936d969e7d1d50affbf74cb4fa9a2e605a089419b0c137e1bb53c01bc8c7514fe9d90f6bacc595 SHA512 f82032d823a12bd26b6fa3011569c8a0ad8db72600fc5857d9266a238a25b77c6c41e777eeee34df21af6c281e01fef9055b6fb83697a28408ad7dc634537643
-EBUILD sbcl-2.1.3.ebuild 8233 BLAKE2B 14a56a2a8eda829ddfb780c0511bca8233a40f2837cbeb7aaacb28ab60f6c59d6574b328c7763341c708a89dcee62dfaf176426175076fb2460029d730ea9cb5 SHA512 128933b438227c8ed43f0b70c16a3ad000d1bdef5141c39645d96e32d432ea96209589f5af56b8069b812469348068480bad434d246b52b7e967936b20b4caba
-EBUILD sbcl-2.1.4.ebuild 8233 BLAKE2B cf9684dd392b811b73b8e781a2554a36535a0a79c1a491f66030fa7329973a07401f537cfa94547f3e2930ede7302ace2f755f2b46b29bd973f3473ed076a4c3 SHA512 460e2cfa51072f350056ea4dfff1401554ae7dacb1853f2234fa0b0ae3edcc0c2e2f5bf760f645dc6887af0b28a627785102948d443a763e9082c54fcd25c85d
 EBUILD sbcl-2.1.5.ebuild 8233 BLAKE2B 1b36498a792e2a3facbc3d050cfe68097b2e69df4d08e036a4f2fa1f5927dd0279ceed72248ffc2afe5df3cb1a9c7dc87fb57603465316e1929a7a04edead55a SHA512 90f1aa10baa49c48a3b73b1ecfdc597b2bffd58fde896184b82c0045761da7d642b069116066145d335593ce28936c50a8138f20ecd649cbe01be8d59eaba5fa
+EBUILD sbcl-2.1.6.ebuild 8233 BLAKE2B ca5778c4c9f0606e9e908e6cc797e67bb9ed74aa162932fd891492eb0366a9be5214335fcd89813fe9bb3fe5e23bd33088e364cd15b6ee585b1a1302191b47bd SHA512 bd0fc6d0ff1d7454333cdce372e4bbba03abbc7d08aad47732ca0bbd9a0dd7b3b5957449206b63585bddf5150448c8433ba133aa585e431cb055d64e73e23602
 MISC metadata.xml 1184 BLAKE2B ea8559ab65d1a9579739f537dfaa90790755e6ad448c9362516d18679c13d6f58c42de8f8840f3b109be4ae8744abe27af5efad88740e4aa7aad7edb5aee001d SHA512 b9621f775d3be8fb18ef0feb81f87f8cf956f79e077bfce6fe228c436763a67ac48e9da00969bee6b925786990bfc42240d3674af5fa9d1823a4bca83c03175a
diff --git a/dev-lisp/sbcl/sbcl-2.0.10.ebuild b/dev-lisp/sbcl/sbcl-2.0.10.ebuild
deleted file mode 100644
index 5b10db5a631c..000000000000
--- a/dev-lisp/sbcl/sbcl-2.0.10.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.0.10
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.0.11.ebuild b/dev-lisp/sbcl/sbcl-2.0.11.ebuild
deleted file mode 100644
index 8f97a4edc517..000000000000
--- a/dev-lisp/sbcl/sbcl-2.0.11.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.0.11
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.0.ebuild b/dev-lisp/sbcl/sbcl-2.1.0.ebuild
deleted file mode 100644
index d52ecf3e92bb..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.0
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.1.ebuild b/dev-lisp/sbcl/sbcl-2.1.1.ebuild
deleted file mode 100644
index 35d6414cdd24..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.1
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.2.ebuild b/dev-lisp/sbcl/sbcl-2.1.2.ebuild
deleted file mode 100644
index 24d9a683f21f..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.2
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.3.ebuild b/dev-lisp/sbcl/sbcl-2.1.3.ebuild
deleted file mode 100644
index 0ff92fe69f4f..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.3
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.4.ebuild b/dev-lisp/sbcl/sbcl-2.1.4.ebuild
deleted file mode 100644
index 7e0a646d884f..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.4.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.4
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.6.ebuild b/dev-lisp/sbcl/sbcl-2.1.6.ebuild
new file mode 100644
index 000000000000..9d2f456fe5b6
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.1.6.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib flag-o-matic pax-utils toolchain-funcs
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.1.6
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.3:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+	# bug #767742
+	eapply "${FILESDIR}"/etags-2.1.0.patch
+
+	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+		for d in contrib/*/; do
+			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
+		done
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a14e62487a62..3ce5380fcbbd 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 912836e8e1e0..cbaa7ac9d721 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,7 +1,9 @@
+DIST dose3-6.1.tar.gz 1422879 BLAKE2B b42da3abec4ff9d5d81ea9dbeba0f6acd39fa076c5cb51eb4ae04223ae01078425a7c5d9e80110e7946f8ae87bf7d8c6c124965c3cc47fb1e16473f225dc8adf SHA512 603462645bac190892a816ecb36ef7b9c52f0020f8d7710dc430e2db65122090fdedb24a8d2e03c32bf53a96515f5b51499603b839680d0a7a2146d6e0fb6e34
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
 DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
 EBUILD dose3-5.0.1_p16-r3.ebuild 2256 BLAKE2B 04d27714676035014da0ff4dc1b062f4d790629f6aa2487f6afa05e4d95088148a1d7822910833c906b7bf0d9f88003e487582ce46802400291164a7c3bb1716 SHA512 c453ec3a3a63f761e58d0d0d48ab83570eaf9530a17855806e27240b87f1379aead72f528ab907bb33e4c8eae9bdd8b94d53b1b52eda1926b0ab5c07116b3fd7
 EBUILD dose3-6.0.1_p2.ebuild 1290 BLAKE2B 0b1bd09cf903e03dfe054ed3109fa8376c9228bc533620f6ec668bf76867e5d1bb24e44050ba080abb97cd1a4cb713fd2a061f2367e6afbe81c7c428c3d51034 SHA512 97abd4158824da5464b4d2bec931676f45f2dba744886ef835a3a97839bebae2f001ec6a8fef8dd8cec43ee1c288aedc14d92895af807951c3fa248d82d78798
+EBUILD dose3-6.1.ebuild 1035 BLAKE2B 8edbe50b5af19c45f7467814f5335a53a308c62e5debe48fd903157c85342c40a96b0604f1dddcf99a78c9a7bab79ad93a29806b51f2e2df3b903e04fbc21642 SHA512 86f7198d0b8f338c13114ead3970c98a3d2a1e8194560adb124fa83425c8bc48d7bbeca9a6002eb315a7513a12f7403f181981b254036267076117e1e4b8109d
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-6.1.ebuild b/dev-ml/dose3/dose3-6.1.ebuild
new file mode 100644
index 000000000000..ac9e12e891ab
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="https://gitlab.com/irill/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 04e14541f025..30ffd015b9d8 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,5 +1,7 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
+DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
 EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
+EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
new file mode 100644
index 000000000000..87edcf4c3a33
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/result:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-private-libs
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Strange failures about opam not being initialised
+		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+		test/blackbox-tests/test-cases/merlin/symlinks.t
+		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+		test/blackbox-tests/test-cases/merlin/per-module-pp.t
+		test/blackbox-tests/test-cases/merlin/server.t
+		test/blackbox-tests/test-cases/github1946.t
+		test/blackbox-tests/test-cases/github759.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+	:
+}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index a09a9f4ac453..f0ed52517a43 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,5 +1,7 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
+DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a
 EBUILD dune-private-libs-2.8.4.ebuild 4113 BLAKE2B abbb2c64d54ffe7b78468d37517a83725e561ba58cfc85f710576342720bb92bc8b40e7818ebc1537c0ce5651d1a38ae8da5ffaeab278a63364a5298bbab44c7 SHA512 6d6f87691c660cd4d01e8a3adb86cb46b2cbac3b4288e8f9d34a89795bf8e7891badd9bc364ed8593c85a8b45bcde24da03c1cb6026c054aef3d164f47598ceb
+EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
new file mode 100644
index 000000000000..7b6b59feb352
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	~dev-ml/dune-${PV}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+DEPEND="
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/findlib:=[ocamlopt=]
+	>=dev-lang/ocaml-4.09:=
+"
+RDEPEND="${DEPEND}"
+
+# TODO for test deps:
+# Add cram?
+# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
+# Add coq?
+
+src_prepare() {
+	default
+
+	# Keep this list in sync with dev-ml/dune-configurator
+	local bad_tests=(
+		# List of tests calling git, mercurial, etc
+		test/blackbox-tests/test-cases/dune-project-meta/main.t
+		test/blackbox-tests/test-cases/meta-template-version-bug.t
+		test/blackbox-tests/test-cases/subst/project-name-restriction.t
+		test/blackbox-tests/test-cases/subst/with-opam-file.t
+		test/blackbox-tests/test-cases/subst.t
+		test/blackbox-tests/test-cases/subst/unicode.t
+		test/blackbox-tests/test-cases/subst/from-project-file.t
+		test/blackbox-tests/test-cases/trace-file.t
+		otherlibs/build-info/test/run.t
+		test/expect-tests/vcs_tests.ml
+
+		# Strange failures, seemingly from newer versions of deps
+		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
+		test/blackbox-tests/test-cases/merlin/merlin-tests.t
+		test/blackbox-tests/test-cases/merlin/github4125.t
+		test/blackbox-tests/test-cases/install-dry-run.t
+		test/blackbox-tests/test-cases/c-flags.t
+		test/blackbox-tests/test-cases/install-libdir.t
+		test/blackbox-tests/test-cases/dune-cache/trim.t
+
+		# Strange failures about opam not being initialised
+		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
+		test/blackbox-tests/test-cases/merlin/symlinks.t
+		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
+		test/blackbox-tests/test-cases/merlin/per-module-pp.t
+		test/blackbox-tests/test-cases/merlin/server.t
+		test/blackbox-tests/test-cases/github1946.t
+		test/blackbox-tests/test-cases/github759.t
+
+		# Wants nodejs!
+		test/blackbox-tests/test-cases/jsoo/simple.t
+		test/blackbox-tests/test-cases/jsoo/inline-tests.t
+		test/blackbox-tests/test-cases/jsoo/github3622.t
+		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
+		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
+
+		# Wants coq which doesn't build for me right now
+		test/blackbox-tests/test-cases/coq/rec-module.t
+		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
+		test/blackbox-tests/test-cases/coq/native-compose.t
+		test/blackbox-tests/test-cases/coq/base-unsound.t
+		test/blackbox-tests/test-cases/coq/base.t
+		test/blackbox-tests/test-cases/coq/native-single.t
+		test/blackbox-tests/test-cases/coq/compose-simple.t
+		test/blackbox-tests/test-cases/coq/ml-lib.t
+		test/blackbox-tests/test-cases/coq/extract.t
+		test/blackbox-tests/test-cases/coq/compose-plugin.t
+
+		# Unpackaged dependencies (a rabbit hole for now)
+		# utop -> lambda-term, zed
+		test/blackbox-tests/test-cases/utop/github3188.t
+		test/blackbox-tests/test-cases/utop/utop-simple.t
+		test/blackbox-tests/test-cases/utop/utop-default.t
+		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
+		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
+		# ocamlformat
+		test/blackbox-tests/test-cases/formatting.t
+		# mdx
+		test/blackbox-tests/test-cases/mdx-stanza.t
+		# odoc
+		test/blackbox-tests/test-cases/odoc/odoc-simple.t
+		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
+		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
+		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
+		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
+		test/blackbox-tests/test-cases/odoc/warnings.t
+	)
+
+	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
+}
+
+src_configure() {
+	:
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 4612307713ea..98a7fc4db374 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,9 +3,11 @@ DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e828
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
+DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
 EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
 EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
 EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
+EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-2.9.0.ebuild b/dev-ml/dune/dune-2.9.0.ebuild
new file mode 100644
index 000000000000..47084c42bd00
--- /dev/null
+++ b/dev-ml/dune/dune-2.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	!dev-ml/jbuilder
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/findlib
+	test? (
+		dev-ml/core_bench
+		dev-ml/ppx_bench
+		dev-ml/ppx_expect
+	)
+"
+
+QA_FLAGS_IGNORED=/usr/bin/dune
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	ocaml bootstrap.ml || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
+}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 0d9670b83520..52dc5d4cf602 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,4 +1,6 @@
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
+DIST findlib-1.9.1.tar.gz 273012 BLAKE2B 8b51e3ca3dde04e77e225638f9d45166acf42fb1e3321aa5ce6e66fcddcfb978a301f2fa22a26172e1a8c2f8a879c5d1d10e8c984994d6b2879c21c4392955ce SHA512 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84
 EBUILD findlib-1.8.1-r2.ebuild 1670 BLAKE2B f64382277a45d1cbe278e6eb389cafd2fb255363694b36483b8eef0c33af4f08db95f2ab14b13a02f985c3e8b04940a39cb175616ad9e224893175342ff4be38 SHA512 9c51f008f2a9ee6189ee1a541f8187a149195dd114694ef35cd0c7774bdb128bf32df8a4f8f28dccec656eb8d5540590f24fb458aec84cadb1b04bbededd03fa
+EBUILD findlib-1.9.1.ebuild 1629 BLAKE2B be50bf81301e64b7eebefea1e7ee454f0ff42062bf54621d92f0dd427bcee2f031f743957fff86a1e7a9d5be9075488891a2c39884a60458de5e725edf81f1fc SHA512 e3d9d8083d36446a0ed05fa6cbaf844ccb5c8fec59ff396bca6f9f600a6408c038bdb6693d1b135b4e8ef125f5fcc9f9f0e44583bc768de09fb92b65e6f4ec03
 MISC metadata.xml 417 BLAKE2B 2ea51d563846cf4b4a6826678f68a32db60cd0c5174524701e6d91c59c8be896f26b6a7f7ce458b9466424d7325542219c7fb2b59d2114cf2a29a0d8772fe92f SHA512 d4243498f26d7517fd55467382b8968e75e3593f1d3ba76c87cc0a53746e6e500c2bab475e51c9490abccf4ca5044637f681f5b50ad090d72e580eff9358ca6e
diff --git a/dev-ml/findlib/findlib-1.9.1.ebuild b/dev-ml/findlib/findlib-1.9.1.ebuild
new file mode 100644
index 000000000000..4a52a554364a
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.9.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	if use doc; then
+		cd "${S}/doc" || die
+		dodoc QUICKSTART README DOCINFO
+		docinto html
+		dodoc -r ref-html guide-html
+	fi
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
diff --git a/dev-ml/graphics/Manifest b/dev-ml/graphics/Manifest
index 91460cd0bc31..5c58dae29b93 100644
--- a/dev-ml/graphics/Manifest
+++ b/dev-ml/graphics/Manifest
@@ -1,3 +1,5 @@
 DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a
+DIST graphics-5.1.2.tbz 58863 BLAKE2B 640a288759f5c233f3ded3c0e974329b0b8a41ab60772d0d41e6f89057432215a35c0f06facc552fcacf2e1fb8d0f5c47bc5d0aad5ca89dcf4ab71732a9b1c9f SHA512 1387c1ecf5dfd62c3927f1f8ce0bcc8b162ef22f15bfd41eba47c955091f7ce5f19395beab550d31cff38d22c4ad097350975381e60936a0004271e96f65b09b
 EBUILD graphics-5.1.1-r1.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
+EBUILD graphics-5.1.2.ebuild 523 BLAKE2B 7bfec9f03f0829ca0d2d2d5e2c38dff5b7e27e05f24b14c749897d2a2ae519bf086206804f5aedc8069b19a36162030b300540e6450d79fb624a12867eaea3d0 SHA512 cb2278d0019721404922c5ebe82b316a6691fda75a6b36ee0e993268a78e317bd1f61b2300bb80284ee3e7150177da3c3e8f1b375f3951cbaa9cdf54d1de743e
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild
new file mode 100644
index 000000000000..68860652dce7
--- /dev/null
+++ b/dev-ml/graphics/graphics-5.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="The OCaml graphics library"
+HOMEPAGE="https://github.com/ocaml/graphics"
+SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
+	>=dev-lang/ocaml-4.09:=
+	x11-libs/libX11:="
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+IUSE="+ocamlopt"
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest
index 2b5abbb3042d..758e2996feec 100644
--- a/dev-ml/markup/Manifest
+++ b/dev-ml/markup/Manifest
@@ -1,3 +1,5 @@
 DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab
+DIST markup-1.0.2.tar.gz 281957 BLAKE2B 04094edf2b6e7cec8de8e1d2ebc9c43b55aa18ccd7c38ee07217a7578764e1b919da8f30b3855d04deb75862be9c429ddf2c24c7a8a2baa2ed01921514f3b334 SHA512 6a04240da095a7557932e26b8f20979e0a8dc4ef2b5ce98aac7dfcaf82f0350397633120b638f76efd2a30a482a2381566b66a35c0585535e225f44004539b87
 EBUILD markup-1.0.0.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
+EBUILD markup-1.0.2.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
 MISC metadata.xml 324 BLAKE2B e168b429839fdf6aa127eecfdb0d6d53bca42fd44a4a111c0fe88c92f956c4d84cdff299977727ed510d2fa75409c3119c399b774acb3e10eae4c4bbeda272db SHA512 15681de57dd33e743107811a6f05c0139cad1488009191cbb8396f344e29ead53fa8ba09bbb914c0e53d87439d2e83a864c5f162e099ae027b5b0958b6946214
diff --git a/dev-ml/markup/markup-1.0.2.ebuild b/dev-ml/markup/markup-1.0.2.ebuild
new file mode 100644
index 000000000000..65041afd6bac
--- /dev/null
+++ b/dev-ml/markup/markup-1.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Error-recovering streaming HTML5 and XML parsers"
+HOMEPAGE="https://github.com/aantron/markup.ml"
+SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-ml/lwt
+	dev-ml/uutf"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )"
+
+S="${WORKDIR}/${PN}.ml-${PV}"
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 2ab49aa90fd9..4c5b63084c22 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,3 +1,5 @@
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
+DIST menhir-20210419.tar.gz 1136536 BLAKE2B 9d95600221aca25983674fa736c35ac0c5f2809a8aade5f9163a7b8baaacc660c03376b52749ae1d75d0d35ad8f4710d7f43832ef5ee0283fce7f7a41f15c120 SHA512 cca9037586635a6603531629671cc1448d65deb47c66654928d34c9163c4b501901428afc95eb0efdfc7f010d2efa176385420d9296d59b840176e07b8bf0fce
 EBUILD menhir-20190924.ebuild 915 BLAKE2B c33ff204555d700ec02abc8bef23ca5e30767b409f3d226dd5fd380ce75d11fc1bb228d3446c3f7d1822530e6a556225138fa2700ea8ed99c828bdcc0dd983d4 SHA512 0ea611c2f1f32aaeee73ee407a9eae82a24bca518e006eeb66b33ab5f1f0adb3c06ff85fd2c0a99fdd865f8a3245239165617a0c3ccbe815009aa761b8ad7b21
+EBUILD menhir-20210419-r1.ebuild 543 BLAKE2B 12230575ad22528949d5388f1e57f447334f306df992328b2974b017fedc2c2d1be99978bb2c2d3ab5d9ef5097e73596127f0907a0693a3ba792c63306ea3a3c SHA512 f262ea1825b660624d8716b44aed0b6bec99ea5448dcf29e9c960d9c5b45e168fb904c14b6b724505507aa145546de13582ab207508603696c175ed08de155ec
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
new file mode 100644
index 000000000000..eee8ab93b315
--- /dev/null
+++ b/dev-ml/menhir/menhir-20210419-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+src_install() {
+	dune_src_install menhir
+	dune_src_install menhirLib
+	dune_src_install menhirSdk
+}
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 8ad287c5a8d1..fedd8c78ee07 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,3 +1,5 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
+DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
 EBUILD merlin-extend-0.3-r1.ebuild 486 BLAKE2B f227cdf4269f27a1b06b23535039c85b4bbc8482e2ae752a4dc45c2abf643fa5d025d4d852c13ac3ea0b264494047fbe86411b770659f3f2e258d8ba149e01d5 SHA512 ed84872092614bb99c9a623d098d40cdbfd51d69e7ae1432d20f6b8efd81bec7cdc9b860fb274840fa73029b87ac381d0ea0fab73da863757094b32c41647024
+EBUILD merlin-extend-0.6.ebuild 481 BLAKE2B c8323e66fd99225ee36771290b137526def8d831098e944fb7e708bd8c7c22de7f50aff8c3b3097443149cc55d59acd5c40c91507354ee093c11e176e751ee7f SHA512 dabec95c8a521ff3a0a2ce2c5924d50d48baf38c94a791bd37ec85db704f2707f4c3217c0dd0d9af022d596e15055eab941e06f49d25f2b0fbbb92c2677ee127
 MISC metadata.xml 318 BLAKE2B b58e16f26419d26ae958729d1b854a1ea29f3e71c9c9b6bfcc7851c1b0248bc26bc0e13028cab62744013280a88254d42e03e7894994033de077b781eaa76ecf SHA512 c50c068b90bc67f46cc5016182ecd06929dd31c2bff0a63065196a0adf382dcbe33f2e4a19a1e5744ce4d805a9d342ce1c9ceda4e1079f061af3497df2302365
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
new file mode 100644
index 000000000000..d1ed1442d2d0
--- /dev/null
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="SDK to extend Merlin"
+HOMEPAGE="https://github.com/let-def/merlin-extend"
+SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/ocaml:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/cppo"
+
+src_install() {
+	findlib_src_preinst
+	default
+}
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.880.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.880.0.ebuild
deleted file mode 100644
index 63f89148cbbb..000000000000
--- a/dev-perl/App-perlbrew/App-perlbrew-0.880.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=GUGOD
-DIST_VERSION=0.88
-inherit perl-module
-
-DESCRIPTION='Manage perl installations in your $HOME'
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-6.860.0
-	>=dev-perl/CPAN-Perl-Releases-5.201.912.200
-	>=dev-perl/Capture-Tiny-0.360.0
-	>=dev-perl/Devel-PatchPerl-1.800.0
-	>=virtual/perl-ExtUtils-MakeMaker-7.220.0
-	>=virtual/perl-File-Temp-0.230.400
-	virtual/perl-JSON-PP
-	>=virtual/perl-Pod-Parser-1.630.0
-	>=dev-perl/local-lib-2.0.14
-"
-DEPEND="
-	dev-perl/Module-Build-Tiny
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		>=dev-perl/File-Which-1.210.0
-		>=dev-perl/IO-All-0.510.0
-		>=dev-perl/Path-Class-0.330.0
-
-		>=dev-perl/Test-Exception-0.320.0
-		>=dev-perl/Test-NoWarnings-1.40.0
-		>=dev-perl/Test-Output-1.30.0
-		>=virtual/perl-Test-Simple-1.1.2
-		>=dev-perl/Test-Spec-0.470.0
-		>=dev-perl/Test-TempDir-Tiny-0.16.0
-	)
-"
-mydoc=("doc/notes.org")
-src_test() {
-	( # export leak guard
-		if has "network" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-			einfo "Network Tests Enabled"
-			export TEST_LIVE=1
-		else
-			ewarn "This package needs network access for comprehensive testing."
-			ewarn "For details, see:"
-			ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
-		fi
-		if has "network-dev-test" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-			einfo "Developer HTTP Test enabled"
-			export PERLBREW_DEV_TEST=1
-		fi
-		perl-module_src_test
-	)
-}
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.920.0-r1.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.920.0-r1.ebuild
new file mode 100644
index 000000000000..ee46095e8e2c
--- /dev/null
+++ b/dev-perl/App-perlbrew/App-perlbrew-0.920.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GUGOD
+DIST_VERSION=0.92
+inherit perl-module
+
+DESCRIPTION='Manage perl installations in your $HOME'
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/perl-ExtUtils-MakeMaker-7.220.0
+	>=dev-perl/CPAN-Perl-Releases-5.202.103.200
+	>=dev-perl/Capture-Tiny-0.360.0
+	>=dev-perl/Devel-PatchPerl-2.80.0
+	>=virtual/perl-ExtUtils-MakeMaker-7.220.0
+	>=virtual/perl-File-Temp-0.230.400
+	virtual/perl-JSON-PP
+	>=dev-perl/Pod-Parser-1.630.0
+	>=dev-perl/local-lib-2.0.14
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.34.0
+	test? (
+		>=dev-perl/File-Which-1.210.0
+		>=dev-perl/IO-All-0.510.0
+		>=dev-perl/Path-Class-0.330.0
+		>=dev-perl/Test-Exception-0.320.0
+		>=dev-perl/Test-NoWarnings-1.40.0
+		>=dev-perl/Test-Output-1.30.0
+		>=virtual/perl-Test-Simple-1.1.2
+		>=dev-perl/Test-Spec-0.490.0
+		>=dev-perl/Test-TempDir-Tiny-0.16.0
+	)
+"
+
+mydoc=("doc/notes.org")
+src_test() {
+	( # export leak guard
+		if has "network" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+			einfo "Network Tests Enabled"
+			export TEST_LIVE=1
+		else
+			ewarn "This package needs network access for comprehensive testing."
+			ewarn "For details, see:"
+			ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+		fi
+		if has "network-dev-test" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+			einfo "Developer HTTP Test enabled"
+			export PERLBREW_DEV_TEST=1
+		fi
+		perl-module_src_test
+	)
+}
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.920.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.920.0.ebuild
deleted file mode 100644
index 7bbeb13d3d02..000000000000
--- a/dev-perl/App-perlbrew/App-perlbrew-0.920.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
-
-DIST_AUTHOR=GUGOD
-DIST_VERSION=0.92
-inherit perl-module
-
-DESCRIPTION='Manage perl installations in your $HOME'
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-7.220.0
-	>=dev-perl/CPAN-Perl-Releases-5.202.103.200
-	>=dev-perl/Capture-Tiny-0.360.0
-	>=dev-perl/Devel-PatchPerl-2.80.0
-	>=virtual/perl-ExtUtils-MakeMaker-7.220.0
-	>=virtual/perl-File-Temp-0.230.400
-	virtual/perl-JSON-PP
-	>=virtual/perl-Pod-Parser-1.630.0
-	>=dev-perl/local-lib-2.0.14
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		>=dev-perl/File-Which-1.210.0
-		>=dev-perl/IO-All-0.510.0
-		>=dev-perl/Path-Class-0.330.0
-		>=dev-perl/Test-Exception-0.320.0
-		>=dev-perl/Test-NoWarnings-1.40.0
-		>=dev-perl/Test-Output-1.30.0
-		>=virtual/perl-Test-Simple-1.1.2
-		>=dev-perl/Test-Spec-0.490.0
-		>=dev-perl/Test-TempDir-Tiny-0.16.0
-	)
-"
-mydoc=("doc/notes.org")
-src_test() {
-	( # export leak guard
-		if has "network" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-			einfo "Network Tests Enabled"
-			export TEST_LIVE=1
-		else
-			ewarn "This package needs network access for comprehensive testing."
-			ewarn "For details, see:"
-			ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
-		fi
-		if has "network-dev-test" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-			einfo "Developer HTTP Test enabled"
-			export PERLBREW_DEV_TEST=1
-		fi
-		perl-module_src_test
-	)
-}
diff --git a/dev-perl/App-perlbrew/Manifest b/dev-perl/App-perlbrew/Manifest
index 82a63426e296..df8540adce18 100644
--- a/dev-perl/App-perlbrew/Manifest
+++ b/dev-perl/App-perlbrew/Manifest
@@ -1,5 +1,3 @@
-DIST App-perlbrew-0.88.tar.gz 92126 BLAKE2B f7bff0635d9d3d768f781ffd0f67c69db4d837b7f2dffc72a002c3dee4ea2e7cc04b1e4ed46e68e52d675859516b88832be563f8cdfa35d6dc6cccc875ecf265 SHA512 16a60637f9de4ca12b270b3a6946b15b0881af797e5f811be601895ed25db0eb98f6056a219025213f439ceb5f2253bb175e0efa5d3742fffd7820fcf0433115
 DIST App-perlbrew-0.92.tar.gz 85094 BLAKE2B 478ebc87ac6b93e5913b7c0f8be6aa6cbb0033581cafba141ac55f3ee8b475721b87c15536fdcdb3855583137e4336a8e8d630ceadaf2ccb85e09eadb1e0bd73 SHA512 34115bb3f8eb3e903fa2fd85f6f00b89338379799c6ff5f14600eed035b87b7e83bcf3e020a34e5ad6437d8cd5ed542ca8e091b3245c636045c7908a94d5de68
-EBUILD App-perlbrew-0.880.0.ebuild 1623 BLAKE2B c026fb9c7e69a2bde4f86ba917ebed88e24d5a84d552fa07c61b42147956f40becb9da90e61ac965c6326ab964548f8d0d51e20d6fe61542ad824a85bdbb4ddb SHA512 b722f1b7350e04f00f9b0ac40cff0b20cb74ba2b8288faff45b02fab1c0c49aa8ece7c6c727a69f36a68b97b7ea54b413f8b0b228a75315fcbeefd4cf2b0757f
-EBUILD App-perlbrew-0.920.0.ebuild 1582 BLAKE2B 280c9f7ef57660071e7cdf427250f194f8713ca89d514ed5317fd85a30677236e369bb1b0d32ca7e50601e89e46ab376e277dbd30b14111e534f77a3bf1a714b SHA512 833c8ba35ff44e2f5294fb41c32f8ad414a2a1bcd1e50184bcfa690bd3e2238eee76c034244b34ac14b9826ed453eeb6cbed87363bd9682feb0d5417768595fc
+EBUILD App-perlbrew-0.920.0-r1.ebuild 1540 BLAKE2B 8859bde067c3222d6939ce2e64fcf8253c0d120eb14412479d73901261dc503eb4d65a446d686caaba9293ba0e45c5aef5dacad08d31a46ac8324991924abe24 SHA512 5c31f978b2d597c92fadb0b1b583ea5bd37e9a6e47ecd5f1b652812da7f80d6fbc7dfa35b053a50a24bc7c8c0b66c4110606216a0df2495f8dda0c7a042e95e5
 MISC metadata.xml 805 BLAKE2B a5399dd449fc9c317b1ba815f8fbf91f7c1af8c995b4571b31e079369960f2f04f2a3a36a6e31be1f314a60f936c1f5157df629db3143a5f7a2a5684c5c30d24 SHA512 e1c363c3654dcf7de70dccbb1185bd9c2ecf54dd1fba0ddce2a6bb86bfdb1b197abcac8d68856a5aaf0c608f052f39d94a0d3fc5579331f45a07d01ff34576d0
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
index 9914bdd1bd36..04677230f11c 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 1ca5eb87be9a..4f0a4e421b2b 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,5 +1,5 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
 EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
-EBUILD Config-AutoConf-0.319.0.ebuild 717 BLAKE2B 125ae7f44812b64dbb440b8095a383b417020433689f1c84affec037b042f86fcfb2597069dacc49463536d3ca1188bde80e2aeeb343a15fc91474caf4bd4a75 SHA512 396e995f9a87d1bfc20fb3b1eeac21f50601d6d7610dd8791a62154992ccdf41ea8e4d92e211fc1585d2242deca15f395b43736e6722f7670a0fdde22399519d
+EBUILD Config-AutoConf-0.319.0.ebuild 730 BLAKE2B 694f0d1e79fbc8d8a19ba624624d77ab7604b090a4bd5b6b06d2478f48a60aec97836a71ddbf7ef56d0de2db70e873eaf083b475d1d5bd55513453e60ad27d21 SHA512 7e5921ff12baa0b446b7ad5a32554b789bb8d6dcebde77f474b271a4c850c5b6a24f290362b28f9bb1a69b9ee798806e4cdb9f2853f03226236d0bfd328095fa
 MISC metadata.xml 402 BLAKE2B 4cdc91bf4199fc7257fd8e1e24844b3a7e5dc6dc365e9f2e1d62c8928427138f43219dae7d87168c6706d59da3218f6da9668937920fef89942e005e6052eb56 SHA512 89053a14b4b092051ebb66bf194123691701f5a4c85cf31a3d0c4b6f063c93f1bf2211bf38f98318fb1dc2bd5705eedc07ef6c37e83683cbdf9114512cb1a25e
diff --git a/dev-perl/Curses/Curses-1.360.0-r1.ebuild b/dev-perl/Curses/Curses-1.360.0-r1.ebuild
new file mode 100644
index 000000000000..780e2754fc8b
--- /dev/null
+++ b/dev-perl/Curses/Curses-1.360.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GIRAFFED
+DIST_VERSION=1.36
+DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
+inherit perl-module
+
+DESCRIPTION="Curses interface modules for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
+IUSE="+unicode test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	virtual/perl-Data-Dumper
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+my_curses_unicode() {
+	echo ncurses$(use unicode && echo w)
+}
+
+my_curses_version() {
+	echo ncurses$(use unicode && echo w)$(has_version '>sys-libs/ncurses-6' && echo 6 || echo 5)
+}
+
+pkg_setup() {
+	myconf="${myconf} FORMS PANELS MENUS"
+	mydoc=HISTORY
+	export CURSES_LIBTYPE=$(my_curses_unicode)
+	export CURSES_LDFLAGS=$($(my_curses_version)-config --libs)
+	export CURSES_CFLAGS=$( $(my_curses_version)-config --cflags)
+}
+
+src_configure() {
+	perl-module_src_configure
+	if ! use unicode ; then
+		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
+	fi
+}
diff --git a/dev-perl/Curses/Curses-1.360.0.ebuild b/dev-perl/Curses/Curses-1.360.0.ebuild
deleted file mode 100644
index 694ddf345303..000000000000
--- a/dev-perl/Curses/Curses-1.360.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=6
-
-DIST_AUTHOR=GIRAFFED
-DIST_VERSION=1.36
-DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
-inherit perl-module
-
-DESCRIPTION="Curses interface modules for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
-IUSE="+unicode test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-libs/ncurses-5:0=[unicode?]
-	virtual/perl-Data-Dumper
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-my_curses_unicode() {
-	echo ncurses$(use unicode && echo w)
-}
-
-my_curses_version() {
-	echo ncurses$(use unicode && echo w)$(has_version '>sys-libs/ncurses-6' && echo 6 || echo 5)
-}
-
-pkg_setup() {
-	myconf="${myconf} FORMS PANELS MENUS"
-	mydoc=HISTORY
-	export CURSES_LIBTYPE=$(my_curses_unicode)
-	export CURSES_LDFLAGS=$($(my_curses_version)-config --libs)
-	export CURSES_CFLAGS=$( $(my_curses_version)-config --cflags)
-}
-
-src_configure() {
-	perl-module_src_configure
-	if ! use unicode ; then
-		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
-	fi
-}
diff --git a/dev-perl/Curses/Curses-1.370.0-r1.ebuild b/dev-perl/Curses/Curses-1.370.0-r1.ebuild
new file mode 100644
index 000000000000..f3ce370237af
--- /dev/null
+++ b/dev-perl/Curses/Curses-1.370.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GIRAFFED
+DIST_VERSION=1.37
+DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
+inherit perl-module
+
+DESCRIPTION="Curses interface modules for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
+IUSE="+unicode test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	virtual/perl-Data-Dumper
+"
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_configure() {
+	myconf="${myconf} FORMS PANELS MENUS"
+	mydoc=HISTORY
+	export CURSES_LIBTYPE="$(usex unicode ncursesw ncurses)"
+	local nc_tool="${CURSES_LIBTYPE}$(has_version 'sys-libs/ncurses:0/6' && echo 6 || echo 5)-config"
+	export CURSES_LDFLAGS=$( ${nc_tool} --libs )
+	export CURSES_CFLAGS=$( ${nc_tool} --cflags )
+	perl-module_src_configure
+	if ! use unicode ; then
+		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
+	fi
+}
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Curses/Curses-1.370.0.ebuild b/dev-perl/Curses/Curses-1.370.0.ebuild
deleted file mode 100644
index f98fec7f7497..000000000000
--- a/dev-perl/Curses/Curses-1.370.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
-
-DIST_AUTHOR=GIRAFFED
-DIST_VERSION=1.37
-DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
-inherit perl-module
-
-DESCRIPTION="Curses interface modules for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
-IUSE="+unicode test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5:0=[unicode?]
-	virtual/perl-Data-Dumper
-"
-DEPEND="
-	>=sys-libs/ncurses-5:0=[unicode?]
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_configure() {
-	myconf="${myconf} FORMS PANELS MENUS"
-	mydoc=HISTORY
-	export CURSES_LIBTYPE="$(usex unicode ncursesw ncurses)"
-	local nc_tool="${CURSES_LIBTYPE}$(has_version 'sys-libs/ncurses:0/6' && echo 6 || echo 5)-config"
-	export CURSES_LDFLAGS=$( ${nc_tool} --libs )
-	export CURSES_CFLAGS=$( ${nc_tool} --cflags )
-	perl-module_src_configure
-	if ! use unicode ; then
-		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
-	fi
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Curses/Manifest b/dev-perl/Curses/Manifest
index 49468dacd3b7..43bab9efc44c 100644
--- a/dev-perl/Curses/Manifest
+++ b/dev-perl/Curses/Manifest
@@ -1,5 +1,5 @@
 DIST Curses-1.36.tar.gz 135049 BLAKE2B c63d1f8d80db33e184c6d9c49c9ee902b5e3ed2e69e4ccbdd683d7b6109f8025d63838ce20f6e57e95c9a9bcd9e14d6af448e52f1b9d219ab388ab74798d917b SHA512 40ce96bdf7ef4bbd6975363bc27c2c561a81cafbaf147f2655a2c6521e09f6e40441cee06b6f8f27e370ad59eaf6f677ffe8e475030dfa870d25eca37717c58c
 DIST Curses-1.37.tar.gz 135763 BLAKE2B b42f81d5a382b8cf6c8323cc5c13fd39dcc57081ad2e3de9e940f06a0126879d301ccaebc5c34fb5cb4bffd1263b0681243164539c450db50cd3388e6fd35823 SHA512 10886e725b174fdabc0c9b86a9ef9b717949f0fb03561bfc315e8503be689be7945d1ceeea2f950628ce480c2cc8081736d3b8f28042ea677b252298a9eb4827
-EBUILD Curses-1.360.0.ebuild 1177 BLAKE2B 58e362d8c5bac00ae72c5de5547dbad1d2977483045969abe0222b3b2e3fe0776ff05c3b9b54607c26407f5823c5811f0c29b3e9a2141f3194158df9936436de SHA512 3beec367b86bce1fabb66d9a6fb644423375c152ec64286acb2c5f8c6952b21e48de67dc6683335bb107f185bf5a59bca1c651cb0e03be135fa27d1b0980161f
-EBUILD Curses-1.370.0.ebuild 1188 BLAKE2B 07eae36a117cbf923cb79bf3bbd1e787f7f24703d6e9d43c81914425d460c1d3c889da6767545d1fe4747c07315cf62f62af8ba8bbf80ebe6a3a3d97eb741eef SHA512 44340d2711a7025c889e579cab9236324337c107a65f9150a04ecf09db8fb2f887f0f4a29da6a3218cf4eb659ebb959068709860eb2d7f0ae2c487a893219206
+EBUILD Curses-1.360.0-r1.ebuild 1177 BLAKE2B ce01b2e67609b4dc8a7da9e4a20fbb20174fb61d425f03b10305df90ceb07f4513e43e990a364a9e2592b34fbff1f024c934c20da8b6a92829e06ad2663e2bd1 SHA512 785981a7c2ebd2a47a38466db84153000369b72f81c2ed3ef9f8ae85c59c30a07932855e3ed0378efd81606d24a0469b906dcdaaed2aaaf39cfdedeade96c9e7
+EBUILD Curses-1.370.0-r1.ebuild 1184 BLAKE2B 7bf8879e0f8668dcec834bf71bda1b4c2ccb1248c3b3abe7c10255a4e18eab3cc257b465c6faad00d7ab0f39f72ac24e36f70faf568ddf7babc91059930e0465 SHA512 0a481baf6361efc965e07c2c2360bee0155656d645dbe717602ed83eb5ff9730ce328c235e568a856acb617f12e71d03761394bfcd733e6258a6a56b34a2fe72
 MISC metadata.xml 802 BLAKE2B ccae394619eedd43c6e5a522aa9f92e7d786dbb8a83e109af3261ef7d9911ee73b26427c8e5161b61f325261e39781d7bc5aa46f525811cf168f3ce4a6b7b485 SHA512 286dec4f8025e80d92d654c90ca124fa7b8c7986ca7afcd89585f7d57a4d15a76a044840d6f526a8bfde7edbc2dc9b5ba296d692183fa79a75ae3bf55ead1b83
diff --git a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
new file mode 100644
index 000000000000..882826314ad1
--- /dev/null
+++ b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.023
+
+inherit perl-module
+
+DESCRIPTION="Check for the presence of a compiler"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~sparc"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/ExtUtils-HasCompiler/Manifest b/dev-perl/ExtUtils-HasCompiler/Manifest
new file mode 100644
index 000000000000..a4ded09d8822
--- /dev/null
+++ b/dev-perl/ExtUtils-HasCompiler/Manifest
@@ -0,0 +1,3 @@
+DIST ExtUtils-HasCompiler-0.023.tar.gz 15857 BLAKE2B f999cbc13edc4ff9d4fb1f28fc20dc223e2b504a95e44d6a4871c55766ec3fa0cbe6c5a46add40b694a2513604c486d1d98853c17fcce397b21855d6754fa41e SHA512 352e87249eaefcf1cdaa019522849867c2e3dffe60e07c24957072bc27aea39e6855c082b112f326c5a4f86b2174dbb2e03c487b8f7fb2abfd750847f19e7a6b
+EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 388 BLAKE2B b5bec362d3b0ec1473fd0f3ab9345b12ad242a2c559f342b2e97ce8123afe76fde2a703464650a6468ec0b95251d6b12e49a263761c63baf280245d2c4e6defa SHA512 80c3cd37df22a1b8f132fef70d1a57d7d4a648cfbb317b9d5219db2a2f803980f111c77d1998f18c8631483f68b5c52b61a66091efa4a6fb23865d631f6feede
+MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/ExtUtils-HasCompiler/metadata.xml b/dev-perl/ExtUtils-HasCompiler/metadata.xml
new file mode 100644
index 000000000000..2b9a936fc0a1
--- /dev/null
+++ b/dev-perl/ExtUtils-HasCompiler/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>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
index 90b199f898d3..040c1bd5e802 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the Freedesktop.org base directory specification"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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/File-BaseDir/Manifest b/dev-perl/File-BaseDir/Manifest
index 765f669bb1a1..5609a9522889 100644
--- a/dev-perl/File-BaseDir/Manifest
+++ b/dev-perl/File-BaseDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-BaseDir-0.07.tar.gz 9888 BLAKE2B 345c20687bc6c0d0096ab90a2f53d7d85667c12ca0f7c49e0e23e682dbc8e2f9876ec3790d3193b053b31f8d1d6c3db9a631dd1128662cd5605e093b989552f1 SHA512 782ed883f37aeb28c4c71a10108865b2cc152c2a7a6015f84cf775be452493a3f599182d213a934e48bd64ffc74369bea61ad89f26f8b7b0c2f94504f107b35d
 DIST File-BaseDir-0.08.tar.gz 10052 BLAKE2B 63b1d9777c332f3d4a56e4ae53aa78f1b5793af52b2c4e749586b33d7700c1e5b66e386a770faf8d9d3d04bc0d296dce69f1d9f2bf36e44839b43d089c6981ff SHA512 6b44edca34906c34d574933c21c0e3a1a236a431a3ac12caeabcc2638688dfe1c02efc9a1e75a2c2cd522de0dca00df0620cd262c184ec938cc97766d1121f99
 EBUILD File-BaseDir-0.70.0.ebuild 920 BLAKE2B 1759cda330fdedd8686c9204e77ee9d6715029cb9c5a5611417c6dfa8096a271f35e3c21b6b6dfd51028e9d89cc2a362ba0179f762d0b6d213775d43cf9f842a SHA512 4c19aba43c7762f699807c4ec51ef2615161e41dcb6fa5ee77eec1b0a94e7f76a96dc04d3c427d130ec2fbf73023315c79f571b88116c8c03e522aae36ee92bf
-EBUILD File-BaseDir-0.80.0.ebuild 873 BLAKE2B a9b4dc3f25a30d8933e17a8cdb0f84692eca6847b5485942e040997f33db7e9b3f0c55443486aeab027321f1a74d0be4f0bc688a58c20b3201e83749e95002af SHA512 04f4fcf18f6afecbca89de71eae52ad724e03897a207b527c59f4b7fbdbd259c30461315a5eb1744f5bcc2e92f3f1ee551a8ee370b29050a040c5215cf6f6d19
+EBUILD File-BaseDir-0.80.0.ebuild 880 BLAKE2B fb548e9ea1f19c369986aa12ed728c36143c0013eb67a7ee5e83926ee520790e0161fdce1f434c513c563c19d2cfe686551d9da0f4e4cb297255b1e8f35fa8a3 SHA512 aaebe312ba7c511a224e1b6e940fe8c2d775b31c296cb8d61d54e38a3c4d71e3868c8deab0e13096195b964e30f094399af3c3ebef959231fbe12b2659e72210
 MISC metadata.xml 519 BLAKE2B 875987e9e16f33472bc355fa0b6dbe05f0659d134c2e095ff64c758f20a26ca6fecb3d413d8308c0b3e91d35c8c84c250152ace8eb81de928aa1bbb386859044 SHA512 1d6892e71323a869a4f1ed70c1c32c0877a3dedfc13c2d019e833c0a2b230dc434a99821852dd52a60e35dd44e5254e51e7f6930fb8478356b495fca77905fc9
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
index 15888855f8fc..71af8d097263 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object to handle .desktop files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-DesktopEntry/Manifest b/dev-perl/File-DesktopEntry/Manifest
index 752477153a43..50c45d81f7be 100644
--- a/dev-perl/File-DesktopEntry/Manifest
+++ b/dev-perl/File-DesktopEntry/Manifest
@@ -1,3 +1,3 @@
 DIST File-DesktopEntry-0.22.tar.gz 18366 BLAKE2B accca0319aa3701cdfbe941f41e68e1ef1a28713ba557ac6f549cd3476df7635898ca2f6fc40cf99ad0ca86c1e42cd862468db2b59c4b79ce401e992a3e8066c SHA512 f6a0f2a91c66ea3e5ebac1e66f82317c4109d8d3e2211b4e84cd870b9df07320c03ee0d026e89f788338a1c02152c77e36402684da4f5a7093eb3ac21ff584a7
-EBUILD File-DesktopEntry-0.220.0.ebuild 740 BLAKE2B 47f4c8498a27c953c119d61ff1eac965c52b64914442192a4a5ae3a53ca94344a563fdeb493653613241674b6c2ac9c6237a811c1a567e95e07d8e130acb45a9 SHA512 2405cfbcc30e107ed58d478b2debae5c9915145567f63262dd28add34e883805208332f7380f3ab11322de3d00948c5f11a405d29061df712712d6ed9de123d3
+EBUILD File-DesktopEntry-0.220.0.ebuild 747 BLAKE2B 6e8afa7f49435e458794bc5a1860f65c11ac61f385797a76ad0cb4f1cb52535631d56ae1f69b3620f6a4ddd76a9c87d8aab16802fda3e199f660953eb7f4eb5c SHA512 dbc894c59c9276ef6affd1163ae5384988f653a6cacffa137ea2d8f99a02f58429f9aae05055f9d933b881390641a97134f13d56d5d4d5c514307a56de546b1b
 MISC metadata.xml 406 BLAKE2B 188af9f87f30ac7ffc02f775edc9f33728812ce86352848013c03e4cf289e370085a016ae68c7055e5406b53c45f943b1c4665c2b5db5dd25826501729508bea SHA512 7132cce1914101f95c393eaa9a16bb56879eadd848ab0ab90735e1760ca0961657ed0925ae9b42e49f2061064795901ce4eaa02ae85ae1854c315f18ab219734
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
index c1e5a0496bc9..240d7cc7c2d9 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index 48c9936c057c..9af5802913b1 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -3,5 +3,5 @@ DIST File-MimeInfo-0.29.tar.gz 33113 BLAKE2B 5653316aea954cf82ad1c13474b6bb27408
 DIST File-MimeInfo-0.30.tar.gz 36132 BLAKE2B a87f9efe05d6b09cda4f365e9395e5677bf80a2baa5eae6592c01da4e6aac46994f82676f4383f0f538c8bdd6b70a4ba7aa1eed4c038eace6586839f2a9ecbaa SHA512 44030d2e2be66cb67d4329f8f308bf114014c511fe965979600157d62deffd5c2f05fdf883cb02d98f00d5d0b77c56e252cd377a398461ec421fe7491cd544ec
 EBUILD File-MimeInfo-0.280.0.ebuild 705 BLAKE2B a546bf761c39a96cb87c164c28c0401c9f0851e5eff2898d5d239c48b4effc731bd158be62dc88c6ae1468c5adb04117b8591efc35f5569dcb94ac06bf0b62c7 SHA512 c0db3093ae8aec6d3a663f52793a02adb0f45faa13fc8163fca3bd607748fb92c2e22ab3493776155639d09e4628d15422c19501a3304a83499107eb15317d32
 EBUILD File-MimeInfo-0.290.0.ebuild 716 BLAKE2B 7fd424a4ca703a7d57887ab618c4d62d5ee586d33c78bef7f2e94e7e32338479a70eb9c605a4d926a1619338020ee68fa454570cb4bae87272747c66d795be68 SHA512 23d712493fccc8888c4a0e48770917a7d3afda7508e3bab1f1af6c3dac96450421e760fe50a14018cc1d64e80ac521df170f160c7cdb66d0bb41bab8284372f0
-EBUILD File-MimeInfo-0.300.0.ebuild 748 BLAKE2B e666e7e52a9d783d2fb4b17251355195128e56759c5942f117920b3f1596bade047f366a457721b832174908d8a1299906ee03306e4276e15c9be929342dd9bb SHA512 9fdfcdde5ae03cec1e1d803462b74fbf07ea125a3b47941cf752d52629484922cbbe085681f0fdb48e4f2aa9c6c5b040eb6a4514dd943a74b7265b10257812f3
+EBUILD File-MimeInfo-0.300.0.ebuild 755 BLAKE2B 3f7eddb33f32bc5043661854288f52cb4c1b493c5930eba77b7b673afb332b5034c9c64f8a4da102d1e0beb378baa92eca8238817995d24d7b35572470368af7 SHA512 4b05cde07376a36fcbca06b0247214f20a803122dd6f1a23c2498a53c0c464317cb5f2e9bcb8a83d2c88869128e371fa0d2d6c8d9897383fd4fc7fa294e918a5
 MISC metadata.xml 607 BLAKE2B f55da2dfd584d8fcbe2cf7f6130877f24eb882986c95b77c3d9981fb72658add64a5acdd41eb53b2eb215bdf9d50caaba6891462fa666da8c4deb5b165df4645 SHA512 064d2744a58bff1f5c0f092ab1b8c154a2557cd8c2f4ab8d221b0265a38fa15463ec1288466e3175d59f758d145bb4237c33a8b178ca135514c7d58902a7ccf7
diff --git a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
index 9b949edaebb4..716e87975295 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k 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/File-Slurper/Manifest b/dev-perl/File-Slurper/Manifest
index 4a68949f8e3c..9dfe62002400 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -1,3 +1,3 @@
 DIST File-Slurper-0.012.tar.gz 15517 BLAKE2B 07f451e93e5fa8641a4b8156a61b9a9c1a9c9dc36b33c4991e1686e44b37730af3a9541de33396cdec6bac1d08ec1bf9db505e6fa07f3c95187c4901016955a5 SHA512 276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb
-EBUILD File-Slurper-0.12.0.ebuild 792 BLAKE2B c6c475dbe22be02ce39a881848f8db7a0f86661ab22b08306da65d03c97d54ea2d668f196c2d607eade5493536b84bf3d5c907e5aed265a9d2ee7346fff83786 SHA512 1db3b055a35c1719235a6b5885124c50d3a07f8ff112ece7bddc38351461dd042c38c5fe2a2834345bebdea7756646e6cbdabb08ae275c4d4df94d3c282f7e4a
+EBUILD File-Slurper-0.12.0.ebuild 799 BLAKE2B 07dc9ab1fe88125d0bb3276d104b134c6b4d0678bb04dd9e91c91025878118ae02eb684b7b9c087f01d1698db21ed33043d3b0c9b06ab11b758528de59d2162e SHA512 65b50e72d3848690efd2215943c92809e4f55712ddf80275b0173449495077a8573289b7e989ad6574f5eb32b883b7dbdb6c12f90eace784e8e6df5c7daa9e24
 MISC metadata.xml 481 BLAKE2B 2f8f554f6beb1ed6ac889fe379ff15c4bd76fb8ad050ea6a14f400572aebce11a7bf91468d62ec2844c00c1827928809fb48344f326b55b61f3e4913842641cc SHA512 62906c3487d2b3b8ea9bdf5a5d6fd6aaed39500bc41346fb918363771220742c31de061eb825916f3897a229e8b92bbff87a9181551718cc3fde1eccd9b60600
diff --git a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
index e1d7f269acc3..2b1b66685436 100644
--- a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
+++ b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Bridge between GooCanvas2 and Cairo types"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/GooCanvas2-CairoTypes/Manifest b/dev-perl/GooCanvas2-CairoTypes/Manifest
index aee05e9ef984..5910a3201105 100644
--- a/dev-perl/GooCanvas2-CairoTypes/Manifest
+++ b/dev-perl/GooCanvas2-CairoTypes/Manifest
@@ -1,3 +1,3 @@
 DIST GooCanvas2-CairoTypes-0.001.tar.gz 13527 BLAKE2B 492def35e1cb5142f37804c3e7b10ea5fd966c838b44e6f67f26cf19d08f12867e7f28a6901ed3d40798c6fd3498dd1a6149eb8ca9e18be66bb82343aa8dce32 SHA512 00478eda62bfb80393635e0c5eaa86cf43646e74df1ec61f9fac58f4792e8deabeede3f6dbfbaf8844c850f3ca729f3f27090449670f9eeeafcf2ec3ccd316c0
-EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 553 BLAKE2B 5b0698059af829a41a0ac29fc70147d89f24be78c0ab3892f143591049e85049042c9f22567bcc5874a96d0215b42c04b09891ecc0dcf7fab88ffc3d0e0ef20d SHA512 d70ce6729bb88c7b4357084daca657acbd0c79817243287b14c2b266b5b32c49ac78dec1eb71d938a4e660104c97b3f5d5152fb00c0d91254ff105ad915aeb56
+EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 552 BLAKE2B 7c3535e01a580fdf2bfbdac1278e745f44cac1fca6faa5c834b671718507cc8da6e85057b81417ee94f6ac342c826ae9de579f9e605cec622ad527146ddd2ac5 SHA512 9571997a1cb5f8875a77a8dc2c732b7fd1b79523e64bfeeab2d1d3b9337d62140352dd7fdb89b8e3ed89fa31d00d5932991e1de4f89443063d053444333631ba
 MISC metadata.xml 666 BLAKE2B 901d6e2a0029c0a9c24fa8bfdd06f1d2913043babbcf21c23a04560606bf53fb94c8d67e25d2a4ca45e933f96920b0e790b31a53b583cdad830ec75918d84125 SHA512 6b6ad6f1b4caef3f750cd2ac1d8069e47d0ad3eefaf18c6bb7059168bf0f7957c9d0ba5ca994a6103772e76c6a93f42cf853bb136796a8ac46f84f287881ac51
diff --git a/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild
deleted file mode 100644
index beac334d257f..000000000000
--- a/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=GBROWN
-DIST_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="a Gtk2 widget for displaying Plain old Documentation (POD)"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-perl/Gtk2
-	dev-perl/IO-stringy
-	virtual/perl-Pod-Parser
-	virtual/perl-Pod-Simple
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Locale-gettext"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	local MODULES=(
-		"Gtk2::Ex::PodViewer ${DIST_VERSION}"
-		"Gtk2::Ex::PodViewer::Parser"
-	)
-	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/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild
new file mode 100644
index 000000000000..1348da599cae
--- /dev/null
+++ b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=GBROWN
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="a Gtk2 widget for displaying Plain old Documentation (POD)"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/Gtk2
+	dev-perl/IO-stringy
+	dev-perl/Pod-Parser
+	virtual/perl-Pod-Simple
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Locale-gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_test() {
+	local MODULES=(
+		"Gtk2::Ex::PodViewer ${DIST_VERSION}"
+		"Gtk2::Ex::PodViewer::Parser"
+	)
+	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/Gtk2-Ex-PodViewer/Manifest b/dev-perl/Gtk2-Ex-PodViewer/Manifest
index 8cf3844196c1..5175c6e04af6 100644
--- a/dev-perl/Gtk2-Ex-PodViewer/Manifest
+++ b/dev-perl/Gtk2-Ex-PodViewer/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-Ex-PodViewer-0.18.tar.gz 15417 BLAKE2B 4c74a58dd023c2be098d0c752d9d34baa7eee9db7910be01eb9a979aa940a618a9eabc6e52a7720858d6ca680fb34381fa77d1651025f014934d0f9c48873483 SHA512 488c83a95776f0d54d92bc45abc7b1727d76930a16d16c203865ecd9e9274340f59fe2916ceb16fed0babc8b531cad625cfd549ff9914321440e14ea81c49893
-EBUILD Gtk2-Ex-PodViewer-0.180.0-r2.ebuild 962 BLAKE2B 886c8404f6827607c289730ea66a8c72aca980205dafbcf978f80eb7f4b49b98319d7682a9aec744ba23f9811f3f132eac30925f269b8ba5556664acbf26ab9e SHA512 b7da5f42d723a0fe5eeb46314bd36fd2f0900d094eaf562a6ca7ee902ca0b7fc3fac9fd979c74e0bb1c899171dce1e7e20dd2977d75da4ab7b420ebc8db6e993
+EBUILD Gtk2-Ex-PodViewer-0.180.0-r3.ebuild 968 BLAKE2B 780d7609d2f4976537a18819963f2e64bd643ddf1bf8d3434d9265ef316f890b4f699253752ca479704a39d0c5b30849104ad744a94cc641d4ce0ad7dcf4ded4 SHA512 05c6262ea5a012b1efc271c63a2a645fe3221a722d8f9885db0f1173f2b1b68749ebb7bbf970a8345ea9b86c7d3b574173b95aebe97348d28db5d105e50999c1
 MISC metadata.xml 481 BLAKE2B 0516aebd0c98449ef5f36dcd1f5800dcfd5eb800fa727f47df62885f2cab2dbaecad4a3ca717fe44cf27e8697b78522a916a459ee32f646f2492134ae339f4ee SHA512 8a505188adae06fd9a45d11b075f599a0b744c68ff45d483ae39ef1dd076068acccef2bd6470c6e9cca7e4d00d5681e8c8fb98c878950828e95cc78633a3538b
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
index 3d42b612a761..cc14d5993e54 100644
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Image viewer widget for Gtk3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-perl/Cairo
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 4e60f4ba9a55..d60556bc013e 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
+EBUILD Gtk3-ImageView-9.0.0.ebuild 692 BLAKE2B 7af57f3860c66f616f1313a74784276922fb3d0b5ea594a70c856656caeb740fb06e2261d0ba4a6c4709dba37e8123af774523a910e1c66654ed6eb4539fe79b SHA512 804ae4035aaa6d600d34d6e0c21ba735a116d6687f0a6cd9d3c8c137a580e0de37b273614ff23b0f80ddc7455464b52a779bc9e616520039994e8ef3ecb8c623
 MISC metadata.xml 1017 BLAKE2B bebc2e45548a9e410ad22ea557f8d57e302489ed1d1dd823ef9cdee524d273f52043eb595856c0faba5237dea52adaba62b260b8d376ce4b29aff4ff89b02a37 SHA512 f35f6ec768e183b3a60d1a10b2015aec58e865233f9d261e8e3586bcd36fe826000cbb911331b48b84e4c041ee79604f6e4b339eff712cea112646ee8feaff46
diff --git a/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
index 8547c08f08d9..14d0c5cacab1 100644
--- a/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
+++ b/dev-perl/IO-AIO/IO-AIO-4.750.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Asynchronous Input/Output"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	dev-perl/common-sense
diff --git a/dev-perl/IO-AIO/Manifest b/dev-perl/IO-AIO/Manifest
index e439090e651c..e14de702ca8a 100644
--- a/dev-perl/IO-AIO/Manifest
+++ b/dev-perl/IO-AIO/Manifest
@@ -1,5 +1,5 @@
 DIST IO-AIO-4.34.tar.gz 156615 BLAKE2B 913e90403bc8172d2376420c3cc3c48e4d694580a71adfa19e59e8f0c7d8d451df736686393423b94f2f916002c153ddae40a1350d05ae20f035f633e8df9c50 SHA512 7b7e05fb01513864321c1aa2a28192444299486831b75461bd57bad5a0370863d46df42c698288096eac55f9972a3492f8af46cb265f13c721da698c9fe3529c
 DIST IO-AIO-4.75.tar.gz 181557 BLAKE2B 842b15d19607eff47bdaee7afd4b823d6333e31a9cc8b5eaf4ad875103b2e37adfb7f1cfbdc1cecc99d4b1375f29101087f26d6e1f85fbf8e026b5985d46ac62 SHA512 3a30b34d6de476accc9b07c0723a3b21c235e5bd2b5951edc3ce3150de22a6b7dab5634d78ec17b799a71f2ede0bc138fead1e02885eed31a4da5cec05dfcaa3
 EBUILD IO-AIO-4.340.0.ebuild 785 BLAKE2B 1e8235879b357e9c8231c3db1b92cdb7fbd81e0564cf6f207d8e30d61a2aa4a8825425744ac8e09acd33f826b4a98e8529aef4db133642d4783b0ff3c9c9fca1 SHA512 7762b18d8d43b069e319f11f4311659dc10ac5696e474781b85009cda080a685a20af4417978b79d0b423511ce93d4b19fa1766126cad74f7647d62724fcd47e
-EBUILD IO-AIO-4.750.0.ebuild 630 BLAKE2B eb76fe5cc7addf3516f0f1a0b73c155dbe2c369f07b13b81397377891bec1c6ad69fa4fc24fb9cdd8c8aa7ca65b8055c13171445b4194fb5ad8c383312641620 SHA512 706ea408a00b4db45811904db540174ddcc8e99207516824be9c09a8e215b8f9ea0ecbbac37ade90fbb9e249a128cfb2de79e71bbcfa9edc57c9aef83b7f4426
+EBUILD IO-AIO-4.750.0.ebuild 637 BLAKE2B 4f1797c65399e2de21eaf12ca8130c1917edbe2a13797f8e40ce53d2017bc4aa64e5f1f3c42242f55e99afbe67dbc7e28cf14d94d04b41942121fa8fb52ae179 SHA512 0008c56a0e5f2e709e393fd18ffec3362d3308eb1810ec57cf81c2d39473eb7d020bbfff4f32b7e07d40ffb9a9f0ad19cbe2cd57519a327bfe8b46ba031b8ae0
 MISC metadata.xml 384 BLAKE2B 1f5e7a27cd47b19cb6bf5ec507d316e39080b1d47b8a770c9ecf0796daa8de4c89e247e0b329be67097c603db6a329fbec5ae5628d9a87a43243774feb5d29eb SHA512 b8b6b875f238a07128ef4a9c41f4cfd00d3b782c595dc79873d49474db057e0d8991f06637905dd8cdbcd78764a0fa55bde44f7ef22f3d08eb0a86cdc8dcc5f3
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
index 7eaa89c8f182..7f9e15c15000 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils-XS/Manifest b/dev-perl/List-MoreUtils-XS/Manifest
index df45c4b5e669..10dd523356dd 100644
--- a/dev-perl/List-MoreUtils-XS/Manifest
+++ b/dev-perl/List-MoreUtils-XS/Manifest
@@ -1,5 +1,5 @@
 DIST List-MoreUtils-XS-0.428.tar.gz 159642 BLAKE2B e3f41c4baf14ba54bce0424e818baa603f11804e83e96a9afd61b0f80d3c207f0a45cec8ff61059b70a79abc631d0e074c6654ce6d99e4ad834b40ded21aacb2 SHA512 a608568e3c4a2e160e4f9afa26640be5b97ec83e301a6b81849e37951698b9423c0a969d7e8797a49b4fb6c5123780630a3726c64713922b90b21b947682c3dd
 DIST List-MoreUtils-XS-0.430.tar.gz 163827 BLAKE2B b5f3ecd788d3accf4b3f344da96fba8a5c5c24ba73f292c180932d16b0b95bb02104815b6bfe407df3cee8f96338b2b73600e458dbc02041217b06e9af5c39cd SHA512 98260b81f03a425bf8c2e0b63bc3a8d360a0aa2e198b2b7faaeaa48684936183018afdd1e6a04bd7e99a7e728d809709c6206ea578dfe7d8d40c5a4e3e4bb405
 EBUILD List-MoreUtils-XS-0.428.0.ebuild 851 BLAKE2B 70c7cbbbedd99c7d21758ac70037e463abd897bfbe9e4f2441b654ad52eaf0206a8faafd8109735df95fc9a4bba1f2caca45bceef07978ad8efe94fa160d5f15 SHA512 fc7182fe8bbff16f124794af7186c1ce7224f17e610000b60274876328a9174983c386f99a9f241270abdc7a0f21af6b982601558c861377b217796873750026
-EBUILD List-MoreUtils-XS-0.430.0.ebuild 838 BLAKE2B 05c6767a4d54d3f0615fa148eda32b46e291ddff70248df0e5e809c86f9dc6cd55a0dffad5573bd6d4fb8fbd23685d17b2c1bc109ed04e7c6f42bf3814ede9a8 SHA512 cbe4cb2e74837f2ce4e557c6d5c30c4431ff46d1d2719962f895367990e5fd9685951e6bbcd97d78ae0f183a075f2d21bcc24a99ab54e8bad585721040d62b4c
+EBUILD List-MoreUtils-XS-0.430.0.ebuild 851 BLAKE2B ae209d465984f31d9607472984e2c4c357ac898e1a7513b7a32d1aa58c9e1b2f8c43989e5aa2c4daaef05b7733c7a228fd5420c0ce97e0f10cda19f30032be92 SHA512 01a13efeb8ebf334ffd32358d0a206824e0feab200a5c31a207dff040a791b9726410d305910e52fb1251f530d25ae55df729205c1a958eaeccbd72f6c1f21d2
 MISC metadata.xml 407 BLAKE2B 0b3bce00c44e63c18c7c9f6ae43700a3aecbd359286e430c0d7939783f763cf42bd7f7649414d0606becdf0c715a26d07de5d669c23068b441350772341d0a7f SHA512 be227e311e8d434fd0d3b55a335946bcb3c319956eac4fa94a829c682496abdd8ced4c8325b5cb3ec67c8ac60fc557ce4933ff8eb6aab3f2475ddd8a5bafba7c
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
index 686fc9821516..6750429df572 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+xs"
 
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/Manifest b/dev-perl/List-MoreUtils/Manifest
index e0ba028520d4..fcddf12f48ac 100644
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@@ -2,5 +2,5 @@ AUX List-MoreUtils-0.426.0-xs-config.patch 2181 BLAKE2B dea4017e432a3c3bba4cc3d3
 DIST List-MoreUtils-0.428.tar.gz 146030 BLAKE2B 8a2accf028ab4c3c9f48f0cdb17624022c1951cb99d715c0af573aa55a659cf6fb51644a2b1ad225edc475ca2476401960fecc7d1319d496a7db27eb52bc1216 SHA512 f7e11f10f1d7bd3b8f9f8bc2fc325e1a9230056f68591da624aed01fb4e4cbac20caeae0c3e2aa3acc8b71febd6d4149284367f051d3c1e608e3a4ca8b62dbd8
 DIST List-MoreUtils-0.430.tar.gz 150571 BLAKE2B 97a492d465808460f161c1296f5343370a5fe7296492ed3c0d957dd029669c23c3a325efab654d5e9250043f37b4afc380bf531cab1837bec27afb3cb92015de SHA512 bc9ff033c12251a6f0899a96da0ec8fc314ddb8d6cdf18c37fe1fdcfc38a4c95ed6f8e006bb124e77d07241ae6754f429bc2041f7772b4acfce9378a21283469
 EBUILD List-MoreUtils-0.428.0.ebuild 888 BLAKE2B 762cedfcdc09fb624a3d766a0eaaf5900351c9990218b6421f8a82b04954de5660035bc9bf0a96b83696c6b45ce9275ca0bffbe49f6fd436bfd309d3d74e424a SHA512 cc1990b49291f20bbe1c1c6f2de284b7cabcd6cfb41a7a3643d933ef435e06dfbb6c1d458fd1f76cbe365abd6d0fb6862658328303c3b0d5e08b13fc4d74fd0e
-EBUILD List-MoreUtils-0.430.0.ebuild 915 BLAKE2B 941617fbe018a936a4178eb23ca4e268a6a9d5416a91e5cbb7cf3e13da2128cf069f17e54424b8bcf2ee3c76bde75a4724b3d1fe0b136eba22c76119ba780e6b SHA512 efdf4d4d2b0cf51175f2f08da10462ca6b4b32f4a3969fb0256e6e3de4eab16358753280522636c5ebe77f5c32b2785e261dc4eaf2ec925f8448fb43e3dfac1a
+EBUILD List-MoreUtils-0.430.0.ebuild 928 BLAKE2B 4d0b68d04cc11072323a38b7de6c0563896871d4e31da82777562de98586f1d56625f7e0fef9e26b61e33c3c13086ff0d035e77239075fe82202f2d0452e06e8 SHA512 73624af19fe25c7bd2e27ec06952729e3af8d0d834d4bcefcf42d5844ba5e72492d21a91f27fda122f9201bfac6ea3758f90520ca79dc495cfc616471f786bad
 MISC metadata.xml 565 BLAKE2B 1d9445527a6329e96a6d38f590f02fa98710bbf649ec5709533b5212402b7beaa4fb9211fe93814de01054a4bdf7c89ea52e8e0f6ee625ffd50f367b2c6286aa SHA512 b4fc48156533446dd91d18f6aac2dd58a61f3e3911357930b3710241f8b3e29a7a9143b02bf348e25c15e5cb323c66dbaf6b3555d64b5b333bc7281bded865be
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 47091ad4b8d2..a6ffe845c02a 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Starter/Manifest b/dev-perl/Module-Starter/Manifest
index 00aa53684557..90ea8a56f2f6 100644
--- a/dev-perl/Module-Starter/Manifest
+++ b/dev-perl/Module-Starter/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Starter-1.73.tar.gz 61368 BLAKE2B c7957a9d2013f7680309b39f0299141a9dba9075d191d804dc2cd09dc80f25b28b7fde128e51d43266fcc93d7d56a54b0b8eb154e8f674dc270970f9a2602f13 SHA512 813bb98a2cd2344c5a8fd032d2ee42c13f767b436ac48a7d88bd6338ec21929cefd8940fa0b606abaa4e264291fcbfc993e10d0c0d471d1b5fda0d2eb7d80d58
 DIST Module-Starter-1.77.tar.gz 60328 BLAKE2B 821a9fa0708677a52b0743a6627d422d89000ba9a816c666ece2ad096ea852578309e2ce855abc5aa6b8bafcd6a4bf140a01fdcd2580e8f70621705e14efc358 SHA512 89e4b8c26c4f5df372736a6070026a81c3038a55b20f9be00ea1a064eb7d363c70c53def3ea179a62e871a1fa775a2cbb588b3ed8c3484243c137006fb24d80c
-EBUILD Module-Starter-1.730.0.ebuild 674 BLAKE2B 54519d66ea84f932b8d50ab9fddb26a18689dd12c3a38f40fdbfba5b31e855c6d9dc457e9a1705dd870fc9fa7bda2b51719bbefcb31d7ffc4b8b3ebe1d515652 SHA512 fc911230e09b48233123eccd10903de70c8628f356eb66b6b12bd529a478e6b98450a0e9ee1a273298e5551d43b27694f75b4c885e0b416a3c0c6be66610fac2
-EBUILD Module-Starter-1.770.0.ebuild 662 BLAKE2B df681b4faf314b94de1a64f02be364ea748141e5932e91ba1c427f7abae00bfd5ebd93b79c2cf4c2d0252b17823cb72e7d520b4d7de9006f6c1b8f7388da5ac2 SHA512 631cb5acc39d2425103bb79c8f10041f929b850fc02a261bc3ce64a9097fb0d1403e64571d7290cb4db54b0044e3c48671d34c5df0e3209be747d4be895a397d
+EBUILD Module-Starter-1.730.0-r1.ebuild 670 BLAKE2B 70d1625ca589422b2b95b4a61296b041ca34d0ca23b02b3bed6a60c37b33f1267817f330cb122f5ff0c75cb6962c28ebfb660f944ac8983e7e153f70cbd2ffae SHA512 7088f1e9163cfe057bc8a2a44534b48f996b313b9f1b25d78421848bfa11bffbb425a319a0c3089ec4d8d20a67179afb70f57096159e69fafddf9cda79f4e881
+EBUILD Module-Starter-1.770.0-r1.ebuild 658 BLAKE2B 42b140479da3b690e9d414ee947b4ee4abbc5f77f5e264220f689d71c716189b48f837860cd86622d69986bb36c1f042c1b8fa4c7361ff2256c00ab158371b64 SHA512 d2ce4889c6d7b06a5333de0e288e8de3798f7e6487a60593b1d02195e50953527df090a9d7e36823ae8dc5a8e205823b7b3d7b45548902cfe46a9e018a0fa405
 MISC metadata.xml 691 BLAKE2B 803baa07db1892c53a9a71d10ffd42dc4eed57eb2236d9d82edf06f6c2e7dc1be6ac8d6581f68fbc14983e22120d51f66df396ee89d96f9f14d4a170b32d00a8 SHA512 5765a20520d23174f755ec516ba5c73eb45d3441ae602bfb1bb6ce1deec43ffe3d0c1c41a107803ff4f527b5a9d7e0b53c01523b0d93febd70bfdd670a612416
diff --git a/dev-perl/Module-Starter/Module-Starter-1.730.0-r1.ebuild b/dev-perl/Module-Starter/Module-Starter-1.730.0-r1.ebuild
new file mode 100644
index 000000000000..90c5a5bab42c
--- /dev/null
+++ b/dev-perl/Module-Starter/Module-Starter-1.730.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DBOOK
+DIST_VERSION=1.73
+inherit perl-module
+
+DESCRIPTION="A simple starter kit for any module"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	dev-perl/Module-Runtime
+	>=dev-perl/Pod-Parser-1.210.0
+	virtual/perl-parent
+	>=virtual/perl-version-0.770.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+		>=virtual/perl-Test-Harness-0.210.0
+	)
+"
+src_test() {
+	perl_rm_files t/pod.t t/pod-coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Module-Starter/Module-Starter-1.730.0.ebuild b/dev-perl/Module-Starter/Module-Starter-1.730.0.ebuild
deleted file mode 100644
index ed58174f81a4..000000000000
--- a/dev-perl/Module-Starter/Module-Starter-1.730.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DBOOK
-DIST_VERSION=1.73
-inherit perl-module
-
-DESCRIPTION="A simple starter kit for any module"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	dev-perl/Module-Runtime
-	>=virtual/perl-Pod-Parser-1.210.0
-	virtual/perl-parent
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		virtual/perl-Test-Simple
-		>=virtual/perl-Test-Harness-0.210.0
-	)
-"
-src_test() {
-	perl_rm_files t/pod.t t/pod-coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Module-Starter/Module-Starter-1.770.0-r1.ebuild b/dev-perl/Module-Starter/Module-Starter-1.770.0-r1.ebuild
new file mode 100644
index 000000000000..3651d037f2f6
--- /dev/null
+++ b/dev-perl/Module-Starter/Module-Starter-1.770.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=DBOOK
+DIST_VERSION=1.77
+inherit perl-module
+
+DESCRIPTION="A simple starter kit for any module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	dev-perl/Module-Runtime
+	>=dev-perl/Pod-Parser-1.210.0
+	>=dev-perl/Software-License-0.103.5
+	>=virtual/perl-Test-Harness-0.210.0
+	>=virtual/perl-Test-Simple-0.940.0
+	virtual/perl-parent
+	>=virtual/perl-version-0.770.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PERL_RM_FILES=( t/pod.t t/pod-coverage.t )
diff --git a/dev-perl/Module-Starter/Module-Starter-1.770.0.ebuild b/dev-perl/Module-Starter/Module-Starter-1.770.0.ebuild
deleted file mode 100644
index 0913f2c52d45..000000000000
--- a/dev-perl/Module-Starter/Module-Starter-1.770.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=DBOOK
-DIST_VERSION=1.77
-inherit perl-module
-
-DESCRIPTION="A simple starter kit for any module"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	dev-perl/Module-Runtime
-	>=virtual/perl-Pod-Parser-1.210.0
-	>=dev-perl/Software-License-0.103.5
-	>=virtual/perl-Test-Harness-0.210.0
-	>=virtual/perl-Test-Simple-0.940.0
-	virtual/perl-parent
-	>=virtual/perl-version-0.770.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PERL_RM_FILES=( t/pod.t t/pod-coverage.t )
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index d6f8cf5c81b9..02b391b78339 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -2,5 +2,5 @@ DIST Net-DBus-1.1.0.tar.gz 2075154 BLAKE2B e5f75f63678b72d2d80406af76430802c715c
 DIST Net-DBus-1.2.0.tar.gz 108296 BLAKE2B c5c4fadfe1c04f5f6dcc73f7d3ccb2a91555809209229f51a326494e73b5a0ccc83a89f427c19c73a82b9608decf85cd19ad469a635cf176d5b1dc42bdec98a0 SHA512 9dc95288ae81037985020e18db33331de6908b1280fc3b0ca898c183a5b577d21d240f4f1045393f9459a9be6e3425feffa9ea581e6af2bcf165cdf48348b255
 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
+EBUILD Net-DBus-1.2.0.ebuild 613 BLAKE2B 2b9c68aeb4076ccce75f4e70ff57382c26be0ae4db121f6e9a6a13ddf9f14cb4fb09019575e7a2b0da198de53ad7180523b6d4f86c3ac1c78012a6fac868268d SHA512 47d63170546ca2f2b216c492f62152a014e23fe25e5ff38454db71d2a23ed695eb6305307f9df4c1547cce8c4dbcc8e81318426f56924fd3ef7a529a2e75e2d5
 MISC metadata.xml 2428 BLAKE2B 0ed3b699ea865b088921855030debc8a323d80d18a656f5e7a132b18ddccf34a926e1bf081bc779bc7583715c75a58dd4e79b04aa5c557a9cb42a26874bffa45 SHA512 ec204108cdc58e7a0c59d4f8ea88e04eb29e47ac52f83600bedd2279608cccb09c60840883f477be475ccea923e7a8344196b6053aefd7d8315dd8d628560f44
diff --git a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
index 79d9e96afe88..78e711e40aeb 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.2.0.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-apps/dbus
diff --git a/dev-perl/Net-Z3950-ZOOM/Manifest b/dev-perl/Net-Z3950-ZOOM/Manifest
index 5064c7760c71..c2a96ae60884 100644
--- a/dev-perl/Net-Z3950-ZOOM/Manifest
+++ b/dev-perl/Net-Z3950-ZOOM/Manifest
@@ -1,4 +1,6 @@
 AUX Net-Z3950-ZOOM-1.28-network-tests.patch 6346 BLAKE2B 7057da20a3241402c411d7b572674c1f6a3c9c3ab35e8ee841c60b34e8c49c8bceee9b288fc8256f7a1cd16715ad8ff2ce718a320e258c7870367bb28a9866f8 SHA512 daa687aaeb6bc504f1ea33102bdcc82b355bd9cbf4ca8c4a0c894cbfe0b40caff4e43b7ec7c88e299fa9b7ba2648911ef106bf7c2d5a953aba84f95941acba60
 DIST Net-Z3950-ZOOM-1.28.tar.gz 66800 BLAKE2B 747fdc742914edcf0c12e40a03ee593a45177bda6020489055a8e3e208c1ef02c709360fc2a72b7102e0d707c6920a01925b24be351eea4786103b6c5433d21e SHA512 647ec0e7e572a10307be76c469781423f3cdd176c9d968bc93746f22570b11208dc3364e8835fa1840dfb10de7a5df0d683ff06aeae2f1a67db13a8f810871eb
+DIST Net-Z3950-ZOOM-1.30.tar.gz 67042 BLAKE2B b49659cc925d33867619e04ef5f2e52bd067ab9bae7fe31db979b268dba663e4ad400e6a5eece05d0e9060b8b17db783b8e5b70105ad4ea7099a4d2e32ad7831 SHA512 6511786d9d25070eb370313428b25e32120b4d591e1dbe585933b57e210423ea5b599bfdd995e65682a0963854b0ad7143c80d90b81f1e511c3ed23e44b6a7cc
 EBUILD Net-Z3950-ZOOM-1.280.0-r2.ebuild 408 BLAKE2B 6f5c60734fa9f420571d60bcf9979245ea1a6654749e9808c4de6920ba18568493a3e7b87e5bf45937a536ec03c0e471aa20a3349ea7b29a491f9fe1144498e2 SHA512 8a0f30cb47e183d906274bffcdeffcc1bbca069d37bac8b52f90c43c197a863d9605aa6dea5ce8fb7631d5ad792a445dadfd316471cb92e45b94e1ab5a546e57
+EBUILD Net-Z3950-ZOOM-1.300.0.ebuild 441 BLAKE2B e776fb6a15b9ba8c28e10990ad46ecd2c5aadae48cbfc9b735d0874dfa37bcc12ddac585b0f3dfc9bdec5de04fcab7f93f4ceb7fd03207831e54792d922b6bbe SHA512 bc959a9392561437730230b3b96c73cee7297138714b220257ff697f6e580b0c6c2cbaac75e09bd22cbbb220ddabf4c7d6742426c756a2a24653ca38d521b742
 MISC metadata.xml 1684 BLAKE2B 12eb6f17b81fb79b5260d8480bfb4ddf222284c8dd6132c099bffc056db0c7aa90df8b65d2790076f623edebef7f470f0d76de4283cb31e137bb5a96dc9aee3f SHA512 1ffa5d22a2b2be9fcb6592ec5a22f1d14c9d18fd28fc13e82cd38f93dd286b84f12e834fcd22a724d8a7d513528b153c85c9627844d09a23ad3c7dfd89330146
diff --git a/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.300.0.ebuild b/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.300.0.ebuild
new file mode 100644
index 000000000000..aa657fff6ab2
--- /dev/null
+++ b/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.300.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MIRK
+DIST_VERSION=1.30
+inherit perl-module
+
+DESCRIPTION="Perl extension for invoking the ZOOM-C API"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/yaz-2.1.50
+	>=dev-perl/MARC-Record-1.380.0
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.28-network-tests.patch" )
diff --git a/dev-perl/News-Newsrc/Manifest b/dev-perl/News-Newsrc/Manifest
index e184d2b3c219..aaa1860741a6 100644
--- a/dev-perl/News-Newsrc/Manifest
+++ b/dev-perl/News-Newsrc/Manifest
@@ -1,3 +1,3 @@
 DIST News-Newsrc-1.11.tar.gz 11603 BLAKE2B ed79d75d31f69ac69efe0b801e7dc46f4c012f8e51ce89de532007641905eecb786f5782f73e5a6634468ece8e0948fe3ed603ee700544fc6c2c07d5c4df3b51 SHA512 f5df8bc14f9793e0cb670a99feab065e7a392ba84c8b5f93cc14d7c1587f20603a77ee1bc06177737cf8a756fff276ba050d5c27e594d6b6e673c616e4234727
-EBUILD News-Newsrc-1.110.0.ebuild 356 BLAKE2B 545cddc0fe7ae69e9c44857416ecbfffb61194f00e4ede8aa526cbed8d9b3a4da76d1350e7c9ca1f4b6d651fdde9fae4c784d7635acd7a2bbacfe0c204e56547 SHA512 954f81cbf7faaf386a2a4fa9edc49af0de3c426e0f6a711ae4190f8e758b7d50701688c12a3feb071379933365330a0dc7f55d580361e24ca28255189da3bbee
+EBUILD News-Newsrc-1.110.0-r1.ebuild 352 BLAKE2B d293e3880082a2e477e443b0fc87268de0a6bc2795025eee0a6e7009980d4bd642848a831560ce91990d77c7884b65541e996bc197fefd18404b04256e1cccee SHA512 eb3fc3933e60822318e91d29747ff72cf77f67ee0742302b2dda7a5822317d3eaf4d1bc2cbed8289afd989cd85dc2ae31e3fee986738062cef49697c561264b8
 MISC metadata.xml 394 BLAKE2B a6a7edfd00a90ee59a24c9caff9802e55bf79060a7c038605e39373bfd215c4580f3019343c0e741bd9a4be99cfeb3b757279b8478406b66729f91ca18d76cef SHA512 efa7dc494b22167c4be23f43e14330f9ff134efc759183ee1e6eaf78211e3c7c1172e8023a44e87a26b33097338c768a3ffdb91fbd89e3931569fe7f4a6ca7d4
diff --git a/dev-perl/News-Newsrc/News-Newsrc-1.110.0-r1.ebuild b/dev-perl/News-Newsrc/News-Newsrc-1.110.0-r1.ebuild
new file mode 100644
index 000000000000..274fd25424b7
--- /dev/null
+++ b/dev-perl/News-Newsrc/News-Newsrc-1.110.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SWMCD
+DIST_VERSION=1.11
+inherit perl-module
+
+DESCRIPTION="Manage newsrc files"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc x86"
+
+RDEPEND="
+	>=dev-perl/Set-IntSpan-1.70.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/News-Newsrc/News-Newsrc-1.110.0.ebuild b/dev-perl/News-Newsrc/News-Newsrc-1.110.0.ebuild
deleted file mode 100644
index 9bacf0db44b3..000000000000
--- a/dev-perl/News-Newsrc/News-Newsrc-1.110.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=6
-
-DIST_AUTHOR=SWMCD
-DIST_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="Manage newsrc files"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Set-IntSpan-1.70.0"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Number-Bytes-Human/Manifest b/dev-perl/Number-Bytes-Human/Manifest
index acb883de2b9e..b00595a4f7d1 100644
--- a/dev-perl/Number-Bytes-Human/Manifest
+++ b/dev-perl/Number-Bytes-Human/Manifest
@@ -1,3 +1,3 @@
 DIST Number-Bytes-Human-0.11.tar.gz 11571 BLAKE2B 370718d87e0466fdb5efe367765baf290192dce1dcda2fd08624658a2bafea55152e9f108a7b1dee6b1a2d0dfddcce995365d586d730346e89f04c3afaf917ba SHA512 045bfe3d26b3460cb45ef69aeb1398c897605e621f559c43cf199829b1715e12781ad0330d80bed8b7c15b332ca6c9e620e580c71a0f1cf68c7d2fcf4b023936
-EBUILD Number-Bytes-Human-0.110.0.ebuild 476 BLAKE2B e5ddee2078862f8b7c4ee34b1946f1510b686877ea31ca20b881d8bd9b4d781a7e5ac18e9b0fdded61c74b2ff863594886255c758464ea5dd39a00f4a86b3b5c SHA512 894dba9622d98bfb8d7803460e627c3a3f647a82e60d7d976b3bc998f25ef9b4470fc4d8d7034ce0e21f15ca47c22ee335daf47cf6624ccdf20c42befda12b9f
+EBUILD Number-Bytes-Human-0.110.0-r1.ebuild 439 BLAKE2B f83a8b8fc04452e58237f81c881d6e031e45a8b0d89faef007659065d1da3ed8ec8acb30245b25943f4d21eacf4dd6f43f201962b228d8ac8bda4f1742d857b1 SHA512 43e1157766ffe3acc3b7e4b9b22b02d6e0059912c5489143756a458cb2848f6ac8c345d21639b8833a576b9352b613901c97e91964f67a7d05180c38e0cd719c
 MISC metadata.xml 409 BLAKE2B 6ef1621d559b582e47d35b135cace5595357bec93c8c2e1d74378ca48a51fe8340625edf325f402ddad8b7718f9d12758ca1a9b86f4b00f5962707ed3dfe3917 SHA512 28f510b043c75a78ba49869a5e16ce3cc9172cff31e5f6d9811003a797b57f32a856b8dbb6ed4813d898e4300049c97130dc7d7840a0d54acb45872bf3f116f9
diff --git a/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0-r1.ebuild b/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0-r1.ebuild
new file mode 100644
index 000000000000..dd1b35f638d1
--- /dev/null
+++ b/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.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=FERREIRA
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Convert byte count to human readable format"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/90pod.t" "t/98pod-coverage.t" )
diff --git a/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild b/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.0.ebuild
deleted file mode 100644
index 24c00f3e62b8..000000000000
--- a/dev-perl/Number-Bytes-Human/Number-Bytes-Human-0.110.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=FERREIRA
-DIST_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Convert byte count to human readable format"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=( "t/90pod.t" "t/98pod-coverage.t" )
diff --git a/dev-perl/Number-Compare/Manifest b/dev-perl/Number-Compare/Manifest
index 35d369c019a1..e80436ce7cc6 100644
--- a/dev-perl/Number-Compare/Manifest
+++ b/dev-perl/Number-Compare/Manifest
@@ -1,3 +1,3 @@
 DIST Number-Compare-0.03.tar.gz 2572 BLAKE2B 5b7ec7adf7c8b3f295c6587317f892ed5e9b726bf87f0ab8ddefeb26e3db5d9df4586f97e1f71ba7220771374143ec0fd727ff7b5b2f909eba66af2cad7b4332 SHA512 fc7efb0177bcb84142619b7d8c0252f4548e547650ddbe9cfafaba97b8ae791c20fbffa6f8b01449b9dd217d9914f94bfeaff57cdfdc2c11e2a1456992bd9893
-EBUILD Number-Compare-0.30.0-r1.ebuild 435 BLAKE2B 46a9b78d0a1d6a5889384e243c1510666e3acc9fe3d511f6c8be88a4cde2ba2f1fc3e98290688a91aedac18166e9f744323418b0d33fdec1ba0c2b835bfd1916 SHA512 464a566be058f3990a024333be8bc0936a2a45253634c5f5fb35f5c93d374ffa1490a0b443194ee42df2b703c981761e914b77c7a7cbae0e0e66a685aed065fe
+EBUILD Number-Compare-0.30.0-r2.ebuild 410 BLAKE2B 97f1a6b1776c90b87c96649ed1f8b4a85c384da22b93b68de99f59b2a031faf2e8438b3474ffc7c2176478e7bb38dfac9d7e575eaa3a7019ab0abb936db2b66d SHA512 30ea041fc37a9e20eaca7eb42b7ac7a042faea768253f8eee0c50cbb03630737e2c441994264c1f95c4e87591c94fc081eec3f9076970819e3924866b7349e13
 MISC metadata.xml 400 BLAKE2B 64be48cd4efa47e2d82387acacc76514b9f7872aff49f3e20814614fca2ff34f8120c1470c7be8456589fed938a02b2e92e17bf6d4b607d5a80b46bb8eda858c SHA512 3e6ed8cecaebad99f6d9f932e7ce5313fcbf69253acb01a32c459216e189cda22b6d4f44d7d01d6973847889a90c53555d2ff5f8dcf9d61a4e7778cfe9cbe36c
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
deleted file mode 100644
index 1f35866d87dc..000000000000
--- a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RCLAMP
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Numeric comparisons"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..f2755d4358a1
--- /dev/null
+++ b/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RCLAMP
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Numeric comparisons"
+
+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"
diff --git a/dev-perl/Number-Format/Manifest b/dev-perl/Number-Format/Manifest
index 4b7c9b3acbcc..e405af8f76a7 100644
--- a/dev-perl/Number-Format/Manifest
+++ b/dev-perl/Number-Format/Manifest
@@ -1,3 +1,3 @@
 DIST Number-Format-1.75.tar.gz 24526 BLAKE2B 32c20a6ccf53cbfcc52ed43af696b148b3ac377b346c389982d893c562ea35a8fd94a01761ee96b54235dcd551eee1c3830dd09e3fc2492b4fa709cba87332bb SHA512 fa712a82b33ba062308e6bf29a4d99e73245f95495206e2c4252d8735d1851136553ec719a00683163aea0d3dddaa6bcc1261ef643439b870605df8ab17a40ef
-EBUILD Number-Format-1.750.0.ebuild 296 BLAKE2B f69c8d7a31a7f004a3fb01bc07c7384f8b51a41d606c4c8ce057264d62b5d777b139c899ddf2adad01a8db3dc495070df8296cda3228ec76c785fabfe7c179c0 SHA512 b02b0231d05b075f2b88575d9c338c68ad979080d9eab2a47b54ea90da9237161a50d75ace5443d29bda497ce1d9b15557a5db8ed6f870b017efd3c3ef3be0c2
+EBUILD Number-Format-1.750.0-r1.ebuild 266 BLAKE2B 6c3daa072d89b365bdc324f26b9eba3ab895bb72f5df7986c5d1bcb4ad745853f25b719b0f449e177a3e2c42973cebba3f3a654ff2540d900025166e325d1b95 SHA512 9052e53bdf7a9a3df076d7accd0e9d9aa93750bfd78e23b8baf8507499a22eb00244fc3d255797d4c2f713ccf1b84aa062c5b4c11a4bc769748f88639244af7d
 MISC metadata.xml 398 BLAKE2B 08f1ecabb44a8349184551634c95030c3a33c79c619e0d0f480650872bbd4b4ba239eb70ed7dd9f7e43436418a79137fbbcee7987e4e57c6997d6d76e7558106 SHA512 786d7ab51db2a2f02a123297ca127612f84d5da9de4be1cbddf2673f279b0a84ed846233c493305dd62c4b032040f48c3397522621cc9b72d8853153d1ae372e
diff --git a/dev-perl/Number-Format/Number-Format-1.750.0-r1.ebuild b/dev-perl/Number-Format/Number-Format-1.750.0-r1.ebuild
new file mode 100644
index 000000000000..44dcfbc793ee
--- /dev/null
+++ b/dev-perl/Number-Format/Number-Format-1.750.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WRW
+DIST_VERSION=1.75
+inherit perl-module
+
+DESCRIPTION="Package for formatting numbers for display"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
diff --git a/dev-perl/Number-Format/Number-Format-1.750.0.ebuild b/dev-perl/Number-Format/Number-Format-1.750.0.ebuild
deleted file mode 100644
index 7b8cae02a240..000000000000
--- a/dev-perl/Number-Format/Number-Format-1.750.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=WRW
-MODULE_VERSION=1.75
-inherit perl-module
-
-DESCRIPTION="Package for formatting numbers for display"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Number-Fraction/Manifest b/dev-perl/Number-Fraction/Manifest
index db560e46f3c4..de153d7749c9 100644
--- a/dev-perl/Number-Fraction/Manifest
+++ b/dev-perl/Number-Fraction/Manifest
@@ -1,3 +1,5 @@
 DIST Number-Fraction-2.00.tar.gz 7771 BLAKE2B 49cd613ebf3c3342160902e09582fed8247c6e1b089d1f68455d2c120a219f7d3e1009e64ff950037b5ba61347818e51b756cde50c25970f2071874ca63a7ec9 SHA512 ce78d42b4d448ae1425f1a6c98a7c8a330d35aa510971748e30b55a235f26e3fae4f1cb498b9014fcee512fd19a72902c5d44b2f00ad6b03111783a757644135
+DIST Number-Fraction-v3.0.4.tar.gz 14891 BLAKE2B a43b82c09f04191d1d251a14c02656d1ad695768a681442a17e85182c13f049bc66582dad1e03d99991966a7c43581211bdf4daba568364daf5022f771f06210 SHA512 c309e4ee95909a8ad570f061387490c49cf11d71b76569dc2b3b98c8c4bc0c2b4936ca6f14dc5818ca3aea34fec06486665269f304ff5141c566acc061522407
 EBUILD Number-Fraction-2.0.0.ebuild 517 BLAKE2B a76661875b5bfef9217a7e65b05d7c3dfa923fb917633070a77a70a69343bcf04e654f07dd067139c4dccfa33cd3f2357c63b5c09c1649622913460581855601 SHA512 e896749aea1d4ef13bab8b549dfcffd8a20c2461ada9e2e8bec18cfab5a308b6eec36f0b7cf69b0b0fd231f549ee62a527c053ee76f43ee8c250d632b1cd57f0
+EBUILD Number-Fraction-3.0.4.ebuild 502 BLAKE2B b1200c830e397be9b2d315ef57e053f96af6f11ba30bce1ddef16d52932d30e31d89a69863da2485b6fd480f9c9e90a710863e3de77f34b8b9df7dcc9da1535d SHA512 ddc2029f77d686978585b3ef7dcc051820d6e46bc2dc9e8ad2a6ae2589639ae3bb5628d92ad335b24cf18d75a2ba7bee98437d6a9cfa6b2d7a6f515070d8672c
 MISC metadata.xml 390 BLAKE2B d57f6cbd78dc63d84441ec4689901cf316ee5b5dc60dae91ba5e3b5d6e951b9ef553b55d57383b2714ec1250e7d1e11c5f3d77ceb226f612954f2f87426e48d1 SHA512 264cf6588d14a86cc823397345fb4b69cd0930057c353257c8f0a66b7012393a0a667752acac23df7540686c57f4a48d82a5482c55b389c66e85d16bb839959f
diff --git a/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
new file mode 100644
index 000000000000..cf0e6578eb6f
--- /dev/null
+++ b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.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=DAVECROSS
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="Perl extension to model fractions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Moo
+	dev-perl/MooX-Types-MooseLike
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Warn
+	)
+"
+
+PERL_RM_FILES=( "t/10_pod.t" "t/11_pod_coverage.t" )
diff --git a/dev-perl/Number-WithError/Manifest b/dev-perl/Number-WithError/Manifest
index 78ea9f9a23c9..095cc8cbb851 100644
--- a/dev-perl/Number-WithError/Manifest
+++ b/dev-perl/Number-WithError/Manifest
@@ -1,4 +1,4 @@
 AUX Number-WithError-1.01-no-dot-inc.patch 598 BLAKE2B 94f1b4bbafb1fac596dcbac134114d7bdfd75ba9764f28dc38d3a3edf662f1aa241af74e6be3397548866cd619ef2b8ab9cf76db40ef99a1c4315543e8b3ff9f SHA512 37b0d3307084ab71d4cfd22dfd9e57ff4b1e104ec70c89cd6794fa1502c5f074487944876b50b738aa171afac9c9a7d9a1e328bfcd66b751e1c355d8a7da93db
 DIST Number-WithError-1.01.tar.gz 38949 BLAKE2B 5ec7588f881bd46d329456c56a9b20455ec6d074e6f7531f9a039a7a9af5f121d21d17d9ea7b6bc2db42de2040961bd72d748ffab077816b62b5d9b8e910aaf7 SHA512 8d573801fa6c82b1e1578035f34d3208abc11cdd300563b21ae5a1f229f651e9f0b3f3c277da632ce3f583b86e99918ac0b5498ad3727a19e4d100b7e00df93b
-EBUILD Number-WithError-1.10.0.ebuild 675 BLAKE2B 33a41b00675ea913036a1fde5e54e8f32bdce038e922032e3d0c7ab7ff00bae373709fb16486e0caaea279439d28ab3d7a3e2fec2dc67ff2e48d6c3491e8f32d SHA512 adc4aed71cb035b36e1b48c808b171aa3286139830677e14700e2425844e37eda432596d1d0007584fd6c42511d0c7448c18d00366f31c0c6f35fddde0ce1de0
+EBUILD Number-WithError-1.10.0-r1.ebuild 639 BLAKE2B 0360fce4b92bf525f9bd6fb57c66314fa42c88ea3546859b56f7065af930793d3026d7cb035c9eba025a051dc8da16c61d571ce3c40d13a2410c47fb935707b8 SHA512 5a8bd3e089a1f2a9db597f9a50bf707de99cf523c9cfda73d21fcbd42909c2608f03341bf6f3c9310df4c2f9d19f0eefbf4a9eeabae34b21a03d060830dd2e8f
 MISC metadata.xml 404 BLAKE2B 79a5c1671975be8327dd6aa96ec6f4ec6c84ad11d95ebd00bab2bcebab3499ed833782e11d0b9d8aa05fac99ccb77e3165e7eebc86bf50c25f633be4d17aa381 SHA512 ebb4fe68ab68ea5f68cc4a549a887db0715a46fe55cab3c1c796ce81dcdc40d23543439b611e1a75cc270c7525635dea3a15cc721fbecf75cbc47fede3ad2a88
diff --git a/dev-perl/Number-WithError/Number-WithError-1.10.0-r1.ebuild b/dev-perl/Number-WithError/Number-WithError-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..cec229a6f192
--- /dev/null
+++ b/dev-perl/Number-WithError/Number-WithError-1.10.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SMUELLER
+DIST_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="Numbers with error propagation and scientific rounding"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Math-BigInt-1.400.0
+	>=dev-perl/Params-Util-0.100.0
+	>=dev-perl/prefork-1.0.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
+	test? (
+		dev-perl/Test-LectroTest
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
+)
+
+PERL_RM_FILES=(
+	"t/00podcover.t"
+	"t/00pod.t"
+)
diff --git a/dev-perl/Number-WithError/Number-WithError-1.10.0.ebuild b/dev-perl/Number-WithError/Number-WithError-1.10.0.ebuild
deleted file mode 100644
index d25959995b5a..000000000000
--- a/dev-perl/Number-WithError/Number-WithError-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SMUELLER
-DIST_VERSION=1.01
-inherit perl-module
-
-DESCRIPTION="Numbers with error propagation and scientific rounding"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Math-BigInt-1.400.0
-	>=dev-perl/Params-Util-0.100.0
-	>=dev-perl/prefork-1.0.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	test? (
-		dev-perl/Test-LectroTest
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
-)
-PERL_RM_FILES=(
-	"t/00podcover.t"
-	"t/00pod.t"
-)
diff --git a/dev-perl/OLE-StorageLite/Manifest b/dev-perl/OLE-StorageLite/Manifest
index e462931c3a35..ac5a6b66f608 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 469 BLAKE2B 5c8df2dd94a63488da9ef6b79c1c17f5da2eb0bf00d7d3804dbdc9a3b0bbe98bedca12c5e2e70c03f921d612157023ebe91335fc91620d1de915f4c24bd00144 SHA512 0bda4a72c4b2caed8da881c02f93752b23748d71688cc06dbc55df824a70be2af98bdf97e518939ec5cdc99c40673be02e2098f144ef038c30ffbe201baeedf2
+EBUILD OLE-StorageLite-0.200.0-r1.ebuild 457 BLAKE2B ffe1b893fac16aa2e3a516e11cf455a46991c5bd13027096f63f40f71d8383ee5ae30b518076217e374a92a377f52eb28785e80e6f8f6db5f9c4f14942d24e56 SHA512 280df7cdf40c036dab68e27537b19326befeadfdaeb9f423d5b23d265806140c2a17fafc39cae962456e404e6d236049e587970368e2cdf916564c6c687cbd90
 MISC metadata.xml 697 BLAKE2B 56c4bfc48ec655cc65dd586b208d40a8a35b30c88258337613b8f814b303398225972f66918b28bb288bf460f97ce415a12c5c10caf1aad8a5f4b94faed196a1 SHA512 ba17c8b1852db1f8575304e726d20921b69e42dca2c1bd05a30b7cf5af3e1845ec818e4297f72d6a98d0f40679fb6feec5d9fc7781e0383abea4ad365a0ebf9a
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
new file mode 100644
index 000000000000..60e1ba53fd1d
--- /dev/null
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=OLE-Storage_Lite
+DIST_AUTHOR=JMCNAMARA
+DIST_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="Simple Class for OLE document interface"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild
deleted file mode 100644
index 864aeb710cd7..000000000000
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=OLE-Storage_Lite
-DIST_AUTHOR=JMCNAMARA
-DIST_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="Simple Class for OLE document interface"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-perl/OOTools/Manifest b/dev-perl/OOTools/Manifest
index 6fa5c47a118b..b8feadcb92e4 100644
--- a/dev-perl/OOTools/Manifest
+++ b/dev-perl/OOTools/Manifest
@@ -1,4 +1,6 @@
 DIST OOTools-2.300.0-patch.tar.bz2 765 BLAKE2B 049b4c0a581aaad02ea7702dad01b9c1127b7232f1bb1ec7dde70cb788f72782a79803378ba674ce69cd31b0ee7a09000b94345f31639319da143e8430682e8a SHA512 534f696290af7b3352d9aaa8c8b5f35bbd77108d6adc1f45eb046c9f0c730bb269a6853fdf8a8a93326b4fc28698ceafe4929f990ad911000f493747dd920af9
 DIST OOTools-2.4.tar.gz 32542 BLAKE2B 29eeea63e7eb66927d575b009e1754bbabb554c33bbcf238c73d3bdf8ed66affcf4713c2f69098af10494a9680f5ea04b8f1f36a4aa8f4f2488dc5bfb932da28 SHA512 95eb0142ee54d07b6264169b1ac1d47bfa71c5fca3ef97b4bbdebd493fcf02e8340843bb4be7dac8810814e71314e41bf049bf332022c8e2096cf0a3be5b220e
+DIST OOTools-2.41.tar.gz 32627 BLAKE2B 47ebecf4b2844de906c6aa2705cd683e68ea45276d421d67943b2f48bafc833c938853e5a54dadb03703b6f756aee42b72fd36ecac05be3fdd76a2d2526b9d0f SHA512 26337ba9a4909b3de27b7aafdc54f0b0c7671f7d822bb5bf5fdaf7a700d4a0c20e270634365d19c05d75b8eda787afb08d20f9abeab2547a7c74b9d9a1f317c6
 EBUILD OOTools-2.400.0.ebuild 590 BLAKE2B fe13a1c1d69008e6892b5de2369ea742467a03e84628b8e538d7f8076ec667c20cb61498f358666b2a45d88a02cc27e24465f32c395b2f53075804cbf382d43e SHA512 df72a8fa110f9bf05fcae9f078d95195483b856bdcc8827880e7ec9f7ab8eee8bd5bc062f3bec4a45f70e2aa022440925df1da743020d975a15c511a0f66bf0f
+EBUILD OOTools-2.410.0.ebuild 555 BLAKE2B 02b37deb0154f27a974ffe960b3fb5879d57c7be7d24e3a7f6bac4748093f411680cec13a3138437d14a3d74e6bd78687d0659f5a4d46f9dca09a70b659fe608 SHA512 18c5dcf8ddad266332d88d80bee93c95e86d41d51d5d941df08e9a4001505f2710113c378a046966e0433390f20cd20fc07f9530f679a1e079aae22328bd1f12
 MISC metadata.xml 871 BLAKE2B fdf3cb0e245a346439de4892419468a30d80b03757a1d91210aadf216638b219ce77f66d4a3729e7dd28c292abec66b9c71e12d33501a2244df026efe8b7a921 SHA512 6ad0bcc63eb831d0d2703fdf6fa28df0766b0ea0f656e93f4a5b9e9c9eea3606a5b4f02270de744155e05b30adea6fba84154c47340883bbc543e8896fd087a6
diff --git a/dev-perl/OOTools/OOTools-2.410.0.ebuild b/dev-perl/OOTools/OOTools-2.410.0.ebuild
new file mode 100644
index 000000000000..19af93212971
--- /dev/null
+++ b/dev-perl/OOTools/OOTools-2.410.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SKNPP
+DIST_VERSION=2.41
+inherit perl-module
+
+DESCRIPTION="Pragma to implement lvalue accessors with options"
+SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${PN}-2.300.0-patch.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-perl/Module-Build
+	test? (
+		dev-perl/CGI
+	)
+"
+
+EPATCH_SUFFIX=patch
+
+PATCHES=(
+	"${WORKDIR}"/${DIST_NAME:-${PN}}-patch
+)
+
+PERL_RM_FILES=( t/test_pod.t t/test_pod_coverage.t )
diff --git a/dev-perl/ORLite-Migrate/Manifest b/dev-perl/ORLite-Migrate/Manifest
index fc1cc65494d7..d1b8c1744fcc 100644
--- a/dev-perl/ORLite-Migrate/Manifest
+++ b/dev-perl/ORLite-Migrate/Manifest
@@ -1,4 +1,4 @@
 AUX ORLite-Migrate-1.10-dot-in-inc.patch 2206 BLAKE2B 75e09172974271fd7d9b5a284899f54bb4dc3239cae466040da06c11da69b615fefe4e12b07b49aa41e821c307db380eb2494a918f0e52cff6c71816265feabf SHA512 50f89193ad655d3c289572fb3c81ad581346a9d40c03c54b965c8865f3e938a5dce0bf3e578a9f57b5ef2ad021706a6ce86af2e605455d105ba2ccad99ee9bf2
 DIST ORLite-Migrate-1.10.tar.gz 38469 BLAKE2B 3887a5afa6c455e2cffb7fc5c61aeb49e986c0636f95986f26c34953f856a61953c42fe4b1c5a076a8d9b32d87a6e681db29bbafa83c23e98cd1d91e522f99f5 SHA512 aaa62394184e77427e08ec0e181880646f4167449cad7375848b713942991efe3a89c85f9d6346bb9a0c165b4a29fe4bd15608ba64ca082e7ef28ad82c97e36e
-EBUILD ORLite-Migrate-1.100.0-r1.ebuild 729 BLAKE2B fe9a53be992c92961d57e9c8f956fe8707a49918c730b073d645c200b574dc21713b53069495706400ea200cd7e7e6d5286175f1e1b4749b49998091d0db711d SHA512 24e6389dc0d6935a870aaa4bc593be970fa2b7de6542553936f1cbb418124c4d1e88bf1e2e87ab2fcbb0d8c83d0252b9287a87bb9683ddfae1b08ee74486f3cc
+EBUILD ORLite-Migrate-1.100.0-r2.ebuild 721 BLAKE2B a130d380761f6bf643ac55faf55f938d78a146121c041d704e9a8d7aa78e74c156113d8cbb3acbf47fcf493838ffc1b5ced0189240b63f8dedcff159e5453dd8 SHA512 ff830d3ab5a0dc420391ad80e81ce1f34743aabaa2e654e14b3f6130e01cae0124691d50caa473b7d8ac18ec93b7ec1739c158ac7223eceefddd00b1655e0042
 MISC metadata.xml 541 BLAKE2B 81e736be30c54e3a28c32efb075e9cdb339a35543055798f0fb73e3758ce184ac73bb16b14e8ae2f64a489c5f0338fe92ff4ce584d4bada3c9abdcdcbe48aed5 SHA512 eb3df9af2447548b85ac701a2d264eb3e8790da48ddbb9f3fcbec72d3984c87cb9cff32054eb74d556c8fa854346b2b8f9eab8dee850298c8fe7d80ded3c9b56
diff --git a/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.0-r1.ebuild b/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.0-r1.ebuild
deleted file mode 100644
index e3f8e6b4d524..000000000000
--- a/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.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=ADAMK
-DIST_VERSION=1.10
-inherit perl-module
-
-DESCRIPTION="Extremely light weight SQLite-specific schema migration"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Params-Util-0.370.0
-	>=dev-perl/IPC-Run3-0.42.0
-	>=virtual/perl-File-Path-2.04
-	>=dev-perl/DBD-SQLite-1.210.0
-	>=dev-perl/ORLite-1.280.0
-	>=dev-perl/File-pushd-1.0.0
-	>=dev-perl/Probe-Perl-0.10.0
-	>=virtual/perl-File-Spec-3.270.100
-	>=dev-perl/File-Which-1.70.0
-	>=dev-perl/DBI-1.580.0
-"
-DEPEND="${RDEPEND}
-"
-PATCHES=("${FILESDIR}/${PN}-1.10-dot-in-inc.patch")
-DIST_TEST="do" # Parallel tests broken, concurrent DB access
diff --git a/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.0-r2.ebuild b/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.0-r2.ebuild
new file mode 100644
index 000000000000..1fdddffe91ba
--- /dev/null
+++ b/dev-perl/ORLite-Migrate/ORLite-Migrate-1.100.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=ADAMK
+DIST_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="Extremely light weight SQLite-specific schema migration"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Params-Util-0.370.0
+	>=dev-perl/IPC-Run3-0.42.0
+	>=virtual/perl-File-Path-2.04
+	>=dev-perl/DBD-SQLite-1.210.0
+	>=dev-perl/ORLite-1.280.0
+	>=dev-perl/File-pushd-1.0.0
+	>=dev-perl/Probe-Perl-0.10.0
+	>=virtual/perl-File-Spec-3.270.100
+	>=dev-perl/File-Which-1.70.0
+	>=dev-perl/DBI-1.580.0
+"
+BDEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.10-dot-in-inc.patch")
+
+DIST_TEST="do" # Parallel tests broken, concurrent DB access
diff --git a/dev-perl/ORLite/Manifest b/dev-perl/ORLite/Manifest
index b7d901681db2..33e06f35889b 100644
--- a/dev-perl/ORLite/Manifest
+++ b/dev-perl/ORLite/Manifest
@@ -1,5 +1,5 @@
 AUX ORLite-1.98-dot-in-inc.patch 9606 BLAKE2B b71a784a9165e3b77c86727f401a8584a7cc068b12be9555e891b6a7da0eb5ed6953d85dad8479f6c832e5ff673174c156cc8ea8e9813918dde508c32b34ff9d SHA512 947130481b5826582b103c8c26100a2c3c78c8615c1349e77509acdd46bd6dbc0a6be57e276208c6100e182bc54a1ecb4c1eb5d06abea6d875561f6b0b3994c2
 AUX ORLite-1.98-vacuum.patch 1140 BLAKE2B 442f699462308d088d484d382ee0f5d0309f5c2bb9222279007ffc292544c18c90a70a79d9eb0c4197e02177583fbf165212a608a79610f340a3e55d228730b3 SHA512 dbb08c789c78fac0762b2cc5f0cc7e05824b6bbebf909bbc12df2b1c453e651e16186c793d014946d12554f7c86da643d51b33dbe44a1fd40a26ce2ae67538c2
 DIST ORLite-1.98.tar.gz 67402 BLAKE2B f2c5c5f3f36932163c1e5033cd4bfcdf2a3172ba2f5b3dc59e03012706520219162eee986fddd423b289f2bb6b5d350e78e94ac1f3dc3060849383d5894fa185 SHA512 1cc2f8352efe2867806611746d78cf8aa9788e2f38eeb9231ab7b4168a3befeecdb1773360a13578758f9172d08f55261e952698a3e8c5a5b8ad5e63939349f9
-EBUILD ORLite-1.980.0-r1.ebuild 718 BLAKE2B 68e7c0fcf16af176e5219981c053d1479bcf95463c44f7bed487c472973926ec341f9c7f3b9326c8f96b61caa8bf5136ab05b8c78f563bb198099545dba1f13f SHA512 c6254f8611c2c0ba97836a66e7bdf3e59e2761f1e7fb84bb370d18402d14ab7102f7a6b10dd20251405bc5927a85ef4bc4ca6634f837b8e0098d194ebc8d2101
+EBUILD ORLite-1.980.0-r2.ebuild 637 BLAKE2B d530bf1e1a1a68861c4a91986ebea93e0890b2d363b89d2b44db229af110547b130b823ef7bdc87ca89bffdccabe1a4c2401c3107ca2fcb1d12a0be920b9d615 SHA512 fb3f2eeb73597175095830640ba3d8ec297c3b82b71e8e6fe196284a886789336d31335ccfcb3b4b453db70d5e74ef1be5045df6b849fb19023f123660b01287
 MISC metadata.xml 383 BLAKE2B cbc609254d2e0442bd14d6c066277fc7a11db374d3f5d0b52bca780524a30b19631f8861ee4d7045ec8c02f8334891ca3851ff096779f44869c559c12a126be8 SHA512 d0cafda7818648e86c4d3a9953e040bc64dff73f22563805d243b0ed4a4477c6fb3f70139779a5d0370d0160eae88f2d2692db1d0f7e180a96e02082761c58fa
diff --git a/dev-perl/ORLite/ORLite-1.980.0-r1.ebuild b/dev-perl/ORLite/ORLite-1.980.0-r1.ebuild
deleted file mode 100644
index 1020bed4fcad..000000000000
--- a/dev-perl/ORLite/ORLite-1.980.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
-
-DIST_AUTHOR=ADAMK
-DIST_VERSION=1.98
-inherit perl-module
-
-DESCRIPTION="Extremely light weight SQLite-specific ORM"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=virtual/perl-File-Path-2.08
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/Params-Util-1
-	>=dev-perl/DBI-1.607
-	>=dev-perl/DBD-SQLite-1.27
-	>=dev-perl/File-Remove-1.40
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		>=dev-perl/Test-Script-1.06
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.98-dot-in-inc.patch"
-	"${FILESDIR}/${PN}-1.98-vacuum.patch"
-)
-
-DIST_TEST="do" # Parallel tests broken
diff --git a/dev-perl/ORLite/ORLite-1.980.0-r2.ebuild b/dev-perl/ORLite/ORLite-1.980.0-r2.ebuild
new file mode 100644
index 000000000000..165fb311334e
--- /dev/null
+++ b/dev-perl/ORLite/ORLite-1.980.0-r2.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=ADAMK
+DIST_VERSION=1.98
+inherit perl-module
+
+DESCRIPTION="Extremely light weight SQLite-specific ORM"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/perl-File-Path-2.08
+	>=virtual/perl-File-Temp-0.20
+	>=dev-perl/Params-Util-1
+	>=dev-perl/DBI-1.607
+	>=dev-perl/DBD-SQLite-1.27
+	>=dev-perl/File-Remove-1.40
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Script-1.06
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.98-dot-in-inc.patch"
+	"${FILESDIR}/${PN}-1.98-vacuum.patch"
+)
+
+DIST_TEST="do" # Parallel tests broken
diff --git a/dev-perl/Object-Enum/Manifest b/dev-perl/Object-Enum/Manifest
index a9fd633e664b..9a4d02e4122b 100644
--- a/dev-perl/Object-Enum/Manifest
+++ b/dev-perl/Object-Enum/Manifest
@@ -1,3 +1,3 @@
 DIST Object-Enum-0.075.tar.gz 13292 BLAKE2B ebb7d9005c91c7d1eb6e7e6ef280697bab92e56affc965934ac05c0caea9d2717d8be2e407b140db00e8f186035a06218140d3ef676583bfc79e55d3ad59e820 SHA512 75e69101a99ba49aec584654b0e2017c2b4dd86ff0f5f3afde398644730ed2c1860292ccad937028cc19fde3e33a6bd1e8feddd6b05a687a8762b9dc85112d77
-EBUILD Object-Enum-0.75.0.ebuild 610 BLAKE2B 7e91c9edc16e1a441948bda03896114b8f42602733293815807b3a398639d33847e18ef775000488211164c03f4416bd7dadb958005f2e051bc52338c1d302ae SHA512 cd29b9a995be937989dbe601344c53d9d0ed8ea65e292ae8859cd05c311b6bb3ec08a5bae9dc3ea58dcf081d3a9f68cfaab924fff76cb6f4d696460d1a5292e4
+EBUILD Object-Enum-0.75.0-r1.ebuild 542 BLAKE2B a1d240acdc05440d57c76d19841f5ea6686835e9c74fded560594520fe4b468ac30380ab79668420992a6a2b0808bc7e3ed74dc646df1581f4e0a50654802997 SHA512 d9a9aa39b22c1ef0ceaa304bd4149356a1ff1e200332b50836b2b4164aa05ddd106d8a5c2a2dd67d393a9045e789bd94d8dfcb136031f1877893a13c282c9fd4
 MISC metadata.xml 394 BLAKE2B 2df1719840c0b93d40349567c4d721e5cb60f76a351abef8b0baf2c02b8a646a628c5225db2c755b00e6fa51dcc75534f1afa83c100ab1e5f8a5d11bc77b645a SHA512 85de1cf7233e859d1273ce863fb043a9ee16fe03062aaab3446b7a5cf2056f5a176ff007db2d0a6e887c7247f507ecf8d10884e56b2e9ec1698c2bd967b5d93c
diff --git a/dev-perl/Object-Enum/Object-Enum-0.75.0-r1.ebuild b/dev-perl/Object-Enum/Object-Enum-0.75.0-r1.ebuild
new file mode 100644
index 000000000000..d8bc2d30dcec
--- /dev/null
+++ b/dev-perl/Object-Enum/Object-Enum-0.75.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JMMILLS
+DIST_VERSION=0.075
+inherit perl-module
+
+DESCRIPTION="Replacement for if (\$foo eq 'bar')"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Sub-Install
+	dev-perl/Sub-Exporter
+	dev-perl/Class-Data-Inheritable
+	dev-perl/Class-Accessor
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/pod.t" "t/pod-coverage.t" "t/boilerplate.t" )
diff --git a/dev-perl/Object-Enum/Object-Enum-0.75.0.ebuild b/dev-perl/Object-Enum/Object-Enum-0.75.0.ebuild
deleted file mode 100644
index f33c87ec2d0c..000000000000
--- a/dev-perl/Object-Enum/Object-Enum-0.75.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JMMILLS
-DIST_VERSION=0.075
-inherit perl-module
-
-DESCRIPTION="Replacement for if (\$foo eq 'bar')"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Sub-Install
-	dev-perl/Sub-Exporter
-	dev-perl/Class-Data-Inheritable
-	dev-perl/Class-Accessor"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files "t/pod.t" "t/pod-coverage.t" "t/boilerplate.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Object-Event/Manifest b/dev-perl/Object-Event/Manifest
index d67d6d0845a0..202b22c4d0f5 100644
--- a/dev-perl/Object-Event/Manifest
+++ b/dev-perl/Object-Event/Manifest
@@ -1,3 +1,3 @@
 DIST Object-Event-1.23.tar.gz 15740 BLAKE2B ce1e857f06a10371b280cbdac7c6c670c7fd6b047c68e3da99e41ec0e0b0e6f65db5946fb0b52c5b08e0c57df2b4b4b6e895099ca53f217e0d11d7dfe33f9670 SHA512 f2a877e66b00cf095c1b1ea1447b7aedb2c4c24a19b46e870894811bf707616bb2c59edc31b2d9b7157ff430cf2610facd201c9fdd8254bfb945900b70c79918
-EBUILD Object-Event-1.230.0.ebuild 464 BLAKE2B 54bb66e251ecbe80a42b2b2162d42626ffefc29243bc74eb1ee813174cc16b0727060ce56540f5800b6ee2f34f5de9e4796c06de1be3e05af1ec7e1156b9684f SHA512 899c0ac831b4ef77d362e0b100529c9187b53da526cf3f28e09bbe58bbd265e32bede504e23d49649063ec05b3406b33152dd971ca537fb38b327386399b87c7
+EBUILD Object-Event-1.230.0-r1.ebuild 426 BLAKE2B 5aa76fa3e54b7d7c97571c299986742b982c56d3a2ba4cde21445dfd6d76a575d88dde849ab5b3290d32fcad7062b650131f7919ed2f6476c71104b904eea98f SHA512 d9da0d65a0750b1e71380ac373efd043c488def009c9b2758e58bd124043040d910e22244f3d176e17dd89f9417a4332edec003dabde49c79fa383b672d88d96
 MISC metadata.xml 395 BLAKE2B b6c81aa93479b19378e807ae877e46c75b8d06bdc4f9b0c2befcb533fe8db467ac3dac26d4aae427070d348a6d9a16d7e29bbabf79330ba207ee7156a07f7d65 SHA512 bacb2639c9d1d550f9f44a19513c53d77f94e14e6e10d1caa1ba3986bbdd1e52dbecfdc43c25e140b3162207297e2bdc86d0e0ea94f3cd8084a2004c1d1ecaec
diff --git a/dev-perl/Object-Event/Object-Event-1.230.0-r1.ebuild b/dev-perl/Object-Event/Object-Event-1.230.0-r1.ebuild
new file mode 100644
index 000000000000..77bd2ce24f72
--- /dev/null
+++ b/dev-perl/Object-Event/Object-Event-1.230.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=ELMEX
+DIST_VERSION=1.23
+inherit perl-module
+
+DESCRIPTION="A class that provides an event callback interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/AnyEvent-3.500.0
+	dev-perl/common-sense
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Object-Event/Object-Event-1.230.0.ebuild b/dev-perl/Object-Event/Object-Event-1.230.0.ebuild
deleted file mode 100644
index 6bc627b91aba..000000000000
--- a/dev-perl/Object-Event/Object-Event-1.230.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ELMEX
-DIST_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="A class that provides an event callback interface"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/AnyEvent-3.500.0
-	dev-perl/common-sense
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Object-MultiType/Manifest b/dev-perl/Object-MultiType/Manifest
index 2b22a20eedf8..625cd8ca1e0b 100644
--- a/dev-perl/Object-MultiType/Manifest
+++ b/dev-perl/Object-MultiType/Manifest
@@ -1,3 +1,3 @@
 DIST Object-MultiType-0.05.tar.gz 6629 BLAKE2B ad6558a6d055f8996232317c1c96884c4e35bd7bb40ed3d123c591fc59f55bb76484209fbb3a9b985dab237364d5002ddb7fd43dfc04b2110833287e251fa808 SHA512 e53b6a139183985a3a9d410b743983b3389089876d546018908ad787011777611e476bca107538211af2efcbb4da1b2e22c97cd229676c452dcfbf4e5ad9a1c4
-EBUILD Object-MultiType-0.50.0.ebuild 358 BLAKE2B d0f007383fb7557e6ce697e39c8b73f1aea743cfc887165e023dd4086372f34f7f49403daee3097e361d51fed5a56ae95255bb6919c76de9336a47fcc7258c86 SHA512 314c05278e462db4b5ffc67caed7e1dc58b89616c1355a8532ea4663f9adb720017a20945405366d52460e4c8b6513c6d85f59c324a78aa8179f4700d230046c
+EBUILD Object-MultiType-0.50.0-r1.ebuild 331 BLAKE2B dc4b8331e2996fa62b2cdca2a5e08004ac6a42d6a86dbe1a386f4ec1514da0242519597ff37a8985284b7438ab62606ecbb185481096db5c81b41a0a5bf0934f SHA512 42a94e14f6c4e9f0f066027b9e882e13faa3bb3b7494b96683a27688eecd979f9f1c5efaa21877473be604d7d235c4614aa7c0c195d027db28f0e7500fcc1432
 MISC metadata.xml 559 BLAKE2B 27609f4caf10dced9f5b418799f034c621c9955125aa41206fc7142bb1818b23c53bebb8f7ecbdc9a736c3b6634c8a4be3117061730adf9136c9eb01c2127c8d SHA512 56ca6fa7b88b2664a0ed29e1ef8a462ce084fe01e2da0f9078a7c9a04696bfe6ac188bbcda9b523157c702d61bab24f34330c57a2a9fa6a1f130d351bb9e0089
diff --git a/dev-perl/Object-MultiType/Object-MultiType-0.50.0-r1.ebuild b/dev-perl/Object-MultiType/Object-MultiType-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..2165df34879e
--- /dev/null
+++ b/dev-perl/Object-MultiType/Object-MultiType-0.50.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=0.05
+DIST_AUTHOR=GMPASSOS
+inherit perl-module
+
+DESCRIPTION="Perl Objects as Hash, Array, Scalar, Code and Glob at the same time"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Object-MultiType/Object-MultiType-0.50.0.ebuild b/dev-perl/Object-MultiType/Object-MultiType-0.50.0.ebuild
deleted file mode 100644
index 32cbd51c1a7f..000000000000
--- a/dev-perl/Object-MultiType/Object-MultiType-0.50.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_VERSION=0.05
-MODULE_AUTHOR=GMPASSOS
-inherit perl-module
-
-DESCRIPTION="Perl Objects as Hash, Array, Scalar, Code and Glob at the same time"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST=do
diff --git a/dev-perl/Object-Realize-Later/Manifest b/dev-perl/Object-Realize-Later/Manifest
index 24f0eeb5d273..e8aa5aea596b 100644
--- a/dev-perl/Object-Realize-Later/Manifest
+++ b/dev-perl/Object-Realize-Later/Manifest
@@ -1,3 +1,5 @@
 DIST Object-Realize-Later-0.19.tar.gz 11013 BLAKE2B 1b4cbcb8f9ffa8dfafc8c9e9669b2632fa3d56034935fe113178a0ae334c76bf509423728762f5109c6ec3f56e1a721dd61cabd21a3d3a62f2b46ceed746f04d SHA512 4e4d57e17600ab553b8c209aac815e64d3b7164d38afd27db2676da774ee95910a00eea09688d49a53734c07c60922901c2bcec46dc6aada9a3b76f3392b0ffd
+DIST Object-Realize-Later-0.21.tar.gz 12375 BLAKE2B 4ca6cf76fa147a662ea15f61f3f96ce8e16db9199307deddb8601ab0313361071ac18dfdefdea398991527f0a1ac7dd814ffa899d3605bb43bfbbbbbefeb260b SHA512 006b54dc97f4464d434f4dd423546f078eb815c4eecba8cf54e292d4b98b679b6c8e8011aab808582553b245ee25013583b8d430762de6e30c3136a87858c21d
 EBUILD Object-Realize-Later-0.190.0.ebuild 459 BLAKE2B 6028f48851d0571b74112d046ceabbd1e963ac038463938f4e1db1601a6f9050b26495e9a85615d65b434de30b48940378c7f5df17172e35563437a1b7bfa9dd SHA512 3c9a1278e9c5c2bcfff58f4252d8dbdd2474632aac76985fd446bae99e514bf4fa9a97b3c17a0fdbb2ddc93b8e78f233839922158f44c0d33244ac4f0db5f279
+EBUILD Object-Realize-Later-0.210.0.ebuild 408 BLAKE2B 42aeadc983ee77fb2db808ba8140aa3f95cdeb692dc07fe01c70615c24fdf6660f1c03a8ae54c2c2829a855b380bf911d6f37e07d9c71ac874b0689a72feaf16 SHA512 b5283d40f2ccebfe9a9e3c30369719d585a0dbaa27c90886a1c6e5c5a1a884599467774890f1190d44cbea037d1cb98407d670bc081bdb09d11ddbac3d746973
 MISC metadata.xml 413 BLAKE2B 7de2584d18e3ea0b12f1becfd32acc6f28793288351808ac210d1c4c94a20c6bde880b28e3ff1d0b095b12f6b90ea795de7d77ee0e0772e0f9b555f4a558384d SHA512 b7e535a3dc5be979b51b0d8fee9c5837ef7a778b460a1eb933f9a90bc7ffa7b9f919a7c15571067bee10c3393f1c791d5ce49a973baafb3841e9edb84aa48130
diff --git a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild
new file mode 100644
index 000000000000..62c69511fe06
--- /dev/null
+++ b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.210.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Delayed creation of objects"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest b/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
index 7ec81f07b704..5b2c8a1b7766 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/Manifest
@@ -1,5 +1,7 @@
 AUX Ogg-Vorbis-Header-PurePerl-1.0-example-ogginfo.patch 798 BLAKE2B 93d5fb7fcc5b8a8ba20f55585c5f009c6960a4d80d6bc49c259cfeafa1321e76c47a98bab85a0f9e742ab2bc8053b444894ae5eede58f2c33ba3d79d00975299 SHA512 c91c373794cba4e959007ccffd24ba91da8e8ce7b2902bae17b6919496f54af95f0940fec8befb72c102d77de9693c515652ba888e43e311a117799afa4099fe
 AUX Ogg-Vorbis-Header-PurePerl-1.0-test-array-ref.patch 1186 BLAKE2B 3f3529aeab5b1175eaf104f664e3bb1bbeecd043dc7a0e25c9a6b3ab5e127400ad716bd1c8e732b381e0489fd9d151329408aa79d1d2a1827347fd470c46a751 SHA512 81d13330f3f94b127d0db21b5d5145de3263b0fc6f0f7732a292e5da71b4b9908a655997bb19bc1c20940500b89ce375ae915db31c3fc9d476621d3327d7a474
 DIST Ogg-Vorbis-Header-PurePerl-1.0.tar.gz 16370 BLAKE2B 2b3f09e5875104fe1509b748eb4777a6f41545162f52e1a95c4da149e08efc4d8c518db4030c30edd14aa1c25068552f22c511a4db6f58f5e9fe0175c44cce93 SHA512 897cf8033f38219b1292cbf68e4a84a709d69aa76fd513c72a471c042c7b14aff0ab7c23ca780492e3735450d00b37eec28f62a3f65ffe916710b8d1f224e612
+DIST Ogg-Vorbis-Header-PurePerl-1.05.tar.gz 69433 BLAKE2B 14bca96be5d828ce15408d69faf47a227630df31a86ce2d1ecd450f35c27e627b2da489654e19d55aa304f8d6a624fe61c0baa48ec409f6b946a96e53b3c848c SHA512 46d040ad8cd7d51187ca06b4d8968ad9009a8f4e2b5a164cb5318b8ec126adba787b0d70ace6feda810eaea37e63761dc25dbaa399d86c8fd1a13fe0fc07296f
 EBUILD Ogg-Vorbis-Header-PurePerl-1.0.0-r2.ebuild 497 BLAKE2B f5c72ada6842b1443867ba68e0cdd28c3ec74d64d9419f7da62df90a16e49aaf52f81599e4d9cd7d2afc01dc9404087d19fa2966ad8951bce97fb13fc96c5eab SHA512 d271eb0c35c03f8374d8fca8602d31508a4bae6f2518d453ee56ffc23472815168d76e6f11fec7b941d3330b74f52d42c8f4f054e25c6e50ff1243871f8e59d2
+EBUILD Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild 388 BLAKE2B f10078e30ec90c11f3f012eb4b612c466a85ae5a7970d6be2b39340c6aad50fad9a9f3eddecf8f57f0eeefd39aad31ca111cd6bba4869a3a8ce59bd268bb86f3 SHA512 96d98e3f6f813a4472a96d8c97ce3906183b73102b345f4a1ce527430cad9a32840d84ff99ec267a2f238d1866a7dade35e6bd62f36ed700755d8235e7f2f30d
 MISC metadata.xml 426 BLAKE2B 9b49f90aa0fe959864ebf29365e7296281f9ae33bc7444780d59ec16bd2db7be80dcfc4721df1e791323522d38d016dbdbf69779eb9b6279388ecf643821ae71 SHA512 c30b9598bcb384713325273aca00cb513224ec8b674a99419b44629d40b4e99b32830225ca86b3aed3584641bcda38229a79c29d61b62388f7e2fca4c7c5814a
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
new file mode 100644
index 000000000000..78eeac7b4c5e
--- /dev/null
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.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=DAVECROSS
+DIST_VERSION=1.05
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Object-oriented interface to Ogg Vorbis information and comment fields"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-perl/Ogg-Vorbis-Header/Manifest b/dev-perl/Ogg-Vorbis-Header/Manifest
index 30c787a6f6b9..65a3d165075c 100644
--- a/dev-perl/Ogg-Vorbis-Header/Manifest
+++ b/dev-perl/Ogg-Vorbis-Header/Manifest
@@ -1,3 +1,5 @@
 DIST Ogg-Vorbis-Header-0.05.tar.gz 39332 BLAKE2B aa20d304ec67facd32ed69c5c5104e05f5a0893ab061720f647a7a36f8054b2e80a3c693bb545ad5579b66b91934071425cf56ea6a9336eea50c8cb960bbdfdb SHA512 dceb4895453bcaccb83f0820e36af08f96525f011603dbad59135dacf84236e9c9dab388256e8518d4e6851765bd4808c616a8ce89d7c95191cced03832eba72
+DIST Ogg-Vorbis-Header-0.11.tar.gz 33652 BLAKE2B 52832de17a22b869596f1eec6ae4bc9cf6780945b683b23c6e1222a2875ecee7a1c6e625120c8d76615efdd2afb3eb5fd1d29e50c3046efd1c99449c6f326e45 SHA512 edef27bcb7d737a655c6f3c6dc4311442bb97f9cdebd14d930a0443fc56f073d47ec73fe2fddbe5d4b00670f8cc833ae6263796f0017d846b43a6dba44866b2b
+EBUILD Ogg-Vorbis-Header-0.110.0.ebuild 499 BLAKE2B ccfa0986e84004e5a75bc6d35ceda2169f2b2e195d45b27c7d1366c2cd3818d68477ebc1cd6d9e10ba9ca7c3502e25bfaf8d005b11d0aa22ca082f61e476a32d SHA512 fb1747b18763829d54ab4fb602fc4590604c0331c1c0a7f682e15811ae1c5faef7279e392a0e4a956d11f9733477e620bfadb0d0e6c0b3a0c127225012ffda15
 EBUILD Ogg-Vorbis-Header-0.50.0-r1.ebuild 477 BLAKE2B c5dcfefff74ca51c165dce0f83e070265813845bc73bfea08942c6196634357dc14b394d747581bc1130f6ee6981fb8f5bf6bdf82355da56391d1842207b39c6 SHA512 3435ad317468857d79a7b0a892061366029a1beb90aaeef503a978f0a5971ff219ec171b4ce5ebe0fb02bfeffd8eec96a58385826b1e90baa8b20472e31c99ba
 MISC metadata.xml 407 BLAKE2B b4cac766447299366c1c58d30cd77a3e798c074654197c1356241310d778adbc229fe7ef0172cca63b2131832dd0adc7c46f6aee43a6e32e10225e95629634da SHA512 02d6977e0c6773a5f59e1ac2fb81c3fef07c636882427dcfab947f32af4b8d3c75bc7deac38579231e58b32893ba4c614aa3dad09b39e7430144d17f92873c30
diff --git a/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.ebuild
new file mode 100644
index 000000000000..93c870bd9de8
--- /dev/null
+++ b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.110.0.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=DAVECROSS
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="An object-oriented interface to Ogg Vorbis information and comment fields"
+
+SLOT="0"
+LICENSE="GPL-2+ LGPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/Inline-0.440.0
+	dev-perl/Inline-C
+	media-libs/libogg
+	media-libs/libvorbis
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Olson-Abbreviations/Manifest b/dev-perl/Olson-Abbreviations/Manifest
index d20381cc3c98..f881820e83a4 100644
--- a/dev-perl/Olson-Abbreviations/Manifest
+++ b/dev-perl/Olson-Abbreviations/Manifest
@@ -1,3 +1,3 @@
 DIST Olson-Abbreviations-0.04.tar.gz 30578 BLAKE2B 4c510d8af0c2a394f2d3297cf2f3e03f1860f948fe42407bf6fd5ad2ca302376b4daa81b56da4ce031a768830076296b01370943aee02535703dd5672f47be86 SHA512 75f712bd10a41eb5d6bb4f4a8894d6e9f87f9a6a056160d0346b5395bb3a25f03718d5b3a9f6bb25c8a5a8fd4c72456f9a3870e449e3bb0c078bcd6df3340576
-EBUILD Olson-Abbreviations-0.40.0.ebuild 739 BLAKE2B 728e04ec66648bb749691cd586453a002319d285ba6699226b8b2c200610b62aa8756e94dc829e60a88ba475ea2d37cfaf285d35e49521327bc946a3f1929cec SHA512 557357a1affdde1edd9e3c68b8492d9c918502668ac398fafa143ad6495d4778e0b755969fbd0f46c5d1983dc420431d6ce6284fc9ac813082f3f4d8c2da8a52
+EBUILD Olson-Abbreviations-0.40.0-r1.ebuild 701 BLAKE2B 3df9eb01e6b2ce1c574ced3238c5fb140572445dd3de1cc212af3eb57128b00250415f2a82995b7ab01e6b9010654e33e3153f902e37a698432ed32d1f0e3e46 SHA512 d2efb4f62cdd71ae322b0a0f5710be66a062629feba25dfd939fde95b42ef9c27de6f1e89b67727d211ef9b2bdcbef1671b2b48ff0bf144a7c3ecdd796c402e3
 MISC metadata.xml 410 BLAKE2B d1d1f74a61698320f79343e613add23fd1196ddeea7841287338dd01fc53a5e78847c5e060a532828fd2199b498b534b1b6dd01eb0cfdde772c32978d3df6f9d SHA512 7d84658858281de41ee0ae315f8a9322ab4133ef195114f0d347dcdf64dd58cb96e7f54955e834e5a56010f300732d8e681cb9fc51e69e316c75f266f81e469a
diff --git a/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0-r1.ebuild b/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0-r1.ebuild
new file mode 100644
index 000000000000..88d6ad36312b
--- /dev/null
+++ b/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ECARROLL
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Globally unique timezones abbreviation handling"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Moose
+	>=dev-perl/MooseX-ClassAttribute-0.250.0
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-perl/List-MoreUtils
+		virtual/perl-Test-Simple
+	)
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+	use test && perl_rm_files t/pod.t t/pod-coverage.t
+}
diff --git a/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild b/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
deleted file mode 100644
index 7278bf1855f2..000000000000
--- a/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ECARROLL
-DIST_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Globally unique timezones abbreviation handling"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Moose
-	>=dev-perl/MooseX-ClassAttribute-0.250.0
-	dev-perl/namespace-autoclean
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/List-MoreUtils
-		virtual/perl-Test-Simple
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-	use test && perl_rm_files t/pod.t t/pod-coverage.t
-}
diff --git a/dev-perl/OpenGL/Manifest b/dev-perl/OpenGL/Manifest
index 2fc820005c04..2bae88764cce 100644
--- a/dev-perl/OpenGL/Manifest
+++ b/dev-perl/OpenGL/Manifest
@@ -1,4 +1,4 @@
 AUX OpenGL-0.700.0-no-display.patch 3270 BLAKE2B 95f0510ce19f4210806f5c6e0fef4db733816933517bcd9777727aa535e5505ba8ed1ccbc81b694a8e476674cc67297109884d23c9f0ab3362fdcde40e81112d SHA512 be266e4b509a2c915e021bb27ceb3f0472bb250e03b64f9062e76f40a6f180d759e92680172b9df55f817a92c3cfd0fae660d9fb07fcfb7e51a06d631b08dfe2
 DIST OpenGL-0.70.tar.gz 783810 BLAKE2B 9112057cb0eed654827aaed84646c31d80833f6cce90a7a6066d648558c90ade0126b4f79033bef08adce1e3024c2eb4d1e6b10d4807bb422bce18ffcb1baba9 SHA512 7d418015b2553dd69805252b5957bc97013260617d5a358f692e29b8da884590421c81fbc71d4dd678c93a5c89047d6af8c32f15bf0bd0e4ce514c200e634af5
-EBUILD OpenGL-0.700.0.ebuild 1109 BLAKE2B 54b6a4b4ae2e2cd234e46f1f42b623de90402df12d487c63152bfb39dc37183ea8e26c46cb6636dc1c6c24619f948ef7a76c8b48199cb744e45e6fa1018cba9e SHA512 42315dea5ca48775bde3bdafef72cb665e660a2979d6f356c873a059700be90276f9bf7d8427175996eb3f4ea1b502601da8871c8eae81d8e9caf6db92fa2da7
+EBUILD OpenGL-0.700.0-r1.ebuild 1133 BLAKE2B 37d53dc863de21afd083eab4bff1c42a42e9bf8b1e6bd436a888b6a71f610f2e4dcdec1aced64d618b57a094f85f9987ed4072665f39fe9ed9af9aec31b9fd9c SHA512 cd099e24402457b30713b03fddbbcfe239d5e4a86266e74fa793f0de888628b046a5e1c2249c4c56a935bb5b5d8e54a10cfc790f5f3c0cfbdd51b38347d383b4
 MISC metadata.xml 922 BLAKE2B 03764151420fef54a4a5d9f94aca484805ccaf0357d727dfbd53239af696f36fefd030e2e9f212fc3359a8eff45db1d0fc71bdd0c234cd6f71c67ffedf031ef2 SHA512 a186a10481c65733a1a5452d1bc64a4723984d68ab6baae2677a40d249e6ac414d696217bfd30daa01745434991eb05896048a010159ca0fbc2e443829f99a12
diff --git a/dev-perl/OpenGL/OpenGL-0.700.0-r1.ebuild b/dev-perl/OpenGL/OpenGL-0.700.0-r1.ebuild
new file mode 100644
index 000000000000..e1ebf307e286
--- /dev/null
+++ b/dev-perl/OpenGL/OpenGL-0.700.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHM
+DIST_VERSION=0.70
+
+inherit perl-module
+
+DESCRIPTION="Perl interface providing graphics display using OpenGL"
+
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	media-libs/freeglut:0=
+	x11-libs/libICE:0=
+	x11-libs/libXext:0=
+	x11-libs/libXi:0=
+	x11-libs/libXmu:0=
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+"
+
+mydoc="Release_Notes"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-no-display.patch
+	# This should be merely moved to t/ as it gets
+	# installed to OS otherwise.
+	# But it presently fails tests, and can't be made not to.
+	# ( And will need virtualx when it can )
+	# Something to do with OpenGL implementation ala eselect.
+	perl_rm_files "test.pl";
+	perl-module_src_prepare
+}
+
+src_compile() {
+	sed -i -e 's/PERL_DL_NONLAZY=1//' Makefile || die
+	perl-module_src_compile
+}
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-perl/OpenGL/OpenGL-0.700.0.ebuild b/dev-perl/OpenGL/OpenGL-0.700.0.ebuild
deleted file mode 100644
index b4c380719c3c..000000000000
--- a/dev-perl/OpenGL/OpenGL-0.700.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=6
-
-DIST_AUTHOR=CHM
-DIST_VERSION=0.70
-
-inherit perl-module
-
-DESCRIPTION="Perl interface providing graphics display using OpenGL"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	media-libs/freeglut:0=
-	x11-libs/libICE:0=
-	x11-libs/libXext:0=
-	x11-libs/libXi:0=
-	x11-libs/libXmu:0="
-DEPEND="${RDEPEND}"
-
-mydoc="Release_Notes"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-display.patch
-	# This should be merely moved to t/ as it gets
-	# installed to OS otherwise.
-	# But it presently fails tests, and can't be made not to.
-	# ( And will need virtualx when it can )
-	# Something to do with OpenGL implementation ala eselect.
-	perl_rm_files "test.pl";
-	perl-module_src_prepare
-}
-
-src_compile() {
-	sed -i -e 's/PERL_DL_NONLAZY=1//' Makefile || die
-	perl-module_src_compile
-}
-
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-perl/PAR/Manifest b/dev-perl/PAR/Manifest
index d7b29eb043f5..5cc5da5f6b1c 100644
--- a/dev-perl/PAR/Manifest
+++ b/dev-perl/PAR/Manifest
@@ -1,3 +1,5 @@
 DIST PAR-1.015.tar.gz 65748 BLAKE2B 1d5bb6dffb1ba10132af09187106406d2bc982fef6258be7b27fe6ca1e600986af8d0050f9011a4d301a11ebd05440be2cb0e17c5d1247ba460474d84add9a81 SHA512 411048cb6517364b04cb46c179574b4baf2dc0788efecedc1e5fe2283a203d25157f1e74411761b8dd3019f50b651b0f40bf7d50131cf40077c4372571aa62b7
+DIST PAR-1.017.tar.gz 65942 BLAKE2B 99acabab41bff84b9445c38dbceffe5731a20afb16cecef20a6d6fa48babfebdba42d675fd813c91cde59b4b932fff00571957bcebb1001c194e90dbc59648ea SHA512 74f7f0645ff7de8fbb4cd930e0be496401821efa6b34578acba6c567ab3126ef221fd0ab45bd4e6e1118099aed1a48bdd572f2c743dff5e919d8d22796da0145
 EBUILD PAR-1.15.0.ebuild 662 BLAKE2B 4c9b8ac24a5ec1a4512db6c6e7b8368bddec8971271ba5bc23d0d6bb523615a1d0fa12492b6c0ac44014a8ae4065fe2780587e806a4387847103f0257a7c91ef SHA512 14e7a1e12c3d98761c5765bdca0c1eabef06c43786a469e770e00424fbb7c8a25d1d38740b104b57761edc8adb212c0bb1390edb5495102c962f345f4043d5a2
+EBUILD PAR-1.17.0.ebuild 593 BLAKE2B 02e611305a33615f7829a6d940cb423b85708bef3bce929b8d46633f8f24e9ebadf4f3fa366dc9746ebf18f9750b48150385e66da6468a7a001854b448321a26 SHA512 8fd4994c1749f3c496e0bc29b68133c4e3a6b363b4d27c576d569a694e37958b46ece4a9984bf031454e5f6daa04c7110624c808e02894fc195012e3800eb478
 MISC metadata.xml 560 BLAKE2B ffa951edd39e3094a54207c600c906a860fba38c6a4682868f8d88e83695242ab2fc61d6cd4ff43795c1a844e39b3cda5ba86d2824aa2ddeba4fc859b3738bd6 SHA512 aac26afceb2fc5d3aa63fc913f52cd199b3907a1be0478144cab744a3ce23ca57457e10b13b82c0abfdbc7d485bf385ad4b3f88c20bdb455d39fdd7bbb548379
diff --git a/dev-perl/PAR/PAR-1.17.0.ebuild b/dev-perl/PAR/PAR-1.17.0.ebuild
new file mode 100644
index 000000000000..83ebe8254146
--- /dev/null
+++ b/dev-perl/PAR/PAR-1.17.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=RSCHUPP
+DIST_VERSION=1.017
+inherit perl-module
+
+DESCRIPTION="Perl Archive Toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Archive-Zip-1.0.0
+	>=virtual/perl-AutoLoader-5.660.200
+	>=virtual/perl-Digest-SHA-5.450.0
+	>=virtual/perl-File-Temp-0.50.0
+	>=virtual/perl-IO-Compress-1.300.0
+	>=dev-perl/PAR-Dist-0.320.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=( t/00-pod.t )
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index 27ae800e8505..2dcd14c89998 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -4,5 +4,5 @@ AUX PDL-2.17.0-makemakerfix.patch 433 BLAKE2B 6a57d9703d95324ee64bd0c5ca5774f013
 AUX PDL-2.17.0-shared-hdf.patch 1737 BLAKE2B 8123226cc2fae7c8579b9af036f1802f0228efb66fa73b24788c78b9ea5034140b93ecae64fa3ef84153081ceebbbf1ffbf320fd8ccf0309695bf3554f095504 SHA512 bfa39a1742fa6420f03894e04e501c28a434f13cf863880d5f78988c7cfb341de5ca73f877a28bc1fe4b1e5351ced704b44bd4499b047cc51ec2f965acbeb26f
 AUX perldl.conf 2716 BLAKE2B 7cea3e06e00636c45d3ffaef5df236668aabdf52675a3447ef086cd3820df19fee4d6f1a0bd40a15d0374cebd6126a391647f973dd25803da01995cf58d6fe15 SHA512 ed05b5a5d8014a010093d1c03b90a72bc5629760a71f521988cfeaf70e6b59d9a4bfd8b4533a4dc3bcb46ba6fd3737cd7fb74ec086d3da8aac1b8239fa9ca8e5
 DIST PDL-2.017.tar.gz 2889414 BLAKE2B e49e0ee7e7fc3d95dd27098e8008930673cc4067331f2e4d9eecf8584fe717b15d5b4c7198548ea79a4543d94c1078f5e6eedd731b94d7ce062ab2841c32fc8d SHA512 b1c60b45427153928834619a59ef2213a0845564ae997e22fe202dfee281647edceb68bf3bfa6602ee69a7fd0cc69b7b61ccb74407f490d9fa40230f74599411
-EBUILD PDL-2.17.0-r1.ebuild 3395 BLAKE2B 12efaf92e37bc61bd4f59feb621d33183f7181af70e1bf81bc684a54c75ddf01b065a75e7c7dafc50ce84f20870f8c502b0d1db96db587a26fafe73a6cfa8947 SHA512 e6a37e860a0163f16eb3937fb202f2a2f4123932ce6749c7272d502c98f1fe6cf9fda1b7fa93ac188116dd6e34816922ebffb5658c8fcc409e8f146f7fd267f5
+EBUILD PDL-2.17.0-r2.ebuild 3387 BLAKE2B a0590614e7f9f8bfc0e91f9019ffb0ee691b710ad71be75c7b9a3ca94a68c95822e3ac18f8b89ff15fe0a2677d541c50a036879216adab700fddd7ebee6de5b4 SHA512 7e3763da6eb4aa92e4e33f5f094423d91a5d2dd929b23d0ae8fbba9668dd762df6cdccf76331ada86a1b62cd25cc27358255128c0f206d3347e0acc0b79e4bed
 MISC metadata.xml 14070 BLAKE2B 2b8815b4829438c60093b78dba17a5a9a8b25d235e74a46ee809fda26b9a147962afefdd4c0b3bf33c529bbc91d647342730685c4870a3532c3bdd8b04271f0f SHA512 1934d0426e3f14ae27f506e7b5b1960753f24514f28bd7d653e41a486694646be81fc39b16f36686f7b5a6c9a1905ec1a26d79790b98dd2c61b8b100d9287aa5
diff --git a/dev-perl/PDL/PDL-2.17.0-r1.ebuild b/dev-perl/PDL/PDL-2.17.0-r1.ebuild
deleted file mode 100644
index 859935cf5bc9..000000000000
--- a/dev-perl/PDL/PDL-2.17.0-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHM
-DIST_VERSION=2.017
-
-FORTRAN_NEEDED=fortran
-
-inherit perl-module fortran-2
-
-DESCRIPTION="Perl Data Language for scientific computing"
-
-LICENSE="|| ( Artistic GPL-1+ ) public-domain PerlDL"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-
-IUSE="+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:0=
-	app-arch/sharutils
-	dev-perl/Astro-FITS-Header
-	dev-perl/File-Map
-	>=dev-perl/Inline-0.680.0
-	>=dev-perl/Inline-C-0.620.0
-	dev-perl/Module-Compile
-	>=dev-perl/OpenGL-0.670.200
-	dev-perl/TermReadKey
-	|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
-	>=virtual/perl-Data-Dumper-2.121.0
-	virtual/perl-Pod-Parser
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Filter-Simple
-	dev-perl/Filter
-	virtual/perl-Storable
-	>=virtual/perl-Text-Balanced-1.890.0
-
-	gd? ( media-libs/gd )
-	gsl? ( sci-libs/gsl )
-	hdf? ( sci-libs/hdf )
-	netpbm? (
-		media-libs/netpbm
-		media-video/ffmpeg
-	)
-	pdl2? (
-		>=dev-perl/Devel-REPL-1.3.11
-		|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
-	)
-	pgplot? ( dev-perl/PGPLOT )
-"
-
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.560.0
-	dev-perl/Devel-CheckLib
-	fortran? ( >=dev-perl/ExtUtils-F77-1.13 )
-	test? (
-		dev-perl/Test-Exception
-		dev-perl/Test-Warn
-		dev-perl/Test-Deep
-	)
-"
-
-mydoc="BUGS DEPENDENCIES DEVELOPMENT Known_problems MANIFEST* Release_Notes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17.0-makemakerfix.patch
-	"${FILESDIR}"/${PN}-2.17.0-fortran.patch      # respect user choice for fortran compiler+flags, add pic
-	"${FILESDIR}"/${PN}-2.17.0-shared-hdf.patch   # search for shared hdf instead of static
-	"${FILESDIR}"/${PN}-2.17.0-dot-in-inc.patch   # fix broken Perl 5.26 compile due to @INC changes
-)
-
-pkg_setup() {
-	perl_set_version
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	perl-module_src_prepare
-	find . -name Makefile.PL -exec \
-		sed -i -e "s|/usr|${EPREFIX}/usr|g" {} \; || die
-}
-
-src_configure() {
-	sed -i \
-		-e '/USE_POGL/s/=>.*/=> 1,/' \
-		-e "/WITH_3D/s/=>.*/=> 1,/" \
-		-e "/HTML_DOCS/s/=>.*/=> $(use doc && echo 1 || echo 0),/" \
-		-e "/WITH_BADVAL/s/=>.*/=> $(use badval && echo 1|| echo 0),/" \
-		-e "/WITH_DEVEL_REPL/s/=>.*/=> $(use pdl2 && echo 1 || echo 0),/" \
-		-e "/WITH_GSL/s/=>.*/=> $(use gsl && echo 1 || echo 0),/" \
-		-e "/WITH_GD/s/=>.*/=> $(use gd && echo 1 || echo 0),/" \
-		-e "/WITH_HDF/s/=>.*/=> $(use hdf && echo 1 || echo 0),/" \
-		-e "/WITH_MINUIT/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
-		-e "/WITH_PGPLOT/s/=>.*/=> $(use pgplot && echo 1 || echo 0),/" \
-		-e "/WITH_POSIX_THREADS/s/=>.*/=> $(use threads && echo 1 || echo 0),/" \
-		-e "/WITH_PROJ/s/=>.*/=> $(echo 0),/" \
-		-e "/WITH_SLATEC/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
-		perldl.conf || die
-	perl-module_src_configure
-}
-
-src_test() {
-	MAKEOPTS+=" -j1" perl-module_src_test
-}
-
-src_install() {
-	perl-module_src_install
-	cp Doc/{scantree,mkhtmldoc}.pl "${D}"/${VENDOR_ARCH}/PDL/Doc || die
-}
-
-pkg_postinst() {
-	perl "${VENDOR_ARCH}/PDL/Doc/scantree.pl" || die
-	elog "Building perldl.db done. You can recreate this at any time"
-	elog "by running:"
-	elog "perl ${VENDOR_ARCH}/PDL/Doc/scantree.pl"
-}
-
-pkg_prerm() {
-	rm -rf "${EROOT}"/var/lib/pdl/html
-	rm -f  "${EROOT}"/var/lib/pdl/{pdldoc.db,Index.pod}
-}
diff --git a/dev-perl/PDL/PDL-2.17.0-r2.ebuild b/dev-perl/PDL/PDL-2.17.0-r2.ebuild
new file mode 100644
index 000000000000..2b4ef3f9d7e6
--- /dev/null
+++ b/dev-perl/PDL/PDL-2.17.0-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHM
+DIST_VERSION=2.017
+
+FORTRAN_NEEDED=fortran
+
+inherit perl-module fortran-2
+
+DESCRIPTION="Perl Data Language for scientific computing"
+
+LICENSE="|| ( Artistic GPL-1+ ) public-domain PerlDL"
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86"
+
+IUSE="+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test"
+
+RDEPEND="sys-libs/ncurses:0=
+	app-arch/sharutils
+	dev-perl/Astro-FITS-Header
+	dev-perl/File-Map
+	>=dev-perl/Inline-0.680.0
+	>=dev-perl/Inline-C-0.620.0
+	dev-perl/Module-Compile
+	>=dev-perl/OpenGL-0.670.200
+	dev-perl/TermReadKey
+	|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
+	>=virtual/perl-Data-Dumper-2.121.0
+	dev-perl/Pod-Parser
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Filter-Simple
+	dev-perl/Filter
+	virtual/perl-Storable
+	>=virtual/perl-Text-Balanced-1.890.0
+
+	gd? ( media-libs/gd )
+	gsl? ( sci-libs/gsl )
+	hdf? ( sci-libs/hdf )
+	netpbm? (
+		media-libs/netpbm
+		media-video/ffmpeg
+	)
+	pdl2? (
+		>=dev-perl/Devel-REPL-1.3.11
+		|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
+	)
+	pgplot? ( dev-perl/PGPLOT )
+"
+
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.560.0
+	dev-perl/Devel-CheckLib
+	fortran? ( >=dev-perl/ExtUtils-F77-1.13 )
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/Test-Warn
+		dev-perl/Test-Deep
+	)
+"
+
+mydoc="BUGS DEPENDENCIES DEVELOPMENT Known_problems MANIFEST* Release_Notes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17.0-makemakerfix.patch
+	"${FILESDIR}"/${PN}-2.17.0-fortran.patch      # respect user choice for fortran compiler+flags, add pic
+	"${FILESDIR}"/${PN}-2.17.0-shared-hdf.patch   # search for shared hdf instead of static
+	"${FILESDIR}"/${PN}-2.17.0-dot-in-inc.patch   # fix broken Perl 5.26 compile due to @INC changes
+)
+
+pkg_setup() {
+	perl_set_version
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	perl-module_src_prepare
+	find . -name Makefile.PL -exec \
+		sed -i -e "s|/usr|${EPREFIX}/usr|g" {} \; || die
+}
+
+src_configure() {
+	sed -i \
+		-e '/USE_POGL/s/=>.*/=> 1,/' \
+		-e "/WITH_3D/s/=>.*/=> 1,/" \
+		-e "/HTML_DOCS/s/=>.*/=> $(use doc && echo 1 || echo 0),/" \
+		-e "/WITH_BADVAL/s/=>.*/=> $(use badval && echo 1|| echo 0),/" \
+		-e "/WITH_DEVEL_REPL/s/=>.*/=> $(use pdl2 && echo 1 || echo 0),/" \
+		-e "/WITH_GSL/s/=>.*/=> $(use gsl && echo 1 || echo 0),/" \
+		-e "/WITH_GD/s/=>.*/=> $(use gd && echo 1 || echo 0),/" \
+		-e "/WITH_HDF/s/=>.*/=> $(use hdf && echo 1 || echo 0),/" \
+		-e "/WITH_MINUIT/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
+		-e "/WITH_PGPLOT/s/=>.*/=> $(use pgplot && echo 1 || echo 0),/" \
+		-e "/WITH_POSIX_THREADS/s/=>.*/=> $(use threads && echo 1 || echo 0),/" \
+		-e "/WITH_PROJ/s/=>.*/=> $(echo 0),/" \
+		-e "/WITH_SLATEC/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
+		perldl.conf || die
+	perl-module_src_configure
+}
+
+src_test() {
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
+
+src_install() {
+	perl-module_src_install
+	cp Doc/{scantree,mkhtmldoc}.pl "${D}"/${VENDOR_ARCH}/PDL/Doc || die
+}
+
+pkg_postinst() {
+	perl "${VENDOR_ARCH}/PDL/Doc/scantree.pl" || die
+	elog "Building perldl.db done. You can recreate this at any time"
+	elog "by running:"
+	elog "perl ${VENDOR_ARCH}/PDL/Doc/scantree.pl"
+}
+
+pkg_prerm() {
+	rm -rf "${EROOT}"/var/lib/pdl/html
+	rm -f  "${EROOT}"/var/lib/pdl/{pdldoc.db,Index.pod}
+}
diff --git a/dev-perl/Package-Constants/Manifest b/dev-perl/Package-Constants/Manifest
index 08199cf30370..80da105870b6 100644
--- a/dev-perl/Package-Constants/Manifest
+++ b/dev-perl/Package-Constants/Manifest
@@ -1,3 +1,3 @@
 DIST Package-Constants-0.06.tar.gz 3767 BLAKE2B 037ca39f6fb28ad4bf3e5f8ea4a73cbd2eddfffab294aec9d46d6b252b4291840c1c5dba7dafdb8ceffc878b271f70c8a68c5b911cfa368fefd63b5706f571a1 SHA512 a3f855435a989252551dfbd50492dcae5bdfb01efe14c2ef40679722305bb67097eb4c969023df1da00ee22d92f88e39439ebdeaae0b1f3a3fc6c561f3fa8481
-EBUILD Package-Constants-0.60.0.ebuild 450 BLAKE2B 349b2243bc5dc0ddc7364dc5ebc3f6ffaf20958a37a53a26a0c5b0dbb84bab08e0961f5c120a652a0c29f7396f0c6f13bfb7be6b587f14cc90def51971b4d3b2 SHA512 27c04481dd55b0075ce45501e850da3c0d2843841d1198dd16a9003866d4e2a35ab07be2d6b8f5e72160806e89f4450a14954ccd66c8a6eccf0eeb454be63f65
+EBUILD Package-Constants-0.60.0-r1.ebuild 425 BLAKE2B 5e4714dad5131e5a58cf9a31d175943b56364d1b1a3d040434da3f786be2a9846ffda5e0b1ee37051218bde93b818a8e31f39752dd2fb6cf6d692a9200f0db38 SHA512 efc902fbb72a946320f83f7f3dcadcf0229aa6e7fb9946aa6c5cc437a4cb1f9bbe8a30a0307f103aec1f4e70f6730d1c0349f2e5f41ce4ed230a5c147d7ea767
 MISC metadata.xml 406 BLAKE2B 1887df4668c75f3473b2443e593ee45004c9d3e5edf573251bd282b261340f329b213a7bb834175560d6e23489d4995bdfc3c30df19b01ed1c9486e5f97bac1f SHA512 28b9b564192526d40dac0b151319dea8f9434f2b3eae5437a6682a4f3df86f12f93b5d05350d6bca3c089ba7d9246306acaf29f24df46d363d344ad05d64d99b
diff --git a/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild b/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..532e0deec83c
--- /dev/null
+++ b/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=0.06
+DIST_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="List all constants declared in a package"
+
+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"
diff --git a/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild b/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild
deleted file mode 100644
index 1aa8c84ef36e..000000000000
--- a/dev-perl/Package-Constants/Package-Constants-0.60.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=5
-
-MODULE_VERSION=0.06
-MODULE_AUTHOR=BINGOS
-inherit perl-module
-
-DESCRIPTION="List all constants declared in a package"
-
-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=""
-
-SRC_TEST=do
diff --git a/dev-perl/Package-DeprecationManager/Manifest b/dev-perl/Package-DeprecationManager/Manifest
index fecfec7d0186..1bf34558c9de 100644
--- a/dev-perl/Package-DeprecationManager/Manifest
+++ b/dev-perl/Package-DeprecationManager/Manifest
@@ -1,3 +1,3 @@
 DIST Package-DeprecationManager-0.17.tar.gz 27647 BLAKE2B af12433cef899e8d5f911ce76746e1862e8d6f5eceae9a5c890da7fa4f10e73fd41118c0754ca56d4b0f4865fdd09139358f3c9020940d34a348e7a27f68a495 SHA512 57bf79df657895342ca5b8d13f155d85f34d1a85415570b112138b6c50c5d08b421a1707671fbf807918cc334006e4558a626a7201c60096924fc2200c751cde
-EBUILD Package-DeprecationManager-0.170.0.ebuild 816 BLAKE2B 731356e830fdc5cd1a12ad09d16eb88022f8b6f07783603ab97b51bec025f6dc7f93da5bbdff992b72f0d2639f8e50e249e9f5183217722a8b2a148bce5b1543 SHA512 fcb54791983d463dd3b9f24311c2f7d30b8a6f32df0ad0272bb846b1d110035b39021ee4420dc027a873cce8989466c0e8403928d9f113115a6652b0065c7bbf
+EBUILD Package-DeprecationManager-0.170.0-r1.ebuild 778 BLAKE2B 3994f70b9d92bd04b7f1247bffcde4fe53daf637defef81358b60a62dbda7b44fd45094d76bab0caca3e042fc44dfcda5d89cb5edc2941ba37ce629638813c73 SHA512 1c75e259c7c54d947e14ee4e75bafbddd3a4534be96924509d8862c10d4e7169869284f425f9da140cdad0230d3cc2cbd9f8a15f3c01fa1c435700dbe63de606
 MISC metadata.xml 424 BLAKE2B cfdc58a331b544b4f448536f23a79871169616f3b95ca7c1cfb71ea8af2243c363058b4d0657188dad48d23fe78b814a43c79c6f3ac2ac10d0a881f01738daae SHA512 803b02216bdc60a695de8758cd970827bc683e217c580faed6300ddb6a7d07d2370ac87360bad50d972ee8c6d6ec791d6159144402690811bd6603d661e00333
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0-r1.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0-r1.ebuild
new file mode 100644
index 000000000000..2624644bd5f8
--- /dev/null
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Manage deprecation warnings for your distribution"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	dev-perl/Package-Stash
+	dev-perl/Params-Util
+	dev-perl/Sub-Install
+	dev-perl/Sub-Name
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Warnings
+	)
+"
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
deleted file mode 100644
index b38f7dbeb451..000000000000
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.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=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=0.17
-inherit perl-module
-
-DESCRIPTION="Manage deprecation warnings for your distribution"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-	dev-perl/Package-Stash
-	dev-perl/Params-Util
-	dev-perl/Sub-Install
-	dev-perl/Sub-Name
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Exporter
-		virtual/perl-File-Spec
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Warnings
-	)
-"
diff --git a/dev-perl/Package-Stash-XS/Manifest b/dev-perl/Package-Stash-XS/Manifest
index e49330264832..25c44b1e878b 100644
--- a/dev-perl/Package-Stash-XS/Manifest
+++ b/dev-perl/Package-Stash-XS/Manifest
@@ -1,3 +1,5 @@
 DIST Package-Stash-XS-0.28.tar.gz 74161 BLAKE2B d4e0361ff62ace98116cfca1d8ea057cf6f641b5ca2c88a753b2db0724b96a210900201e3070723811e99f9dafafa7f1dec47595703f832db4962789c9c758c7 SHA512 409e884998bf063f438335067ff8f702aa1f12fc686c1912ad532f6536a711273e52c140d9c407c47b7ba4ccacedec480c1542437a90dd76367dc0f732c0db38
+DIST Package-Stash-XS-0.29.tar.gz 87491 BLAKE2B 330ac0d41da990666f70e813acc83c68bf110923610c61f5a39079a79ed9e13d84ddc532d6aa9192ae1ec09d1d40a6a90dbd35ae6ff9bac75bb6d4ce2394d82c SHA512 f7afcf1a67915d9990a8d63e418ebc6b6b48947b90a72a454b8197656233d8cc976f72d44e4179621628e52fa7ab9a9a74f18f95ad1999d3f45181531ed44849
 EBUILD Package-Stash-XS-0.280.0.ebuild 635 BLAKE2B bcf5068a5892b026d8f37c93dee6767c59f5f258211b9f8656a275137b2fe36f8c6aeb5b7b244b99b4ef2b6f132bca5b5d632501dfe5c5bf75a3fcc8a3f6bf64 SHA512 83cbde3893066f1c6c8756884cf7fde56ce6892524436c34cf98c1971147f3719fd639d29e352acf111768c42980793f276b36fca767a25d88e2357bb893f360
+EBUILD Package-Stash-XS-0.290.0.ebuild 589 BLAKE2B 4c2e22c084c65d455091fa77606d81d38263432cfa68d31f73b5476401a77796c87f1e2a992bfc3a6e3c5df0a301350a5369a3aeaaaa6c8c739990c97a9cdc23 SHA512 64c9a9926afa19f9cee04735e9de101fa60fa38f2b44c6830b400b9b5a7491fda12817fa9e3e7658c37a90df4a31a1fd3e0577f7942bfa6f3c741011607ba3a6
 MISC metadata.xml 405 BLAKE2B e257711d919dea89cf86f1b361af4a1cea58d22f0eb575ac52d56993ca8c27ffc7a1d326addc6f274f98b8f20079ed1fea9d9f3766f26ec31cf302727b7687e9 SHA512 eed17fb737efbdb196d2e2d50ba117f11c61c2180dcd0f13e7b98d8a7773d72162403e73e5ebaf65531792d157d9a6b3f1a614743d4838b684e1a8da04d0a0be
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild
new file mode 100644
index 000000000000..7a6e03fa726e
--- /dev/null
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.290.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.29
+inherit perl-module
+
+DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
+	test? (
+		dev-perl/Test-Fatal
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index 9373b695018b..9245362951c0 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,3 +1,5 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
+DIST Package-Stash-0.39.tar.gz 55606 BLAKE2B c4e9ff6fe83f2c8a537fba0b8e38456b3b9a9768ee7dc1c8a2b471a42cc4d8b82c5ce74972cc462996718bc84eb7bf4cd651bb21cc870e438481e85d024a32ce SHA512 c5a6cd56c86fb9f6c8585ee7f65d0add8e905c586747763c7841a054f3540b6bc505f57952f44bb90a6bb500d0d60d20ad5df7a40944480abbc9d8d43d64e30f
 EBUILD Package-Stash-0.370.0.ebuild 1040 BLAKE2B 3e7ca230660abbaaba60fec2b677959a826feb6ad8e31eccaf03e683ae472e20adddb0d1649eb4e3a6b9362ab5aac358d58a7f4dcca1717761d40b1a63437f6f SHA512 74ec8cc08c85097d6eadfaac07e209b0cf2859403dbfe873bd92ac6882d6860e729ea4d1cab93cd92f1d706b4e6347319efdc7c4d36e8bada76170b5b96dfa1a
+EBUILD Package-Stash-0.390.0.ebuild 973 BLAKE2B 076ee5de56c29c8f33526b480bef6d39af06a6b329faef1d6942b8a08f4d7cff029eae6c5e9085ab85081a0bbe6d801a046977ddfc16a2a9aeaac1443a23361c SHA512 1b9263a9c0009b5d224c4bc09cb733eadf5bd1333bfbba333e42f150e47cbd34c4cbba2e8badf8a956f7652807e8f64bae46714ebf4234caa208553398e3b0c5
 MISC metadata.xml 463 BLAKE2B d3b8057579c6439184990d6a8090f76b0800966c0c75bfb9bd0317aefa2f48a1ac375c7b60b3c05c7de7f992f1931ad0606fc44c6e77e4508b71b3987dfa745f SHA512 2b2e4ef2cf309de39aed1422386e2a9737c1b19ba6128e60b21d4faecf2b8f8515036701d3e42f4742d160e745e953b63511e921d206f5643db1ed7c7542a426
diff --git a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
new file mode 100644
index 000000000000..6ef8877dd704
--- /dev/null
+++ b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.39
+inherit perl-module
+
+DESCRIPTION="Routines for manipulating stashes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~sparc"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Getopt-Long
+	>=dev-perl/Module-Implementation-0.60.0
+	virtual/perl-Scalar-List-Utils
+	!minimal? (
+		>=dev-perl/Package-Stash-XS-0.260.0
+	)
+"
+# conflicts:
+#	!<=dev-perl/Class-MOP-1.08
+#	!<=dev-perl/namespace-clean-0.18
+#	!<=dev-perl/MooseX-Role-WithOverloading-0.80
+#	!<=dev-perl/MooseX-Method-Signatures-0.360.0
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	dev-perl/CPAN-Meta-Check
+	dev-perl/ExtUtils-HasCompiler
+	virtual/perl-Text-ParseWords
+	test? (
+		virtual/perl-IO
+		dev-perl/Test-Fatal
+		dev-perl/Test-Needs
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Package-Variant/Manifest b/dev-perl/Package-Variant/Manifest
index d2ea0288d4d0..4555238aa2d3 100644
--- a/dev-perl/Package-Variant/Manifest
+++ b/dev-perl/Package-Variant/Manifest
@@ -1,3 +1,3 @@
 DIST Package-Variant-1.003002.tar.gz 10518 BLAKE2B 3463b018197a428e4fd104716506e9cee8bba405f44e49c614f298446ec4e648fa21feac018a54ed243600838ae2447f1b2c7ca627a8176abeec8f01e90eb509 SHA512 0f311e73049df9a7a43a3e9eb3e4ba48120d119ab92161a4c0da532625d5705c6ee5b50f57d6b40ded30df82ce13b9dcced28894ddc7ee0068787b782fd33a4a
-EBUILD Package-Variant-1.3.2.ebuild 523 BLAKE2B d2d0c6fa163774727997f4a294837ab4f9ec60f56670245c8c033be22d0b813215fa70ea4d27f8c2e97caedbd2a3ff3c30cce7c6c1a86981e45c23099c2261e2 SHA512 84453595609f50ed4aebed3fca0c3ea30af9ca153803bb49b20beced9b9f8504c09ad0731d75a25d40b04f8cb79ae078f81f277b4db0192f6304cee0f705579f
+EBUILD Package-Variant-1.3.2-r1.ebuild 485 BLAKE2B 8797397f9d90ecc9b000406f9665fcdf6246add81e5263e3ed66e205877b476ad37578177c9aec9ac7824cc13d113342c21ed6b1526a0c479bb6d3fed022474e SHA512 1a48de7deb802629943af3dfa4eac36df9b0d2f468d2e03e86b80596ed4627d8d0b0e616a2c2142eedccec320bed2c156c0bb4954b828e7376065e72cbfc76bf
 MISC metadata.xml 390 BLAKE2B df65ad2c3ee03f883d1babdd7e4127e16d82cd1ca2b9d0d56a3ec8cbf1b939e877c82a4908ad451a2f579506fb65d8461847182dff9a14aaa1aa235ab18e8e41 SHA512 9f0b850397926b5eaca9003622e15626ef61339f822e4cb86fd7094ac90945b1b81512431250040e2c15c01dd35cd453ac4d41d4f7d95bbd6f3ab190dd2e9537
diff --git a/dev-perl/Package-Variant/Package-Variant-1.3.2-r1.ebuild b/dev-perl/Package-Variant/Package-Variant-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..98763ed2bcc4
--- /dev/null
+++ b/dev-perl/Package-Variant/Package-Variant-1.3.2-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=MSTROUT
+DIST_VERSION=1.003002
+inherit perl-module
+
+DESCRIPTION="Parameterizable packages"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/strictures-2.0.0
+	>=dev-perl/Module-Runtime-0.13.0
+	>=dev-perl/Import-Into-1.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Fatal
+	)
+"
diff --git a/dev-perl/Package-Variant/Package-Variant-1.3.2.ebuild b/dev-perl/Package-Variant/Package-Variant-1.3.2.ebuild
deleted file mode 100644
index 9905e1ca9c89..000000000000
--- a/dev-perl/Package-Variant/Package-Variant-1.3.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=6
-
-DIST_AUTHOR=MSTROUT
-DIST_VERSION=1.003002
-inherit perl-module
-
-DESCRIPTION="Parameterizable packages"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/strictures-2.0.0
-	>=dev-perl/Module-Runtime-0.13.0
-	>=dev-perl/Import-Into-1.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Test-Fatal
-	)
-"
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index b6b441104af0..23084a3009a5 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,3 +1,5 @@
 DIST PadWalker-2.3.tar.gz 16177 BLAKE2B b809448751e907083cde30ab95ab6229d47089044ac20695968b3488f7a45beda3b1567ac96d7d76a49c06399307419088a6d3d727a537dcca0859efe6d73843 SHA512 0a222dc2ed26825bc031b0e4b4b78660fe9d1a5a5d98552f30e730aa4c8e5c38577da9a960669258a11cfd712f6e3827bafa23162aa1101f01b47b08e303b4b0
+DIST PadWalker-2.5.tar.gz 16342 BLAKE2B a72f0841fdc7e308c3dcac246821fdf321c25c75f5019396d4b09a7b9461289fd1db8e4cc9c970f37834e06440cedc13c47bddca4ab117eef80549429e3c4e15 SHA512 b0ed680be4a06e5f621b09e57fa02a6516ceca89dca6922bd134f0433f699584a535c0b1155ee54c1a8d857fb989a944dec5013ccb84c41447cac47e12593b90
 EBUILD PadWalker-2.300.0.ebuild 480 BLAKE2B 6f5e805706fff3a0a7bd0d1a5934ba1698a331fd4b2b10424fe59f302a24399c67982aa30d3aac07ec513e99b0e4106e062aa1757be336e461e46903ea6c98b8 SHA512 5da98853c60179482659f79c17d22efd961af219246baafa7b785b44e94293672e2f51a1fed235abea74c89844bba48b17b9ba4097586e8221451d129d83a265
+EBUILD PadWalker-2.500.0.ebuild 438 BLAKE2B 5f1125f64e24457e52dabf7bc085d0d193df1600bfa938c8eb93c54d7098b12dca993079fabfe7e3c48e0db9d40fa600ac7c4cbc7be07848a56d84eafab79c9c SHA512 d4c26aef4091c740c610806b13561a241e17dae12338297795220f2eb70266464b2e4189c13dc99b24c9bc9b762ed61365400887672b950ec63dac564756b722
 MISC metadata.xml 389 BLAKE2B 7c98c1fe323f72769d7d734e454c205631e44cba76754b44cba8dcd3ee863c90719e0d9aed5f9579fee035931066b728ce7fcd46e0559cb5728e6c9bb7a8e869 SHA512 a85027bbaa6c174e996335493d2959a26edeb8147dc2ff5fb89a4580c9d13c590cca322a94e24e1ba1ab19129dcbc298802a4cb26b57e0c421c12f006c5b5432
diff --git a/dev-perl/PadWalker/PadWalker-2.500.0.ebuild b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
new file mode 100644
index 000000000000..834bd7b5107e
--- /dev/null
+++ b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ROBIN
+DIST_VERSION=2.5
+inherit perl-module
+
+DESCRIPTION="play with other peoples' lexical variables"
+
+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"
diff --git a/dev-perl/Palm-PDB/Manifest b/dev-perl/Palm-PDB/Manifest
index 539a47538491..2c3444fdc028 100644
--- a/dev-perl/Palm-PDB/Manifest
+++ b/dev-perl/Palm-PDB/Manifest
@@ -1,3 +1,3 @@
 DIST Palm-PDB-1.400.tar.gz 40842 BLAKE2B 581f01e346c4b8e1cae317d69a5067b4bdd08497ee7955891b45a8ad3b4cb225ef3f36830e11ed35ac8308948e113cbe7d1c5a06927ca4a28d9361fc49ff5013 SHA512 d0ec567e6d0964de03f8a73b12eb3b6082556527ed790118d65cec37b2201844f3d92cf12517d898c162918d28a111229b64513fa8e75f99afb7a76fceeebf98
-EBUILD Palm-PDB-1.400.0.ebuild 674 BLAKE2B 2e4dab88919e24c47632c6cf693d0fbbb7959e23e1917d188bc5b1e26b7065a69009c88d37c244dc79b6a98208554e84620dddd1c59edadb03bfea7ae13d4d07 SHA512 11cb0d41639de06629ea878ad16f51564095d1fa86c2d4fc6add508230952f7fc7bb65e39f412008017552306f39e1b4f01a633e51de38446b906469aeb5cf08
+EBUILD Palm-PDB-1.400.0-r1.ebuild 480 BLAKE2B dcc7fffc2c9ba7a785b4d85f9313311d084a14698eb8617c366312e5eec1c64f5fde5a2be4303d131d8738229827ef5005de4d5c9ae1160eba013b851fa83f59 SHA512 907ee099e0d705fb95a1257082c91404015055bfdae9e40e597f201cf351c314bf6f3abedc5aba32c1dde886c0ce0e3d46df4896c60bada2bb77ae7e0147dacb
 MISC metadata.xml 430 BLAKE2B b9a4e29bead4f637f6f31c16734d14941b6e50ff2c9a31165909b58ab22aae61350e364a6824e9457f62e0da16ef4a43ec16d6efef35021864b28f777911bea5 SHA512 9af9c1693ebfddf587eaec8633768f9c83ae1b7c68492ed41d34fe517e46419f29f6c30e8676f10d9673db67513c7e6b838008cebbfd6fc41fd7dae145391851
diff --git a/dev-perl/Palm-PDB/Palm-PDB-1.400.0-r1.ebuild b/dev-perl/Palm-PDB/Palm-PDB-1.400.0-r1.ebuild
new file mode 100644
index 000000000000..55054d2f13fb
--- /dev/null
+++ b/dev-perl/Palm-PDB/Palm-PDB-1.400.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=CJM
+DIST_VERSION=1.400
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Parse Palm database files"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+# This package is split upstream from "Palm"
+# so collides before 1.14.0
+RDEPEND="
+	!<dev-perl/Palm-1.14.0
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Palm-PDB/Palm-PDB-1.400.0.ebuild b/dev-perl/Palm-PDB/Palm-PDB-1.400.0.ebuild
deleted file mode 100644
index 81e8a9d9cfc7..000000000000
--- a/dev-perl/Palm-PDB/Palm-PDB-1.400.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CJM
-DIST_VERSION=1.400
-
-inherit perl-module
-
-DESCRIPTION="Parse Palm database files"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-# This package is split upstream from "Palm"
-# so collides before 1.14.0
-RDEPEND="
-	!<dev-perl/Palm-1.14.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-perl/Palm/Manifest b/dev-perl/Palm/Manifest
index 570317e3649a..aa8164de97ad 100644
--- a/dev-perl/Palm/Manifest
+++ b/dev-perl/Palm/Manifest
@@ -1,3 +1,3 @@
 DIST Palm-1.400.tar.gz 53355 BLAKE2B 8e68b59e478a930764145c169289bee71bc22c7193f6195cd73c9c880a40eeb2b230b88799ebec9a9d020311d28b7432489b89719a3b0e10f3c3f08e4b95b8b9 SHA512 a8b8fe962db5df9442e6576d6e1d78fa8c4d58c088f9dc8a681c448ecd59c037529c4ed3d13f24afabba41adf1223032d9713e31fd71f775d9b5d42c8364dc39
-EBUILD Palm-1.400.0.ebuild 738 BLAKE2B 86ff8a4bdd24468cc85b753a92e5d4a4953d353cc063be0fb71c34afa55784ac8a474d26cb9bcfa382a7f49820418c7ae5bea606b947b057818db70c090cb760 SHA512 88fd614fae2562ff18918182a9dd237499499b1cbebbd4b18088da9fbd6b87e4db64052489dbf75e37041491f8811f2000b5d695a4dd8d2c52147bcbf64ea9bd
+EBUILD Palm-1.400.0-r1.ebuild 709 BLAKE2B d73be5ae98b92cdba452fd4bfaf7c50c9c3d784a148f31eafbf05739c077cb08fd1c0ed1468557082f3f36decaddabd2ada431a1f0dc38b722fbb65f8a5ca512 SHA512 431be47d83db5ce50319f79a835a7ef3349464599aa514e1426e667abc9a9c5d74aec9439a3a7e5db48f0f7b79ff4ece6e87eca76f399c0780bd9a4cba682888
 MISC metadata.xml 972 BLAKE2B d4ce00c17f3b7d45a55d8eeca00bef13c789df021cf0ca8d568c2dfc60a98a7960a5b58a45b433d8264ce0a7f6b27d04fe551038494bc3c67687683638d18d2d SHA512 e491f4811c73469fb1009d01f9c9bf5a2f30495e071700e730d8c00d3db9c0dd67aa3ae6d95bfb6e9be9cdfc303c8212e11dbd40a53f8cc33e25acf484ad0bfd
diff --git a/dev-perl/Palm/Palm-1.400.0-r1.ebuild b/dev-perl/Palm/Palm-1.400.0-r1.ebuild
new file mode 100644
index 000000000000..ba1fc40eed43
--- /dev/null
+++ b/dev-perl/Palm/Palm-1.400.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CJM
+DIST_VERSION=1.400
+inherit perl-module
+
+DESCRIPTION="Read & write Palm OS databases (both PDB and PRC)"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+# Palm::Raw -> Palm-PDB
+RDEPEND="
+	virtual/perl-Exporter
+	dev-perl/Palm-PDB
+"
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files "t/pod.t" "t/pod_coverage.t"
+	perl-module_src_test
+}
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples/
+		doins -r examples/*
+	fi
+}
diff --git a/dev-perl/Palm/Palm-1.400.0.ebuild b/dev-perl/Palm/Palm-1.400.0.ebuild
deleted file mode 100644
index 903a10689e4c..000000000000
--- a/dev-perl/Palm/Palm-1.400.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CJM
-DIST_VERSION=1.400
-inherit perl-module
-
-DESCRIPTION="Read & write Palm OS databases (both PDB and PRC)"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-# Palm::Raw -> Palm-PDB
-RDEPEND="
-	virtual/perl-Exporter
-	dev-perl/Palm-PDB
-"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files "t/pod.t" "t/pod_coverage.t"
-	perl-module_src_test
-}
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples/
-		doins -r examples/*
-	fi
-}
diff --git a/dev-perl/Pango/Manifest b/dev-perl/Pango/Manifest
index 737a0d084125..e1240b942d52 100644
--- a/dev-perl/Pango/Manifest
+++ b/dev-perl/Pango/Manifest
@@ -1,3 +1,3 @@
 DIST Pango-1.227.tar.gz 46457 BLAKE2B 642dca9e7d0eade0ca5e255963601e674c9941ede1eef3fe592d05f069650c4c4832b15bad7286f186e39a387c5abfd52c304ea7e1cfbe83c4d8356bdbd2e0f8 SHA512 df44d126d6a9aaa7b7dc2d993ca00fe9eb6abdeb6c7f75ddebc71728b0cfd2d7404c2d27e2dbcbb7acdd73f30888d4abc5c33da9ecbbc7d155f67d083960f29c
-EBUILD Pango-1.227.0-r1.ebuild 1655 BLAKE2B b931e389b8502d3767f285a2e04395cfa059cfcb15bba367817a7e1e973f0bc314819dfe0f0520c934a7e64061974f2604842af0806ff2ccf57f24bfbb111a15 SHA512 0d7ec5af58c5b4637851bb758218fe099261249163092d8f0c3bb24976a54e416f6054cc10de4cbf44c903f2d43f730c3242d4143b2f5ff663cdd1beebbce9ac
+EBUILD Pango-1.227.0-r2.ebuild 1548 BLAKE2B 4e2c0b1c8094eae108a071dd93eb9a68e9fa6e34510f54d97f59607a3968054093a8647e3eb84c9b6c3f5d7260eb64a9cef0517a739177ac8f1a2b64e2d276ff SHA512 680174142fcd7e6fa80c449a4ca510c6eb35696d818ec214f20cd628a434fe84cc42928806a3e64e434716aa0d9ff40ef9c86a86b3f1e77226c328f2cfc4a12d
 MISC metadata.xml 381 BLAKE2B f9a3a096049ec9be0868f10dacb6b2fe799a7529a1752c5e67553995cd7fb4c3975084a77b1160f8491901ee290b5115d3eab9f8157c839c6c141af796e77f71 SHA512 643b40dd10aadd07eb3ad07e5391040129c49c69fca5f924a635cf5d5a6af1a08f1ce3b1c306e87aa72a503b0f4ba592aca91c01196a70d847725c02ed66700e
diff --git a/dev-perl/Pango/Pango-1.227.0-r1.ebuild b/dev-perl/Pango/Pango-1.227.0-r1.ebuild
deleted file mode 100644
index 9b51b32f5fc7..000000000000
--- a/dev-perl/Pango/Pango-1.227.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=XAOC
-DIST_VERSION=1.227
-VIRTUALX_REQUIRED=manual
-
-inherit perl-module virtualx
-
-DESCRIPTION="Layout and render international text"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x86-solaris"
-IUSE="examples test +minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/glib-perl-1.220.0
-	>=dev-perl/Cairo-1.0.0
-	>=x11-libs/pango-1.0.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/ExtUtils-Depends-0.300.0
-	>=dev-perl/ExtUtils-PkgConfig-1.30.0
-	test? (
-		virtual/perl-Test-Simple
-		!minimal? (
-			>=dev-perl/Gtk2-1.220.0
-			$VIRTUALX_DEPEND
-		)
-	)
-"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i -e "s:exit 0:exit 1:g" "${S}"/Makefile.PL || die "sed failed"
-}
-src_install() {
-	local mydoc
-	mydoc=("NEWS")
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
-src_test() {
-	local MODULES=( "Pango ${DIST_VERSION}" )
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}/blib" -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 use minimal; then
-		einfo "Skipping builtin tests due to USE=minimal"
-	else
-		virtx perl-module_src_test
-	fi
-}
diff --git a/dev-perl/Pango/Pango-1.227.0-r2.ebuild b/dev-perl/Pango/Pango-1.227.0-r2.ebuild
new file mode 100644
index 000000000000..4732764d1bbf
--- /dev/null
+++ b/dev-perl/Pango/Pango-1.227.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.227
+DIST_EXAMPLES=( "examples/*" )
+VIRTUALX_REQUIRED=manual
+
+inherit perl-module virtualx
+
+DESCRIPTION="Layout and render international text"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x86-solaris"
+IUSE="test +minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.220.0
+	>=dev-perl/Cairo-1.0.0
+	>=x11-libs/pango-1.0.0
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.30.0
+	test? (
+		virtual/perl-Test-Simple
+		!minimal? (
+			>=dev-perl/Gtk2-1.220.0
+			$VIRTUALX_DEPEND
+		)
+	)
+"
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i -e "s:exit 0:exit 1:g" "${S}"/Makefile.PL || die "sed failed"
+}
+
+src_install() {
+	local mydoc
+	mydoc=("NEWS")
+	perl-module_src_install
+}
+
+src_test() {
+	local MODULES=( "Pango ${DIST_VERSION}" )
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}/blib" -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 use minimal; then
+		einfo "Skipping builtin tests due to USE=minimal"
+	else
+		virtx perl-module_src_test
+	fi
+}
diff --git a/dev-perl/Panotools-Script/Manifest b/dev-perl/Panotools-Script/Manifest
index b5119a013cf1..c977dcc12855 100644
--- a/dev-perl/Panotools-Script/Manifest
+++ b/dev-perl/Panotools-Script/Manifest
@@ -1,4 +1,6 @@
 AUX Panotools-Script-0.28-curly-bracket.patch 1212 BLAKE2B 73e5be9293830d33cca8502260c68f32573d4e3302313e4fa487ecfbb7813c6e65bf62f602fb1cc3cda1a17bb00e0c66c171367c205ff598dbef202f3fb8de75 SHA512 bdeea08d578f92b6022dfb49e702a8ce3aeba59cbf3c6b3eb09c8eacb820e7d4d6f753bea4f0bf267f6639c0c9fe5217f9c113cec0a4b7114e361702b35fb1f6
 DIST Panotools-Script-0.28.tar.gz 158062 BLAKE2B 8131df889a344fcff745158e144905e4b644f55c4cbbd8ab92bc9c28ef870e4d0c95052aa66e1fdcace1d702b57b5b040a349adbf14622017bf1386c6c178b58 SHA512 bc63985c7412dec33ce10025e96dc7b26fe57bf2d016e7de60c082204a22681ece624054c08051c3760582386eea0954118c523db192589ace78cdf2dfacc750
+DIST Panotools-Script-0.29.tar.gz 164253 BLAKE2B cbe8c3586ecbe452e39e55acb6f90dab31760ec134c0b42251619aa461af11ccdd22966bc078e5ea6f54e70f9d0f026231fb8a96ea101d7120efa151bc941787 SHA512 780d3b03a6dd6000d8018342fc1546fdda49f79118af889f91e98b0233beb65a2d7af7679d32007656aa406d483b49b6445684bb11076ed78f8f3673298d3040
 EBUILD Panotools-Script-0.280.0-r3.ebuild 965 BLAKE2B d96e6f371a93f4b2d91f455e629f05c1eb9ef1c584b5f1f8b2ab21dab8f432238c9e71aecf055ee84d267054704c036970e89fe9381c45b19eaf2c74c62d7f5e SHA512 ddd8fcb16fcf050692ab946f7b6940a9b3e95d0f0879c14e605f9b48ad11826eaf8c2e61580001e63b4dd6044216c8bc47827aa742054f86d8aa3ed144b06571
+EBUILD Panotools-Script-0.290.0.ebuild 1025 BLAKE2B eb9e50e814ae66cc2dca54ad302de2d548a39a1b64110ac9107ecd74e7cf19b7a2ac922a00498e856f0f58106f7d283e1a0ce0d25edc48f12438911835e8dedd SHA512 0ec13372124f92735913342be5aa5da5c7b2ee9c361dec96368fdc1a127fefc48593ca75468356d71ee40fddea5ea3eef0cd3325cee3b2a01fc53a71513532ab
 MISC metadata.xml 1757 BLAKE2B 049b882519cc29cd78de314ef59f38561725e76d21e4d4aa0fd35ab64f18915f591d08065fe1e855922736818b442b557d5f3ec8f00a4fb6dc173a4a1c3b2ac7 SHA512 fb19b123456ef23d1fee6b3c92ff561c583f9f153f2e75ef6aabec8faa54d2b2c336eb71ebc3e09ed2f922370b26656beb13c9f40de362c0c777549903d50e46
diff --git a/dev-perl/Panotools-Script/Panotools-Script-0.290.0.ebuild b/dev-perl/Panotools-Script/Panotools-Script-0.290.0.ebuild
new file mode 100644
index 000000000000..58a52a70c7cd
--- /dev/null
+++ b/dev-perl/Panotools-Script/Panotools-Script-0.290.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BPOSTLE
+DIST_VERSION=0.29
+inherit desktop perl-module
+
+DESCRIPTION="A perl module for reading, writing, and manipulating hugin script files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+RDEPEND="
+	>=virtual/perl-File-Spec-0.800.0
+	>=virtual/perl-File-Temp-0.100.0
+	>=virtual/perl-Getopt-Long-2.0.0
+	dev-perl/URI
+	dev-perl/libwww-perl
+	>=dev-perl/Image-Size-2.900.0
+	>=media-libs/exiftool-6
+	gui? ( gnome-extra/zenity )
+"
+BDEPEND="${RDEPEND}
+"
+
+src_install() {
+	perl-module_src_install
+	if use gui ; then
+		domenu "${S}"/desktop/*.desktop || die
+	else
+		rm "${D}"/usr/bin/*-gui || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some of the scripts require 'nona', 'freepv', 'enblend', 'autotrace', and"
+	einfo "ImageMagick command-line tools which are available in the following"
+	einfo "packages: media-gfx/hugin, media-gfx/freepv, media-gfx/enblend,"
+	einfo "media-gfx/autotrace, and media-gfx/imagemagick."
+}
diff --git a/dev-perl/ParaDNS/Manifest b/dev-perl/ParaDNS/Manifest
index 2bfe220e8c5a..f3470e57eb7b 100644
--- a/dev-perl/ParaDNS/Manifest
+++ b/dev-perl/ParaDNS/Manifest
@@ -1,5 +1,5 @@
 AUX ParaDNS-2.0-net-dns-compat.patch 1408 BLAKE2B 3cf3439936f3b5889137ac21cd0bf5ed07ccf063741771830cf463331d0f116be02dd7d4355a1be1fa3fa6589f9122e6425ae481406452f6c3e7000eb589f81d SHA512 ccaaaee494364ccd209d57ebf8547033be2b80393ae4c84caf1507531864f9f205b9a6dfb139bb243875be58a1f183919e11c9afd2d2b35fd6968410d7b3de64
 AUX ParaDNS-2.0-no-network.patch 703 BLAKE2B 6f6a48b482ba3db9f9f9953f6f68029791abf4c65f8acef428ea997f883eb7b5f447795490e25f9e8e6c875de98d046ffb7ebb6781b2a477795eb5a47579b4c8 SHA512 4d828e6fb5ce4e7a88225e0a5a19692964f22df92ff083c394f3e87a80a2b57cb0f1c4caab75f318eb9f7335fd37cfe6f2406cc934594e5bdff6c10b1e454dfd
 DIST ParaDNS-2.0.tar.gz 9655 BLAKE2B 917ca35d1da3f43352cb85ea5b7d138d7fdc22ba5a1a17b802a410ee2339f3a50d988a7e9cf5f09551feb91cb53ef658afb2d31f83ee7275e70cf8860d0ed659 SHA512 762856b151e0a1cb7193af5d4be8cd302244920e8278bf1940f8fa12cf9f8a818c71dd7f553b2afddc69c531b625d80d9d8e7769676edb370bfaa0b5e7fa3dfc
-EBUILD ParaDNS-2.0.0-r2.ebuild 460 BLAKE2B 74e8c6ed71d50b2d414f40d4155eb30a833a227d14f5a06ca319266b3c88db11d5ad97ae3d037fe00ebb2101963d5d0944815b5588d859efd0e75008e971eb3b SHA512 a5153bb62bcd31ad5bf2c9ec0cb579917e5883b7db80a1e01d6b5f65ce2dda552a605ef942d50a4b79887b2c89c63924bd9aa97219565bd191f6bdf5e3315153
+EBUILD ParaDNS-2.0.0-r3.ebuild 455 BLAKE2B 817a8b72de375587313c7c0e5639961e90b0165e36ec6fc6fad19d629db7586111634393bfd432e60bfd8708aa3e21518994ceddc5518ffd1963563095037d1c SHA512 de57eb6cac2bdaf167b62328dcc7e04326574d6cf672c1fd4f2e2e58f5e26ffe353273742d2d3c5e8708ed2599d6661846a4f3bd74ec2ede24487dddd91b4924
 MISC metadata.xml 520 BLAKE2B 162491d8d7beacc77533cac49dd543f678ea1d524e4e743032f866424645d2daf84aef4d4b724c50569d3d32b95bdcbdd82eac326239b95ea005fec1768e2342 SHA512 7222bfe334233c5b7c559106344d797e5c78927f8387340fccf21843df4c8129f8ad7440d50c14877c113f4b368edd9462f54ad49f7a17fef86f250cad9d8650
diff --git a/dev-perl/ParaDNS/ParaDNS-2.0.0-r2.ebuild b/dev-perl/ParaDNS/ParaDNS-2.0.0-r2.ebuild
deleted file mode 100644
index f39727696356..000000000000
--- a/dev-perl/ParaDNS/ParaDNS-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSERGEANT
-DIST_VERSION=2.0
-inherit perl-module
-
-DESCRIPTION="a DNS lookup class for the Danga::Socket framework"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-perl/Net-DNS
-	>=dev-perl/Danga-Socket-1.61"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-net-dns-compat.patch"
-	"${FILESDIR}/${PN}-2.0-no-network.patch"
-)
diff --git a/dev-perl/ParaDNS/ParaDNS-2.0.0-r3.ebuild b/dev-perl/ParaDNS/ParaDNS-2.0.0-r3.ebuild
new file mode 100644
index 000000000000..d68954af0d91
--- /dev/null
+++ b/dev-perl/ParaDNS/ParaDNS-2.0.0-r3.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=MSERGEANT
+DIST_VERSION=2.0
+inherit perl-module
+
+DESCRIPTION="a DNS lookup class for the Danga::Socket framework"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Net-DNS
+	>=dev-perl/Danga-Socket-1.61
+"
+BDEPEND="${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-net-dns-compat.patch"
+	"${FILESDIR}/${PN}-2.0-no-network.patch"
+)
diff --git a/dev-perl/Parallel-ForkManager/Manifest b/dev-perl/Parallel-ForkManager/Manifest
index d49f84d04ded..9983dc95e55c 100644
--- a/dev-perl/Parallel-ForkManager/Manifest
+++ b/dev-perl/Parallel-ForkManager/Manifest
@@ -1,3 +1,5 @@
 DIST Parallel-ForkManager-1.19.tar.gz 24381 BLAKE2B fbd92bdbf69012337419e7d28678dbde291a819ce310fdcd47d05fd150f57a65da3e9e582946adeb95a85b3539447dd315a17746ea9dfa346222ff5a14106e87 SHA512 fdd076de153a09e1e8fb681cadc6c36a05f4c8a6718df61937eb5d26729108a6f2f322a7fb9d4bf6166bbfe52cb857e3ea6cab8368c7b5959500018cc01747c6
+DIST Parallel-ForkManager-2.02.tar.gz 33457 BLAKE2B 7da8a88fc8b9314d5e3e27c50267171f0503c773921ca9cbf512d5ea69d3e244fab6f4e4415c80f3aa169478492ff4f45b82c3ab317ee836d8c5f3feb8056c9e SHA512 2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb
 EBUILD Parallel-ForkManager-1.190.0.ebuild 703 BLAKE2B fd036c5803289bfde76348f3b968ed84907f31d17e79b0dfa33e35f1e0d88788e5e00cb5ab87658f894671b7de634c4a7f025ebcf1b758e5b05473adb1a8ceb9 SHA512 f6993f9080e492813cbfbc39eb3df91041b9fd7faf5f759ecdb231e3aba402924d7d8b675b7432aa00611fe74455bbc171c77b7d7d1ca835758c727bcd3dc193
+EBUILD Parallel-ForkManager-2.20.0.ebuild 706 BLAKE2B b0e7e0f3b08f0c520d3f2d069954d194bf3c6f8c277b4769c55a1b8ad02632d4c1e2f296337f755526005f8a3d2956848e6d5a511e8693ae80c3ca1631936aa1 SHA512 552564ccf527b37ac279dbdd4dfad52f962d5a10765f5d6277ced7bd58c40236df8d0c717b2f44716f4f1e76ed2e97e00cec12c7f4418f790540059ed9ca058e
 MISC metadata.xml 412 BLAKE2B f9685f233ad57dc03a506dad17ed7ca7db47574c9c86066925fb083917fee2d75de7b889a50be75a1a0497088b4ec87f8f0a44c3ba1c8cecad5320d10ced06f3 SHA512 3ece8329d77002aa4b494d3546d98dc46561326302daefbb46791da19e1ec0c6d9de654655ca434282202a3772baac665ea2cf4f47ce75464b2d17b5050c250e
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.ebuild
new file mode 100644
index 000000000000..fadaadeb2fa1
--- /dev/null
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-2.20.0.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=YANICK
+DIST_VERSION=2.02
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="A simple parallel processing fork manager"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/Moo
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.940.0
+		dev-perl/Test-Warn
+	)
+"
diff --git a/dev-perl/Parallel-Iterator/Manifest b/dev-perl/Parallel-Iterator/Manifest
index 1dc17577d094..e8b0622ab89a 100644
--- a/dev-perl/Parallel-Iterator/Manifest
+++ b/dev-perl/Parallel-Iterator/Manifest
@@ -1,4 +1,4 @@
 AUX Parallel-Iterator-1.00-perl-5.26.patch 1490 BLAKE2B 628556289b1bde90149890e7ffa6bf45d3e8e33fdfae3d28d35a81b3ee03a592fc093d2214c9b88c29fc9bffe1c4e558b8d4aa835d636f1b819e9f4f6940020d SHA512 c0230fc0e94158782b6434757cd1e8ceb11c3523aee8875225bbf3f9278b888565e85042c8facc44bf8ce071f0ae125dd967e0fc81f9d9785dd0c2db6d24857f
 DIST Parallel-Iterator-1.00.tar.gz 15227 BLAKE2B 9ebfea3c67627d7f85d688f4adbe6bdca497f656789704c4567c306dd3530f2306bba4a38cd506da65e941483cbc68cf3b1d262daeb9cbf8f1e6141db64e6c9b SHA512 3027434d08da0750f33ad2cc10b1c00b18ac0f626af5aa1f9d5d94711e433c7e313e04106e5307d5a498ae65ebf577dfd83c669ecf5414bbe04d87c862b2a511
-EBUILD Parallel-Iterator-1.0.0-r1.ebuild 500 BLAKE2B d8c8dd10b95161de95438bc4ef0efae888d0e4e367e2062bc1ac7898264b5d5640880e33980a126ca555921cd97ffdc0d8590056a9b3436937b04d699f97520d SHA512 5840134bfa359d8a906058ef29e17ee759477018d755c993cd6ef85223ec7249f086ba64fe88d906cd5c83b0bfc05f41619b10589304e5ff721038192085c6c0
+EBUILD Parallel-Iterator-1.0.0-r2.ebuild 463 BLAKE2B 69674005eeff50f6b67b4a2d8fe92b47f1ac4ddb4af62b8c27726657b4452693e8919a1e85925deeadef48cdc59f06ecce96e5ffb44acbb26ad884f1630cfa8e SHA512 da53ecd8afc7996c0873095d085832889bfe1af1ff50a9f9fca89041c46cc43edb135206793c8b39f8aa47c088251a5556e069cf8cd2205075eacf04d31d7816
 MISC metadata.xml 394 BLAKE2B 98b66a7dbe3f1e8e72d16a002627ff6e87e493bafbdc871e8a707c3e67969ddd1cb3cdf28af37fd33e192f35728cb08a119304af3d85af7c2e28b4185972df01 SHA512 cec047e4438fc273dd3b3cdbce193dd26e92be54b035f81fe48c972fc14a68c0b8a0fce82155b5697c040d0c2f6f55bb6e30066a378caa525d6223e4178df66b
diff --git a/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r1.ebuild b/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r1.ebuild
deleted file mode 100644
index af8473215b31..000000000000
--- a/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ANDYA
-DIST_VERSION=1.00
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="Simple parallel execution"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-IO
-	virtual/perl-Storable
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-PATCHES=("${FILESDIR}/${PN}-1.00-perl-5.26.patch")
diff --git a/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r2.ebuild b/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..93f88ffc0d0c
--- /dev/null
+++ b/dev-perl/Parallel-Iterator/Parallel-Iterator-1.0.0-r2.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=ANDYA
+DIST_VERSION=1.00
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Simple parallel execution"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-IO
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.00-perl-5.26.patch")
diff --git a/dev-perl/Parallel-Prefork/Manifest b/dev-perl/Parallel-Prefork/Manifest
index 47d8ce5942d9..4a93fdaec149 100644
--- a/dev-perl/Parallel-Prefork/Manifest
+++ b/dev-perl/Parallel-Prefork/Manifest
@@ -1,4 +1,4 @@
 AUX Parallel-Prefork-0.180.0-RT113449.patch 1210 BLAKE2B 061e253d87dc83ef0ffa52cb98e9da041a2cfb6b41f0d43062103f2d918d809774c5ee0d5b32cb670593b8f3be814bd1c35c14e360424c5a77b4e2dfbda32d5e SHA512 8e9f2739bdf8e50937ba9ecc1537501b589432d6734ff54601260ed1d89a77ec390600523e02712dd4f65485145844162ca4549958d6367f3a24fbd699311571
 DIST Parallel-Prefork-0.18.tar.gz 28226 BLAKE2B 17071133df5fad1772ca46b7bc235014c0727fac9bd5945895670ae6463679168e685b3a8520d78e8394641f6308c0fa53d72c0df2a59878fdd03d65d78ab59b SHA512 9d2dc977d98c3ba263a0d8e189877b59661bfa9fdf97ed5e685271b4b1661522e8288ae8392bd9eeeafb21b37191e55a2bac35cce49d2d5d68e6c3e2d3353c6f
-EBUILD Parallel-Prefork-0.180.0.ebuild 807 BLAKE2B 9e9cfc15a829c4edbac1c8e6993ff7944fb0a0b51893bf2fb18161b7db114a5447674c50f1e9385b36f790fe38851d98ffb58ed9cc38b8181eb1eb24fc1820a4 SHA512 be0118cece334b5009fdadc7fd43900d1e10a2102071f9ea14b321e5ddaf200055936c3af90e6c9562052bee980b9165014bace3f229e5682dfcd385ad689d7a
+EBUILD Parallel-Prefork-0.180.0-r1.ebuild 769 BLAKE2B e8c4045be7bfba9b396810be3b4dc4081d14ca2c022c6a359579620910dad4cda0043e9619a3b737c35e02af0614689f3b24cf1da3765b1d7df60e86f8fedecb SHA512 4dc6ed1c10af061b811a7008cf63c82b008a662241bb74546ce1a765ea57234b68bc3ed061156c2b291289a59a26f3a87334dd72f03c133fff193674f339a542
 MISC metadata.xml 572 BLAKE2B c94194aaa93b272a58566be94ce520e51fbe98a60d54261d3dc0dd74f970544b15783596aa08cdf6f5c97260db3f929d87a57519a967b2e65424181ba4b56717 SHA512 582fedf8c5467edf8d3425f16ce9c5702067cfdea676e9e525eb3a953759ef554d2f3887ae9df8bd270dea9b0a3b928fce2d72821ad3fc3e2428bff1e22de464
diff --git a/dev-perl/Parallel-Prefork/Parallel-Prefork-0.180.0-r1.ebuild b/dev-perl/Parallel-Prefork/Parallel-Prefork-0.180.0-r1.ebuild
new file mode 100644
index 000000000000..b254a74d0a9f
--- /dev/null
+++ b/dev-perl/Parallel-Prefork/Parallel-Prefork-0.180.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KAZUHO
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="A simple prefork server framework"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Class-Accessor-Lite-0.40.0
+	dev-perl/List-MoreUtils
+	>=dev-perl/Proc-Wait3-0.30.0
+	dev-perl/Scope-Guard
+	dev-perl/Signal-Mask
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
+	test? (
+		dev-perl/Test-Requires
+		dev-perl/Test-SharedFork
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-RT113449.patch" )
+
+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/Parallel-Prefork/Parallel-Prefork-0.180.0.ebuild b/dev-perl/Parallel-Prefork/Parallel-Prefork-0.180.0.ebuild
deleted file mode 100644
index c736967a10ce..000000000000
--- a/dev-perl/Parallel-Prefork/Parallel-Prefork-0.180.0.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
-
-DIST_AUTHOR=KAZUHO
-DIST_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="A simple prefork server framework"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-Accessor-Lite-0.40.0
-	dev-perl/List-MoreUtils
-	>=dev-perl/Proc-Wait3-0.30.0
-	dev-perl/Scope-Guard
-	dev-perl/Signal-Mask
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	test? (
-		dev-perl/Test-Requires
-		dev-perl/Test-SharedFork
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-RT113449.patch" )
-
-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/Params-Classify/Manifest b/dev-perl/Params-Classify/Manifest
index 92c6c1c0946a..59fd7ef01215 100644
--- a/dev-perl/Params-Classify/Manifest
+++ b/dev-perl/Params-Classify/Manifest
@@ -1,3 +1,3 @@
 DIST Params-Classify-0.015.tar.gz 22061 BLAKE2B c905a067415d6c2846fed8c52689cd93ad81fed70414369aa7d36a314c40668ab0ddc025fe296777fdd959161e79330cca41374044a2e5ad5887d96ae76548d4 SHA512 1c41590a3f06d21d5f23e12371b0aee5d4249f773bfb0738e955fbdccdccc6e495744c50d3b91305a6b470e022475446705c8eb8e8d05ca1ed037d369a67617c
-EBUILD Params-Classify-0.15.0.ebuild 752 BLAKE2B e5a65961937335b7eb4e4748891421b2f591d636c7af3632a8061a5ce3cb814f5ee0510533bb32d443c96836a1a912c69222ba99401860bd189967fd389f9101 SHA512 0da331a2b24d6f115e9187295d40eb328e1a967919aa7066b041fe63dc5133d61f9f669f361ea1c2832b7cba9914091275e3eb8203bbfa36c0245c98dd902715
+EBUILD Params-Classify-0.15.0-r1.ebuild 714 BLAKE2B fd6b2df8d3296e2fa4dcd9fd0caf875a13b5e97c1011a8ce23e9d03c01393b81d9e051029538aa426c07b8038522e234b52d5844c0a89bcf940315655236d43c SHA512 d3757c19129fc0b43722d0b233c13420d19b0b04b307d8b4af4063a0c758bb0bb8dde6a190d46f81840bc952c15e9552f736c3d2b8607cb1a2ab5e1f562c1817
 MISC metadata.xml 426 BLAKE2B 1de0a01712ae8f7ef7b1fd36ae0750f786972b1f4fed908bc04b7b5c2242a4418edd0c25503b9f16e78cbb9a766540ffc3c66cedb1c66be754721ad7702dc67f SHA512 f225a5362caebe1c868973ee63115caf802b914443e8a9a3347e72fa4ac533fe3f16e95f8ec1ae96ce5a85fcb1e6b971bc18ba1a9b14b410a7e5b23e9ead0214
diff --git a/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild b/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..9a4495145b5e
--- /dev/null
+++ b/dev-perl/Params-Classify/Params-Classify-0.15.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=ZEFRAM
+DIST_VERSION=0.015
+inherit perl-module
+
+DESCRIPTION="Argument type classification"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Devel-CallChecker-0.3.0
+	virtual/perl-Exporter
+	>=virtual/perl-Scalar-List-Utils-1.10.0
+	virtual/perl-XSLoader
+	virtual/perl-parent
+"
+BDEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build
+	>=virtual/perl-ExtUtils-CBuilder-0.150.0
+	>=virtual/perl-ExtUtils-ParseXS-3.300.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
deleted file mode 100644
index 3499c0452773..000000000000
--- a/dev-perl/Params-Classify/Params-Classify-0.15.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=ZEFRAM
-DIST_VERSION=0.015
-inherit perl-module
-
-DESCRIPTION="Argument type classification"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Devel-CallChecker-0.3.0
-	virtual/perl-Exporter
-	>=virtual/perl-Scalar-List-Utils-1.10.0
-	virtual/perl-XSLoader
-	virtual/perl-parent
-"
-DEPEND="
-	${RDEPEND}
-	dev-perl/Module-Build
-	>=virtual/perl-ExtUtils-CBuilder-0.150.0
-	>=virtual/perl-ExtUtils-ParseXS-3.300.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Params-Util/Manifest b/dev-perl/Params-Util/Manifest
index 2d49cda0bfdd..7682945e87fc 100644
--- a/dev-perl/Params-Util/Manifest
+++ b/dev-perl/Params-Util/Manifest
@@ -1,3 +1,5 @@
 DIST Params-Util-1.07.tar.gz 40726 BLAKE2B 96d84eaab47a880520b666e5410215003f498b6a4b66d7b3df25a0d9bd2ee3d5ecb655da37e17174d3e4dccde7143bab3cf2f197799de6f6ca64dfaee3fb78d4 SHA512 ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56
+DIST Params-Util-1.102.tar.gz 194986 BLAKE2B 691448bfe946242142bd8865c78dfa411e65a233d334df06a4739a70b4c0a332c82e80cf204a1898c8a332a04e52b8bae60ee66b490f1eb103d5c085af465177 SHA512 e2587b62545cf0572cc8f719ea8e5411d710789c3cbcab4038c5b01f86073a010d32191551f6aeea1bdae22d49e7d34358250b4e7ece9f261a598854af187194
+EBUILD Params-Util-1.102.0.ebuild 644 BLAKE2B 083427fb047b7d47d828e9916bea6c0b13d42660ef2d907fe98913b74c597a2c8f7ee10a6a31696c35c08ffb382a12ad76853d2707f1e7bcacbe3bdb511948bb SHA512 7400f16d045c443263955093583eb06174dd2b25937a684d627993f5cb43f88163faf308b4fe480343a9caf2d4716a2075ac2d0cf7ff792369e5d9e47b0af7ba
 EBUILD Params-Util-1.70.0.ebuild 702 BLAKE2B b1dd6f42ab85183f257e762eb301ac341e3f601b28676ae67dbe0ca3d394601c61150638e9eb04977562223581f75d42b5e566070e0e9a89d579be0f739daac1 SHA512 3592c79edebc99a80fd7053c8c114484bafe745673d92b115ed4317d8814e52b63ca60b5068043509da5111368fb1e406003c1a4af01d4964bcc59d99ec1d0e8
 MISC metadata.xml 394 BLAKE2B 81eb56b97951dab4d8b65fc45a485bd1ee1384690a930afefaef194abf96053b680e9ac4ad1b6056c785c173eac7802f6a3ec90dc899b8feca163d25dc4374c7 SHA512 5ecf99ab4566f2737d6554c15ddbd221bf50c3b03f8e48a898eff9341d51e9a6d47bc9ec976114ad77392238ff05c2fac3d63fab436dcd09984ba90ef1d08438
diff --git a/dev-perl/Params-Util/Params-Util-1.102.0.ebuild b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
new file mode 100644
index 000000000000..d08538870dff
--- /dev/null
+++ b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=1.102
+inherit perl-module
+
+DESCRIPTION="Utility functions to aid in parameter checking"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=virtual/perl-Scalar-List-Utils-1.180.0
+	>=virtual/perl-XSLoader-0.220.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Config-AutoConf-0.315.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-LeakTrace
+	)
+"
diff --git a/dev-perl/Parse-ErrorString-Perl/Manifest b/dev-perl/Parse-ErrorString-Perl/Manifest
index e245c6ea3c4f..afdf83a413d9 100644
--- a/dev-perl/Parse-ErrorString-Perl/Manifest
+++ b/dev-perl/Parse-ErrorString-Perl/Manifest
@@ -1,4 +1,4 @@
 AUX Parse-ErrorString-Perl-0.27-no-dot-inc.patch 622 BLAKE2B cd25836fbb076bd47aca6dc9abe73074336b75a85544000728726674bb5d10514fc01a2f66d36ab3f7e6e30c5330795b12b44c869f24f39ba82291e1b9ef6b80 SHA512 25587eb339e5962c1b73c22919dc94318038bcd48493add5dfe704dfdaeee62a13b452c0dc52f8d951f67eff424bf54e42375d953e6225243d80e544ed211d30
 DIST Parse-ErrorString-Perl-0.27.tar.gz 29698 BLAKE2B fc1743382145c40a44de21f9a48d302fbb5f80f583b8545553507ef892baebb4f879649e1ccc0e511ffe3d986184397c8933ccd40999966be3154785b1b0004a SHA512 2111d3d130e7eeb754e11d6a20cd289be888fd384853d19000820363b8a2bb60f75db029cbf6646ec267ba5a9f25ddc596c335c41623cc07a82b12fce81a9800
-EBUILD Parse-ErrorString-Perl-0.270.0.ebuild 632 BLAKE2B 72cf2c3ee9c786b1c6ed2104edfbd7735f3ad7555ca85ee61fb769a9117ac389de2e9e0fd6907d8a8c61ff443dc253b332390da8227aaa8d6b662201e8892d11 SHA512 71606dae1e6763f29413d3f6f68096b6446d05e37a3719ce754e787a7883bfc377282ceb870009570883ee9708a83072c1b9d5feb1cf9b356dedc4424cd52ce9
+EBUILD Parse-ErrorString-Perl-0.270.0-r1.ebuild 592 BLAKE2B 8d0da7b6eef2bdabd24402799e20475d66796887f239a7f16cd97669faac87523fb3996f5bc2b0bda0da02e0d31f94dcea6676b33033ce8e8a14b8d8a39a85a9 SHA512 36232b0d8ce3b0919feb2e38f9cc5b24bff9886f54e07283a07a8cb140096529a5ee59152567e1287b56aa570388bffb08642b666d4a3a1da9824c5d5772e141
 MISC metadata.xml 581 BLAKE2B 112dabc3f3a4a602324629d21b337474d7cfe273bf857586c37c0941bf25b3a9ce277a7aeec61b29545b5a6e9cc34c1c83e91e446b160ba150bfc230de7e425f SHA512 4e26bebe3cc4eb0d930dace8145d31e4e7f017c21b5e6a1480e592d5e97d43132d85556299bfbc8e81a96a62c245064862dfa3aea5c84ddd14e8e3e29871b491
diff --git a/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.0-r1.ebuild b/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.0-r1.ebuild
new file mode 100644
index 000000000000..b747bac9f613
--- /dev/null
+++ b/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.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=MANWAR
+DIST_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Parse error messages from the perl interpreter"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-XSAccessor
+	virtual/perl-File-Spec
+	dev-perl/Pod-Parser
+	>=dev-perl/Pod-POM-0.270.0
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.59
+	test? (
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.27-no-dot-inc.patch" )
diff --git a/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.0.ebuild b/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.0.ebuild
deleted file mode 100644
index a382ae4c1d11..000000000000
--- a/dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.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=MANWAR
-DIST_VERSION=0.27
-inherit perl-module
-
-DESCRIPTION="Parse error messages from the perl interpreter"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Class-XSAccessor
-	virtual/perl-File-Spec
-	virtual/perl-Pod-Parser
-	>=dev-perl/Pod-POM-0.270.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.59
-	test? (
-		dev-perl/Test-Differences
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PATCHES=( "${FILESDIR}/${PN}-0.27-no-dot-inc.patch" )
diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index 05077e64407c..09b2fc1d4673 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -1,6 +1,6 @@
 AUX 50Perl-Critic-gentoo.el 435 BLAKE2B 67cd9711566c4f06785a1060202638c7501648a5c1b2c479785389d2c4106b05f3e9193c1c517810a1798efe8b6f06c4ca363682e7c89d9dfc0c594e0bce5c6d SHA512 2f0d1135e98c4fe3a920b24b0540459b2c609bcc81f4a7dcc39dcb390646837573f2896df4fc7c2e0da6650ece104c9a6c1ba6f894c9755967b92117f28551e6
 DIST Perl-Critic-1.130.tar.gz 647052 BLAKE2B 2b0905636486531dd8de50af6e490701f1785851744b78a5164539797e6d2549b46c9daef05d3061b53f82005ffc1fa47b7e2dccec613f9a5490c597d61072f4 SHA512 b443ddbb5905a61835061f49d7f10e2e71579e5df96778eb183c3d1e9987342e1536db61196b32e66a192c92916eafd9ebb7b713b0be71ce89c1f93155e89828
 DIST Perl-Critic-1.140.tar.gz 650449 BLAKE2B 648e3605278fbcd9c62437b1c3d587353541db3146829ed2d4aee5d0e240e13d692358146fd860150d1bae79d359ade93b53451a095a36f9c05f49cb0fd93d5c SHA512 46afc8260d2b500edbb29836be993f065270ed9ffa6aa00611a980b294025b794286bc820afeabb94b7d1cdd9bfb4e715e44e466fb0340cb9d938e031b54a6f0
-EBUILD Perl-Critic-1.130.0.ebuild 2073 BLAKE2B eaf4493dac1e6b71949d83ec1b531deec46675057ba76b993cd586340c83fd8f6d28e51d5d3a17c63df52ab57db7b57f01d6e006458e7c25893e0f00065de977 SHA512 c6bfa3223bf2f0406ae16015a595bc9dfe79cbce239cdd9173e6a4567418ba6868b5d7ce9bcb53a416c8e63cdf57af1834a1c61070a39cbc5fc747b9fdabcc43
-EBUILD Perl-Critic-1.140.0.ebuild 1990 BLAKE2B 94dffc7e8e351b4f5d2b0fba06f5ae98b7b4d0ce384c8e720c98137cbe5fc9c66f979ceb3e8b063c74e0ca43e2d400077a470be57f0a9fc76986ebe6556cda00 SHA512 e38238bfc12af31e5f229a9cb84e63a3775b4440b49d1c4c4b24a10b1c9382b5d02b3dad8cdde3757b9ee462331aeb4648c7fc87c3bde37fde28031eb1eff2cd
+EBUILD Perl-Critic-1.130.0-r1.ebuild 2069 BLAKE2B 99a024565408fd0b7b077461eb36ed679192daca943930c812fc72ab002aaabb4325801439aab9c7db7697827fcf765bfafb2f5b68425c5e71db99133afb5457 SHA512 7f75de127aa1df7c18dc20565f77db29c6fa9cd64ccdd3052d91504142ef79b8c621953d632226e5402b7214b5411f104122d36d114352a1635c348ecb3bdf85
+EBUILD Perl-Critic-1.140.0-r1.ebuild 1956 BLAKE2B 3b92710cccb77609496048cd55b3ea648b37ef41fb4fdb11373996983423e99410db0ad8a3cdabe94bbda05c6efbefa1d958363ba90c82c03c94aa1a6a66d3bf SHA512 c2064f12035cf4e7fc0b9b1e1a4f3f3089efd88114d430490cf2ac2ba47c47da1eae462b48a123255697868012ed026964749fc6e0e30c83681f413aa0e48cf1
 MISC metadata.xml 20125 BLAKE2B 102686a85bf6f17bd0687bd5b05a4701c7b782c93f6b4fe7d3f4b181360067778c28911c85fa101e8cfc4e44174410b7b75bc0138a9b0e20a6ec38b2b956bb42 SHA512 e98d510b1a6d7e95b6558fbabb7857a2b5133958d790c87d51716be4214b60b091360de6e4e81b71aad14d4f94dcf7c3529087d32f052add0736c2fe4f89372f
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.130.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.130.0-r1.ebuild
new file mode 100644
index 000000000000..a9e33f9e1d86
--- /dev/null
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.130.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.130
+inherit perl-module elisp-common
+
+DESCRIPTION="Critique Perl source code for best-practices"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="test minimal examples emacs"
+RESTRICT="!test? ( test )"
+SITEFILE="50${PN}-gentoo.el"
+RDEPEND="
+	>=dev-perl/B-Keywords-1.50.0
+	virtual/perl-Carp
+	>=dev-perl/Config-Tiny-2
+	>=dev-perl/Email-Address-1.889.0
+	>=dev-perl/Exception-Class-1.230.0
+	>=virtual/perl-Exporter-5.630.0
+	dev-perl/File-HomeDir
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/File-Which
+	virtual/perl-Getopt-Long
+	dev-perl/IO-String
+	>=dev-perl/List-MoreUtils-0.190.0
+	>=dev-perl/Module-Pluggable-3.100.0
+	>=dev-perl/PPI-1.224
+	>=dev-perl/PPIx-Regexp-0.27.0
+	>=dev-perl/PPIx-Utilities-1.1.0
+	dev-perl/Pod-Parser
+	>=dev-perl/Pod-Spell-1
+	>=dev-perl/Readonly-2
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/String-Format-1.130.0
+	dev-perl/Task-Weaken
+	>=virtual/perl-Term-ANSIColor-2.20.0
+	>=virtual/perl-Test-Simple-0.920.0
+	>=virtual/perl-Text-ParseWords-3
+	dev-perl/Perl-Tidy
+	>=virtual/perl-version-0.770.0
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.402.400
+	test? (
+		dev-perl/Test-Deep
+		!minimal? (
+			dev-perl/Test-Memory-Cycle
+		)
+	)"
+
+src_compile() {
+	perl-module_src_compile
+	if use emacs; then
+		elisp-compile extras/perlcritic.el
+	fi
+}
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples/
+		dodoc -r examples/*
+	fi
+	if use emacs; then
+		ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway"
+		ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682"
+		elisp-install ${PN} extras/perlcritic.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
deleted file mode 100644
index c92239a522d4..000000000000
--- a/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PETDANCE
-DIST_VERSION=1.130
-inherit perl-module elisp-common
-
-DESCRIPTION="Critique Perl source code for best-practices"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="test minimal examples emacs"
-RESTRICT="!test? ( test )"
-SITEFILE="50${PN}-gentoo.el"
-RDEPEND="
-	>=dev-perl/B-Keywords-1.50.0
-	virtual/perl-Carp
-	>=dev-perl/Config-Tiny-2
-	>=dev-perl/Email-Address-1.889.0
-	>=dev-perl/Exception-Class-1.230.0
-	>=virtual/perl-Exporter-5.630.0
-	dev-perl/File-HomeDir
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/File-Which
-	virtual/perl-Getopt-Long
-	dev-perl/IO-String
-	>=dev-perl/List-MoreUtils-0.190.0
-	>=dev-perl/Module-Pluggable-3.100.0
-	>=dev-perl/PPI-1.224
-	>=dev-perl/PPIx-Regexp-0.27.0
-	>=dev-perl/PPIx-Utilities-1.1.0
-	virtual/perl-Pod-Parser
-	>=dev-perl/Pod-Spell-1
-	>=dev-perl/Readonly-2
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/String-Format-1.130.0
-	dev-perl/Task-Weaken
-	>=virtual/perl-Term-ANSIColor-2.20.0
-	>=virtual/perl-Test-Simple-0.920.0
-	>=virtual/perl-Text-ParseWords-3
-	dev-perl/Perl-Tidy
-	>=virtual/perl-version-0.770.0
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.402.400
-	test? (
-		dev-perl/Test-Deep
-		!minimal? (
-			dev-perl/Test-Memory-Cycle
-		)
-	)"
-
-src_compile() {
-	perl-module_src_compile
-	if use emacs; then
-		elisp-compile extras/perlcritic.el
-	fi
-}
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples/
-		dodoc -r examples/*
-	fi
-	if use emacs; then
-		ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway"
-		ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682"
-		elisp-install ${PN} extras/perlcritic.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
new file mode 100644
index 000000000000..d03e4349cdfd
--- /dev/null
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.140
+inherit perl-module elisp-common
+
+DESCRIPTION="Critique Perl source code for best-practices"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64"
+IUSE="minimal examples emacs"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	>=dev-perl/B-Keywords-1.50.0
+	virtual/perl-Carp
+	>=dev-perl/Config-Tiny-2
+	>=dev-perl/Exception-Class-1.230.0
+	>=virtual/perl-Exporter-5.630.0
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/File-Which
+	virtual/perl-Getopt-Long
+	dev-perl/IO-String
+	>=dev-perl/List-MoreUtils-0.190.0
+	>=dev-perl/Module-Pluggable-3.100.0
+	>=dev-perl/PPI-1.265.0
+	dev-perl/PPIx-QuoteLike
+	>=dev-perl/PPIx-Regexp-0.80.0
+	>=dev-perl/PPIx-Utilities-1.1.0
+	dev-perl/Pod-Parser
+	>=dev-perl/Pod-Spell-1
+	>=dev-perl/Readonly-2
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/String-Format-1.180.0
+	dev-perl/Task-Weaken
+	>=virtual/perl-Term-ANSIColor-2.20.0
+	>=virtual/perl-Test-Simple-0.920.0
+	>=virtual/perl-Text-ParseWords-3
+	dev-perl/Perl-Tidy
+	>=virtual/perl-version-0.770.0
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.402.400
+	test? (
+		dev-perl/Test-Deep
+		!minimal? (
+			dev-perl/Test-Memory-Cycle
+		)
+	)
+"
+
+src_compile() {
+	perl-module_src_compile
+	if use emacs; then
+		elisp-compile extras/perlcritic.el
+	fi
+}
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples/
+		dodoc -r examples/*
+	fi
+	if use emacs; then
+		ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway"
+		ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682"
+		elisp-install ${PN} extras/perlcritic.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.140.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.140.0.ebuild
deleted file mode 100644
index 0be484697e78..000000000000
--- a/dev-perl/Perl-Critic/Perl-Critic-1.140.0.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
-
-DIST_AUTHOR=PETDANCE
-DIST_VERSION=1.140
-inherit perl-module elisp-common
-
-DESCRIPTION="Critique Perl source code for best-practices"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64"
-IUSE="test minimal examples emacs"
-RESTRICT="!test? ( test )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	>=dev-perl/B-Keywords-1.50.0
-	virtual/perl-Carp
-	>=dev-perl/Config-Tiny-2
-	>=dev-perl/Exception-Class-1.230.0
-	>=virtual/perl-Exporter-5.630.0
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/File-Which
-	virtual/perl-Getopt-Long
-	dev-perl/IO-String
-	>=dev-perl/List-MoreUtils-0.190.0
-	>=dev-perl/Module-Pluggable-3.100.0
-	>=dev-perl/PPI-1.265.0
-	dev-perl/PPIx-QuoteLike
-	>=dev-perl/PPIx-Regexp-0.80.0
-	>=dev-perl/PPIx-Utilities-1.1.0
-	virtual/perl-Pod-Parser
-	>=dev-perl/Pod-Spell-1
-	>=dev-perl/Readonly-2
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/String-Format-1.180.0
-	dev-perl/Task-Weaken
-	>=virtual/perl-Term-ANSIColor-2.20.0
-	>=virtual/perl-Test-Simple-0.920.0
-	>=virtual/perl-Text-ParseWords-3
-	dev-perl/Perl-Tidy
-	>=virtual/perl-version-0.770.0
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.402.400
-	test? (
-		dev-perl/Test-Deep
-		!minimal? (
-			dev-perl/Test-Memory-Cycle
-		)
-	)"
-
-src_compile() {
-	perl-module_src_compile
-	if use emacs; then
-		elisp-compile extras/perlcritic.el
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples/
-		dodoc -r examples/*
-	fi
-	if use emacs; then
-		ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway"
-		ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682"
-		elisp-install ${PN} extras/perlcritic.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index bd25975442b4..36305853b783 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
-EBUILD PerlIO-utf8_strict-0.7.0.ebuild 848 BLAKE2B f94e5fdd9339f3af05bf1c7c9fa4c4f78504812c00b04280fed4e99bc8334e0d5b9af7cc8724f7710bfdf7e66ea1aec6501a8956c19d7db16a9648858008cb58 SHA512 4994c92440cfe76740ecd9f9a90bf35a6c171e08e52a55dc5410cb5314a073b7dec23d6f82d174b17c61b3b853df93b734545e9e800a7f684a54ab57385a1037
+EBUILD PerlIO-utf8_strict-0.7.0.ebuild 855 BLAKE2B d96be54a4b06e419987b9e0fc14ff5ac9cc45e5e2471b3431fb49d2f91743324751ee565301f321dd74a47a245c7403b89a69d586d3d1a7e7605a2e39efebc44 SHA512 4c3b7a16ab2c37009a57f41d3eed72133b6f7d6ad8c6eb9f38c96ecada3aa3d66e74568dbcbaf7144a7689b9f4bfdb41a7c3a71e7163a7d8fa1d25dab75c507e
 MISC metadata.xml 408 BLAKE2B 7c975db4716a114a97f21cfaebc54334634ae0d8f6c8d58bd19edc8853a74583c4f16d0f3729f380bf9cf6cb1d0a668f9484ef58418370e977151877a79c5860 SHA512 bc9d04bc551d13a2712b9e57613d9e423a1649e3cda65436178079dc13cbdadf183f4aea41963d023744d60d638900944ddb60752f054a728d6868594d2f4c55
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
index 509d6300fbe1..2e09f27a3204 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k 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 )"
 # r: strict, warnings -> perl
diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index 1416e0669409..d22a5f87a25c 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -1,4 +1,4 @@
 AUX Plack-1.3.900-network-testing.patch 6047 BLAKE2B 2293cc7cd0ae0b429b5923dd2e66e40c666f3336952463cbf574e636083139f9a66fc459d37e9f7ad19e8548efa19237e609c5a49e86f8fe4bb19d225ad937cf SHA512 214a2a2141f71875026ed25387d6076d62c0b4d0b912ebf475645b3a2948f41faa7d8826c46620682448a3b9916a53c3178858286551d542073c5b66112b4fce
 DIST Plack-1.0044.tar.gz 178730 BLAKE2B 60f6a900b1ebf05c48295ae679e7cda905441d4322929e9280aa87e6fda51a08e3fbaef37e2398fcfef3b39268f115603dcec2529dd135ddc86b79c9118da0c8 SHA512 a0dae77d507d4b4cf4192931470cf87f68f7027b2057ccdf757680f9e6584534ee0da79c508a44f9ea72426497e1dbbdb7acf6d7dfdf31698f4320f2c1f2ac61
-EBUILD Plack-1.4.400.ebuild 1799 BLAKE2B 60b9abe6307530c91aaadad199abe24984bb7f9775229cb3872162c6f6798e0dc69cce90b0aeeb24096d3f96a10fe232b3e67b6d5e00cef82661b8e00d8a1bde SHA512 559978c5dd8ea986aab85551070b9aa0b9261926e6631b66ef814baa3ce51ac96c3708f52e86950560fdfdccc62acfff3645a767f1a2e5030e79d75a5c4ecbc9
+EBUILD Plack-1.4.400-r1.ebuild 1768 BLAKE2B dc4ecf966e8f46a8abdb1fe0c441df06e61e58d60cd4b4d006cf7b122b6f12eea906725861c0cd5a4a2d6a01dbd426f3f564b2a377be052c126b16dbf8411c59 SHA512 c908c17bb9523dfd8786c8c7610968362e4500b9c3757b6d680f9f54c84eea228e48f3b35a702d6c0ca00a402159415f6a131307642e235d430fe7c4984fd07b
 MISC metadata.xml 5553 BLAKE2B 5b02f3ae63335b64b251a5310d3191beea142c599c6d19034096bd6ebbaa9a478ce8f533c3520550f7ee761859908bd327cf8b4d41deeaac73577bbfc2f160ec SHA512 13cbe0cf258311039d50b04983ea67eaa88beaffb9d4e8bb46ff1a985b8846b5e66fa9a284f38615c3aeb697ad9c62177b6bcbc0b9b47969a1e6d942580c4dfc
diff --git a/dev-perl/Plack/Plack-1.4.400-r1.ebuild b/dev-perl/Plack/Plack-1.4.400-r1.ebuild
new file mode 100644
index 000000000000..ffcfa58efdc5
--- /dev/null
+++ b/dev-perl/Plack/Plack-1.4.400-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MIYAGAWA
+DIST_VERSION=1.0044
+DIST_EXAMPLES=("eg/dot-psgi/*")
+inherit perl-module
+
+DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+IUSE="minimal examples"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.900-network-testing.patch"
+)
+
+RDEPEND="
+	!minimal? (
+		dev-perl/CGI-Compile
+		dev-perl/CGI-Emulate-PSGI
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+		>=dev-perl/libwww-perl-5.814.0
+		>=dev-perl/Log-Dispatch-2.250.0
+		dev-perl/Log-Log4perl
+		dev-perl/Module-Refresh
+	)
+	>=dev-perl/Apache-LogFormat-Compiler-0.330.0
+	>=dev-perl/Cookie-Baker-0.70.0
+	>=dev-perl/Devel-StackTrace-1.230.0
+	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
+	>=dev-perl/File-ShareDir-1.0.0
+	dev-perl/Filesys-Notify-Simple
+	>=dev-perl/HTTP-Entity-Parser-0.170.0
+	>=dev-perl/HTTP-Headers-Fast-0.180.0
+	>=dev-perl/HTTP-Message-5.814.0
+	>=virtual/perl-HTTP-Tiny-0.34.0
+	>=dev-perl/Hash-MultiValue-0.50.0
+	>=dev-perl/Pod-Parser-1.360.0
+	>=dev-perl/Stream-Buffered-0.20.0
+	>=dev-perl/Test-TCP-2.150.0
+	dev-perl/Try-Tiny
+	>=dev-perl/URI-1.590.0
+	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
+	virtual/perl-parent
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		!minimal? (
+			dev-perl/Authen-Simple-Passwd
+			dev-perl/HTTP-Request-AsCGI
+			dev-perl/HTTP-Server-Simple-PSGI
+			dev-perl/Log-Dispatch-Array
+			dev-perl/LWP-Protocol-http10
+			dev-perl/MIME-Types
+			>=dev-perl/Test-MockTime-HiRes-0.60.0
+		)
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+src_test() {
+	perl_rm_files "t/author-pod-syntax.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Plack/Plack-1.4.400.ebuild b/dev-perl/Plack/Plack-1.4.400.ebuild
deleted file mode 100644
index 916aced42905..000000000000
--- a/dev-perl/Plack/Plack-1.4.400.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
-
-DIST_AUTHOR=MIYAGAWA
-DIST_VERSION=1.0044
-DIST_EXAMPLES=("eg/dot-psgi/*")
-inherit perl-module
-
-DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test minimal examples"
-RESTRICT="!test? ( test )"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.900-network-testing.patch"
-)
-RDEPEND="
-	!minimal? (
-		dev-perl/CGI-Compile
-		dev-perl/CGI-Emulate-PSGI
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-		>=dev-perl/libwww-perl-5.814.0
-		>=dev-perl/Log-Dispatch-2.250.0
-		dev-perl/Log-Log4perl
-		dev-perl/Module-Refresh
-	)
-	>=dev-perl/Apache-LogFormat-Compiler-0.330.0
-	>=dev-perl/Cookie-Baker-0.70.0
-	>=dev-perl/Devel-StackTrace-1.230.0
-	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
-	>=dev-perl/File-ShareDir-1.0.0
-	dev-perl/Filesys-Notify-Simple
-	>=dev-perl/HTTP-Entity-Parser-0.170.0
-	>=dev-perl/HTTP-Headers-Fast-0.180.0
-	>=dev-perl/HTTP-Message-5.814.0
-	>=virtual/perl-HTTP-Tiny-0.34.0
-	>=dev-perl/Hash-MultiValue-0.50.0
-	>=virtual/perl-Pod-Parser-1.360.0
-	>=dev-perl/Stream-Buffered-0.20.0
-	>=dev-perl/Test-TCP-2.150.0
-	dev-perl/Try-Tiny
-	>=dev-perl/URI-1.590.0
-	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		!minimal? (
-			dev-perl/Authen-Simple-Passwd
-			dev-perl/HTTP-Request-AsCGI
-			dev-perl/HTTP-Server-Simple-PSGI
-			dev-perl/Log-Dispatch-Array
-			dev-perl/LWP-Protocol-http10
-			dev-perl/MIME-Types
-			>=dev-perl/Test-MockTime-HiRes-0.60.0
-		)
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-src_test() {
-	perl_rm_files "t/author-pod-syntax.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Pod-Abstract/Manifest b/dev-perl/Pod-Abstract/Manifest
index a081a7379330..4b4afa8899f0 100644
--- a/dev-perl/Pod-Abstract/Manifest
+++ b/dev-perl/Pod-Abstract/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Abstract-0.20.tar.gz 27676 BLAKE2B 01ec7079c7bad3af22db78eb9288866cf30e6eecd6800919ff022c7ab360f0fe0c1fbbc60f04f3bd6091143fd804bd4b6e0a78db38bfbdb38b2482110be53b9a SHA512 466a55fd3923ae00cef777b69494714e2d4e9ce5ba5c04637bd9f56356c16674d4412ee2705eb230bd2817aad6cd312e87d3394c2d6c45c80b91f57b4e4fc637
-EBUILD Pod-Abstract-0.200.0-r2.ebuild 478 BLAKE2B e11c34d147a22940938be23859842bd371293d9ec1951f7864950ad82464e963e16e7dae9c5a493e18a05400b8e98bcff18e6e2797c2bdf5e07b7323d0fa6186 SHA512 bfdacfa5ac78a8ddf36bd5f3d01fdb3b8d521b7666c9f43799159c46f7dbb0ca40dc230ae9a575853ce79dc90e381a57208c4e719271f2cb6ebb52b334f05fa2
+EBUILD Pod-Abstract-0.200.0-r3.ebuild 436 BLAKE2B d13f80482ca817c6a818665d4dcd37638f394662c0802c1266ce894bd39c81fbd0e7916c442959a14e2b191ca88d838ab7ebed10b74684aa05357306fd42904e SHA512 faeec12fc362176627d44551869344a29ec1f02af3985ec334555e7c000ba6cff541d8c5fedf34048dcc27e65206e01e4651cc451b0af483859ae5e373dcec7e
 MISC metadata.xml 1647 BLAKE2B a4a2d08e3f903590359fd144b09f7134529ea20bec293387d4862f0e03e3bf7808c7840bb7ea938cbe8ac90d9f243228d62f0aac39db8ae83b0be5f7f4f019c0 SHA512 00c56c98e9623556a9a880373181808f348559460f6e95d3b3366c251474c4207651d381513ebef12a422bd277965314712e23dd60deba240a16a27233bdb14b
diff --git a/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r2.ebuild b/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r2.ebuild
deleted file mode 100644
index e4ed10e97135..000000000000
--- a/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BLILBURNE
-DIST_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="Abstract document tree for Perl POD documents"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/IO-String
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-File-Temp
-	virtual/perl-Pod-Parser
-"
-DEPEND="${RDEPEND}
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r3.ebuild b/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r3.ebuild
new file mode 100644
index 000000000000..0aaf7587d1c4
--- /dev/null
+++ b/dev-perl/Pod-Abstract/Pod-Abstract-0.200.0-r3.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=BLILBURNE
+DIST_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="Abstract document tree for Perl POD documents"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/IO-String
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-File-Temp
+	dev-perl/Pod-Parser
+"
+BDEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Pod-Coverage/Manifest b/dev-perl/Pod-Coverage/Manifest
index 79cad1fe4575..3c1a000b82a4 100644
--- a/dev-perl/Pod-Coverage/Manifest
+++ b/dev-perl/Pod-Coverage/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Coverage-0.23.tar.gz 13211 BLAKE2B 0a17ee10325135b00562ec3491ecb05bf7cf7050c24795f19d727074ab1de29c0b3adb8db7400c129f377b29d1657bd1a686e02cfe30761d03f6ed8107767202 SHA512 64760bcaf37b22a1308b665bcccb9273e3f7d12c9a96e4a2c4a0fddd4b528e2b476dcfeb654dc52ef3f40f64f2e7a1e860647f139dc53909c7696f406b7a312e
-EBUILD Pod-Coverage-0.230.0-r1.ebuild 689 BLAKE2B f99fad1a45dc721f5e79f19273f02548e06cf87b370d529d906c58efd5f175840d8d48a68d81ba8cccb075395b4a2015c77322f24e714dc8d836ce66c7a3c5d9 SHA512 73606ea9bb3f148f0e5d2014c68988e51d7096d7e24c2bb21679349fecc346156e3b9bf4f72bbc21896ec417b48ff4d3d79c4d797db2ebe32b5e8ba404f910e5
+EBUILD Pod-Coverage-0.230.0-r2.ebuild 634 BLAKE2B 1c40070cc5f3168a9146736628e5720774e6033f0649fbe52c9cf383cbc5731b0af1a54584c7ba08647cbdaec39435c35437b475bd54de690237a0fdb57bcfb6 SHA512 c14fc0a8ceea38946fb1d7427979a0467e6ccdd3ef637b269ec6ee9b8db8d8c93a2459cce1baa441035e416e8a3df8b619658b97d0acf31dc1964255125c43cd
 MISC metadata.xml 685 BLAKE2B 16a91db0bf471648d3e6cc9dbb538bbba54e0e8eeacf3f29901b1a2c88f2ee7a07d74667ba14d7f49aa3c23b0507d69c3249c4ad0738560724dcf726b5503ff5 SHA512 64c2ecc10ce7657e742f5f85ccb0a6ea57ab272c437e0fc6d22cb267840088ad66085efdbc95868c6e0bd49fed24a6f54b896d0636871a7cbf97f0d5c594a239
diff --git a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild
deleted file mode 100644
index 6e660ca4c74e..000000000000
--- a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RCLAMP
-MODULE_VERSION=0.23
-inherit perl-module
-
-DESCRIPTION="Checks if the documentation of a module is comprehensive"
-
-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="
-	>=virtual/perl-Pod-Parser-1.13
-	>=dev-perl/Devel-Symdump-2.01
-"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/07pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild
new file mode 100644
index 000000000000..eae2eb263a97
--- /dev/null
+++ b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.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=RCLAMP
+DIST_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="Checks if the documentation of a module is comprehensive"
+
+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="
+	>=dev-perl/Pod-Parser-1.130.0
+	>=dev-perl/Devel-Symdump-2.10.0
+"
+
+BDEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/07pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Pod-LaTeX/Manifest b/dev-perl/Pod-LaTeX/Manifest
index 21a67b8def9c..c66e66012bcd 100644
--- a/dev-perl/Pod-LaTeX/Manifest
+++ b/dev-perl/Pod-LaTeX/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-LaTeX-0.61.tar.gz 32618 BLAKE2B 6fa102c637c3d990247446c09fdf86cdaa9c4a50fd09a5d386c2b2840de0cee7c64116cfd27badd6cc4b08dd17fceb9a4f58eefb4e4b27599baac158bd44ded1 SHA512 c9b5d8b50f630e25e1f913d95d83a1323e71d2c5a3a794a543bdc9962800e5979b3e58595e7a653a96f9aea1f321c1564e2062e9b9d70d8c4d1c6729cb8df498
-EBUILD Pod-LaTeX-0.610.0-r1.ebuild 593 BLAKE2B ac595afbc801162548cfd31d9a7a1f978d883d9631f4c5cecb4bbf4dbe92e0334a389a0a65e330203cde4a17b212a0bcc85f21d47664f0720b38b0e13ace1c5a SHA512 9a475a982fb18fd6034df5a51b16c9a178230cd81ad81aed62fdb50eb0537ac987c342b78e3dd5989e893250386d958dc4ff857eed92bb68533968c25973e6dc
+EBUILD Pod-LaTeX-0.610.0-r2.ebuild 551 BLAKE2B 4b31447a6d6ddcc8873616b7bdc6ffca83b3edafb8b27f93dda365dc2510b79b30b93cda6254a6fc8cafff29b04cb42e77363e4d09dae0ddd008a806739eccc8 SHA512 ffe28443490a6a385690b3396652de69e519ab7f8ee0b9c6b1dd403dcf443955bf47fc16bea46a7b1e43580712c4c4777a59f71529f0374ec8c41b4955f551b7
 MISC metadata.xml 390 BLAKE2B 4c5f45fedf26c3fec15f84ec9be02cb52bad73ef1ea1440660d4b5be42f2b6b6b90ca0aa5c7791fe38ac9b3848100c4045a350f0407e442140f42bbfa4d3dfa9 SHA512 341aa40bd68ff1f379b3b316a95126bbd491942545992ec62810de8b3f471493960fa1cc51328908488daaa5d1ef4a299f2b6f8b59b78e22b53985300759cecf
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild
deleted file mode 100644
index 6edc8fd633da..000000000000
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.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=7
-
-DIST_AUTHOR=TJENNESS
-DIST_VERSION=0.61
-inherit perl-module
-
-DESCRIPTION="Convert Pod data to formatted LaTeX"
-
-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="
-	virtual/perl-Pod-Parser
-	virtual/perl-if
-"
-BDEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
new file mode 100644
index 000000000000..8569cf14b6a3
--- /dev/null
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.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=TJENNESS
+DIST_VERSION=0.61
+inherit perl-module
+
+DESCRIPTION="Convert Pod data to formatted LaTeX"
+
+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="
+	dev-perl/Pod-Parser
+	virtual/perl-if
+"
+
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Pod-Spell/Manifest b/dev-perl/Pod-Spell/Manifest
index 9da2185d8b62..4e1594054c79 100644
--- a/dev-perl/Pod-Spell/Manifest
+++ b/dev-perl/Pod-Spell/Manifest
@@ -1,4 +1,4 @@
 DIST Pod-Spell-1.20.tar.gz 31220 BLAKE2B ee725edd8d0dce09ecd076b468e1a6b05f89d2bd79f2e51c996ce715847141aaf2894b995603c716e3df4dbcba7d55f8ec0a3c4aac4d3b9ef6cc84e770ac1e87 SHA512 9a676a897dae7dfe37e9bfca2e5c11bcdc3221ed532b79970e6cc4d0de8dec0eca754cb9fbc5cbbbf6533a213c284d691609dd86d246ae146187bd9cd37d292e
 DIST podspell.1.gz 648 BLAKE2B de6d7b87d746e9649986570c83882b598c11033d78624055df33e81285abd442de3484f03a9c2e4ca08cb4da528ddcd48de75c7244a84959d2b0da5a5546c63b SHA512 651d2fc9376329cb95986a885119dfd542f55e79045ec7aa2f37afcd9fc7bd86ba690c2e3a247b35ffd2d90c9adc9ad85e2d6128fb3424c75130d70aacb1c154
-EBUILD Pod-Spell-1.200.0.ebuild 1038 BLAKE2B c623011167fe519d07fbf2245a75e5462927ba574f90731f176741cd2e08a19356b5c8bb19186a97c52dd7e62c6febbbbf63881bf657aa4d3e91b359fc85f2be SHA512 d250c5b2f2fe4d02f9d67dcb21e8eb31eec1e4b1c87aaf34477c94f6f8232e881128c0020d70e9c64c48af362f42713bfb32f3a1844cfe4b676c7bb434c64cf6
+EBUILD Pod-Spell-1.200.0-r1.ebuild 1004 BLAKE2B 3202b1f77a41d21e2cbd8343144ae29fbf93d74d541a6c68db5024bf4bd129669d2cbbc5c32aab0823f49c47878799b3113a89fb2e9dd9a89a54e9ad51c2036e SHA512 ca85e3c20309b17078b2724ac1bf8a299e388111e4838cd3dd78a6e333a466fa797e9ac8fa180897961b97947bc525ee18a315fd7564d679e0afb1e11016cc43
 MISC metadata.xml 436 BLAKE2B f3921b08aad2a4c144aa3fac50ff02fe849eb7b328d5d3fa64f0bd4e5eed230f1175a7f0dcf93ca2cbb3c8ea8e72156e757d4d6361b1141bbe4212d0be919f66 SHA512 32c7920aa303d2e48461f89cc3118a0032469a15bf669e1569f11760639ee65f7c6980c51820e825811edeeff1c42c6ad6dfcde309db0f028514cf71bcb793d9
diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.200.0-r1.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.200.0-r1.ebuild
new file mode 100644
index 000000000000..71e87b713575
--- /dev/null
+++ b/dev-perl/Pod-Spell/Pod-Spell-1.200.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DOLMEN
+DIST_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="A formatter for spellchecking Pod"
+SRC_URI+=" mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-Tiny
+	dev-perl/File-ShareDir
+	dev-perl/Lingua-EN-Inflect
+	dev-perl/Path-Tiny
+	virtual/perl-Pod-Escapes
+	dev-perl/Pod-Parser
+	virtual/perl-Text-Tabs+Wrap
+	virtual/perl-parent
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		dev-perl/Test-Deep
+		virtual/perl-Test-Simple
+	)
+"
+
+src_install() {
+	perl-module_src_install
+	doman "${WORKDIR}"/podspell.1
+}
diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.200.0.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.200.0.ebuild
deleted file mode 100644
index d3df1d389344..000000000000
--- a/dev-perl/Pod-Spell/Pod-Spell-1.200.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DOLMEN
-DIST_VERSION=1.20
-inherit perl-module
-
-DESCRIPTION="A formatter for spellchecking Pod"
-SRC_URI+=" mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Class-Tiny
-	dev-perl/File-ShareDir
-	dev-perl/Lingua-EN-Inflect
-	dev-perl/Path-Tiny
-	virtual/perl-Pod-Escapes
-	virtual/perl-Pod-Parser
-	virtual/perl-Text-Tabs+Wrap
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-IO
-		dev-perl/Test-Deep
-		virtual/perl-Test-Simple
-	)
-"
-
-src_install() {
-	perl-module_src_install
-	doman "${WORKDIR}"/podspell.1
-}
diff --git a/dev-perl/Test-Pod/Manifest b/dev-perl/Test-Pod/Manifest
index df765d7f6061..d82327e07954 100644
--- a/dev-perl/Test-Pod/Manifest
+++ b/dev-perl/Test-Pod/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Pod-1.51.tar.gz 12159 BLAKE2B 569fd4764ce2b5d2f64f54d92c7ee5c6cab9bc38944a72fe439b1e5f6bb49196ca12a741bf7ed98ba72b4248c62a96ae462e27085f76afcf1da81cf7e47e9037 SHA512 bf4e8b2a71a79a5edec86991c7cbbcc929fa4f2eb403b411cd678fbdf89fe30c198e00a29db80ca9c98fe6655167c0a77e7f166f073a18711db3b1f3e5cd3c15
-EBUILD Test-Pod-1.510.0.ebuild 654 BLAKE2B 89085ab9e304491b35f59ca6c1d88367905a1fc5c9f1af1d36cc799b1137b240868513a10ecff1ac4045383edc88daaa2497259889843afb4f2d3c368820f586 SHA512 e2c41946cd72fe7314da50a6284d8d7d63834e02f6578800c8fd922bdaf07ed651b377dc398c320acfd9629675b5d1f3ca739e38f9acc4991db8b706b0d3cdde
+EBUILD Test-Pod-1.510.0.ebuild 594 BLAKE2B 97bbdc4c7fdf59541c8eee635dd7c5b5a569a3f62107662a7d0e7dca2a8f01adb46f2a54d6e2a1bd13ac22c8db5e3d458256ed9dc3a77df41940966209592a89 SHA512 ebd0de0674c291c998be3540da43684594308373d86f411218cdb8875115e9f520b07473164d7af86e0b0ca20a85b3b36843a53b3d7ef90ed5f8898029c79127
 MISC metadata.xml 388 BLAKE2B 561b4fd87f7e96ba57cbdc81ff800421b8fb722219c171ac4d2bee3f7c1e9e7b4de834b1462c01fb939b1ec171d3383a3837527cb267b4fcf53d0dae7de756c1 SHA512 372636cc4cdd14790918973b089b56e0ef2c4ed99b2c961dc8d0c2ef60b6a69cbd6e23c6ff77e0ce5f06ed1553ac4735aa7dd78891d198c9b7ecd6fdf0e04422
diff --git a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
index 47367fd5b322..2c83b71fa423 100644
--- a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
+++ b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.51
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.51
 inherit perl-module
 
 DESCRIPTION="Check for POD errors in files"
 
 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 )"
+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-Pod-Simple-3.50.0
@@ -24,5 +22,3 @@ DEPEND="${RDEPEND}
 		virtual/perl-File-Spec
 	)
 "
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Text-Iconv/Manifest b/dev-perl/Text-Iconv/Manifest
index 9a5f623a7526..a80e436c277c 100644
--- a/dev-perl/Text-Iconv/Manifest
+++ b/dev-perl/Text-Iconv/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Iconv-1.7.tar.gz 10454 BLAKE2B 2a6e364babaa9584674b7d1cfb50d0f781f0c62231c687cde4fccd55689fd53a841012960512b88ca03328e6e2a7c9092c77c557a25270dd9944c721576bfb10 SHA512 ea801640e3595d2daa063ec04feae6ef2847fc50e999c173d2f6322288c8053c20e00c9c707f4f66240d28b7e451566ee7327224e6770a75aa0252c28ae2a290
-EBUILD Text-Iconv-1.700.0-r2.ebuild 451 BLAKE2B b1035d5207194aaa3441efb5aba3690aa0ea65cb1bc8adc12b123b754392023284c0c040f24d9021d8e6daa7a6101925fe296541e7fc46b7efb011ac337cff3a SHA512 b2c794a6d9b9c3d27fcd598fb44117bdb98216272d7016bcae53df47059c69756f5acaf5f85cd795c7f66af2f83694d1d2e13dff4172572810e7fd75739f7652
+EBUILD Text-Iconv-1.700.0-r2.ebuild 458 BLAKE2B 610c12ad96931f827140c183c02328c5bd8abeb78ba25c841e68a48f13e17fffd2ce4b742972f3ba5d3510b3b99e20f0e17d687a7fd5e52dbd97a6489cb7bb57 SHA512 e2d593f25df35388cde0ae9f468d64ba04586d489f1f7deb0100f7ae26ec3398c4abdcd33728a8d1860c7da5451a71fb9538716e42448c686b568387158b8bef
 MISC metadata.xml 392 BLAKE2B be1df2f85e4ba3b48c0465dee16534c3c6b4e22673565e75a736584706982ac4282be7b69aea056ce683423bcdde1613fd247a548226b0c3b4c117bc1f0f9f66 SHA512 37cd928389545e7dc1c18c65e12105d4602a4e030d8ddb0d9c4b6253390bf94cfa650b1b493bdb4287cbcfdd1b44e382504800a827c2128fd4c52a52f787b5e5
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
index bfa07f15b6bd..2c011e2e9165 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl interface to the iconv() codeset conversion function"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="virtual/libiconv"
diff --git a/dev-perl/Tie-IxHash/Manifest b/dev-perl/Tie-IxHash/Manifest
index 09d576df5474..8cb0dddda7e3 100644
--- a/dev-perl/Tie-IxHash/Manifest
+++ b/dev-perl/Tie-IxHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-IxHash-1.23.tar.gz 9352 BLAKE2B 79b8305b438dc54b899e4d9bfe031e858d7a49daf4ac3249af3a12f4d46e4d535776ef77390e02c78e0a091cfec57e7a02110aaf7eb818b111151d37f191b9b9 SHA512 13e5015cf4e11e3ba828279a5090704b8e4bed26a04e1f486a9d3a63c41eaf38d54d233b20ef5d1886b56e857208c229fd145c4c676b681e3e9c1ed3c252f195
-EBUILD Tie-IxHash-1.230.0.ebuild 612 BLAKE2B c55d4303ea9f2a519d61512cd31e8ddba95f3ea247c6871d0acb1fcef7264d233a793c833959edf434c61eae846c057615531d81504731bbb1cae99efc0635e1 SHA512 1a93489a264fb0746ecf5dbaf50863a59922230fa4b32d553f511e28b1d8812bec594dc019de3f15ec16e3b6b89fc8d18e16d145b513d1ca70adb1a6919f1880
+EBUILD Tie-IxHash-1.230.0.ebuild 619 BLAKE2B 29234d2db4df4fe289660468ee3fed78163233737e157cd20c47d13cbb931d1796833ef1e030ed4d93b2caa6b0fd77e5fd5b8ba184afb6746d4819603376bd09 SHA512 74b68816d9c23c2455df1cc54536ca8e9c6989a0486850e4564f65c12e32942cd9ddf072ac02d1b021cc659ca0ceb3edd8c131b0240ed35362a75a1cb54f2e94
 MISC metadata.xml 392 BLAKE2B 857700dada4a0388d01b84aed6b0d67084ce47acb8854225d8c6ed22085143e7a1261b54ec6f382859537018e749fba14a6abfdf094e8fe287ae74d66208bcfc SHA512 2c8099e514e05a312125bd0fdf06bb94e09993f0623f373b1ad66367ee7c5244563ee1d57f31ad8a173787428a94515c7ff449b26c20ca0592e140de2972af25
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
index 3f333c87d6c9..d0b13e4957c3 100644
--- a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
+++ b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ordered associative arrays 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/X11-Protocol/Manifest b/dev-perl/X11-Protocol/Manifest
index 51c982f5d18d..8b4dfb3c9a28 100644
--- a/dev-perl/X11-Protocol/Manifest
+++ b/dev-perl/X11-Protocol/Manifest
@@ -1,5 +1,5 @@
 AUX X11-Protocol-0.56-test-tap.patch 859 BLAKE2B f126f1516191c68557d12d0d68a13fc63a1385a715394e9291b3acb06e0dfccca9cda893965223f02c55f69f43413792c402abcafb7bc13a57c7b5869ed66563 SHA512 e48a388e73722bfecec01388c3b149a9e9507cc3d99c101ea0ffe6170925c157628600cbc43474945fe464069632da2890c494e3fb503e2d9aa6e27cbfa9b624
 AUX X11-Protocol-0.56-test-timeout.patch 875 BLAKE2B 4571b7ae0ad18c5545de085bb472c26021ff961e6e22f85310edb8bb6c34ac066a1de58e197daa5d5ccf561f305c6c318755ec3e4831e1a40d2bf90a34d9f6c2 SHA512 cc825c1190b594cbe787aa41fe1302e8b83d318a5ec6d42e802e630cf385193f161bce82f399d9e2f2eb96783afc5ce60c85d08238691d3063539c5686063207
 DIST X11-Protocol-0.56.tar.gz 101227 BLAKE2B 7c13e7f511a36c0f480f500577d4b9f2a5915fc1d071bb660a8d8d56ca0c2d5facc8122e3f9760751bbbe5f669a52e4c5cd6a375f209d7abb4f4281b227157d5 SHA512 1c1a6ed15ceff77e8be29ac32a0e72aa2d0a1e62b5e19af2e34055aa001ee281ab584d993ace82f46f00d4da2e7bd4c60e4e31876a43c6c64c3e216beb13fe5f
-EBUILD X11-Protocol-0.560.0-r2.ebuild 743 BLAKE2B cfb08622fafa5d6500b3b69aa4fdb3c93e0380004e2b423b24a0bf46f61cd419f3d9e32d1ddd4d77485ae121dd9a68de506aa8ddb77dc4e945033ee61dcead67 SHA512 2e28cfb4f1bced6a07a7ae0d8a2fec008bf8e1dcb78ce649c3d9ad896922c59d99a3b3b86a9eabc1ef2cd197bcaa0b9eab7fd953432d3519980920babb672da4
+EBUILD X11-Protocol-0.560.0-r2.ebuild 750 BLAKE2B af3f2900c20fd1fd7a53ccbd30f7b578de1ccb649e4626363bfcd1fec751112aa4859e805f9420d1c7386a16bcca6d7630e0717dfa2e220d24156714dce09112 SHA512 fae0e7d1a913954b118d5396107821ce5ad4261b78e66014a06c951d161b50551c94974fdf06c014c44df836b2237fdbecb51525de29062ce6a0e51919802582
 MISC metadata.xml 1594 BLAKE2B 9de873c7cc1a7db3edf3a6ef6c1b7dd1843b0ffe0675ac9cd14c7c96cc92d838d800bb182c4dbf1fdb67560e1aa17dbbab536972f65b3c968bad86189a69140e SHA512 61e03d09767517801cfcc9af58a74ea67f092f6426108438b92afdbefd90de1945fc851b9b066f624f98b1f6cd4780e52cc50b7556b13bcf06fdfd0d6935f9ce
diff --git a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
index e65c4680b68c..572bb256c9c0 100644
--- a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Client-side interface to the X11 Protocol"
 
 LICENSE="${LICENSE} MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Filter-BufferText/Manifest b/dev-perl/XML-Filter-BufferText/Manifest
index 3a859b532cce..24964f2f5ad5 100644
--- a/dev-perl/XML-Filter-BufferText/Manifest
+++ b/dev-perl/XML-Filter-BufferText/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Filter-BufferText-1.01.tar.gz 2269 BLAKE2B bb1ea1d949c2b303cd37699394fa899391b57475a662c3b3fcac73f88a911515e852eb0d67ebec57b173e09e7f12abade9afd64d392cc9c8b2c87882a4bbd0ae SHA512 01cfa5b2132e05a8cd3cd07bb8594174678d5943148c67dde98689c65600cd3fa2ca02663d83c0cda4cb4192d3377b3ebeeaad64a728f2c24218a6c8c6a9f87f
-EBUILD XML-Filter-BufferText-1.10.0-r1.ebuild 504 BLAKE2B 2139e7938cccef7cdf1b2b3f2e0acbc6cc16ac46e76acbff63d14b4e80120eb0f8cc6926d7670f9e595a15cd9404de3b58d333466f077e23ffb28f3b326418d3 SHA512 a5479933ea8893bfd8e7d4e541ebf20e46c7ebfbfff99337885656d2cc3a842487829eb96833f8f07f20ef0e7819564889b898aedbf12067513888b1921939f6
+EBUILD XML-Filter-BufferText-1.10.0-r1.ebuild 511 BLAKE2B 1d3d2a9b9b26d87a00a52fcc94cce9e7630393a5a9bcf587ea5fa69cda22e0458079930166eba37886cff9bfeecedc6109c67dbb61cc2ba8ee803c6a600f230b SHA512 09a49859f7e4f0c5000546bf97b2c3644c18ee2ec3a2386c1b2199fae4259d5d7cf640926faa79a2656420a72253447fff1284190c7bf4a01475a64fa3b7b68c
 MISC metadata.xml 415 BLAKE2B a653b5b77d11fef71b45eeb8fa7ff4a54c4f9c24655cadd5cea57d73af7909d9d383a648f123a9fe1d307c8f9c6f62cdedeb4fa93ff24bd575f72e083faac175 SHA512 dd69542f24b134f88a1f273888f49ff99a3c42e8729b8cbe84d7901b7964eb5b39061b5eacf7cb469732dac94e4e15b5d036c2d07cacbb4fc334eaea470d3b64
diff --git a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
index 25ce97caa232..2a0e52395cc8 100644
--- a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
+++ b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Filter to put all characters() in one event"
 
 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=">=dev-perl/XML-SAX-0.12"
diff --git a/dev-perl/XML-Handler-YAWriter/Manifest b/dev-perl/XML-Handler-YAWriter/Manifest
index 6f7ce2ec56ee..dd8a6a114842 100644
--- a/dev-perl/XML-Handler-YAWriter/Manifest
+++ b/dev-perl/XML-Handler-YAWriter/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Handler-YAWriter-0.23.tar.gz 25695 BLAKE2B 081ef78b93d502387313dc88a37830cf5923fce0b22cb58df02fd19433516974b70d8dc40b1db78dfdafd4f65af662f3dbdab7f8623ed99ec4c2769b40dfd0c4 SHA512 3d41bfa4a33296ae1556b269b0c6ecd732a809fa517805de37aa452aff8394cdf639a68a7a3248e5457297dae4bedf22ea73407de0dbf25ea6a9facccbd4098f
-EBUILD XML-Handler-YAWriter-0.230.0-r2.ebuild 530 BLAKE2B 848ad3db7a646425bb61dac43e4584ac223e34b08ff4e73eef61d72486bcc12d97ed064b8560267bc7832bc59aa408f79587540f41c6ecdcdc4ccc1f4dde317f SHA512 ef267f88a54a36d2b76030bf50ba478362dfc09490315a50b54580f7dbd0ba942b0f082df5f8b83a1b5baf7d477aea5b26b5dfd296572bc251ce6bbcae2e5bdb
+EBUILD XML-Handler-YAWriter-0.230.0-r2.ebuild 537 BLAKE2B 3286d81df78d6ad4bca841b8b18889202243c317fd77a264c5e2ff9374595f03763db4f986f20c2ec8f74dcfe5797d39dbae6a800da21c0d2acec245fc2dd8a7 SHA512 5b0ecf19f5faa3714935d7073ac33d90fa0a2ae7a8e2736332ff100de46225204f2120979aed3b212fc62347087cdea5599a56338ff0439a3ecbb6ccf87a7625
 MISC metadata.xml 413 BLAKE2B f3c1cfef7c72e5127a4e9cfcb225982ffa8ff956eeaf5b90382e661e0c010f460fd13af7f07c09db4ad8fabf1e6cfe831d40b4de6270f7f61c6f9df1d0e2bf4a SHA512 5798214cb2a76bc3a800a3013343a792ff2e76a5c59950bdbaf0d834e28a14455ce053a576afe4984f21440f9e3c20196dde474e4d11662cdab309184b9764e0
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
index 7fee2ad3fb38..a242c2ce7d95 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
 
 LICENSE="GPL-2" # GPL
 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=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-SAX-Writer/Manifest b/dev-perl/XML-SAX-Writer/Manifest
index b582852c48c7..4a224ae3a95c 100644
--- a/dev-perl/XML-SAX-Writer/Manifest
+++ b/dev-perl/XML-SAX-Writer/Manifest
@@ -1,3 +1,3 @@
 DIST XML-SAX-Writer-0.57.tar.gz 22120 BLAKE2B 08126b613fe0727356f341bfc7189eca04bac5e987c2ecb47950dcfb56d1981fc5f98520a3241a6be3da2de9f86647f91bda6497fbda9e370323ef0c7a9ef71f SHA512 8a6e8befdd91278b6e1dbce8ef62a630675f43e2debfb5833809fc46707d449c779d792e7aff44089f0509f9c3f8f10d576570ab0b8255f9f793802be92ad94f
-EBUILD XML-SAX-Writer-0.570.0.ebuild 761 BLAKE2B b18550c024033f29d501b94a74b309920b2d52d9c03a80e2a8399102a658ab18b300e104290ee5d75e7c0777e65ad9f4550b322191dfe9ce245abb56dbfeac81 SHA512 7c79abe45be167ee9f72d2aa76d209d9e1356f74b524df50fe8c4d0ea79b81fe6dd38a009d68f9c0c275fe20819e571daab5c5cb185ad6959d9340ceb65aec46
+EBUILD XML-SAX-Writer-0.570.0.ebuild 768 BLAKE2B 636b880419d667e5b51a412d7f085d4d32158a181833db78371167d78ba48139d53788ada3f6d0af52a0bbecbaed35b242431befe848496a719fb04175e6be4c SHA512 8f0daeaa0a9990a6719a940de466f6ab5c6cec97273f650611a0099a723766b2ccc0af418ffc9cf99618cae7abc3896a80ce082b920e987cf033ebe2005a9ce6
 MISC metadata.xml 1090 BLAKE2B 9d850e8660f18c9454c3aee8db2f268ea1811ee65ef77abee9c71a09971de2c31ee5b8c39f19d5ac02513b1bc121a146d360819218387c6e865893200a227432 SHA512 015b74cb17c2f62ede3c2ecfd414982a14b574aca86544ed59654f1a47b0af649e6f7522dfae6176ad0943d97fc47606e235e9f626ff5001df9350af537d7c33
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
index 036fa50beadb..a6798b1c4f7d 100644
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="SAX2 XML Writer"
 
 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/XML-Twig/Manifest b/dev-perl/XML-Twig/Manifest
index ebd183361ec8..ba5a5d3398a5 100644
--- a/dev-perl/XML-Twig/Manifest
+++ b/dev-perl/XML-Twig/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Twig-3.52.tar.gz 407769 BLAKE2B 7420f694db127bac536efc124f8735b6c285615781a8ed00d410938df25b629c15dbf0703cebfc0c7ea8ebdcf290826cf66d25052adc19a90a3eb9ad16132a52 SHA512 1594e127fb76c0e53d0bd1f0a12fe3874c9523dd2bc55675d5a6cf44d5682ddea481671f786d3a65e6b69f5307c4da1701529f318453a1f8a22685b2dae793a6
-EBUILD XML-Twig-3.520.0.ebuild 959 BLAKE2B 08ce93cb3ad82805e15882b589f7aff2c9f40a510f37c31fdb603ebb7033eed347409981429362f167cea6cd7e33519b156ec9b6bda433d9dba172a921f726a9 SHA512 d6c50a7b3ffde20dbe6769735885601d185de591b5180e17842bd349bc39173da47e5a33aaa368895d950d54ef3aadc211c5123a12f6ec934aab8e0ac70c990c
+EBUILD XML-Twig-3.520.0.ebuild 966 BLAKE2B c5c7da8cde91ca0310b28b18c27287e8c428d48fc6914c5976ff5d8fa3438a3c9aab1ae5ef71fc2eaee7005fa3b2b9106385bc8bc95bccae59ba3b25648a6e7c SHA512 202243a2cfc9211ff2a4bd00721345baac0526b465d0511ac3bf907b68658bd5e011819cede8bb90bb29ea358cb7c62bbb3cd9cc34cbf4c5893a423607e05fc6
 MISC metadata.xml 998 BLAKE2B a2f5790ed712c731447edd885f2fd8b48b608c0f621e20bca24f640f5d5b3f6c94e21e94913963c4236f327bf14c2a9fc6d709209a191da29015bf8429f4bb9f SHA512 64b1a3797be80d2246fd8214c27ae50ae9e1c5743a16532a49736d62f2dad26713cca8b66908b248934efc24b4c082b87eb024a1ce8d1616a635c57e1ab4e08b
diff --git a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
index 90b6b08999c2..d8c229691ef7 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 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"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-XPath/Manifest b/dev-perl/XML-XPath/Manifest
index 4d77d0c4f710..b3a2b97aa54e 100644
--- a/dev-perl/XML-XPath/Manifest
+++ b/dev-perl/XML-XPath/Manifest
@@ -1,3 +1,3 @@
 DIST XML-XPath-1.42.tar.gz 55907 BLAKE2B 8146556e2f144e12b1303e54bddb5d4b0f6f3fd46ff81d8baf8753f07e97c2779e1a144e46f2f08a9ccb4591bda5bf044063a1c81dab1efbdbb9ade0c537f821 SHA512 170e0d5369f937444ae340dcceccef2e836a3a87f393e4f2915a189d822101278c5046665f1bc9b165f7358deab9207e199903d5d4f2f3d8e62ee04a31fafe0b
-EBUILD XML-XPath-1.420.0.ebuild 708 BLAKE2B 0f73a790d1e308cee36c15521913497bdfeb7ca63f0cbba89b7fb676bcf568247532a5b95af37ea74069e299b90e0bfd62c0e0b484693e5a4a7ec0a94aebb56d SHA512 7d87b2811ca08671d808a419db275f65519c9a04fe2ed46738e1795d7ee0d71cc5e35e3dc372e6354a6be0b878193025ad4b97586bd699a589e7e8bd2d068010
+EBUILD XML-XPath-1.420.0.ebuild 715 BLAKE2B 18e469ca0c90368123054c6c1196742e77acc3daa89e412c94ae6bfa0c6d48184b7e5fd57739ddfaccbe95fdc62fa774b62ad076e228c14d13eea5c084ac53f1 SHA512 9b6ae1f2b4d57e941966efba58db6a4eeea8144ab6eecf9295538bdbee38e1d7a45c394d20ca938cce2c7f5f684af678611bf1ccd975363b32279cee504b2cc7
 MISC metadata.xml 2322 BLAKE2B 764deebac617014956ef0fb69432bea3063f4b5c5b2467394468417e3d5cbf5d3cca0c550d0b8c155f58dca44416c46f9fc43e03f4a17e5a2bbd3f3c90474af6 SHA512 b75e8efc7beb5ad2732323126cd20dad66b01986427a2dd97ace202ab7a65b2d3604df2f2a7c9314659c12ef1f9cb8c5d442b5ba6838dc019ec24edc22d80efc
diff --git a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
index bcea82c83d59..93ae6b265e34 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A XPath Perl Module"
 
 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/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index 816453efffca..fbc586c5df45 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 2020 BLAKE2B 16198726a12e0f811f315cb8f90a143701ec85dd0c9fc2e05bdc16a6c4fbab10794ad8791f03e86c19ca95dbd3a820f9868692d096a73f2f239b1cc482e2b89e SHA512 426cecd9e22a7eb4184329823da763fdb9387d2ff2f72f771953a3541900e5b785518066b57a65a97909a14af039c99bf8598047720db9feb9586c2ef183c64e
+EBUILD libwww-perl-6.530.0.ebuild 2018 BLAKE2B 9be792ba07aa74ccdf843bbfacac4baa6b16ded5d7af28d54fcda14d2053552c38e3b8c7c7d91fc2d6b53612e6cb657f7a28597a2ce7142fb51cea50f854d9a5 SHA512 f1eae30d95e81c03677100c11b4692ae279d1826212d16bba09873875a5db54813c8bbc30183d5a4636b0792e4ca673cbecb29146779bf83657246782a32353e
 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 169074f74776..a41714d1ee58 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-perl/libxml-perl/Manifest b/dev-perl/libxml-perl/Manifest
index 66c440779c46..d13ce9fc0781 100644
--- a/dev-perl/libxml-perl/Manifest
+++ b/dev-perl/libxml-perl/Manifest
@@ -1,3 +1,3 @@
 DIST libxml-perl-0.08.tar.gz 64335 BLAKE2B edfbe3705872e6267a3e578df2721184de14eafb8e8801d0d21dc577b7bee69829aa13873c10df2c871575280a798282924e241090682f3724b3facedd1df87f SHA512 66c1874a04b746334d4324ab37ee057c6da7fa7191dffae2900e0832dab3b2ededc5cbdc5e838c0d57c22161c9cf196ab40b62f61338d4c994bda9fa7b1a7702
-EBUILD libxml-perl-0.80.0-r2.ebuild 493 BLAKE2B 0c3fff03c0df1edb6fbf3b2bd4cfbe1cb82a8336a0a7be0d29fcb6af05f36b65f3408bb9f137bf0cc025b438ad0e5761fc8f5ae1ad1bb9d3e2171593e3f2c4c3 SHA512 d1281eeb29898c7bf3d9d591e8d7b4f34dfaa796638a39ab1e0ccf1a2ff7541f4eabd1c5b9cdf55c7c0db67d65fd86ab06eb4f497436c77736293be4e587ecf6
+EBUILD libxml-perl-0.80.0-r2.ebuild 500 BLAKE2B 39a4c6e2da2181e719727e3eb72ec6bdaa7043411fb7f9452bd94df70474d537cd966e25b4c8d6be303ca9d616ebb722887a2d89403331d97acd51e938bdc91a SHA512 fbf13e4dea72eaf10f1558ee599e0c1103a644262721ff2a29705053e31126e98af7287277c83c5da81d9ad062b0e335d1d316e0bbe93b87e7e428b55c555aac
 MISC metadata.xml 1532 BLAKE2B 214a72ad7c670ec630a8d69b090c1b88929e8be703383963e8f9a9bf89c6a31b4077a1b071ddd0fe5cc0a59904bc77fd815391be9bf0b8fc5fa38472d6462252 SHA512 c21fb26c6f87f6c5610641c32c54ba3663aedfbe3eba485a9c861eb58bbc9ebcb869389f0e75f4e24db0af0d07ba6fcc016953e1ab22c83a6f99e87a4b64b749
diff --git a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
index bc7499e98fcd..a206081cc3ef 100644
--- a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
+++ b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl modules for working with XML"
 
 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=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-perl/namespace-autoclean/Manifest b/dev-perl/namespace-autoclean/Manifest
index f3c1cfd3dfe4..38aedc64f4e4 100644
--- a/dev-perl/namespace-autoclean/Manifest
+++ b/dev-perl/namespace-autoclean/Manifest
@@ -1,3 +1,5 @@
 DIST namespace-autoclean-0.28.tar.gz 36130 BLAKE2B ecbc71cec5256087799f91b337c98d87bbc8be7d670b03b74533f01724a7251cc592f26669756756413dc52d7d25478f22d683e72a9df67a687a862a09819bf0 SHA512 2541f69862b334fcfe30059d025668175de1b182a5c8ee8f2619bf1d661c316a38fe2014f274bb23e887cd36959f98abb297154ac8ceb600e2e93cbd4a75e28d
+DIST namespace-autoclean-0.29.tar.gz 38791 BLAKE2B 7d35dce524f8a5f9ab757f24802f8abb3972f8c3176a5ff2ff516b6a88f547978a47bce0c6be61d91a4d0f72caa5d14b6af2e83ead92608edfc339fabc36e99a SHA512 64dee8009c8ab587c1aef504c0b429248a9069e6cfbfcb4062b83ddf56c82121be66f821013f3251e6863935429e0663aec82202352904983db600a79348732c
 EBUILD namespace-autoclean-0.280.0.ebuild 800 BLAKE2B 17d642d0bddce8bf4ebd8fb97bc9fdbc15e76c18e3704f0c4bb706ea1e7fbb36b47289e2e14d5e7fc10a76d3f1a452a6ab320c75c3502210a0c84d0c8f868dfc SHA512 fed6e40d528438e9727494e66883fa0c6234e3388325141fb336e2594b8101d35f6b188fd48a885b286b393a10c0b1aa071747a5ed158f03c2a41b0f5c76c4c7
+EBUILD namespace-autoclean-0.290.0.ebuild 767 BLAKE2B 5fcae5c2e94f918aca13da9e28fffb46b9148ff582203dcc9e2b4981bdc294d00af151641218d28e252de9b6c4feafd64e96d6169cdac35bd5178145b1ec554c SHA512 51303fdc0b002e485d9a454c58e1ae87cef3792c542b774715b5147d109615ef2b00136a82926b9596dd2c615897fffce742003bf529567e0ce0ad4c9669a8fd
 MISC metadata.xml 410 BLAKE2B 253c1f1b727fa4b6f8e336806756909de12d17a2f75880fedb0dd4abc7c84e096b5b03e4b2bbd493a67a18ec462a7885b12ed50c0db11373eabb6247d3c6b3f8 SHA512 27e0bffb8b96ab0449bbb16249ed023a836f3bc7b803cf03b761baec7582df30ae0e3881ee8b5b120dc68193c1a06aca5ab2f292b8e1f0f464d127c0f72ce692
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.ebuild
new file mode 100644
index 000000000000..4fb67242cf8d
--- /dev/null
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.290.0.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=ETHER
+DIST_VERSION=0.29
+inherit perl-module
+
+DESCRIPTION="Keep imports out of your namespace"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/B-Hooks-EndOfScope-0.120.0
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Sub-Identify
+	>=dev-perl/namespace-clean-0.200.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Carp
+		virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Needs
+	)
+"
diff --git a/dev-perl/namespace-clean/Manifest b/dev-perl/namespace-clean/Manifest
index b1ddfdb2a4dc..826bbab73c91 100644
--- a/dev-perl/namespace-clean/Manifest
+++ b/dev-perl/namespace-clean/Manifest
@@ -1,3 +1,3 @@
 DIST namespace-clean-0.27.tar.gz 17801 BLAKE2B caf9c4f88236eb3169ec6b7fd74157466476166fcf119187d9c455b859aa26edd11884de78c18d7d75f95da3a410fba9631482e7bb3bc25edec209aeb9e0a0d4 SHA512 4422640656602e44c6d3675e55a0e699f8c0e07abbaf11f0b0905043f90e13bb95ee0eaa4c4a08c853296825dd8ef33c806e0a7c284a70448e35ac3354545744
-EBUILD namespace-clean-0.270.0.ebuild 624 BLAKE2B d23df30ac20d3dbb1f179d677dafb18f67c64e5f24063fd4515051b70298f9ad56c65078d9334340eb0fb4885af222b2564b1cd7fb4c24e93b31ecc74aa0237e SHA512 b56f0dbc941dee7e15e9c8aff105e96dd5a8754f5a1b9bd730d052ab0be3bcd6bc9b38c3a128e7a1d5c982893304642c54f141f19d6ec1e4992e6af853335000
+EBUILD namespace-clean-0.270.0-r1.ebuild 586 BLAKE2B 5098728e68950e9e3c7b792663a3af45af60476a8c100fd97788e7e6833cd85f4ba5dda893723d870e3ca1da6385e8b369bf370713812b313b2612dabb92f357 SHA512 be4a07d1947de1815450116f3cbc9d34ab4db861c561514ae5b42dd2d5b9e17e989a24096bc009912fbd84a21eae17a9801b8b049aac9cff647b3537228a71c7
 MISC metadata.xml 402 BLAKE2B 8237a644ff3e0b7543520a1993ebe70da0b6eca32405c9d8d2ac5d1d85bf3bf653387bcf9c09ff68a4e96cc0c397af62637d8e2c9b22c55f5aa8250f80fa8ec3 SHA512 d34109e67cdd50bfca925ee9f3952e179a9fbe575ce6288f13ac08a41cb77ebd7a7b2610e30e59c49f53f161c64ef3dd93a1d546238a5eeddc55bf126b7d98e4
diff --git a/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild b/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild
new file mode 100644
index 000000000000..d5e8105866a4
--- /dev/null
+++ b/dev-perl/namespace-clean/namespace-clean-0.270.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=RIBASUSHI
+DIST_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Keep imports and functions out of your namespace"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/B-Hooks-EndOfScope-0.120.0
+	>=dev-perl/Package-Stash-0.230.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
diff --git a/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild b/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
deleted file mode 100644
index 8c88ef3d60a5..000000000000
--- a/dev-perl/namespace-clean/namespace-clean-0.270.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=6
-
-DIST_AUTHOR=RIBASUSHI
-DIST_VERSION=0.27
-inherit perl-module
-
-DESCRIPTION="Keep imports and functions out of your namespace"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/B-Hooks-EndOfScope-0.120.0
-	>=dev-perl/Package-Stash-0.230.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 5a65fd06663a..ae3a48d2ac43 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 05f0d295f414..52c4dea52757 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,5 +1,7 @@
 DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497
 DIST Archive_Tar-1.4.13.tgz 21836 BLAKE2B b150c7493995c889bd91d24fb7bc5374be6ae157e27522a0d1e5b8fa994a09fdd7a03288263d0931f1d46da3e1b37c80e67cee07d5f54f501531b2adb7f4bb8a SHA512 3ee3dd8c8c8af018eb6c6d32409f2867c49f5a8ef21efecd8fb0a36207ca211eb49aaef02806b2df35aa6613d5dd69c8d81c72f97d4297dee3f732a9ab6ff9a7
+DIST Archive_Tar-1.4.14.tgz 21992 BLAKE2B e483ee9943c955dd6834538de70e8d6821b9abb250fca752e01fec7a62c28f59f65a6afe66adb804565c1f79cfc679fd72a32d0311f231dee424199b2600bb73 SHA512 a0277086221acf0cd01ec342af5afd62f01055a8b3bb4942d7a96d3517cce466a0c8a086411671a18d0f7a0a5e4187a76bad0d5c410c93fefe8cc58992327789
 EBUILD PEAR-Archive_Tar-1.4.12.ebuild 1339 BLAKE2B 6bb49ee44218b20678ad9910601ec45594912b0b6daf7adc0e7331a289fc8846514ddc66b2664461629ca50d480d5d840f461c7ad48c60683a9952ae121d4815 SHA512 a9c556741d824c935e9e1a4007ec6270b7da65f32032d03335353f8fb3676eca9b2404be01444c01d5456eb903c3a7df22d09bc22eb70ccfaead4a5bca6746df
 EBUILD PEAR-Archive_Tar-1.4.13.ebuild 1345 BLAKE2B 788692c5dbc83cf35c4937b3332edb6c59e3f6837f541c963b25227e9ecbb7ba137bbb1053bd83412e05bcf320ec2c4bee72e7bb1196a24d58f67cf3130050b9 SHA512 8aa15cb4e7dda9e75d54035d4f492db34186c49a9e53aec29b280f1038fa183d797850beaaebbcbe575fb9d694199a0b3d3fca3c3050473f523e30e68852e9ce
+EBUILD PEAR-Archive_Tar-1.4.14.ebuild 1345 BLAKE2B 788692c5dbc83cf35c4937b3332edb6c59e3f6837f541c963b25227e9ecbb7ba137bbb1053bd83412e05bcf320ec2c4bee72e7bb1196a24d58f67cf3130050b9 SHA512 8aa15cb4e7dda9e75d54035d4f492db34186c49a9e53aec29b280f1038fa183d797850beaaebbcbe575fb9d694199a0b3d3fca3c3050473f523e30e68852e9ce
 MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
new file mode 100644
index 000000000000..02c0db09b3a8
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+HOMEPAGE="https://pear.php.net/package/Archive_Tar"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r Archive
+
+	dodoc docs/*
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_postinst() {
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
+		-x "${EROOT}/usr/bin/peardev" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
+		"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
+	fi
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index d4b695e61a53..e76ac49f9572 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -6,10 +6,12 @@ DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d8
 DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16f4c2de30739c40a1fae396e7f188173c5ef9356c6f55922457ea52c7c3e19e9040c37e86fdb4575016aac07808 SHA512 22105ab3f831ab89cf80e247c6e6f6263f3116a24394b9367b7e7c1e1aebfdcf9bb833add4763c34c621714dd8f22c87327ccf6c8eeef113f753ba800a111a5c
 DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9
 DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652036690c2e31b4250eb4a0e3607a1b4080745642fb085be75dd1174073164f9a8a1422745b4bff5887df694fd99 SHA512 d3214f39651e323b419979ed150d5239f992a6b643048a73a777ece0a1b3d5e3dc2c58a5084b3e825834acc258c18947b0c6461c47960a10552617c8f541df86
+DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
 EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.2.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
+EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 MISC metadata.xml 804 BLAKE2B 7d5f809e3017ddb3836c494f03798eabd9f604ba6987ee1c0b6a21b0b6697e7142557f03b066e7b236c9330cf8505a87c906591fd571545294b70f3b70f2377f SHA512 cada8e3b771827502011a1f074082ef7193b014b7ac2e1efe3f17e6fc126d712e64afa0ec6177e8c0d37681d5d57daa04637e89cb10a783c6278c58606e12ab5
diff --git a/dev-php/composer/composer-2.1.5.ebuild b/dev-php/composer/composer-2.1.5.ebuild
new file mode 100644
index 000000000000..1dd769c75b17
--- /dev/null
+++ b/dev-php/composer/composer-2.1.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
index 137049b8db31..e2909e75c15b 100644
--- a/dev-php/json-schema/Manifest
+++ b/dev-php/json-schema/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 272 BLAKE2B 35cf5eb6efc11395c45a12a98d2882bc249b4496cba7b1ceba2abbdfa5dbec43a782e1034701f72e12d586aa80460fa87f0623f497f0da33cd8aaff7948d7370 SHA512 d5b970d485d198c855dcebe4c04adf37d7aaa118d7546c3b6d73944809c69ed18436568e33f847329a8027220f735cd5752ef5019bf8dfad40a740d94d02733c
 DIST json-schema-5.2.10.tar.gz 31261 BLAKE2B 2f2e3f562552105e924aa3e4408e50c6e42171cb8440ca8009166d956dcb9d4d6a3903c3b7e62bcfa228069c1e17f4faeab56e56ff935fd59fe251d27d12ab3a SHA512 b6d31b5478b93ef7dea741307648734d4d93aa4c0518b0037e81f5411810ea0570a046adb314cbee3f06da4cc9e654c419ff0be75b6ad0f5d3770c03be5707c8
+DIST json-schema-5.2.11.tar.gz 31273 BLAKE2B 7b5309c772816de08a6a3b600cef1291385357879cfb1e48f548ca2cb666fc87454064d090d4ab662d7937f0bec99bc4f0f304876dd2482896aa5bf41b2ed85e SHA512 1b1981dd12fd8642c26d3be75b40111320f89b6a917dabad087ff40d3baea78304e5611cf2b931e6f8e48f5ee4d14fcbe18c68ba76a90b59702783aea5d63477
 EBUILD json-schema-5.2.10.ebuild 858 BLAKE2B e8f206b58487a01e3830d8b6aee6a065db5fef28026168b70e67aa0962e7562e0281c4e7e4b0330dfa54421a06bbb760a4cdc5752eaee4c19937c7af60ca13cc SHA512 fa9780f06d4a76609e9ba9e5a6c7c5b6c576cf3538245c1ce00db8aede778d0628cd53aca985b4e83cd59d81844d2e358ceea5607935c34f01ec143fbe18f758
+EBUILD json-schema-5.2.11.ebuild 860 BLAKE2B 64f52cb1a1a872c96b204977b21241e7ac181ec134f2e4684bfcdde592469bee858b53061c79735fbed294bae22bd193c94b98441504af3149b53d7326a89c54 SHA512 42c9a9b3363e0402fad0910576b9ee949066439074ab8e657fb21c6955a2b74ce4ca9488408461c14c95549389b2bf712f8dace61eea365a7e4112f7bc191547
 MISC metadata.xml 593 BLAKE2B a68b29ccf5133a7c4cb1715fbe9539bb10469769db9ef1f6d526b81402353399e943079f374340393a13b3a840b3d0e8b71213c2267ae863b22b0ee53180c136 SHA512 1a107de444658b5f0bc0bf413eaa85faed542a9788b47a5f60b807663b8f19c5bead35871881dd4aace1e886d9fe9d2c0dbd77187e9d27a3b81eb69f52eded21
diff --git a/dev-php/json-schema/json-schema-5.2.11.ebuild b/dev-php/json-schema/json-schema-5.2.11.ebuild
new file mode 100644
index 000000000000..88ece98fe120
--- /dev/null
+++ b/dev-php/json-schema/json-schema-5.2.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP implementation of JSON schema"
+HOMEPAGE="https://github.com/justinrainbow/json-schema"
+SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# Tests are not in the release tarball
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-php/phpunit )"
+
+src_prepare() {
+	default
+	if use test; then
+		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+	fi
+}
+
+src_install() {
+	insinto "/usr/share/php/JsonSchema"
+	doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
+
+src_test() {
+	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-python/GitPython/GitPython-3.1.19.ebuild b/dev-python/GitPython/GitPython-3.1.19.ebuild
new file mode 100644
index 000000000000..87d5f7d31add
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.19.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 pytest
+
+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
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 3563d8cbaee8..5ab639afc44f 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,9 @@
 DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde29314b467811526f67629f181a62b2b5ba235a3302b979dfd87993deca238a91820b3caa58fcb7cf3aaffc3bf76b0c731 SHA512 91fd937193db8a948fb575bf24a295c349e69b132128ed3b0c4fc3be89feb76ff47f31afe422c99ccbee4cf908b3040e9dd3f568db74785d12cf6cabbc356daa
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
+DIST GitPython-3.1.19.gitbundle 9507079 BLAKE2B 7f9304c45784ddb779642df6b4412d022dad5ee20f89e998281db426928ee7bfafadb9a849e174c7cf850b049697ac097e1d144ca40f86497c6bab03e32ede8b SHA512 1fa8b01b27a993221ba4771aca416c724c12c208169fe4a6e08666ebf20c8dd870eb01f039d33ed13d664df5c6126cc4477994092ceeea64fc77f28a68cd9279
+DIST GitPython-3.1.19.tar.gz 187639 BLAKE2B 835a43edc7adfbb6253abb904d2f313bb597418c749473e6ce5deef67e546ee5285146a3a8c34d6afc4f56345e3e6a6481899465c8598b5215dbadb59b0bd507 SHA512 019a558fbc60c540872451ae1cd5ab029d5b3c5d5ed4979dadaa0e1829548e04bba62173a85d8fceddab5a19bc83e1750d938f73e984a64747550e6936400c9e
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.18.ebuild 1929 BLAKE2B 3a33df8a43887f52e637aa66dca50cae9920a7e00ea51af8d0980ba79ad67882c8bdf362f4c8824d6a2475388f7d04327d8624b346466cc2a4c4d5c1ace3716e SHA512 34d346d78b2e7e57d108bbc65476975f31effc169fe69b8ad5fc253dbefeeb23db3faf461de46e427733191fa12aa49f49edbbb7e438d7cbd579dfb9d1b81d77
+EBUILD GitPython-3.1.19.ebuild 2032 BLAKE2B 0db75c2c178d93ad3bdc72f94bda51d9768dd7ce94fe5cd8ecdb5aebb3598f3465edaf93527f89dfe35034504054b801705688ae5e0a419fc2eea8d82b805490 SHA512 15855219ad51288f129755a8a7f7a85b2a720731d87cc98273f1309de1a6769d8f2642e71e38a2f9d8541e567934965133191d29cdda2fd1fea782ccabc076ce
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9b0a11a27cd3..cb8bd94b3636 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index f103231513bb..9ae880bf0774 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD PyQt5-sip-12.9.0.ebuild 626 BLAKE2B 2ab1323935acf4aef2ed8a323ea37d6b1cbabdd6bc51fc4f5cad2463e1fd23d4d52cc7978191d2e7947496b7dc3fc38eb39e08803e5822851c9d079e3073e5bb SHA512 2193afd19e05f57fbeb92d591bd1a8a78391747cea55628e71222d08a9bf17fdc50cc642080c7af8547cc5475a623465baddfd71a5427c1caf3f2772dede6a64
+EBUILD PyQt5-sip-12.9.0.ebuild 624 BLAKE2B 7a98c0d732bc07ae55892090d9c64767e3d7c661cda383ffe6b5730174fbd268fdaee61b811527bf384d5743b1020967ab4e8b77142cd1322f2e7d4847870da2 SHA512 ba14181afd43c520a854d12f347ddafdb1c6ffd05125113f4e7e28201b5bfe0672b17399f5a6adaee3aee96f68230cad4154133750f350fbf0b699a7e4c703a3
 EBUILD PyQt5-sip-4.19.25.ebuild 2048 BLAKE2B 0ea21df4d969c0f922de85e9aebf89d1037301b7b420a742dae29063391be0bbc264e88a2673e2046dced52def880b84c0b7af546f8bef6c2f85f2aca8cba1f3 SHA512 30cd6bbf428e0749b4fb34f7ec33c95d54d305821db022a30a8cfedea49badd83f7c8bb6b3d616ad2b499ff8c3d82728098ddface1d45be8144a75f67b2d4a4d
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index 7b6eacca3cc8..8965008f0016 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -19,4 +19,4 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 77622a6c736d..b80a2cb96775 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5436 BLAKE2B 6331b07f0f74fe65e99465518611b1bd0fc5609559511e1e4fdb634dec13ec3cf726d2e1898763a38370a7172ad9e759d7f989d8dd80b09dee920b9a8ffa98c9 SHA512 4ef0c7099c5858eec7159a39f24f9554dc20127a338d54830214cb06efc828e4f0e5b7464cbd8c1da7fe611c8e77fa0919a412c2968d877b1a90bf4a196e7c0d
+EBUILD PyQt5-5.15.4-r1.ebuild 5434 BLAKE2B 025fe217ee4c9bbc7ca527fdb58830bddc04be3854607cf0e9fd7e8e9c3eb1a340209ae47e842613381e12fa7d3c488e41f583c1a8ec2045c0752ce00881652d SHA512 500fb65d0320a04b600e69fac5ebfb7f7dc1a05b93ff07f886d923d3421c6c52ca1cdff60cb42d607bd1c7517b169c83f4ad0b62ac08fed5e3127e53049355e3
 MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index c184e736ff48..3df5fd4ae177 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 1483f1e5920a..bc7a49fea4f7 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 1708 BLAKE2B 64d902a7393e50554350bb76281f592e0d4b6cd68131e7bfeb84d610fdf08cf0e85400699ec0f361e302183ab81284fe99be10f5329f4f7e13884703ab5a26ac SHA512 26f41890f33277171b2d473635878be377126d48ad9d8cf82a7a4475bc99b35885389daa9c70254819b2c44935b4ec2de2997644d1df4f8fa92eeea2a274bc3b
+EBUILD PyQtWebEngine-5.15.4.ebuild 1707 BLAKE2B 38c1186a305c4c2e5ecd05a7407a7a535c023a35160853561de4747f1e70406d25f6db94273af8c3817171e7726a200749c57955766c507f477e97a2eecac063 SHA512 b42f7f5dea9802588aba25c7263588afe76127644a0b5d7a5d50d01af5c7019e220c6ecb98ad37ce5402db0bbacb56eb72add4e656da439976fe1b80820e7174
 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 81bcbeb17ccb..8aca0d1edee6 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/QtPy/Manifest b/dev-python/QtPy/Manifest
index d46fe415bec4..1c32afdb5e2f 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,5 @@
 AUX QtPy-1.9.0-python3_9.patch 401 BLAKE2B a28d4344fd4dfed3270d4dcfeae7df6a12ed38fcab779dcbf3e43798a0385960b3fa45e5077ef9c7d00cb9fe69e84653668a09c50c5ba9dfb5eb13e7b23cb554 SHA512 c0996c53cd3b7401986c11510cbe9717ec7448c9b4d6acfed43d64c2c4035e6d474c90783f7d26d8eb530c9ad91297e02d4b27c95fc1ed026344273be455404e
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r3.ebuild 1985 BLAKE2B 82aaa05d5afd83b1ecaed22a5f0b69fe03c9520dbdcb847004447361e49cd47e02276a07abd866d4fc601ebca9d93e24f70d73ea4729a7b3eedc5e40f51701d5 SHA512 d4225cdb1b33c28f8c31a6253fdb52d5a55c27a539e1632bf4c375c38357d9000447a549049949e850cc0b1d5b3f9ba9f5c63b4dca35ad8176bc109bc2e029f7
-EBUILD QtPy-1.9.0-r5.ebuild 5743 BLAKE2B 14d6fd460701ecab1524aaccd4edf0a22a6ab39da9c24b47d7177e939d03f5b1b9ca0b0bf3fd960f216d15fbc2e8f86e433dc63ec9ba88851ee3035ab44d7326 SHA512 55cde53b372dbf8bd86b81ce58062253473f7a34552c7236950aa201db19acd16d50009b1dc401a4e566249e88427a056f99cc2caf22e65eaeb6be48474d5c5d
+EBUILD QtPy-1.9.0-r5.ebuild 5741 BLAKE2B 26d4998c307431134d3b4098872b806286f068449f9a9960e49bd403e2bb2370749183318dedf6163710e02132728c17b6821d640b3b58137548e2c2fa35d84e SHA512 490f95492079e166736d78e7a16b651f91f4ab76537e007cdad1b3995840a394d4bdecd8e70533e894da0f55460a14f7e127ae75f33a58e7dbcb00aa61d57542
 MISC metadata.xml 2903 BLAKE2B d3efb9532ee6bf7bb8d995baf356d022be803b0c0649c01558087f62bdb9b7751f4fa1df63d57916faa701cfe1111ab23c31f8f4badad2944a4522eba2d85068 SHA512 8af6cde3b273124f804aa6d91448baa3344982aa6f533ded0492296c27cc630782356397d11bc4b8289d7c081849402e780a79a18b086ab93632c1baf3615025
diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index b1afa53aa7d3..c4c03bc5f4cc 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.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"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index 9306ac7bb915..02bbee3047a3 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,8 +1,12 @@
 DIST adblock-0.3.10.crate 7678458 BLAKE2B f15dfe6ecaf1146ab0058afae6bcdc179a9c870c0bb00ea0061ac7726a77c89a44ccabb50eb29a77dcd72eeae6533e505ad34e0d9a75cc4bf9fa3d304e16a1a8 SHA512 fea38d9204d2ac7f8a289d3affad18bf814e9054c2955f8e259454913371d30751c6a090a0a09b844bda46083815c8a9a4326c8f9fa210ce71b5f9adef7b338a
+DIST adblock-0.3.13.crate 7691310 BLAKE2B 0d9958235c123ff09256f6512c04474c4dee10c855b7161e32f3dae517959bb16815adbc22787648a1441e04a0ae94b89369c6bf9e3c61715638a4c452676a1f SHA512 f534c49d60118e170f674415a20075f15a7e45187d9461a0025acaf3fb9a94388ed7f99d15484a0354d8953798dd8ae720ca77f6faa59551e9d99d937a3bdbb4
 DIST adblock-0.4.4.tar.gz 22207 BLAKE2B 8337b41627af07a83586c174c0ac446dc43d8a3031d7cc758dbd987685218983f355155b812c746f3b736a31fd5ab835ab59c37234bf04dad1ab2d3c48b13b2e SHA512 19d24fe79d798825bbe00efc552d7c7357073791e3b4cb591aa040bb44543a9fba3c872cbd5e77e1d7a07e459e2d3c33605cc0fe47466ba210b18dc0aafef395
+DIST adblock-0.5.0.tar.gz 23000 BLAKE2B 4d1e991341e605484df4c96b3ebffdad261a7c90d4aa1e14a8e6258b1a5368fdd3215a9ae3600560a082f91cc34d005b271f5904bb883f938bbe5451d4ad4e64 SHA512 5ae9c979a769fbfc89c26d2c5c40a1712f0573707840b3bf35acf7bd15d2c22f08dfdbd384ab0e886568aee686ef5da3ab5f1cb73bf66491831be24977e6173c
 DIST addr-0.11.8.crate 89500 BLAKE2B 365d96ae27f6e62e09c23362d667d7818b62e2c878ee6e4cde59016e19ee31ba320dca289c02aa0d542e0aab3e828c18d5e78c7f2c9b101ff86a8c370f91e5da SHA512 4ed5cfdd88e9a31b64a950824e2ebcbec8ad33612fbc815e9eb5225af38bd8dd4250b506fd089e8d32cd6e6003b60172b2c06e20228b993d0d11856fa4340fb5
+DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -25,6 +29,7 @@ DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
@@ -43,7 +48,9 @@ DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
 DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed1828ca6b09ac9511b8cb34a1092ffcb8b5c34f2e97cbf3ef44b5ccf99a2b68c4e8a202066380fcbe114fc8286df25 SHA512 e2659afd22446e26190008bca8cbf147e09eaeacd0518d81fd26c12e26d9fc06b48844719827cc392a882bb927d62e1d7d946a0426f81eac36cc882d8b0c2d28
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
@@ -65,4 +72,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD adblock-0.4.4.ebuild 2226 BLAKE2B 6a2acd3a1a33c0ddee363d982d4b99566e555d6f699c573d52feab38f681f48e04c4065f48638c90c5ce15da629cec77a5c4284e939db25e91416d526f61250a SHA512 c95ef87d201e3cf5649dbac9ee55616bdfa6c3cf41811c9b0a0d75e5e1f58971a05ff97fd494a8778f774521ac1e983cc34119f9af4f41d124eed636a820b4cd
+EBUILD adblock-0.5.0.ebuild 2294 BLAKE2B 3272ad30dafb7e7226378de6966b979f14479381515fe672d73f728ff338bd48b9e99ed4b7dde419b9b2676cb1a6a5e95f4c793819495d958c8ce15874c432d3 SHA512 8738a2bf2fd43c0230fab3316a43cb7c9512ddae5bd75d9c8f6bb4fa0ee58bb3e546505774887307082cd47b134967059508992ba2184777683eadad6f825732
 MISC metadata.xml 247 BLAKE2B 25c731c759786cef3c3ffdb2513becb723ad51c2e3902853311cf3845ab1e9c193672430b2ba6510df55ff43039f593a6f73bc8e057ac6237462b814beb69d37 SHA512 4926bbe8526eca3acea716f8f865c02398b29f7b0481eb07cc9c92f17974a44b038db4489bdd5ea9fc8b73e6e7212bd6dd0948727f8290b5002014291e748de8
diff --git a/dev-python/adblock/adblock-0.5.0.ebuild b/dev-python/adblock/adblock-0.5.0.ebuild
new file mode 100644
index 000000000000..5ef500a3655d
--- /dev/null
+++ b/dev-python/adblock/adblock-0.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adblock-0.3.13
+addr-0.14.0
+adler-1.0.2
+aho-corasick-0.7.18
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+byteorder-1.4.3
+cfg-if-1.0.0
+crc32fast-1.2.1
+ctor-0.1.20
+either-1.6.1
+flate2-1.0.20
+form_urlencoded-1.0.1
+ghost-0.1.2
+idna-0.2.2
+indoc-0.3.6
+indoc-impl-0.3.6
+instant-0.1.9
+inventory-0.1.10
+inventory-impl-0.1.10
+itertools-0.9.0
+libc-0.2.93
+lock_api-0.4.3
+matches-0.1.8
+memchr-2.4.0
+miniz_oxide-0.4.4
+num-traits-0.2.14
+once_cell-1.7.2
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+paste-0.1.18
+paste-impl-0.1.18
+percent-encoding-2.1.0
+proc-macro-hack-0.5.19
+proc-macro2-1.0.26
+psl-2.0.18
+psl-types-2.0.7
+pyo3-0.13.2
+pyo3-macros-0.13.2
+pyo3-macros-backend-0.13.2
+quote-1.0.9
+redox_syscall-0.2.5
+regex-1.5.4
+regex-syntax-0.6.25
+rmp-0.8.10
+rmp-serde-0.13.7
+scopeguard-1.1.0
+seahash-3.0.7
+serde-1.0.125
+serde_derive-1.0.125
+smallvec-1.6.1
+syn-1.0.69
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+twoway-0.2.1
+unchecked-index-0.2.2
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-xid-0.2.1
+unindent-0.1.7
+url-2.2.1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cargo python-r1
+
+DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
+HOMEPAGE="https://github.com/ArniDagur/python-adblock"
+SRC_URI="https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/maturin
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+QA_FLAGS_IGNORED="usr/lib.*/libadblock.so
+	usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
+QA_SONAME="${QA_FLAGS_IGNORED}"
+
+src_compile() {
+	maturin build $(usex debug "" --release) --no-sdist || die
+	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule adblock
+	dolib.so target/release/libadblock.so
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	python_foreach_impl epytest
+}
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index a8ec88a083be..4493e8cfd042 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -2,8 +2,10 @@ DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a
 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
+DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
 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
+EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.2.ebuild b/dev-python/aesara/aesara-2.1.2.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.2.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/amodem/Manifest b/dev-python/amodem/Manifest
index 50e788dbbd48..234aa4db430e 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,5 +1,7 @@
 DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
 DIST amodem-1.15.2.tar.gz 30438 BLAKE2B ca8e4d0a1aad5a3c9b10568e7613cba95a7bb356b5ac46cbfb383ce057012ed385abcc7b348ef18090b49fe00f402f79b6ebf719e0b938c960f38593c0acd3e7 SHA512 3d0a366c19fbdaccfb990e875e49935fdb2b6d2a3bac69182ec2c7e51e67901429c968f41edcc2dd98dc74e90958a58a09b24d0d4d36ea7256a4b945881483b6
+DIST amodem-1.15.3.tar.gz 30297 BLAKE2B 7ab9bce50eee0fbd788fc42ca668a187ac14e5c8e9c6d2a8c4fcddf24ec77a5e40c37edf21222d49f984d343adf46ad710973dc689e18e9065b470b4d1e3a5b6 SHA512 72e574bc4ddfbe949763427587ed2afe8baf153188cb2c6abda1c9f0e9e8f483bdda1edff9278519130b1b5d5487527d83cc9307e6f47a7a86404757199e0712
 EBUILD amodem-1.15.1-r1.ebuild 592 BLAKE2B 19bedecc070ca6472177add7cda6ca1c6a166c7dce2f9910e41c837f115a6d4b8d887b9ea50808f34aa97517c15dca6bfb76203c8106e156980a8a80ff00ed00 SHA512 6cb8c9dab01249327c1cdb80fa6b21e7b4a9dc1eca682d6f6bd31c4c98cc497946a88d5576afcfa30a880153f7654d1896e5c68761c5cc1e0b8df250579da115
 EBUILD amodem-1.15.2.ebuild 559 BLAKE2B fce820f054e8fb30172eea22a4d0dce73f38a259cc523ae15f0aa277ef66051ac0984687a8733ba8ee6725653fbce9915b0aa5087328c760c8953acb36dc929f SHA512 da49d508be223cd057eb0767f26fbe5993b9e87c758b8bb41c557d717ae5676d86dc59bcaacebfacb22493173a52a14dc2089997f1b761c477024d51f6a33f0c
+EBUILD amodem-1.15.3.ebuild 525 BLAKE2B 4b3d4534a4ab01b983faaaefce4ee1ff01ed26e5f7a5aae802d44d88ef0f9f075e0af585708331425f16590833ae083d31cac55f06d482a6d1f2d0045d6a8998 SHA512 f722ee4da7f297c5cbe0215aa3ecfa6eec38fd3f33ff31772fe2e56b814cd74c8f24c0aaab9acb94e6d48bccf3af54c4ef7d5f3c909a994cfba0c9b60def4dea
 MISC metadata.xml 569 BLAKE2B 676247b7bc7d89b0f6fa2d591be617e02493c5c4cb7b2cc5879cf395136d5466093d2da0d08314e95c03ab1b12c00dc014ff717b7cf5018b71a08793c553dd26 SHA512 50d0c0ae9e5ab4155906706df3db3741db9c938a0d8800639c30c22052f0012dda8a78ad1a8608af01f823e93fe88f762c0c3d5e1fda5754d2fe133b36a40890
diff --git a/dev-python/amodem/amodem-1.15.3.ebuild b/dev-python/amodem/amodem-1.15.3.ebuild
new file mode 100644
index 000000000000..f26ce2b39b7f
--- /dev/null
+++ b/dev-python/amodem/amodem-1.15.3.ebuild
@@ -0,0 +1,22 @@
+# 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="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 5ff008e07b80..3953256e0210 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,9 @@
 DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
+DIST astroid-2.6.4.tar.gz 364123 BLAKE2B 742d2bbe4a4056406b14a61d6aecb37d7add577b6f97b0649f22f7133a5ec0af30b0a7e195817681d014ae25fb69684d776a45948709cb6c2e349352da8960d4 SHA512 d81aee724804438565ab8d49b5df132e528989a3f746f9855ac841c98f06a85c72a7749492ed2856657895e948548f7f9293e4347f4247219065592d2eebf642
+DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
 EBUILD astroid-2.5.8.ebuild 1189 BLAKE2B f519059d0c45508e587e62b79df37ce94385e97bd71c4e91d2e4b3845c55104b21ca3a689873782a0e1ced58d3c2d67df31cdfc9e4294d81e91023c264e0f461 SHA512 f63e523a3f82497443b1a7e72da6298ef8284d72074b7f87209497334795a47ec2a9cc09c7b960d77754f99adad94e36d80dc62fb25518d90e42f0f0e5c63424
 EBUILD astroid-2.6.2.ebuild 1203 BLAKE2B 76c0402208fe16f0efb7083e0dddbba8a45ada958eee01b9386f202e98596e14a3c85bd7d9543b54dc7fe15fcb3a4f7719145f0676e1157154b134bf32651b22 SHA512 e56dba9ea2058590585d088140ef844f65ad450fb1dedbcaf56eb82f2e4b1756bd34ed6e4c5749f1f61476ea89dc28d46b1b7e91b38e8a82406e39a5fa7d5f48
+EBUILD astroid-2.6.4.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.6.4.ebuild b/dev-python/astroid/astroid-2.6.4.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.6.5.ebuild b/dev-python/astroid/astroid-2.6.5.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f12c5ef53c07..1e354c3db1c7 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 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
+DIST aws-sam-translator-1.38.0.tar.gz 895012 BLAKE2B e3beae1af8b9fa510f3f21f4f637b0816084c206d49009106097c3b58ef8755b51041b6908fcd04c28b18e512b782570f84f5acfc7de5c6cab239a70e5bd114e SHA512 d76ef3e95bf5e4db1cfbfd1df9928d8f62dd1245f6629ab5078c4f3761e1d5e4ac372d698aa8fba1f4f77a38826c2e9c9f4899518dccacf56ffba2f89ddea801
 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
+EBUILD aws-sam-translator-1.38.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.38.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
new file mode 100644
index 000000000000..9b41296baaac
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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
+
+	# 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/bitarray/Manifest b/dev-python/bitarray/Manifest
index 95096270a01c..417971e3f198 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,9 @@
 DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b74179e361f1e08644d3c4557085bdd99931ce9cec633e39d4fd454fa36d0170c5057a8931cbd8ca2fb8f3bdf71dc1 SHA512 de84b8b1c84be32f946a5f12e8a6ce84f9aecba6e5dc28c0cb0e1fa59434cc5b0757cd5e0b616163b134d460edaf4d53edd53da86ea517a97c818ee83855b174
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
 DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
+DIST bitarray-2.2.3.tar.gz 79709 BLAKE2B 75bb085914fa5f7b926ede947d69f7a8de1dcd8e61917d1e154049102c539e78a7d0a4bab181a8bf8a19338d0d73124d9aec5f746f25d12a8f5a0c188f309009 SHA512 ed8641bd12a87e440642535baab62b132ce4499b8525a699eb82926b098d7f9ce6f66ea07846bfacabcf45cdc1d30c12c104a0b1af638efa8ad809329914a186
 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
+EBUILD bitarray-2.2.3.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.2.3.ebuild b/dev-python/bitarray/bitarray-2.2.3.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 67571011d038..f1dc66c6eb06 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,5 @@
 DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
+DIST bitstring-3.1.9.tar.gz 408443 BLAKE2B 747ce06fc33681cbe63d706c2dace5ebce314aea1ba45f8a5a9d65f849bcf253fa9354e39fd80731af4845993e418f27232ede47c940367b8cb425867ffee8c9 SHA512 6dc9c8d683e4415dfd685153b350bd5462117c49c7d8fcd9b2a066f927d82bb2bfae1cc5df543dd38c5e65b93d453ad13d2937f9523b77b007b1234b24ba7be1
 EBUILD bitstring-3.1.7.ebuild 609 BLAKE2B 0df85b6d07998bda4615101776e33312bcc85da3fae9ea4cd1358cdec33405ade6f7999c050d8d7ecfc95e62e02117427e43305a01897f631730ee8b9fc88f8c SHA512 f6506e19231a6ad124693af8baacbb0251573e431ff83a5e7d34306355393ececb3d7166d640fba61545eeaba118ff26ea5f889e231c99de06ecf27f89708987
+EBUILD bitstring-3.1.9.ebuild 582 BLAKE2B 6d7a214ead7da14de4205d73290d07e435d64125f5fd93efb71b243d07747d40ddf7bf218d17f45564009ad5f3720f2a3b6e22d005690df45001f5dcc6811d02 SHA512 2b82f633c2ac0053796b7095931a8ada6f409878cebf3bd2005b5d1ac097928a1165faeb8ed1172005c272c44ae0477bbebd8e900aa900f091120f3becf65059
 MISC metadata.xml 732 BLAKE2B a9b70595fe02e148ffca9507d10b32167a12f8c96d10e5c37a33be5c469d450ace9f58e0c2002334c2519c2927b2f074f0b38ba46fe8404353737ea65e09993c SHA512 c192d76abacb6e82cc65877ed9cf211e79e944aed79242c0a01808dbef8c2ec2dd5d254c0022cb17d5acae33fc8065362f0c4d512f3f440b64e9247daa52d557
diff --git a/dev-python/bitstring/bitstring-3.1.9.ebuild b/dev-python/bitstring/bitstring-3.1.9.ebuild
new file mode 100644
index 000000000000..6e59803ccaf9
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.9.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} )
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests unittest
+
+DOCS=( README.rst release_notes.txt )
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 0cd71334b087..206dcfb56794 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 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.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
-EBUILD black-21.7_beta0.ebuild 1334 BLAKE2B 437d2ec4445a6653d4415e3f307fe84468eb99f0422bc1a0919f71773de361224ac57e52e932c595d77f4865c4726f5c1a64a4f740e25dbe9d3485398af946f2 SHA512 7450a4f89eb092402f7b662588fadeac5a2febd13f6320f303678c4871882a6fff9672cc11c771bbb2a96e0a10baba7d1b0bf9ab63f86dc67fb59193dabd4a65
+EBUILD black-21.7_beta0.ebuild 1348 BLAKE2B 4b42e640783f97530531950439c5c23757dd8a0129c01b53a1535a8564b4ff4e29ebf12012445067dc4a87cfca242644466ca96f67622c00ada098cd6d35a5dc SHA512 8ecd1609e65d6e6d3b46ea16d465f474905d4be7cdc27c867e59733d902c345630ce450ba130de08fdf2212b63aa7bce2cd42c0e88cc8897d9567ffc35c79281
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index 38f9c3e07d94..6c1c2cf07008 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index bf03e9c4823d..bb21828e53dc 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,17 @@ DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98
 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
+DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
+DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
+DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
+DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159434db8d492edb8d93f3d872757dde5adb358b89af80d9fb3f489fb424a4de6f8c62ac14220b22588bfb1ff0e SHA512 9292241055684dfdda22ec2243b0d64b00b3fa3ec73b3209db8eb8d90c14aa5aa2d7a77cdd0670350227ed6b923b9142842ed5bc8a4fecbaa4705a90af546022
 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-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.5.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.18.2.ebuild b/dev-python/boto3/boto3-1.18.2.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.2.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.3.ebuild b/dev-python/boto3/boto3-1.18.3.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.3.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.4.ebuild b/dev-python/boto3/boto3-1.18.4.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.4.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.5.ebuild b/dev-python/boto3/boto3-1.18.5.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 26cb3e2ecd71..c0dd5fb67e98 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,9 +3,17 @@ DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a
 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
+DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
+DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
+DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
+DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc413bb3a2e36b2ca149f4edb0b8b750cba1149474351ab52a04e08018de81fab93607eb65e19b452a80a249cefb5871 SHA512 ad84b3f75883279452ba9922492e1a63b9f951ed54767feb573000d077335eb50685727ae1924d02f23d5342bcd8f96d2a56b06efedcded4b718e8ec68f6d636
 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-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.5.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.21.2.ebuild b/dev-python/botocore/botocore-1.21.2.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.3.ebuild b/dev-python/botocore/botocore-1.21.3.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.4.ebuild b/dev-python/botocore/botocore-1.21.4.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.5.ebuild b/dev-python/botocore/botocore-1.21.5.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.5.ebuild
@@ -0,0 +1,59 @@
+# 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/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 3f4819cef066..c77ac3384bb2 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.3.2.ebuild 684 BLAKE2B 7b191a2ec704b43b9a804449e505895e549dfc59411549b15a5f12d2c56e713bb133be5cea3e2a6cc4e2e8e1b26d5cc996d90e6119f20c34dcbf53af25c86fda SHA512 6670647c1b69301bc1168b1a6462d4754a5c1c29ed4148b5cf2a2539dab29dbcc6f45f5238f4b5b849f415780143811ccee20c3b5935395939ccc02154168fbf
+EBUILD bottleneck-1.3.2.ebuild 691 BLAKE2B bb72a9571480e7aa2e448aa594de34833a66d68ea7421e35cad7b7905138436dce7112bf49e643db62e241317b88a97ad02ec61ea2994680b614c9e155afae58 SHA512 c3b1fc381b7e15c572c613de75064a7e61487dbf7a2f4b0eb1ac904c8bda91ab67f2451f31fdedd72bb72a7100b6eacfd431afc98d1d007b8873e4708f62e7c7
 MISC metadata.xml 352 BLAKE2B 3ead01da9109e52e74befde776364c4d88aebb02d1d6857654d3ceb3f9c8bc6710de6d89dba16151497055e1a18bb6c6ba012242c1ce7a9f4b3d1f5f943992d0 SHA512 7bfd46f9995d2c167dd572f409900241f09beede06bfd79c4ddf8733e0e762fc2ee86379be9cb0dc57f7b56643ac6be36172dc0966cad2a6736924766bcc5415
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index ed1fd761efa2..2bb815468f3f 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 0645e12bc912..79b3fb1fbdae 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +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
+EBUILD charset_normalizer-2.0.3.ebuild 607 BLAKE2B 4c9807834a2137fc10d5aff25a7e611b7e3611072d0d4af55eb51578acfa2a3bca7241d768809c4a02596402780f2c321436f37aa01509679a88e1e3c2128809 SHA512 a4a05ddb41008aa5f8835362a2e4568d5e4c747c3d40f453d18574ae5ebe467bdc8c0548e5df524b61e56e6586ede56445d3f50a75e945b3bd62cd9bae51a233
 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
index c31319b41abb..8083f63539bf 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 629fa1097f3d..dd7dee6604db 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,5 @@
 DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
+DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
 EBUILD dictdiffer-0.8.1.ebuild 1022 BLAKE2B 0c7acf3350dcebf73b7a79393f48cde94784a996a1d79431589308fc309f52d62d20153e4b1722b0a45983cdeda91f20cdc470b0884ac636b07e3102787a82c7 SHA512 53fcbba5ce9807030b85c3dfcede681c6da5623516031b0b118e7aaa9e77c16adb2deb8eb6ae6f280ce5d2d2b22867fac7ce8ab51cb419ad09c972e9a002bcb8
-MISC metadata.xml 422 BLAKE2B f926b468982f49d593d7752f56f8cd984dbeb0ddcbbf853612a56ffc63d3a2fda04c2780cb81139eac4801b1a0ae494dcbb9777850757a9e256136660dbe8f69 SHA512 e823a29e9d83a8b011c66085debed2ae9f48ed3208ce7f79e1f51854c9ca7231993e7a426da6273ea82e0c30f1ad6fccb0c9564290026f187fa94dd6e7c7e098
+EBUILD dictdiffer-0.9.0.ebuild 937 BLAKE2B 83616c1c9a1d17648e0f9a052db24a65d9d7fb6992653f23cd2ec256ed77e3e6101f5eae930f48c7cf561240e8ca67925d65d4c6597500e38532319219bfab95 SHA512 05d938a4a2270eb81d4344fa29737eaca826bb6932bfb86dc3758ffc7fbd2f6901229697af1f5ff985b85fc31071269bfeb44254d369ec25b2415e9bfbc75e63
+MISC metadata.xml 523 BLAKE2B bf1e9589b48905feb3403b44d6b3f71e1bbf47c881d4fa095d29a3f63f08942eada116427be49ca4504703156e938136881556a4a082cace3e3371edfd35b361 SHA512 e3e91226e18302414a97ceb9160a36ab0f4e3b1dc8537936e0fcd31371e1d6ae75a4a471ff97cae3366af4b92596a25fde266f9233304052c61efb945044d292
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
new file mode 100644
index 000000000000..7cee88a5c46d
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Dictdiffer is a library that helps you to diff and patch dictionaries"
+HOMEPAGE="
+	https://github.com/inveniosoftware/dictdiffer/
+	https://pypi.org/project/dictdiffer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# Requires self to be already installed
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# remove dep on pytest-runner
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	# remove dep on pytest-pep8 and pytest-cov
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dictdiffer/metadata.xml b/dev-python/dictdiffer/metadata.xml
index 86e09fd12fa0..385cb0b46c44 100644
--- a/dev-python/dictdiffer/metadata.xml
+++ b/dev-python/dictdiffer/metadata.xml
@@ -6,6 +6,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">inveniosoftware/dictdiffer</remote-id>
 		<remote-id type="pypi">dictdiffer</remote-id>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index ea0e1c064081..8799fc2e818c 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,3 +1,5 @@
 DIST django-auth-ldap-2.4.0.tar.gz 53523 BLAKE2B a8c49b4a4ecaaf31b3b9e7caca228041e110b5b418bef0a16c0fac423d929b0bc416cb83d8dd54f0f4567503ce9d09f686c936cc9d7e170d2cf93d8c124bb3d8 SHA512 acf85846ebf6bc354f6bf00f14f3436e1701f1d7a7746cc3572310f92ae93fb75ee6eff38558548d270f2e22d64aa7c0108f4cb91457a783aae76adc714b61d1
+DIST django-auth-ldap-3.0.0.tar.gz 52381 BLAKE2B 6964b36d72b365899d4dd3dc96f16b9c1f12c06ad95c7d387ec27ac6dbc38807e16fdb953e172fcde1a0d4042f318d276b780e474d9b810325e97cd601d070b7 SHA512 105885e62fd22aace2cbe291a107046109a91507ba77257b9b428e6d49fb74b6f47116f1d8325c3fc186590b00fb2b46507dc5b73333707e56d84e9a7b926d9e
 EBUILD django-auth-ldap-2.4.0.ebuild 888 BLAKE2B 63e2603e90f39e3a98dfce26142f83a5cfb689ae108e55259b3c3858a271845d2de128d95aba8e0201a94d0c3b13342f4422b52fdf00a1507172d18fdf813a84 SHA512 5e3dff77fa73754acd3d33cca398dd6c35ef7fb871264201bbf2acc9014021d3d504af2af7c0ca04dfd32f4dea2a697c1612f0e3a08032698e039bab2fb849bc
+EBUILD django-auth-ldap-3.0.0.ebuild 886 BLAKE2B 06c81941e067e5f682bbc6487fc20b2c9f18a2dc3d619f6dfdf0a2701ae4aeac80c3e9aa2b09f700728c7e1ad8b15b8354bced9b9c102486c763b7c45a630fe2 SHA512 4e2d74840920b1080027a11fb0dfaba9299e8ab53ead0f5e5b682b8168319d95becf057bf6e52ef7994d9a5366802b1e5c11f28cbf079eb8ac4ea50681bfdf16
 MISC metadata.xml 404 BLAKE2B 5f203773409d544e168b6be9303ff7ad455977584df34b302fec6c84993362bb3b5058984e3e7b4c413081c47f2b0ba7301e1e866fc88297f524e3920afef353 SHA512 dee72beea7aeec5097d015e83ba95cd256005545294312d9dfa80ebe52489d6d5a1ef132177d6dbcfe77ef4fa306b532c86a5de86cbb84c8f1e0a02c86617c6e
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild
new file mode 100644
index 000000000000..afb03025412d
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://github.com/django-auth-ldap/django-auth-ldap
+	https://pypi.org/project/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		net-nds/openldap[-minimal]
+	)"
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# for slapd and slapdtest
+	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
+	django-admin test -v 2 --settings tests.settings ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index c19ea97178cb..5b96917ff350 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -2,5 +2,5 @@ AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 EBUILD dnspython-1.16.0-r2.ebuild 1341 BLAKE2B 96974c67109cf7b06cd9266886d12aafc4f2fd562d66de61b7e9eb7500dfea21cbea6d07ada8823eb71e3b916d82bccfe9264891c10153486f0aff48cf63434e SHA512 250253fd84576d2ee6b2d65166e6daec2322867d607336c663d56b474d6657a449718534b8e3916bb5367ddb3c3addbd7c0c2e510810091d43e0736894e4eece
-EBUILD dnspython-2.1.0.ebuild 963 BLAKE2B 9d39e73249547eb03aa08f0780f8dd88547b82450b99b7f474f9e139487c09bc979c72798bd65833a78ac945f6cc08e6f1c0dc43d9445cf4fc3a7cd38550162c SHA512 b82878a0aa58ffcbfce91dbf5f69cd8f7694d14b4542d1c26002050d867252e0f95a7234150d76e36acdac57541c820c79029eb310a61ccb22236649cf742707
+EBUILD dnspython-2.1.0.ebuild 970 BLAKE2B e1bc4aadafbb4514e8606f6ffa551d5e8a852f0c9229cd34d3f76baa014ebac3678f807b92b04de2a5f7816cf8306d75bfa80b3e7cae8b66b9706e9bf29a9fda SHA512 ecdc6674de2f6cb29ddd16a5aa23e74f3593d63ab47457f824ecb50eab7ba68f330715788d1529be4c29977f6fedda0f7b19f2a91424eaf6adad6d2b1435f10c
 MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
index f195de7c5e2e..9cd1b227440f 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index 21c31218f7fc..c51692ab42da 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 537 BLAKE2B 392cf463652bd4df175139f74b3c184bf84edef00dbe4be512f01d83377ce4bf6bf4f1f2d1aca60eb491f8a9bd6cf80296418abd4848c128b825224135792e96 SHA512 576672555c9a7ab3732fd227e928c28923500162a953f69111c4d924157a87249d0f529963b428a928b2c7b2e77b8e611494804c726138fb2a7c6959f0ec2bec
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 544 BLAKE2B 0262a6888d7a9aaae35e84c4feee841cb36a8a846e363698ab12c2753f9840dab5519b18b91e549b3661e7f691ce83a0ee2849c5cf0e8742395d3b3a10a37664 SHA512 cf0ebd14eccb6f9de33eb104622d6fa903ef24171ee58d6ede4d83ed2cc38550bc342a5fba7d855b6a18c20d51ecf798658b2dea7c4fd6655026109916a9403b
 MISC metadata.xml 396 BLAKE2B 0d99d9adf86b3df99ecd9caadaa9591c2273a48e6e6bcfb9f27ba779b725fe7eb074db30ab856add3755d38df90ac9215f0326c457dfe834e94ce185e59b8295 SHA512 80229a027a295b73d98c58cd8f00b731324b6ed7b3c6f4c55169f0c5d3eb89521a2ad45611206ec9b972edd9223e7a3c1aa4f601932c1e37b5183106317ffc2c
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index cd4a04ef0710..c2c645d1154b 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index 934aa97623a3..b0dbf932dd5a 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
-EBUILD flask-migrate-3.0.1-r1.ebuild 654 BLAKE2B 26b23baef434a602182fc1a1f627df0768f801e39b7364cd3062f62b5565c480cb5fd115d84616e9fc54301dee71725c82c8c563802c58f7bc84d7579045e274 SHA512 49a3000dc724c3097fe1afdc191e2b9683996b87fefd18c6923d0b0f91222848107efa373a3b0676e805d15575f533a38bfffd7046cbe1b1052fae27d3293012
+EBUILD flask-migrate-3.0.1-r2.ebuild 657 BLAKE2B 1167a915ce904d3e95a25fa5e93df907e08bc1f6125df14679fa2125f61dea0014a4eda96fde2c1abb894ac62fbff7034459e6cc727296cd0d3c359d41957922 SHA512 9b97500eccd64da049a69b46dc904ef6831b37c583ae3e671b3e128ca479a4acd34d334f55e39840186b198737cc7ec372707011a470a6087ae8298a040413dc
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
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
deleted file mode 100644
index ab97cc945587..000000000000
--- a/dev-python/flask-migrate/flask-migrate-3.0.1-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
-
-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-r2.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..4e81f2756a02
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.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-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 5b1288363c1c..39bd14ee435f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,11 @@
 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.14.0.tar.gz 25412673 BLAKE2B e8c14c069f2900d560ab2ed70855cd0ebcf1191f0932cefa385858466a482f92934df97cb994801a0d85514bcc33d918ce50ee2e980f1957f11c1cb8cfbb34dd SHA512 4c644d7acb5eb9853672a17fb3cb08796c3afa172b3b1c56027b8ef20734cdc2995d972006a6803ed806171f88a0652910a0fd1682f3427c546312cf1a719e42
 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.14.0.ebuild 1602 BLAKE2B d1807524be9fd7c9bd6e5defd06589431c622bdd988846d81c11e64274978e7e2565576e19e357fb1f27f988e743a33d4ecde9a92534c183885d7bc7dd9ab725 SHA512 e334d83ad75593788df24a3d4887a34f1a1ddb28f844ed18c97bd5e44bc54ec5d2d9f65abd82b0f7ae67992602ec21eae09dd3824c81a86a7c838a9b9c87bf4b
 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.14.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.14.0.ebuild
new file mode 100644
index 000000000000..950b595b313b
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.14.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 tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4f7e8bddb751..1b885060b7c2 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,9 @@
 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
+DIST google-auth-1.33.1.tar.gz 178615 BLAKE2B 1600ca8861a7e75decfda5605414ff45d8f6d7ece40e0bb7a5892fe2289f1adc5bba313eab10c4d0e1f6e7a38634861e28518c2f02522ec924d6ed53805c4207 SHA512 c54356b21af5ddeda88023b886631050e8e4306ed444093ed6589d13d95af402f03928dc5b5f44f9b4c038128ed254aa14de6d852108f44949c42e2d05304062
 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
+EBUILD google-auth-1.33.1.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.1.ebuild b/dev-python/google-auth/google-auth-1.33.1.ebuild
new file mode 100644
index 000000000000..2bb9e016a997
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.33.1.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/h11/Manifest b/dev-python/h11/Manifest
index a438368121f3..e4451de0a5d2 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 481 BLAKE2B 2f378c3365977c1c9be04d45e087b7b5d92fba0665cc55906970d1a8eb62cc617b22c12bef885c400198849d3a9a9b43b7f5367732858e845f77a699b43a225d SHA512 b26ed5c592d8cceb5bf3969eaa2a4418f1760f6ce4824c290e82f280b400911fa35212d4292c1caadff5269d491e28b2bc5e806f4ec42c5314d8c6cd8db7b501
+EBUILD h11-0.12.0.ebuild 480 BLAKE2B fc1d19a44fe2de2c6340068f6c2d04d40d733230e5ca30ca5b2db7d6d8f3ee17acf172a6cfa3dd0475e29a7e0af8bd5e783fac16ded56e5ba0fd7be4a05483a5 SHA512 0b43d882a7b87ff76ee732b3bfe14eaa15a3928fda19f40aa26391795be995629c3d308affe855ef8340c2c90ac1ca971be44cf50008ab3fd4f04939357289c9
 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 4ba4f935f5d5..692c8f38381e 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/httpcore/Manifest b/dev-python/httpcore/Manifest
index 9789f4f463c5..0cc933dc544f 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 2204 BLAKE2B d03b92df7e8b0127162e2c6125f0e88184a82e151254241e6c3b1c080551d159d5bf34dc0ed81669a1d6ad7d92b060100f732178fd8f66068d794c900aaa667c SHA512 cc7c7f37bd4abc92d431c7b0169832736e4e38493ea0e4722e5a4021aa5204c23ee1774c66a4a16509deb1ae0f41f0a041ad279c9c1e311f9b01a5c3b2daa934
+EBUILD httpcore-0.13.3.ebuild 2203 BLAKE2B 3c4bbe16a90244ef5a340dd1c22692167cb9365d8fcc25bc5ccee78c60b6b365daa984f96229381b402c7b6bf8ad8bd47fab5da932e7b3da6ec7bea199ab39ea SHA512 a1db99e35da81f34e78806b1cc9226408736f09bce1321febed43bd3904013abff5f3978fa326d652d4f6fbc5199a1af045f90712531318055f31df65b9c7b97
 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 e43157c8ec6f..16d4d2c1c957 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 6afc5f8ccebc..0b022df6c5b8 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 1290 BLAKE2B 9a5f8d0cd03ec6bc20e799012d4f15fd815bd4223a70f1434198366c5dbedf0ee358c3728e51cb4e694c718275f1189c7b45be5733ad6f8feda9ca3a1520a10b SHA512 0eab5a37e9c9ef42a360f957c84644df06dc4e0d493d0755c1f3810458f06841df3fda91d5e97ae1f17e309abafa2883bb02ab3da37b500d996baef12531f5ab
+EBUILD httpretty-1.1.3.ebuild 1289 BLAKE2B 97f5e5ca195652b2cf5f504470f81db41e166e0b3a6d3552f71b19201fec716a268c3176db4c8c4909a64f8dcbd251070f307ca958f06a4c73b8a62c33a88eed SHA512 93785980e8c9ef12679767006bf50c2a0a55158d866a659322a0c1a2254400fcfbb5802baf487c1b07c7c28d797173573aab42ee52db69afca6ef15a6c8dc28b
 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 cb404053d78a..6fb4f3d7e8ae 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 f5ee35ec7fc4..9a2c5732f223 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 1311 BLAKE2B aabdabc7a3d4c38f89a5db92265aa76b1329dbe2c731159f08f55378a5ef78d0b49f29d742dc5895b20938d338ce3e0a9b63354cadf43a01475eac99c11ddc6c SHA512 2623ce502c30cb40e4e8f629248781f368a8944da809110ee259cd6cdb8108ad74fcd1940ab9b1d29fcbdabe52f3bbe6f6094a1e5e8f6809921281ebb3b288f5
+EBUILD httpx-0.18.1.ebuild 1310 BLAKE2B cd916f7b1a450de2a2091ea53cac84b8fceaa9efca9a6a3dcdeb4bed6a98bbd2306eb3e2147756ee5bb0c307f698acc300f41e3a3932a8b9193e1278d19f6778 SHA512 0015042ad3ed2fe9ebf2ebdc1221231f4b49ec31f3dd9d69e645d737778612f7d51bbd061258e0e014974230cd0b5481f58a485151d6bd44f91f1a17813abd57
 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 2a51074bafbf..2cfb607a045d 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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a56e394f19f9..ea549f4c4e3a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,7 @@
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
 DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
+DIST hypothesis-python-6.14.3.tar.gz 9135537 BLAKE2B 2effb0c68cf3a7a2f7d56c0c46c2ba36cbed4fed35b8a617ec68a721990247370772b986f0492aab112f7420c07409f8d738485ca28f42e7aea919af52611b10 SHA512 1722c5dcf1eb7375fd09d4208851826582808449fcaaa0345f1461d9a531961500a9c888bec5a457efbbb34f8178464b3358a3187b94bb5c783af42b4e7287ce
 EBUILD hypothesis-6.14.0-r1.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
 EBUILD hypothesis-6.14.2.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+EBUILD hypothesis-6.14.3.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.14.3.ebuild b/dev-python/hypothesis/hypothesis-6.14.3.ebuild
new file mode 100644
index 000000000000..536affb7ae13
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.3.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_{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/imread/Manifest b/dev-python/imread/Manifest
index 25f04f0276ad..de36add530c8 100644
--- a/dev-python/imread/Manifest
+++ b/dev-python/imread/Manifest
@@ -1,3 +1,3 @@
 DIST imread-0.7.3.tar.gz 131492 BLAKE2B 060bcd8312f24f2966f840a6403486a9a9a2f6b9d033e92f0268594711f4fa06530c2a825103683b1041570c43c3af584faf10acf45a95e693dc83c81da4190d SHA512 401ec64fd4a65fac1cf2e1bd929cad00a8d704c6c03b8a10256d1e9c27cbc83b47a11567731a42c731aca3df9a5101b7ff90bb51f869695b1405c642e16486e7
 EBUILD imread-0.7.3-r1.ebuild 718 BLAKE2B 7ae44cde8cc03dfb1f137d816e7ebed7985b9122f21015acb5bb1d58fe38d4c58e84c34b044376605cf9f29542233d218174316239a06b8cf34017f4d5e67f03 SHA512 0b71af04b9b02cac10c8b5feec03bca939cc17056d5f98aafa05ea3736fe7015ae91d6803739824bee668a355e9471a9ed8afdcbd426da5c053a017b006fd980
-MISC metadata.xml 630 BLAKE2B 93a4fb70862764f6de127fab8f761d04f568d755d224dc0196b285c13966fbdbb7670ab96c8f8a01b279f63d319b2c4ee254b184a7fa532596dfe33e595c0d2c SHA512 0f156f922d31d45abc2b390e2a2bda8abb3a8b84ef9cb1ef48d2ed8917574b9bf4f4606d3b40b3cd6bf5dc41fe721eab734707388e6fd1040b2593580df95cf0
+MISC metadata.xml 537 BLAKE2B 07dc7fe0d46b65809671206361c7be792ccc34807876f4874385695744f14f8aa26d3f77ab7cb941e8120cc6ff4520bf1cb4c0221a28f2607a0655093a667215 SHA512 45013e91173ea577891f59e08f2909cb0747a8ba39c8fc42440d9d5e8fec9d11a2b15e7ae7d05c3801a24538e723321c1c2d29805d20136962925adbe3d2a25c
diff --git a/dev-python/imread/metadata.xml b/dev-python/imread/metadata.xml
index 0fd0da447123..6a251bb2bee0 100644
--- a/dev-python/imread/metadata.xml
+++ b/dev-python/imread/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		IO with images and numpy arrays.
 		Mahotas-imread is a simple module with a small number of functions.
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index ffd0ffe3744b..c9d218000ebc 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,3 +1,4 @@
+AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.6.0-r1.ebuild 694 BLAKE2B 28636c22c1802f5bb69d6e1b8eb52bffc71375d427dbabb72d487208fc01f0112e032e93c4052ffad83330eb1f0b000054671c0878c5726c271f3ac3e5956750 SHA512 dd01c3955893ba0b4e6d84754401b69243bdf7e44b641b9d4b23d6e5664968fd9d0810f56cc07feaaa009e1df06f2de820a291ce672cb6375e11ff692e35e7ce
+EBUILD isodate-0.6.0-r2.ebuild 629 BLAKE2B 74460c2091f1e6634461cae46cbbf576680a6d9d0d172fe67cfdaf7721641b7d6cd306d10d274f6d810a8e8b3092aed7d019e0f4f591b884baf60174da295c47 SHA512 894784c520c8c23b6b524feb89938800b2b6459fd5a752c85dd6339edd9902462d9f7a2189b12cefaf1b66ca2b31fbe09bf3b5a8b70a80d98c6b457671b5e2c4
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/files/isodate-0.6.0-py310.patch b/dev-python/isodate/files/isodate-0.6.0-py310.patch
new file mode 100644
index 000000000000..81b38b48a2a9
--- /dev/null
+++ b/dev-python/isodate/files/isodate-0.6.0-py310.patch
@@ -0,0 +1,95 @@
+From 40358ac82b948ea8377d5ca32b576def31b39a84 Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:21:56 +0100
+Subject: [PATCH 1/8] Avoid unclosed file warning
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e39446f..9634625 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,8 @@
+ 
+ 
+ def read(*rnames):
+-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
++    with open(os.path.join(os.path.dirname(__file__), *rnames)) as read_file:
++        return read_file.read()
+ 
+ 
+ setup(name='isodate',
+
+From 91bf24dd1610d5f6ac5d4867457f0703046017d2 Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:22:22 +0100
+Subject: [PATCH 2/8] Raise warnings produced by isodate as errors during tests
+
+---
+ src/isodate/tests/__init__.py | 3 +++
+ tox.ini                       | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py
+index b1d46bd..7208cbd 100644
+--- a/src/isodate/tests/__init__.py
++++ b/src/isodate/tests/__init__.py
+@@ -29,6 +29,7 @@
+ '''
+ 
+ import unittest
++import warnings
+ from isodate.tests import (test_date, test_time, test_datetime, test_duration,
+                            test_strf, test_pickle)
+ 
+@@ -37,6 +38,8 @@ def test_suite():
+     '''
+     Return a new TestSuite instance consisting of all available TestSuites.
+     '''
++    warnings.filterwarnings("error", module=r"isodate(\..)*")
++
+     return unittest.TestSuite([
+         test_date.test_suite(),
+         test_time.test_suite(),
+
+From fc0fb3278da5f463ca5b2f0a3acafbbf2869bd7a Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:29:43 +0100
+Subject: [PATCH 4/8] Fix Python 3.8 DeprecationWarning
+
+Ref: https://docs.python.org/3.8/whatsnew/3.8.html
+
+> Many builtin and extension functions that take integer arguments will
+> now emit a deprecation warning for Decimals, Fractions and any other
+> objects that can be converted to integers only with a loss (e.g. that
+> have the `__int__()` method but do not have the `__index__()` method).
+> In future version they will be errors. (Contributed by Serhiy
+> Storchaka in bpo-36048.)
+---
+ src/isodate/duration.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/isodate/duration.py b/src/isodate/duration.py
+index 6d1848c..d923cee 100644
+--- a/src/isodate/duration.py
++++ b/src/isodate/duration.py
+@@ -180,7 +180,7 @@ def __add__(self, other):
+                 newday = maxdays
+             else:
+                 newday = other.day
+-            newdt = other.replace(year=newyear, month=newmonth, day=newday)
++            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
+             # does a timedelta + date/datetime
+             return self.tdelta + newdt
+         except AttributeError:
+@@ -264,7 +264,7 @@ def __rsub__(self, other):
+                 newday = maxdays
+             else:
+                 newday = other.day
+-            newdt = other.replace(year=newyear, month=newmonth, day=newday)
++            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
+             return newdt - self.tdelta
+         except AttributeError:
+             # other probably was not compatible with data/datetime
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r1.ebuild
deleted file mode 100644
index cbd14a1fcff7..000000000000
--- a/dev-python/isodate/isodate-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}/lib" \
-		|| die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/isodate/isodate-0.6.0-r2.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..4b9e27d5136c
--- /dev/null
+++ b/dev-python/isodate/isodate-0.6.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
+HOMEPAGE="https://pypi.org/project/isodate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+python_test() {
+	eunittest -s "${BUILD_DIR}/lib"
+}
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 3725c7c40c11..a7c93b7413d4 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 541 BLAKE2B 7d61c267e689f3185bbd040faa25aa330cce37ba071ec1656af63107c1e7212246ab7f25e8cd9d1331028153e07eb278be18d7cbfb6178d3634274586dd438be SHA512 11edbab9d4c5b0ffd79b13d2e5f770e7c3c33c670a9bbe122df057154c01a60842dc955bb20f6a724b3717d95273782adb5fbc9f133e6e67c1fde214b8168444
+EBUILD libarchive-c-2.9.ebuild 539 BLAKE2B a9b31b42c38345635b35317029948bdbc8db8b0a379c4ce937d17cb7e1f3a2761dec995a9fd7db831560928853fbe4d49143117cce3829ab2e931b57da650f61 SHA512 0eb0633128d218ffc5c420cdf91b11e20e7704aad6fb8029846c2be2e2c290647bcd2025b23185bf06147b3f2ba4ea6a35852a9b565d2f60c1deb4079b7c76bb
 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 be0363504712..102eaee9ad83 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/markuppy/Manifest b/dev-python/markuppy/Manifest
index 5bf28684d301..2625bbc7695f 100644
--- a/dev-python/markuppy/Manifest
+++ b/dev-python/markuppy/Manifest
@@ -1,3 +1,3 @@
 DIST MarkupPy-1.14.tar.gz 6815 BLAKE2B 219a220c3aefd2870a6cfa6e4d460989cfdecf65a9e760a222f70d202ee4d6d4ce287f08a7e881218360d662c5281f140c9a4a176182fce19d548707a998ec63 SHA512 dbc0abaaa0b9ffd95d2aebe62e5f718a44a0e614eeded5f3624df190778f11a10aa98e34c444e38295ac05de38c4ddad57fe885446ebe7c4b9fd1d64b312f168
 EBUILD markuppy-1.14.ebuild 527 BLAKE2B 4d580910238f9e10351888083c4bb89592e5244a2cead79808ca3af816cdea918198bee6a666576d4eecade4bf1f66e0806185389aed298d64e5981e541a45a3 SHA512 dcfaf45e9f3b5c78c8bf92900f3447581cb84460e41256b3568f05fc7a68b5275ef5283e968f0473443665779d8e0b6cabea7471d25c681f3377406a61c23542
-MISC metadata.xml 567 BLAKE2B f53618b9cc6ea30c99c658c3c8e064abb2671a34fe6aa17ae6dacb3981b8fb4c2fb096729c89e7480045bec1a502f3c75163ed30d4b9d462a2409f6fcd6e7126 SHA512 0f5e1b610e926db85551740ba936ec856f64c29c92d0faf59d4014614bea5f438ebe74669d1a0917f34f8205a797300079bfa1f95a668f478c787a21793107a8
+MISC metadata.xml 311 BLAKE2B 73c12de3db1c524bb5405f26ba3c09f0ec36b3a5fc3369019f5fb970210c4a0abccb9b7c90d090bf8e220d89ed19f4992b9b746920132335b880879d1ea2eea4 SHA512 0766b0c2cbad73dab165f9db2b98bd479e6a8121dc616104f8d192caa4a48cfba01beca9236c7dfd3cf92e8b1571978fefffceac9ec3ea56555a9f47c7b27247
diff --git a/dev-python/markuppy/metadata.xml b/dev-python/markuppy/metadata.xml
index 478828b0eeba..4ba0f85b0295 100644
--- a/dev-python/markuppy/metadata.xml
+++ b/dev-python/markuppy/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 765ea625fa70..0edddb00e232 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,3 @@
 DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
 EBUILD markups-3.1.1.ebuild 978 BLAKE2B 5b00c69a8ff4438686d1ae12874b9c1e8628f369b5eb80a7eb10fa336e4308220aeb333144c77b090d2ad14fadd26882269e5735e546e0572b3f81cc18016962 SHA512 370eceb9be0241f38e677dd5b4ae35c9876f54dbad0d36476e136230302cac60079bd70752d92382a321fc72bd73b2559e02702d977c5cf9536a563cbc21380d
-MISC metadata.xml 680 BLAKE2B 863bfbb8aeee26e72ad3c6e9cae490e82b67ed54fabf3adc11e98f8894d181e02cb0d174babf003cbdfec1f8a4dcc6e07df47f952683a46e7a4f1c6e3bb2e8d0 SHA512 8e71b06846e8ec4ce1cb2a4cc9aa4e172912ed9a77f76d6a7e9b475432e65d39fbb130a375f35ac429c398ff4d2b32e5ce99386668a88a8cf715660339a961f4
+MISC metadata.xml 411 BLAKE2B b8ccce5d1d56ac92ff97a282910ad2796447dc6f0a7b99d2642af966625476b73968736eb538cf816d0bfd07d475347e79cfc3425a69ab24d47d0ba97260d202 SHA512 b5d0c8e389d14577ec801b90359f3623c89796534ee4430764bc07de9cc11e5cfe9fca45c1c95fbc3ae217c60623e911aba2197e022750d7a61fc77e2e945c19
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index fbb42d8965dd..a3a4dbb46b31 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>holgersson@posteo.de</email>
-    <name>Nils Freydank</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index ed255b213398..f86f7593a078 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -2,8 +2,10 @@ DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5
 DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312
 DIST marshmallow-3.12.1.tar.gz 174784 BLAKE2B d3540ba833950d730db719c8ac7e8d66a54a4b06d0decc161d9b1f82d2012db2df7cc376bf3fb322e8d07e60057409f2e6ab761561e822c942d189418c70b9fa SHA512 aadbf9c3b45a5b435ce7fd7f60a4318f393221f23687be7b48af43deee111f48806489169815122f297539614a81700a435cc579cf5b7d0fffea2a2809368db9
 DIST marshmallow-3.12.2.tar.gz 174529 BLAKE2B 67c8431c1b013f40c3ebbb23631be3060e978a4cb71f3802b810d943bb69fd32bea59b3b7c92df5ea3cbcef28ef7b64f32c9fb1a6a3d5d42e4eabd6ce4b7958e SHA512 d1f5e695564d0df10ec3f74b336b6ade7b247b722beea61a8cf10e30653745d187d26dcda3a2f2d38c04423315d20a67bc883c9e7b0d4686a759e379644cd457
+DIST marshmallow-3.13.0.tar.gz 175134 BLAKE2B fc8ffb87ba31d5bd56c7ebf655824f59c78cea257a1b59de8a97be9f380367d4db428b6f4f93f81140cccd8274fee7946e466f87f7c31b6b9d39d5bb9fba3104 SHA512 e4425bfa26609c80bc581b60be5554effe4a57eafc36338dc672cb0b42fc14d788a1ef3b4506b6429bf8d235e6edb10925173c8414b2abca12a4c7bb5496ed53
 EBUILD marshmallow-3.11.1.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.0.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.1.ebuild 606 BLAKE2B 0ab0d2ac445f20b651e9101ea0f4377d4ad568ceb1fe481b7b827d031f834fcc6d08bae97898f0a2a8f00b5c3a9b145f4315d7ce82d2575dd76221bce73f4bd5 SHA512 ea76fea9a0f0b477ddbb2769cce7469f2f484d67d1a4c0c220ebd7e4455d72f80d4f281eb6631a6eed0407f32735b29bb85146601e52756a5dea14c33465c445
 EBUILD marshmallow-3.12.2.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
+EBUILD marshmallow-3.13.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
 MISC metadata.xml 461 BLAKE2B d1723db313f210e554d88a75276965f8f1a385ba8f879d2c43d8875a774240e7db4df6e2cf2a73138069b67a65760b2170bac2ceca8d5cf8681242b01f68d974 SHA512 257a5648aa10d9f8ec87a62e1e090374595256a4cf66f32775be135772114396610ad57e7ddf5274b6ef4755c563bdd3bc364df2751e61b10593d10e12bcb654
diff --git a/dev-python/marshmallow/marshmallow-3.13.0.ebuild b/dev-python/marshmallow/marshmallow-3.13.0.ebuild
new file mode 100644
index 000000000000..7d3435061f3f
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.13.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 5659de671f59..c91fdba72a8e 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
+DIST mkdocs-1.2.2.tar.gz 6919165 BLAKE2B eba8d585c3653640bd3babbba3a1fab6aa9dc3ee365536ee7b0956e38250611bab3180c6a7f08eefb1e1a3637d07a0f366179570a9bb69df4f02a605610a770f SHA512 6cb111fcb3167a39e1d282d24b5e67d806c3e7506f55ef11a227b37ceeaea950142db2bc1db3709caaa2813c62ef8c4ef74aeb26e62f4f10aeee528e0532eccd
 EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
 EBUILD mkdocs-1.2.1.ebuild 2117 BLAKE2B 781052ab12bd9605e4b6ce320c8db679db1e84c301c5566f55396dcc4c7c8e67f8fbcef4f5e6e39f91db5196dc6609d0f6a9e94c0cee4bd443102c8567dbd318 SHA512 425390d7bedab31ce6fef549c7eae9f9104ec2b4708303b600b84ef0af408c6377770f61df47296b18fe45697248ee6bff814d3c3b22e01878e092ab2f390968
+EBUILD mkdocs-1.2.2.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.2.2.ebuild b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
new file mode 100644
index 000000000000..842e38bc6ad1
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.2.2.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
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 9d62d0efc19e..def3f3c52c10 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,4 +1,4 @@
 AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4
 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
-EBUILD nautilus-python-1.2.3-r1.ebuild 1066 BLAKE2B a1ee20e2f5ebe1cbc6b8736cea8089e60be0a68049b2f52715f44a6bea3f71680dc0c56a561b40a0d14e8c899ec086d29a3daa30554f7f63f68952cf22cc3f9f SHA512 1dcaee2ab0a1fe8f9ff1fccf0a7d75801863e9bd40d2ecce1748c6485839d5d62be1f518c03c89992043ab63db973b90d533b9d7b070b393dd579e6967194d14
+EBUILD nautilus-python-1.2.3-r1.ebuild 1060 BLAKE2B c288d0262a9d4e21d948822d07f0a164f1e88b02999e35e7402f9770b2679efd4786bef844cefec40e9937583928339b4a77f4d97e37b7a1f64c1a33602658a9 SHA512 8072b6a870b56f2e650387cb427f4d2d144019bfe6d778a55b3013ea7f3b7f43fdfb72ca20d381ecb3c2dc618f5ff84b46c3998eb9af54bf2f3cf54fe5664483
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
index 3fa650508cbf..e51196b9f0b9 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # requires pygobject:3 or :2 and >=nautilus-2.32
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/nautilus-3[introspection]
 	${PYTHON_DEPS}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index f016236fe3c4..d2078eb143a3 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,3 @@
 DIST nbsphinx-0.8.6.tar.gz 146019 BLAKE2B 106c121e9306c1b79771d49697f125b7c9272bddd9859b308d272e69cccf38fa306330bac01e8744f1a5a1e6831f63b73b43b0a2260eacceee4d2ff6c4ae61ef SHA512 11ff82be0633b3a2af2238d9dfe4406900804caf494885a5b3ff22f651c8c43000dadf83546ffaa85873901ef9625c2e786e53e866c27141fd9e9d58927ebf14
-EBUILD nbsphinx-0.8.6.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
+EBUILD nbsphinx-0.8.6.ebuild 624 BLAKE2B 0c6cc84c3b436f373f82c9dee376901e32b7aac3a1c0a84854d7959b94771163805d45013fdf54422a1a0275e0f7420429e0b98dfc25b6a3b771a367379bbf2f SHA512 f6794fe9a29d963e87e9d20d31a5e97de90c72cfc67a6eed813f96431e4aca07bf2d20f1679bea66544b2e19e822c67358a3711f03c08a37b7236b527fbc007a
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
index 6d626dc40a76..cb2a5a717366 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 9304792308a2..79ac9302b042 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,5 @@
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
 DIST networkx-2.6.1.tar.gz 1842369 BLAKE2B bac0106758fa7d33000d970873ee221ee9b367ad895f2f8fbfdfb29908851c69f632214dac06c48ab433e3b6251a439199fe3675517252c959ba2a29076cc866 SHA512 132f34eb8790fb366263cfbb501ec5ca0f9c9082562215a06a114b2ec80baf72f5489f27e7fe1cbea49749eab48116e8772ff953339de0caabf37096ce097500
 EBUILD networkx-2.5.ebuild 1504 BLAKE2B c281bc937ee2e4b13a57e6e861e4dcf881498e8b645230038d53fa6b10b800a15a999297c85503491c54a091f170604a91004a4d8c7387a67b4b36d4ea724730 SHA512 1c3d8159f280fb08aaea8dba9224db19ce801f73a991e4ec5f654ada7e9d28518eb366b05242a483ecfd812cc8380fec08770e56b61bee5c17e5f36dfec0df5d
-EBUILD networkx-2.6.1.ebuild 1225 BLAKE2B 024dd63def6aea8de3cd565f345181dbb3f457680c857b696ffa6c70df61c7f5daf7ba0c5b1d6cdcc46c1fd37699f967b65f2d55bf7b93303e58f0ea2cb264e3 SHA512 bace4d4ca169b2b8819ea80a3803799ecec5ee5464869a1b935004697365e4ca05fbe22dad911ecc907f9d7df184fc7c1a68a166488e43955a7e8a624f577cc5
+EBUILD networkx-2.6.1.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.6.1.ebuild b/dev-python/networkx/networkx-2.6.1.ebuild
index f11427eeb08d..51a49fc1b85c 100644
--- a/dev-python/networkx/networkx-2.6.1.ebuild
+++ b/dev-python/networkx/networkx-2.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras xml yaml"
 
 RDEPEND="
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index cfb0da80d123..a684b419d5d5 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.3.ebuild 1215 BLAKE2B 6d2490c16549f2c7033375b9c137fe0a59354c2a36a36d1ee900a49cbc6936a7b50824078a371ecff28b8a51473f17c993d154bbe36c4061bea7c834c8ab8907 SHA512 eaba741b531bcda54da607ab0e37d3ce9fa12fd25f8e109e81644363b8e4f7b0577fb83e755f0bc04a5943063c5ddb35585643c14ae3957382bedf25ca0d0f00
+EBUILD numexpr-2.7.3.ebuild 1222 BLAKE2B 58f76b44daf9078b0423700621ca00dbb71541b146d9b49ef8026ab953517b0f54c8489317ff601d3f4df062f420d7d65bbda3f543a3abfa4f4d691e8470ac83 SHA512 86cb336d75545cc5ce02f30fe2709e8920c899a35e635192634f61d1e45d252a593264b806db3c9a799ffc41436efbc3238b779f9871a649846ffe0fe9674dea
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 37cf6ffd3eb7..75e1887417af 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 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b6f171f76b1d..f111be60a1a2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,16 +6,21 @@ AUX numpy-1.21.0-no-hardcode-blasv2.patch 2671 BLAKE2B 78d7072241148874d746546ce
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
 DIST numpy-1.21.0.zip 10252686 BLAKE2B 98f69855fae35f53a3bd467ca9bc0c06438519e6dc84808de829a4b1e41402b764c35ac4f94edba72496693241f85f488d6f91c81e7e5c3e33fdac264ce9ba56 SHA512 b4653ed78030d3c411fcafc08c6656072480704379810b7e3a4d907b55c255c27dcef6d519cdc0bb2dc79324c475baf0263248fb456be18a9ce80e3a2c5c7120
+DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-html-1.20.3.zip 22936526 BLAKE2B 9c0bf4edea0c34640a2f2d84f117aa383f8690f5c99eb9c504aa27c07195c1e5a4219efc798398d8de709803b67d4a41a2739b1319b6dd7aeba3e70e817c2488 SHA512 181ff49fcde40f2d260e480d4a90bd8b439aecafef4ea581749b5a432c7e8c163b1714a97fd447c512b550d5bf3d9b104c575b4939eb5c8b7b70bbce1153982a
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
+DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098 SHA512 316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
+DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
+DIST numpy-user-1.21.1.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 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
+EBUILD numpy-1.21.1.ebuild 3684 BLAKE2B bec6b2a8cab14cd5348563c635f20918b43fd26e079b10e5bb42bcf0e360b1600111793f64695c0317b06d2bda5efc2a6fa131782b1cd65819598d995551bddf SHA512 06adc056c295c6113f7d69a1cd31330c7dae9460e59e7e7f53dd153392940d6549f5dc3d173a539cee26ae9c7738cde34a9d9e5e96e62992fa4550cf6604fe8a
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
new file mode 100644
index 000000000000..32f6ce2b232c
--- /dev/null
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -0,0 +1,143 @@
+# 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(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV=${PV}
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+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"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local deselect=(
+		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index ad272c3b0a9f..2bf280cfffb2 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,4 +1,6 @@
 AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
 DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
+DIST osrf_pycommon-0.2.1.tar.gz 46633 BLAKE2B ba89f8d783446d52a328d126bcdfac721dba0a811007a55e48ebd3626e58b732d4f03cc2a042d517698d6708bc72e0ffede99ba82604d1f4204ef3c1da36601a SHA512 d05e6bcbb8e7b5506ea953d37c895dbca59765e9a26081aff2c4d213c02365a4254580843dd7624fe4a046afdb2d5b8935c1fcd4d60b6b1d71c4d22789d26371
 EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
-MISC metadata.xml 383 BLAKE2B b1a438df1b9875183113757feb0d88423209f774e28d840056ba11c11ff1dd8590f0e86308e4181d8c433be35124857189c1351d1191f1b4ae042aad95565d69 SHA512 aad17247919afc3b5878b929814921bf3954288d33b8e729d67af134449f52ee6050ba1e9054454e8a29bd92a1fb08a0263096e8ac4e448e70edfffb5e1285de
+EBUILD osrf_pycommon-0.2.1.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
+MISC metadata.xml 484 BLAKE2B 27b6c586f3d70f474606704d9bfcbd85b0e1bffa67401763948e4cd2b4b4712daf44eeeac8942b3f9705a00a0ec7b43a5674b36a8ebbe32823a626e2f145b199 SHA512 153575d6dba847d766ec346e71b57acd4f7b6355f6207ec71dcd7047736848d9d10ff6b3e2f23f935bf092cca72033aa5e0f428ac6c21a347477df88f12c66f0
diff --git a/dev-python/osrf_pycommon/metadata.xml b/dev-python/osrf_pycommon/metadata.xml
index e726c5a74008..71a1c07bfebc 100644
--- a/dev-python/osrf_pycommon/metadata.xml
+++ b/dev-python/osrf_pycommon/metadata.xml
@@ -5,6 +5,10 @@
 		<email>ros@gentoo.org</email>
 		<name>Gentoo ROS Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">osrf/osrf_pycommon</remote-id>
 		<remote-id type="pypi">osrf-pycommon</remote-id>
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
new file mode 100644
index 000000000000..76c71e1f7c8c
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# linting is something upstreams do
+	# for us, it either means unneeded deps or breakage due to changes
+	epytest --ignore tests/test_code_format.py
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index d6be82f18473..ade178c7ca66 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -5,5 +5,5 @@ DIST pandas-1.3.0.tar.gz 4721119 BLAKE2B f09eedd848686597a755da929683e841be61cce
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6153 BLAKE2B 3fb940dffdc0c19cddd05f31d7f065a5c5c873fde0e888b7a6a356b759dbfa2ae4729697c9240ac71b39957b9367bbeb70731ebaeddb46c778dba8e7eacbcb17 SHA512 44f78998f669a2df55b2b31c762c2e28c4e6064b3dd63f465e16a09a4843487e684142244348ee3f17a973ca98eb6645a73450444aa9a1fb984ef174f6a7e0c6
 EBUILD pandas-1.2.5.ebuild 6179 BLAKE2B 1830c307da0c8a1566ab2a47d7c93f2b591e4ad0f31274f133dbc374f12c6a206b7d8d94974c2063a44018f8197c78790f108988e353b84366e7e5b661a59e65 SHA512 00a11c97733b1ff262efd76f599ffcac0b46119508f5a444e386ba3c4d9f0cb36bb9d55afc397a6a3fabe7fb3a52ebedfed153e8f0ee59cd0355704c6e3afc33
-EBUILD pandas-1.3.0.ebuild 6403 BLAKE2B 54a0111d124c7280e6c3d36b4d4ccaec9b0be63b9e6d2aa4440f46f852cba42674534d2b6bbc6919b25878c8b0c25ac40c6e101e7572f587f0a32260fe8a4052 SHA512 3fc220025e0b6418cd363da9bd29c60b286f215eb1e729acc02c7d5dcd9699009c04d870651ae7b460c3a1d51c6c88d2df27ccec482501c879b9fadf56b0d452
+EBUILD pandas-1.3.0.ebuild 6410 BLAKE2B fa9b743b1cddd91d835cb6941e16118a8ca9b118119a0806ccc8d723df417d75a0fbe218b44d62c10983f25a7d1424a8e06798475ee879acb1aca71e018026d6 SHA512 cf2e4eff5dbde9ecf45578660b4fbead2299b419a104b01759c19cae21b6be89e7776ed514445527f338ca88186596c45907c73150e31ab10fe7f619a1f68dee
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.3.0.ebuild b/dev-python/pandas/pandas-1.3.0.ebuild
index fa4aad168863..cf0c8aa8a43d 100644
--- a/dev-python/pandas/pandas-1.3.0.ebuild
+++ b/dev-python/pandas/pandas-1.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 010f0b094c32..af8363de1923 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,5 @@
 DIST pathspec-0.8.1.tar.gz 26644 BLAKE2B 3591aabbd62a0fa1908cef5478d74a6d3ba64333a540c124aa6e7d25fbc45d44faa83e0822fa776ccf787d72ec9c2a977daddefa07d5d6fea2c8c6345836350c SHA512 f793ecf9bfb6511420a37fefa5a9dbd79d8e7329c305d6f1ecb4ea90e322825471983b56722c680e418e0bab41204996075c83cfc8ba7c6a0e5e09b1d8fd1d2e
+DIST pathspec-0.9.0.tar.gz 29483 BLAKE2B 00b48f6987a074e23ac6f344a44ac8f265463bdd87907cb8a602c690a739d1a9a673182fc4d61a6e2ffc02acb6632591b873e435f9fc3893e1cc48015e120a16 SHA512 660f13525325c27b598048a3576fd704c3843e0b07770187d005f0e93996a90cee44e9a0725b6bf775982f586ed3b4ba7cccee966d7149e71e2b95d48030b2f2
 EBUILD pathspec-0.8.1.ebuild 558 BLAKE2B 422f6c5a2833410f01ed8089ab31e330e0c5dd5c9b35e2ecf6188050e6b7711dabc8d17b35506d2a78a1fb3085122ae8a0854e449e713cf6cd2f906f0804185b SHA512 799dc93a8f47780441bafbcdb1664c7697b81fa7b2efd97b647dd8055b07b0331a65d90d05956741855ba38293ebb91633c8b047e9173dd620c15cbc27a5e10b
+EBUILD pathspec-0.9.0.ebuild 566 BLAKE2B ca545c920f8bfaee3b1cd1cc0f5202e8e5329e4d4513e9ecd76f823040af79f75793b06826e2e2f1ca2aefface0a147314a7144f5d003fa56fbedee1d077e303 SHA512 930b8914b47aa107adaade00274d99d8b4a9ea92bd169d79b3fe1002929237583bf215fbe54b9f7bb40a11e3c54df007d556f52a7c148916442ae4fe8fadbc72
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.9.0.ebuild b/dev-python/pathspec/pathspec-0.9.0.ebuild
new file mode 100644
index 000000000000..71f4b7ecb793
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.9.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests unittest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 906c0a11be16..db48dab94270 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,8 +2,10 @@ DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9
 DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
 DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
 DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a149504aed376a255453d3edb49137e979144645780777d988b1fbf5d7380b468ba9dd905f34e42f658f6ff8d0e0047d45ee35 SHA512 d177606bed9ca6f4e7f91ab695d9ae6ddfb2401f36c458907b2b6fe14e85a2ed188967da14971c15ec745b87fe794fc8ecca86679f01d3c8fb649224c2f75139
+DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
 EBUILD phonenumbers-8.12.24.ebuild 434 BLAKE2B ca7366984b77d662a0d9239e2587005262270921ea388226c39aa9e8639a92957b3bb831b99df059a0dfc4ca68772ecc5f38a38f2953ca784eac1ae4c4e3c936 SHA512 269022a5fd237ec45e78bb73ac97dc90d7ae7b507225b8d7721d1aedc77344dff47adc5bc093a07b2fe7aa5e5e2e0a626b3477cb91a23e52d3d5c8f0b95615d5
 EBUILD phonenumbers-8.12.25.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 EBUILD phonenumbers-8.12.26.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 EBUILD phonenumbers-8.12.27.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.28.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 702340202673..8668020537f7 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,9 +3,11 @@ DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde9
 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
+DIST pikepdf-2.15.1.tar.gz 2311058 BLAKE2B 47c7600ed8c27970b2a45dd5cd557ec6f18782f826a6f31247885d34564935bae2d92f6702fdd635d38730bf6a01e9c4b41251a8a94b73c1828677590bdf84ca SHA512 d71931539f87c64319e45710f31d01ec1cddc5c6bbf15948161336344857a9497ce61140ce4631af3e7708fa13e6e909eaf4bfb146c68f7a8b2ce1f03e206cd7
 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
+EBUILD pikepdf-2.15.1.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.15.1.ebuild b/dev-python/pikepdf/pikepdf-2.15.1.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.15.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..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/pillow/Manifest b/dev-python/pillow/Manifest
index 54389bda0426..41d0a5283591 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,6 +2,6 @@ DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722
 DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
 DIST pillow-8.3.1.tar.gz 48722889 BLAKE2B 4483c3cebda33e57f665a7a73b5898b4f0fb5be895ec05feeb266a99f33c78fd1b550d82225c201ea015d267206f5b47909b4963da9f17d51d0e5bd897332a77 SHA512 22a85a5510c8ec13928af571ec7f329f4728c46ebaadfe338d837f6d3718eedb57b7548fd9a3260a3bb0c0f97b3f3c911e730af01f90ca70c967d44b1e5d3606
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
-EBUILD pillow-8.3.0.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
+EBUILD pillow-8.3.0.ebuild 2627 BLAKE2B fccc81f2b2258a42dd70a7aabc1eb66a494f0f6f5dfcca0bcccb4a6d0cea5a81d43a1e15728301158f58d7c726a67cef1b123b7753f7592e420ab1a1cd3b3ab5 SHA512 eee259b4c67547014c84af2d4d034395efacec8f5119735530c51a6d9424fc71d759678b68c9872a9c393b863e6a46df2f9a1a165959c22e45384a99a96835f9
 EBUILD pillow-8.3.1.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.3.0.ebuild b/dev-python/pillow/pillow-8.3.0.ebuild
index 2943f29c9d65..fc76b7c92491 100644
--- a/dev-python/pillow/pillow-8.3.0.ebuild
+++ b/dev-python/pillow/pillow-8.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index cd0b7fb88946..149cec3ff0e4 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,8 +4,10 @@ AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
+DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
+DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
-EBUILD pip-21.1.3.ebuild 4405 BLAKE2B 5c61b37de4c8be7f2bffaf54d6168f79d65ae088d9c9fc1f8f0a0f60b11fafbdee889037bbe47354b74a5d14d449870ffc8e2666695903dd159d7d7047427321 SHA512 424fdab07a6e752b2d577928399fd5fb150f214b9689a41bec6422c005638d4948d0ecf4d40ccf19e10893f08c3775a5d2f756c001f3b5d0317c87bf777af082
+EBUILD pip-21.1.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.1.3.ebuild b/dev-python/pip/pip-21.1.3.ebuild
index 6dddd21d4f6a..dfecccec8ab1 100644
--- a/dev-python/pip/pip-21.1.3.ebuild
+++ b/dev-python/pip/pip-21.1.3.ebuild
@@ -10,11 +10,11 @@ inherit bash-completion-r1 distutils-r1
 
 # setuptools & wheel .whl files are required for testing,
 # the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
 WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
 # upstream still requires virtualenv-16 for testing, we are now fetching
 # it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.10
+VENV_PV=16.7.11
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
 HOMEPAGE="
@@ -67,10 +67,6 @@ python_prepare_all() {
 		mkdir tests/data/common_wheels/ || die
 		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
 			tests/data/common_wheels/ || die
-
-		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
-		popd >/dev/null || die
 	fi
 }
 
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 678fcb87debc..71014d691c5e 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,4 +1,6 @@
 AUX pkgconfig-1.5.4-brittle-tests.patch 546 BLAKE2B d80db0a12eee8f2007075015a46038beb3674fd89cb57105f7a0c2d8164572a3aa45377bc52a3937ed25b4eebcbcfe7bb347ca56bdc0db5d2f01901454fb4dc1 SHA512 f45782fb5330cf218b9550375f2b8f35ec82ca6bfc8a3963736a7cfbdac06a8d1fbe979fccbc78caecb7f5765f46e07f28cb3333f32f806825de2bd2e4365684
 DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
+DIST pkgconfig-1.5.5.tar.gz 7331 BLAKE2B ef93a712198c1da5a38aec59f52d325b3d7cb25deef799bb006ba1f1d16b673b21d8c837475839e659f62eea9571a50476e38d3c8f95551fb5512a61a155334d SHA512 dfdd0a6ba0d9f37b6d504dc9bea8b19b18a3431ae54bb5fe061911bd1c6a20452f30ea66f67acc6c13c06123247036de7442bba3a7b0eb1af4ebb62d84df64f5
 EBUILD pkgconfig-1.5.4.ebuild 624 BLAKE2B d76cf08bf29092890e079aae24a2897015108ecf1618dde8b5f1d0da98242cebea18b33e8f8cb5ae52aeb714915029be9b712818c5375ed4e4a71fdb64cf81ff SHA512 206832f16380b46d2df65b429eb6214ac4f09d14f4fff9c3de435d5337dbdecc92fb2bc8019115c8216cf204921e358b6bb8d2ccee0057d352ef0256dd1e0023
+EBUILD pkgconfig-1.5.5.ebuild 576 BLAKE2B 589efa8c3882e87c8b0c4903f9697e34c55d749fa15b60218160f58bbc20a7e886f5a02af566182c778ffa2234cafee3e495884a56d5462288ddf32fdd36390f SHA512 094413f31e1fa1a029e9bd449bac4e2345b8dd48fcf9dde87be8c61f2b247c127bcb900e9a28412b4bf8c17ed55b50ca602f65680ed902a2d33b353dc68870e0
 MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild
new file mode 100644
index 000000000000..dfe66aa5f29d
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="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/pooch/Manifest b/dev-python/pooch/Manifest
index 2ae0ec4878cd..7c7ea45ea73e 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
-DIST pooch-1.2.0.tar.gz 212831 BLAKE2B 73db6d6ef432960704103cee92c72d80243c9f73c3896458b20a734fc577f4982c0ecd0c72d512f8d355f28f48ca084755816196431aa7f27eab9c467e4e0654 SHA512 dfb7d890d3211f8f737dc79fa81cc895c166dc96b05d86ad2df9b33f1da950a05bce8e6a80abdb467edef2157bd13a8209771ced91a17023903c5541a1b998d3
-EBUILD pooch-1.2.0.ebuild 605 BLAKE2B 07a796f87177f96822e1596efdb351a11b31d91bccfa0607cee779c7c1296be90b3f581d6c0f7e62e4311ad536aed21c78c9ad642212c3ebe85fc8d6811692a3 SHA512 e21a097fe683c871c926a36c945df2626b8fb45f62de3d33a832fa6ef461c86b2a52ade0262795b61d5c5f5ebedd3559cfac6882f0e19d945a0548a9d28196ca
+DIST pooch-1.4.0.tar.gz 57097 BLAKE2B c891387011c99edbb78d84a8301e18fbfce36ecf6e87372ab384921d7e608abc2db2d3b3b37229ba193f3dcebb03f8df546c266075a0a35f18856ff38b3f94e2 SHA512 f883ecbb8831a179338ad497376ced25afa812ba3fdce7db4eb85aca00368aaf7c9c9f4dd58348b24f182b59e5de52bf490f03b6d4b6a807c4dcc182ac89627b
+EBUILD pooch-1.4.0.ebuild 870 BLAKE2B 0b76b07ec095ba22810c8e2ef3313413366a9a539609a309ca3c0a482cdf3382829fdb2ebb706d415a5ab53b98ca9d563ce183e186c8a66ec882eb680df9a8d2 SHA512 9d029105eed7472bec52f3c0c0de98568c6f621811dd5ca71d547f2ce5b8f28b0990828d5bd2abfe3e2027157db77a483619e2fb9f8838a5e142bdfb05d32a79
 MISC metadata.xml 769 BLAKE2B 51633e3219b1a01a53469e0c395441473b8473f5fbaadbd4e5c5031de19237462d5297e12c970e018ef65ece2a56cd94ca3609a833da70ba61224c0f94607b99 SHA512 c2a24da1cf1241cd04424b37688db5a5241cbf425a9d1e29a4b7cb032847b55a5e8174bc7bff29836305e4273800693addb018e02353d081bac963f500dcccba
diff --git a/dev-python/pooch/pooch-1.2.0.ebuild b/dev-python/pooch/pooch-1.2.0.ebuild
deleted file mode 100644
index 217adcfac24a..000000000000
--- a/dev-python/pooch/pooch-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..8})
-
-inherit distutils-r1
-
-DESCRIPTION="manages your Python library's sample data files"
-HOMEPAGE="https://github.com/fatiando/pooch"
-SRC_URI="https://github.com/fatiando/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
diff --git a/dev-python/pooch/pooch-1.4.0.ebuild b/dev-python/pooch/pooch-1.4.0.ebuild
new file mode 100644
index 000000000000..9108a6a076af
--- /dev/null
+++ b/dev-python/pooch/pooch-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=(python3_{7..9})
+
+inherit distutils-r1
+
+DESCRIPTION="manages your Python library's sample data files"
+HOMEPAGE="https://github.com/fatiando/pooch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 133decdfc9ca..2dd09996783a 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -2,5 +2,5 @@ AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a
 DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
 DIST pygraphviz-1.7.zip 118754 BLAKE2B 36507fc862bec45a33bee3f89e7593a15639e7d98067e1c4ddf917558b7bc037b9d7607f7f017ad5980ba0e6805e63f05464efe8fd416ef70cb95709151714e3 SHA512 09438931d1930a70f7da94b0a12b449c0836ad707c6c8abed49bae0db162c136002d170398ed02dc56a5029269490ce3156d2d4b0f30602a11165bc0038998ea
 EBUILD pygraphviz-1.6.ebuild 1042 BLAKE2B 392fc308251b392de90723a947174600ed1f2fd9122ae80614f3c6bada46ec56bc57b912d621d520212c9da4527ad0eb5af73ba07cb8683d9df3ecb1c65bb257 SHA512 a31cb0070dd46767a8703b9c721577e351df72a2e8d1e50f19451528dc997116a4cbff57e859227b2ce9ba4cefbbc47556b2335044bf02aa8b1da3b87a4a3bf5
-EBUILD pygraphviz-1.7.ebuild 1011 BLAKE2B 8cf68c203fc8e94b006dfd8b9b86252238be27496a680ec007b100222e7d685346ed978b7a95c2fadc6e76f1ba7a5b2bf697e0825b69b696f2a4cdbe4f7e56f2 SHA512 d2dd34d45fabf37ff25bca88e2370961bbd1690fc80aa3b5ee7ba5e5bfcb6fb4ededfa12a5fed6390137a4d1843e1d39597804c5757de6bad760d252697d9c08
+EBUILD pygraphviz-1.7.ebuild 1018 BLAKE2B d1edadfe4416cdccda0b11ebb35d0d325778d95dbe977584eda487885691e0a8b36f8580afc35591e14eb6c8acc7f4c40ddb3e293c504523d951893a6688a1da SHA512 4cdd8c2d0367866208e6e25be46f1fed36d0271baba8345bb93afcba523e3f36d7cfc3a4bf67d5aca6ccb5345e4d0d5565cc4e98d4776b08abc29c0a0fbd8aa8
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.7.ebuild b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
index de88e7c96feb..2cf250594688 100644
--- a/dev-python/pygraphviz/pygraphviz-1.7.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 7dc51aa8e63a..74f5f2049270 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,3 @@
-DIST pyicu-v2.7.3.tar.bz2 239703 BLAKE2B ce575c313d0e24838f87d270afce70e8b702753ec41d188bcdd60492f97ea276bca194c1bfd6224de17eaf84455509079e007b81e58c09ad0f48340b231e8671 SHA512 ff3bfdc5f24f259dc470f44c65707f7c29bff5c56dc85be7d4551269e5b6cc6e8f3a6953c5faae63aa9eb62e55f6ac75b32a1524f80ce2a7661de56ee1a5bf99
 DIST pyicu-v2.7.4.tar.bz2 241794 BLAKE2B b76455809704b417a42a60f002b1bfcc0fdf03dd4934b514464b06c4c53d1afa2f99645d9b69a131c3c9218f36a18a4412a6742a912450ce47f856dfc088e568 SHA512 bc68d94d2bd070cd1b7a2f214f998831d2f75a3f4528ad5b1d3394b343d357c24daa6b29443d35a7c984ab0bbafd3b45949d1ccbf89b061423329efa08181fc0
-EBUILD pyicu-2.7.3.ebuild 575 BLAKE2B feef69daec52c720ffd9f57d7f29c932f232eb3cfa71086cf3f3563859a7df6b7209ccb98f17d8f710bc40ba39f6d51b4848aa5f1308b9f3885579cbe4c8a7c3 SHA512 c0d3c1d6097facdf29fd11833672d9d3a8b7b94923ece6f168e27ff42e1b211567ae509c68e07bd6ff285a4ad8e1eff6be842d05e6f5004340b00d459ec7fa71
-EBUILD pyicu-2.7.4.ebuild 577 BLAKE2B 37a973d7dc44a7b31803ca252c236bff9733c057a16982d0833349640298db714246981bba993d774892e94191b26d12c49858a151097d0e265368f22836f069 SHA512 5ca8f712774af506a832ed19382f62e3459daffa68f7e21e216fb3d68b3dc816eb9917de9e60efdebfeb07d7e14a9857f2edc56e17e54f3085b306ead38943c1
+EBUILD pyicu-2.7.4.ebuild 629 BLAKE2B 644be8ae4aae181ea2be74b2031536f80fd986521d7468dc6bb843acd75328e25c4100c0f3015ffb5fde3e811dae101bd1ed11fbf70f4775babb95b6adc0e921 SHA512 830eae0bfd9d3c0d55a447e1a8d13c8256fd009338932fc4497a4bb4ce0034b4a76030e4ca773754bed99ff9c031f30a2a6bab6fc6f8a6c0fb454e68de34b147
 MISC metadata.xml 414 BLAKE2B c5d5e032b7e62372f92e6312f926171dc1ebf9d382dc2ed0f45994cf0a9768b7d467d6ea1ad47be7e9f0edcb58967632bf1b0973fea745c4ce4ce2294ae349d5 SHA512 4e094880c6bdb97f02812d29d95db1ef73b0f08ac6d7538d10cc989e695fc6df5b931be03748ebcd61f07e3078a4f1d969cd58b81b886003ade233c24f932364
diff --git a/dev-python/pyicu/pyicu-2.7.3.ebuild b/dev-python/pyicu/pyicu-2.7.3.ebuild
deleted file mode 100644
index c8c40052fa1d..000000000000
--- a/dev-python/pyicu/pyicu-2.7.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=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.7.4.ebuild b/dev-python/pyicu/pyicu-2.7.4.ebuild
index 30d316501fad..7052eddb95db 100644
--- a/dev-python/pyicu/pyicu-2.7.4.ebuild
+++ b/dev-python/pyicu/pyicu-2.7.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1
 
 MY_P=${P/-/-v}
@@ -18,10 +17,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
 DOCS=( CHANGES CREDITS README.md )
 
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 6d4235662cbb..e9cbdb0f452a 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -3,6 +3,6 @@ AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826
 AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD pyilmbase-2.5.6.ebuild 1530 BLAKE2B 2d3dd8edc3b264abb8980320c2e785b3e2ffda1eaf1342ef226bc8a43856780fd557ea8729361594df31a624641ca2a9a12cdd75d74a9d8e50f5b04a5b4992d8 SHA512 8ef19f6c05652f73d734cdf6d04dbedb90a0e6e202a118b4e867ee35fc7d01f994c2abb3a6c3555b7cd25da11a6f0a17b4fad6f6c13a6c578c9cd7e03435ade2
-EBUILD pyilmbase-2.5.7.ebuild 1398 BLAKE2B 9fc95e65a2391a2a78710f9284f740c40057e11f1aa77b3b51428a3db076139f3adbb6810231763df563c559e11602f2079491c23116ae9a95de1dcb57487f43 SHA512 59c1b31b2ca9db64324bfd6829e5ff54882a41697309c36927b64f36953e626a75824fc586723580c6d9370ab19f24b7be3bc6936a4d6d0cacbcf4a64e48a692
+EBUILD pyilmbase-2.5.6.ebuild 1518 BLAKE2B 984aef1e772200117345cb174c1f46f24c3bb3414d863a86d89d5968f586d3528a5097f9e49583dd982657edd3e8b7259c5a69bbb044da1d436224890e2548e1 SHA512 fb4afe446f8ec3a0de3579ea0a776d70a3b4562046a025d849eb93cf6df33a4a7675dfa63bf28b33ece467dc1cee8dbabfba1d924e521ba638e0e1a68d5f4915
+EBUILD pyilmbase-2.5.7.ebuild 1386 BLAKE2B 3ed4549ec313be8031285379f41f93eba037c3e6bbbd9cd173fe083a4ae7ec37b865cc4da47b289d8c7bb11c4fdd8d4cbbaf0da0c288454fc9fecd719e68f128 SHA512 4a62d97e0de989561e4ca3206e2e6d49c95253d032851a742e972846e0fec1b18baaea525d87dbb49e97430d9f8a812e0d4a3fcf58b0263d80805c5c5f7530c7
 MISC metadata.xml 690 BLAKE2B 857ad16bdb3ab2ac35ca5d8e41a5e2302aa7e130c0dac5125135ba92569959b91278cfb3da987e4647aba4dab3898d7de9c6e340e20551379592a1c90d236882 SHA512 357ac1026fdacfdac7ced27c40fcf936a14dac7a044e8b168de7ac126811df67fb9e9ba01f8ee0fcf40ef86906abf37880fba6a782f27f832ca889de04ea4e58
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
index 76a74d8d9078..b479afdf553a 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="IlmBase Python bindings"
@@ -23,8 +23,8 @@ RDEPEND="
 	~media-libs/ilmbase-${PV}:=
 	sys-libs/zlib
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
-		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}] )
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
index 5578bb6f7f68..b7e9e391a71e 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="IlmBase Python bindings"
@@ -23,8 +23,8 @@ RDEPEND="
 	~media-libs/openexr-${PV}:=
 	sys-libs/zlib
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 20bf7920c5b1..566a83fed958 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,8 +3,12 @@ DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bc
 DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
 DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
+DIST pylint-2.9.4.gh.tar.gz 777252 BLAKE2B 84bc535b3c471be5d01a02ee67494d993cc257f0938e1bb0e35b1d64415d256c4f0dabd45cdc3319716c67e5e71ea935b63633f56b97013bd8616296343709d5 SHA512 9b5db20cf2d858e662c309b11cf28bf247b7c5f90de4f747733a0288ff4acced02e0e6b83145e7d940772eb9debf297b9ee6976e0f3ffbd73aaacaa3f4cb51e6
+DIST pylint-2.9.5.gh.tar.gz 778090 BLAKE2B cbcf5427665f56cc37afd08fb537fcc3f17697ca7cdbd7da97bad4093f344c9b961a156f5d141e070fa84c7e07293175a70585a8c996c9cffb7cef80717752af SHA512 84695bae88704391752f4b0944e39f5b44933fee8d88a8839729845b93bbe59876da08ab98645217c4ff2a98fd793a92063123b25a595fb332ce0a3943bcf7e7
 EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B a3bb2622c8b0c0efc01f6a768b1810f4c2e5abced9f64d74bfde68262ec499bb2b27f92ca54d53e90c56ddb285e1aa557cde18a1aeece020d6635a601847dfe8 SHA512 7dcc3c7ee9bbfef1251fd49e94e8ec4298c000fa3765fd63ed8737acaf33a59ea36ea655367685c2031eb2ac39e1a604db3d865ec5a2aa54a2b8f368a5e458b0
 EBUILD pylint-2.9.0.ebuild 1614 BLAKE2B e80781de4e7f7659a3ed4eb7b97babc20016788f817f8f46ccada5fc51125523b025b86328b3dae86db97bca1f04ea571318deb691db8ff9740608ce5413c7b8 SHA512 d268f97c235d15eb981eb9c68d3f21837ff3df5b87f7f9a1a7febffda82d1bc99c6a3a9e8fdd470ae523ece06ca351ec232eecd3adac8db3ba098fb320f490c3
 EBUILD pylint-2.9.1.ebuild 1417 BLAKE2B 5bc256a51f5f1789798601c125f28ca97f91de685cc955d687ebfecbb4acd3034f23c722356d2f8e8ba0e5b1aa1c2f7c396a06c5f9458d2ebfc2217cc870b406 SHA512 8508781be857a114574609adf5cf483e199ba21d5fb95a1e553ebf3c9a2a84d683852646498bf9d794d5a0e719206f5dc854e72cbebf402e41f4bb90ec28f367
 EBUILD pylint-2.9.3.ebuild 1424 BLAKE2B 52fa7d9843bba9a2a65c6fff4c724be00f92971707aee9ce9ce601bc8b4beb8ef29366b3be202e773b4f8fcfde58f14afb36061d6a8c7a6d41ebd9cdbfbc725d SHA512 d9721d86a998d9c5f0942a005718d5f71178747916d96b8fc8d170d52fd39b41f7dc6032751d901cdf9f737a41b3c8d4781b9481eb24438aa3543b270c1e2613
+EBUILD pylint-2.9.4.ebuild 1424 BLAKE2B b2275bca805d7f1228f2efa04885e523340ff1977617657e6f69612d532aaa93536d06bef8b920fd31f695698877797596d24fbe11997df3900b6edca10cccaf SHA512 283cd629c2075238db8e2de55308b980d5c8325fc2ebe8e4e0b8996a5990ce7567a99b792e9fed855f10f587d54badc99beb9555385be78a9695b04c97cbe3c3
+EBUILD pylint-2.9.5.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.9.4.ebuild b/dev-python/pylint/pylint-2.9.4.ebuild
new file mode 100644
index 000000000000..5c1fdf9d9f08
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.4.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..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.4[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+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/pylint/pylint-2.9.5.ebuild b/dev-python/pylint/pylint-2.9.5.ebuild
new file mode 100644
index 000000000000..75d26e73965e
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.5[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+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/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 43e3f8ad421f..2ad9b48bdc38 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,3 +1,3 @@
 DIST pyls-spyder-0.4.0-gh.tar.gz 8854 BLAKE2B d14a78be98c1db0a37a2fffe2e6bd8955687a95af8524c852d434e57cdd157dda8f5ecceb19ad34527dedede4497c59fb7949a709d266803c2d8cd67c60380ce SHA512 5a9d6667cb85434ec41a176e097d20c78751d5f3879d4d361e097da214b54b37fbef97d95a763a58d7f5e3c148215672e769091814f06a34139c6625cdae3f9f
-EBUILD pyls-spyder-0.4.0.ebuild 598 BLAKE2B dd765621565d4fff92ec8c68688586c38fcf8e5bb3d9445ffc672a1a99af84e69b1faf86e99b39c9ee489eff5c7fb9fe6f47f80b7aeb75ac1d37274eaf55ed34 SHA512 8df8b8a30a17aaca1889e698be51cb712c7251cd04b55d35799a1a106cd64ec01d90d74e07346134a01488dca0e32b2adc58779df7b61ba03461f28d899555e8
+EBUILD pyls-spyder-0.4.0-r1.ebuild 610 BLAKE2B b9a4f733b49107c1410fa899d63e45c529b296fc3aa3b2e229f1091ffa1d7d207421c46bef286858c93b51e379203daafde2273fed8d6fa9bd07d7ad169cdfb3 SHA512 1533be89ba5de97250d043d52588ada706146663b9e5dc2ed7cb64986eb9d7ba5216438cc5c8a9365f1730b9db5624d13904ae49ec030e14ec7f4701454e327e
 MISC metadata.xml 519 BLAKE2B 56a611a4a62e08659e92f60d8262aaef2b81c60036517b7b6cc47c1d9af998e6d18ca08844ddd1ecb6c6853db778a9f79edc34e4618d363f7e6fe93ddaa60a11 SHA512 9ed90f62c0ec5fb27f5d18b78df942b9bfc15fbd39d39ef21eb050d011a880514a4f1361c84e72f026195bf9e8630d65f21136170c90c7929f83bc69c74fa0cb
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..407619370167
--- /dev/null
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.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
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spyder extensions for the python language server"
+HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
+	https://pypi.org/project/pyls-spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
deleted file mode 100644
index d30877c10e7e..000000000000
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spyder extensions for the python language server"
-HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
-	https://pypi.org/project/pyls-spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/python-lsp-server[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index a42ecbb2ef38..39e339fcb9bf 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,5 +1,5 @@
 AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30
 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
 DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
-EBUILD pynest2d-4.9.1.ebuild 718 BLAKE2B 7f9b2cb7f27eab7bff6cf3686ad30a10057415ccdb5ad77a047faf4bcb95ff5b0f4422dea0a90cd07384c1f6de74e42b6d9300ed26bf1314cffd9dcd0dd11aab SHA512 c76ad4206a424f275f9451c3e2e0fde2b34d147abfe78614ebfde92200644b1fd97ed15f0eafa7fe82f57ef697033c2a8df435a4d5cb8c391cddbb7a81146f7b
+EBUILD pynest2d-4.9.1.ebuild 712 BLAKE2B 88abe1ebacd98b606b5f63693037914521673c20fb05102d0049ed7c7e56740cf14bdc048cdd3b69d0e7244b8484370c20ec6ab66c8365ef25c92fafe47aaef3 SHA512 8caee389b39633a187486b9260cb2e859efb10d14ec44190f6e560fc50e843720ed4c1a3a1fbfec3e73cc4ec05333ad5d366ef46512c8437cc36b51e0fe03759
 MISC metadata.xml 409 BLAKE2B d2b4665c2ecc55b12a8058ea9875761523b925461731bc3e9cdfc87b946b950dce07511c3404047dfe283edf761a3b69e71af29618fd39040a04bc3500413a5e SHA512 4e95045f37666488ae3b2dc2277e97bd3e5f832da3d23a20f601d71ede313d51ffe3407ab23536827d9b449a4cf5b38b49b410997e0f3a9bb90ad02ab8e4cbbf
diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
index 44552bf132f5..e6226da74083 100644
--- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libnest2d
-	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
 	"
 
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index 0db8c34fe787..7b0738f56995 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -5,5 +5,5 @@ AUX PyPAM-0.5.0-return-value.patch 1728 BLAKE2B f8f08fb3e254c2f706fb0dc17874bae0
 AUX PyPAM-python3-support.patch 5759 BLAKE2B 4aabd07b022f1c9db01b462438a2908cc248a1751e86230cbeacb8ecf11af5f7696a41387acfed6d6fd7231b053cd736a02fb597b401bdcd8515f11e1e5628ff SHA512 f2fa907fa2f4459894a14f801b65d7459c82ee202a39e6f18f77aa98192543326372a55217615da8b82c34891892d61f8290c3d6e8989ac577083429dd071abd
 AUX pypam-0.5.0-stricter.patch 287 BLAKE2B d3c70bc1db78da2f8434cc076b2a2044dc0d23683cafbd520d98aef089da4d1fe7c0344e72f838a894423d9b8f53e566b10c3cb6b6e267fcc67de14d69601ab6 SHA512 2ea057cce5e8b7810c879554cb9793b3869342a95c5ffa5239012157a3d09c8ab8cbca1f18424b147e83d6ffd770c417cdd39b7521780e611f8c69991c91d9eb
 DIST PyPAM-0.5.0.tar.gz 105206 BLAKE2B 7778275cae11606ca8e522d2f99fb0558c55545cdaedb3ff7c55b4bb693ed3429e22566912f53c7795f73316bc45f1bfbdf5a53daec234dba87e1c141e2410f2 SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0
-EBUILD pypam-0.5.0-r6.ebuild 1034 BLAKE2B 3b0bd955c209a66c439dbecd494141757a4293b6c73275ae857ed969402488afdc39456a29a9c2416afed75b3d022cc9a4487d79732e13972c53efc89eabf062 SHA512 57a309c9456a771fe2c8d6cd0e04872406873c90fe6bb944aebf1998a7b3bba974c03910d99f6392ac29dd5fdafdc8fa16b6c82f78b0e046a467c44368446148
+EBUILD pypam-0.5.0-r6.ebuild 1096 BLAKE2B 0f24537349176ffcc264473866d463e8b9922232805f4e4c87eff562f872386fc68719034818e3d69b6b29ea1108d970bf1d2589853e8729d2df425f21597890 SHA512 41a3e1127fa1a5f6b42f48e188e8fa90361e390cd43a553795a5d0612757e9cf81c4159f3af9c9a3bc4cb1d3e03b67b311a4c1814b6d81872efe974b028caa20
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/dev-python/pypam/pypam-0.5.0-r6.ebuild b/dev-python/pypam/pypam-0.5.0-r6.ebuild
index af7d95bbd828..ca6df1352e51 100644
--- a/dev-python/pypam/pypam-0.5.0-r6.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
 HOMEPAGE="http://www.pangalactic.org/PyPAM"
-SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
+SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz
+	https://distfiles.gentoo.org/distfiles/ad/PyPAM-0.5.0.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 99443628d8f1..d95082d97af8 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -2,5 +2,5 @@ AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feab
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD pyside2-tools-5.15.1-r1.ebuild 1664 BLAKE2B df506bbd3f320d949eaebaeeafd9baf5e92d1b5bd5087a1bdc5dcf938ae46ced2f8ac5bf7831ee527a06229455dfe0d8140f4304e2f2a66683a33583c3b128f9 SHA512 e945c2577d455e12154e10cbb32ffbd27e0305565770f735a7c5a5d6c0c5444698a56ee738f3daf47cb1f890cc5ef0f9e96d5da675ec915fa1b003803ee1a889
-EBUILD pyside2-tools-5.15.2.ebuild 1656 BLAKE2B 68cf0a7a467452a7ffb62d64739d6f83ac878f492b58685c77825ad59bc82a60c385c334a7d6c7bc62e5a7b88ae951c918371e5fc6ebe733fb4f2ce4285e6c61 SHA512 2409aa14f7b05ac02d74c0a57efa94b356179a79888c8db2bdc29212aa5229e631bca576a6f860f9ff05b64ff19d6a94bf34b30398726a93512d9b68e72a3350
+EBUILD pyside2-tools-5.15.2.ebuild 1654 BLAKE2B 9bb7c7ffdf6690414328df5a6a2e1ceaa2cf9e23df0cd88616f09339a42d574f6c84deb1fd5d76ce70efe8ba9d87e2636e8855213f4c34685a3e522f61ce6a9a SHA512 2a11a7e368a50961aa792a0a65377ce430f186e54e6221d1d8cbf149f34fb9c12d92f0b60d289a1c6fc684e9efe4f4bf839bc0f3d1c34203d92a808e6583c2dc
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
index a5390b2c4fbe..26e9befee28d 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 2e8eb969744f..0051a3d4053f 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD pyside2-5.15.1.ebuild 8507 BLAKE2B 0bbe7b1019a4bd79d1dc055367b076cb5001bacf5382913f2886a436f3ed272fb59e0335e9b6d6f578f0da168e31f175d3313502748c44aa85f9a50ed6ed0fa0 SHA512 798f62f0fba6183da092ea879beeba2b80bdfc6bcb87f49e1a09a90af96416dcd855126dc39f5c13b2e65ec43c15762edcc172fc9ed0180cee779b4737e9c920
-EBUILD pyside2-5.15.2.ebuild 8509 BLAKE2B 313c974b96c0afbb614a568cfdc73c934e7d779edda10389f2f73af19524aad20f9bb365de79c24a54ab47615786290a64e1b60ab984548da3f1169a68966e0a SHA512 b192190a03b7674b13b76b6b48645615f1cdefba6cb5d7d471253f4e753e4e1f59a844a2e335e1130a6442880304b316b3ca87f0f1d987dfc7ac9c98ae4bfbc4
+EBUILD pyside2-5.15.2.ebuild 8507 BLAKE2B bfd3ba37c28cb9a9c9882fb30409b59cf27c71140652d724db1f697aa2b7dd0835ba867e22d44af1a4dedf80b318056b82f7b1b24a89adb5c07957c7b003b6a3 SHA512 18334bc86d0b277505e10ed6948233bcdc96e4cea001d72bd24bf209feb540444da6a13b90a699c47c69eef3272d253c16debf904820d73839647d1615db21dd
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.2.ebuild b/dev-python/pyside2/pyside2-5.15.2.ebuild
index c2dd67aed989..1846c6047bf0 100644
--- a/dev-python/pyside2/pyside2-5.15.2.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
new file mode 100644
index 000000000000..ed0cab164f1f
--- /dev/null
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -0,0 +1,3 @@
+DIST pytest_localftpserver-1.1.2.tar.gz 41275 BLAKE2B ddab430541208ea7e30b7091f0e5ed1ff347c4f289c79e1bf93e7fc56ac3d9076065afefb383e8e394cf702ce906747c7450acc0423df73cba5762cac01efec2 SHA512 44dfb4e680f82d6156212a06e320d437c5aa947b149177bb05a612473f882e0d2e8ff02751d0f79d56596cada82a299c9266b5849220687cea1028df7ca1bb00
+EBUILD pytest-localftpserver-1.1.2.ebuild 622 BLAKE2B ba6c3e8a0cb91820caa2fbf4f67813526c4169d0e1e60c3de39170702978fe27261f819db005dbf9609ee185191b85a914e49523613a3e61ee901b50265fea22 SHA512 90113f93c94de2ac8661059b07445fab8d9195ef6210438ea38dfa24d703fcfaf9365d67340d4b39086d87aa591560fd248c98a4bef44e0c6f768b32d40f08d7
+MISC metadata.xml 568 BLAKE2B 8217eb6510f2a94664066eab9396d2eac4b1905611e92db73478f3cc14bd973d3b63d46385a1f7869f81491f727a5826fca03ad982a558acfd2a6f4b27d80c1a SHA512 2d6d549b5f1852308e43a827f5023222aca9d20f70a7139d08d1c20009fb21347854efacbbfe5b9c19d29e2448e675d527fb2a58de701f0f73372f8ce9a3f69c
diff --git a/dev-python/pytest-localftpserver/metadata.xml b/dev-python/pytest-localftpserver/metadata.xml
new file mode 100644
index 000000000000..62e1789c4b28
--- /dev/null
+++ b/dev-python/pytest-localftpserver/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="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<bugs-to>https://github.com/oz123/pytest-localftpserver/issues</bugs-to>
+		<doc>https://pytest-localftpserver.readthedocs.io</doc>
+		<remote-id type="pypi">pytest-localftpserver</remote-id>
+		<remote-id type="github">oz123/pytest-localftpserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild
new file mode 100644
index 000000000000..4706d32e6255
--- /dev/null
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.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..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# Tests require python wget module, but not in Portage
+RESTRICT="test"
+
+RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 5903836a50a9..dfdcc5517136 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-EBUILD pytest-regressions-2.2.0.ebuild 1066 BLAKE2B 18e7110806bd68e26943690c24fb757a96f5a9c04a27a87fc0ee9aedfff1f5c9be83e256e308943d9f96d652e9b2a355fc9743c9bc3eb59bc09f0b680fe8b263 SHA512 f6949629a4bcb9c286365dea82674a8fa37940829adf7e11541d1cb282f290059c1be370eaef3060ae70f5204f45088f6d288eebe2f28ff77293ca7f0a0d00f7
+EBUILD pytest-regressions-2.2.0.ebuild 1067 BLAKE2B 7c71b39503281a8b6be61b5ef690f52c4c877883ad726d9699782359f5f5a66f1127be9dcbc447c32faa810fc7a108170cd6c31c1ec3c875608cef7c831723e9 SHA512 8b324aabeef709b3320115b890b3c57e1d31697e525a8f712de48e24ff42d6dfe4893bce16e6d3abf4f80e0fbb87412e5f6f9fae35b475820f4e80cbb64f9f1a
 MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 07c233bce68c..fa7829c72396 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 415f9d6c6760..bb6661a90b2c 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r2.ebuild 1230 BLAKE2B 66e1184bcdf2b626ab35b4c763b6d970f0bc779a72effa037aae1d42bb7fd4462f789e7dcb5358c3189af022a9a190d2019da9a4116ab2460bdcafa561e5bc60 SHA512 8b4f01abd21bbc1cc5fa41b67368fd74f9909430bdc796470984a6291502240775b1d02a276d1d0f94a0dc5f6f7ab63c434cc824f59af5a6656750b32f8144d1
+EBUILD python-caja-1.24.0-r2.ebuild 1218 BLAKE2B f1398f1578bd7246c4878d588ed03569d0f4e1eac555100cb819431fa1f31d546bb75d954ff9ec31ff25bf3cc274d8439081c918df357bf9dd6469349d90870f SHA512 233bff12b4e70fc76758d613391ae7d1e0fa35c62fb95df9040d810e08871380c1e528af48a607bf23b443543ea0ccb2ce05a60fe73bb72a002cde15d65dd1a1
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index 4e4c9419cc77..2d0ab57971d0 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit mate python-single-r1
 
@@ -20,7 +20,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
-	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	>=mate-base/caja-1.17.1[introspection]
 	>=x11-libs/gtk+-3.22:3
 "
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 365e02d1d123..2fd5ced8d80f 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,6 +1,6 @@
 AUX pyls-fix-test-with-pylint28.patch 9964 BLAKE2B 8f8f4a2a874f0f4a3b146463301b997b82a0b05d662451faf77994ede1057f7be71e2916d74944e0b30fb6d6c0d7b7a9bf5eb651085033b2279974d2005191a2 SHA512 248bfc639c6e534ddaa7775ec09e8c108e1ab8b071b99e2b9fb855c22b9427112a6e46e6f9261150700ecc752206c36a99398973bc8a10b48587f12bc42bed7d
 DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
 DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
-EBUILD python-lsp-server-1.0.1.ebuild 2286 BLAKE2B 13a703acc5377bf150118ca12f626bb8bf4025df6499f0dd1bf9ba0d8f504cb0cc1505355f94262a4336f3328b778682a0144bec6f022161eb6c9f3a034c07ee SHA512 0dd9e1d7e0dd54da5f9a2986eb7dd72308cd053d10dd563dc7efe99c2e7ed7287d7c15a3e83a6b34bf51f2d5be73cd6905e2307ca24bb26f24003b1e9cdb5c74
-EBUILD python-lsp-server-1.1.0.ebuild 2333 BLAKE2B c4cc7c4391c57be88ff269d5ca84af0b9257d2ecc8d599bdd4041c3860beb9bdeb2aa675d8ff64bc1f59ef77cfc0de2417cf855dc57c4657dc54b7a2add517e4 SHA512 1378780230a14f885b4575b9082af179840c961a87f6e90df60a548769866a17bd229ffdda337e5ab7f147aa45dfca388734ad20e51e0295228799838d08b800
-MISC metadata.xml 463 BLAKE2B 4b7c9f0dd4bf6631ed4da34e4c048a5ce16b676b6c56a7f7598074db744e1ccff4c977b5dfcf46d77221d9b1821e56df1722a626f02a6fb7f7c6ba303308c514 SHA512 f868ad2bb319f1ababb0d9a70cb368dec36935822678a6bc365eb2569cab661d300d4d347cd207f6b2f537b5ffebb84dd804fc2faa35cf85f17d437edb177eb7
+EBUILD python-lsp-server-1.0.1-r1.ebuild 2785 BLAKE2B fb1f120ef5169cb5dce27b66b8b82581159fc7bd00d2a8154d96052ef92d92027a7cab629c3956d3531da3094daa638bf38c6ddacd98b852d03c0834bd59ffca SHA512 91fa8f63c97b151189e40680996d8e1a1f8e2db9221eae9c9b235a6dcb7734d6f5528f261f15dcaa062fbdcc6a9b4dbbf3f5f30f9a838f404f7bf7c3b7000db9
+EBUILD python-lsp-server-1.1.0-r1.ebuild 2832 BLAKE2B 00d5fb78a80f07885f952864cc14c8e9126de6011f879c4e8caa72c35ffb3075df242c6f4c9f156931f98d41bdde204ad578bb68bf4ef2d56c40a1c853249e83 SHA512 fd81294a4a46fc6a20047b8532cd0ecc538bc0d19ff1ff7fdf989f8016d107d7a2e6719f3b49c87cdd11effc726b5420615be03698502c80c6c85388813a140d
+MISC metadata.xml 541 BLAKE2B 1c86ef694fd93a9fc531d0f76f919e7cea42cf21a5012dbcfdcb543254541bd66a4deac7593441f5efdf0bca3fbc4f51953303e1391f6f812813b6ab9cf69869 SHA512 9dd78ed4f786f574e9fe607a87134af82fd59934ef35a23183444e3309b27e3341a9288819558de194db037bb0fd02effe1411bf9d93d748b546eb07c038395f
diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml
index d18c2963a96b..bad826ef127c 100644
--- a/dev-python/python-lsp-server/metadata.xml
+++ b/dev-python/python-lsp-server/metadata.xml
@@ -13,4 +13,7 @@
 	<upstream>
 		<remote-id type="pypi">python-lsp-server</remote-id>
 	</upstream>
+	<use>
+		<flag name="all-plugins">Pull in all optional plugins</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..664b3167fc9e
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	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/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pyls-fix-test-with-pylint28.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || 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-lsp-server/python-lsp-server-1.0.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
deleted file mode 100644
index 6acffdf397b9..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="
-	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/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pyls-fix-test-with-pylint28.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || 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-lsp-server/python-lsp-server-1.1.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..a81825d5a49e
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	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/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || 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-lsp-server/python-lsp-server-1.1.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
deleted file mode 100644
index 7bfbc16308b2..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	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/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# This test is continuously breaking
-	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || 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/qrcode/Manifest b/dev-python/qrcode/Manifest
index d081a15f9eb0..a2e781c99f2d 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,7 +1,9 @@
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
 DIST qrcode-7.0.tar.gz 34548 BLAKE2B 0a5f06b73f55ecc713aa34249acf5d58f71b29c90e5433411a9208124931bfcf101f016a6f1fbcbab0eddd3ffdef763cdc92fdf09565addaa86120a80d4d0c1f SHA512 2b96528582c1d80ba1bd27b5bb769d52e238bf5a3eda2fa23c4bef90778fa2d478c50a8f2b581d5b83373d778f346c410ae3475250029b878ff527edeae0f323
 DIST qrcode-7.1.tar.gz 36068 BLAKE2B 93f09da56b6e0cf6875250e46ec6b3cd5fc631c5775093317fcfbca72990ce8e4c2d50336e0a1dd67cbd69b787652de7c75d5108430871e0dfdd3cf17e9a1eec SHA512 838496be964ace361cd1b28b3203afafc2f262d1e929fcdcf54e0a632bd85518cd60b2955ed22c003c27cbe5527f89a9298ff912f6b02a75b14f9e5410fbaba6
+DIST qrcode-7.2.tar.gz 43032 BLAKE2B dc1ff428dd86485d2e2fe08b0efb367eb925551fbc31b4ab4f7f22a132ccc3fa0f7625a1e54f16df57f69fce3753883be0e46de6df84b13170d82d10c268866e SHA512 2ce72b2f6893168b96e1f6dae03b3250b8a0654afc9c0194075493d8ed93616acec7b61b9b95573f92c853cf227fff467edae7255aed10a9f7730e9ec5215133
 EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
 EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 EBUILD qrcode-7.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.2.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-7.2.ebuild b/dev-python/qrcode/qrcode-7.2.ebuild
new file mode 100644
index 000000000000..0185db078736
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.2.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="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index b9ba9531846b..7c2b4f5120f6 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,5 +1,7 @@
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
+DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
 EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
+EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.7.2.ebuild b/dev-python/requests-cache/requests-cache-0.7.2.ebuild
new file mode 100644
index 000000000000..32b48e1d7368
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 1fefc53938ab..c78ee9eea028 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +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
+EBUILD requests-2.26.0.ebuild 1446 BLAKE2B 1b3c5fcc7ed94944772eaebd2f3b6441e0287a5b5216056209f7a584a38028423441ace3bd0b33afcbc3fd0f07ea4b7ebcabb2d2d911d2afe1b98de4130fb1a0 SHA512 e694429e3b585d35189324fce551fa4ed1ff1863b897ff759a95eaa6743b663c659ceb401fd35dab173160ea7f9c6d7317e24cd60df23e0ca6bd91e72ca12077
 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
index 2d726cc23334..9f732a314f7b 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
@@ -29,6 +29,7 @@ BDEPEND="
 	test? (
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
 		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e4414d238bd7..c6a3a912580b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
 DIST setuptools-57.1.0.tar.gz 2144012 BLAKE2B 148eb7b5e432461f692faeb3fd4eaafb99bb9fcd2c430cbde40fb16b365ed011ce49966a8923337a860b63cdc6d8f3a26efdd138cf4c40c99e72f7d714fce57c SHA512 dfcf75584b3d7ae07e0f58ce8f596d7e9cbe3a0c178411053b066fb4362226bcf6467a79aed0853acd0b9f6a3371c47ddb07d77cbd780fe9782b8c19bce2e5fb
+DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
 EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
 EBUILD setuptools-57.1.0.ebuild 2328 BLAKE2B 87a70ef14e6c01d7d28c69eb6bee16a57ee6d228bf002d2614fc67a8e4a7479ac21fcc2234869bada3ed4224f3a22ce2a45bcd3625ddc122f60ddf96ce28e92f SHA512 a1fb816d0e6fe413f6f96129821625a7b8556cdb59ca3d84509e9cf1792e599e7567ac22f62b815dca978644bba1fda0ad10d991cd7bbb113b94b6b7aa1a9e44
+EBUILD setuptools-57.4.0.ebuild 2328 BLAKE2B a099a65fb32d0c0d8484fb50248bf699b0e4563a882e2282318bab53739f4969c3853f7570275251a5568950662650ffcbebccbb8ad528e9337e2412ce2f45cd SHA512 123817b89c66f61ee6f3ca70185038ac835672e724d8a500707e5ed90f83a8e1624a511e824dc74d87af243954d6feccd80765519388b5efef805c08703b2e26
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0.ebuild b/dev-python/setuptools/setuptools-57.4.0.ebuild
new file mode 100644
index 000000000000..771a2d22c1b6
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.4.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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 )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index ef4227ee8285..a4091b849411 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.1.ebuild 6588 BLAKE2B e62c3cbf2d3c7050012de985c7cac72cd379ee7551f5c2317bb6218a038ca5581477b4267ce5e81b22b2b9637c329db9605f6c23e3b33c72a2f3775ca1599504 SHA512 24fa578ba0163f72ab58f335b11649de6fdddc327581f8f7941d05945335a080f644640fb80aefe1bbccf7a6ba5d948161b62dfa04c803b2bb80b313f4efa45c
-EBUILD shiboken2-5.15.2.ebuild 6437 BLAKE2B 0e6d4b56332293168a6b55701fcd3aaf21326cd1de5c06a985616ee9ff5e57744e0279d7c89801171fd9694c59bf9452499599b0a1cef05d1ebefd6a846d7732 SHA512 79e49f5668a8c272155ff2b2584a0000d17114dc03f562f4283d271534234abddc0356324587c3e5e42da44d3e0c2078ba6dfd28a32a54fee2a1f7bc98629a8d
+EBUILD shiboken2-5.15.1-r1.ebuild 6611 BLAKE2B ade01e37bc0c199ed35eeeb176c87f76e9f1add46d9512f692947cc3b220da32a0e143881bd9fc2059dde0ffbaeacb70c0faacf7c75b80d3b0f7904710f96a68 SHA512 25fbcdc1e64ce80a0bae5fbe3eb44943e06289602a4d3032440cc62f5f6562eb622fcc8dd29f146094ab9fa8ff59e31952981d35998057be75de2860cbcdea04
+EBUILD shiboken2-5.15.2-r1.ebuild 6458 BLAKE2B 68ed4512b78e719122febd9e33e927b529fb2c355a65f99ae869453bf45b5721329ce808db9c04e7503de18b6e0737ecb56dbaaa224aa33776a50d50f8a14a0f SHA512 b2e0a97104763152d0b1000fdf95495786e1d9c321b5e606be247dd48ed0fc3f2a50939ad42915bcaabeb9d0467c0bced0bf69076a7e23a1d0ffc66fcc74bec9
 MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
new file mode 100644
index 000000000000..de2845464e89
--- /dev/null
+++ b/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Split the "/usr/bin/shiboken2" binding generator from the
+# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide2 ebuild should be revised to require
+# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2):5"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtcore-${QT_PV}
+	sys-devel/clang:=
+	sys-devel/clang-runtime:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+		>=dev-qt/qtxml-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+
+S=${WORKDIR}/${MY_P}/sources/shiboken2
+DOCS=( AUTHORS )
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide2 does *NOT* care whether the end user has done so or not, as
+	# PySide2 unconditionally requires Clang in either case. This requires us
+	# to temporarily coerce the "${CPP}" environment variable identifying the
+	# current C++ compiler to "clang" immediately *BEFORE* calling such a
+	# function and then restoring that variable to its prior state immediately
+	# *AFTER* returning from that function call merely to force the
+	# clang-fullversion() function called below to return sanity. See also:
+	#     https://bugs.gentoo.org/619490
+	_CPP_old="$(tc-getCPP)"
+	CPP=clang
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+	CPP="${_CPP_old}"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken2_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake_src_configure
+	}
+	python_foreach_impl shiboken2_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken2_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken2" executable for the current Python target,
+		# preserving an unversioned "shiboken2" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken2_install
+
+	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
+	# library and one "shiboken2" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py
+}
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
deleted file mode 100644
index 7acae0aa868b..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	>=sys-devel/clang-6:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-S=${WORKDIR}/${MY_P}/sources/shiboken2
-DOCS=( AUTHORS )
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. This requires us
-	# to temporarily coerce the "${CPP}" environment variable identifying the
-	# current C++ compiler to "clang" immediately *BEFORE* calling such a
-	# function and then restoring that variable to its prior state immediately
-	# *AFTER* returning from that function call merely to force the
-	# clang-fullversion() function called below to return sanity. See also:
-	#     https://bugs.gentoo.org/619490
-	_CPP_old="$(tc-getCPP)"
-	CPP=clang
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-	CPP="${_CPP_old}"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py
-}
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
new file mode 100644
index 000000000000..18e1815df1da
--- /dev/null
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Split the "/usr/bin/shiboken2" binding generator from the
+# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide2 ebuild should be revised to require
+# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+# Fails to compile with python3.10
+# FAILED: libshiboken/CMakeFiles/libshiboken.dir/sbkstring.cpp.o
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/shiboken2"
+
+# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2):5"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtcore-${QT_PV}
+	sys-devel/clang:=
+	sys-devel/clang-runtime:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+		>=dev-qt/qtxml-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+
+DOCS=( AUTHORS )
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide2 does *NOT* care whether the end user has done so or not, as
+	# PySide2 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Minimal tests for now, 2 failing with the extended version
+	# FIXME Subscripted generics cannot be used with class and instance checks
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken2_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
+		cmake_src_configure
+	}
+	python_foreach_impl shiboken2_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken2_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken2" executable for the current Python target,
+		# preserving an unversioned "shiboken2" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken2_install
+
+	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
+	# library and one "shiboken2" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py || die
+}
diff --git a/dev-python/shiboken2/shiboken2-5.15.2.ebuild b/dev-python/shiboken2/shiboken2-5.15.2.ebuild
deleted file mode 100644
index 0f97bbc648a2..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-# Fails to compile with python3.10
-# FAILED: libshiboken/CMakeFiles/libshiboken.dir/sbkstring.cpp.o
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken2"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	>=sys-devel/clang-6:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-DOCS=( AUTHORS )
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 709ec6a3180e..d888a6d8707e 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,5 +1,3 @@
-DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
 DIST simplebayes-1.5.8.tar.gz 5972 BLAKE2B f942ccde5f449d0ef8ef56fb83a07a8ab0421f43e5af40a3be30822a5d7299b9a0cb1d46397a55bcf7fecc92e40f49404f5bf29467acf7957fbce8619625b58b SHA512 0e39110432db561208cf147bccbdb66f64176a78c0e9ce8495a423ed0d6a027b45deb111d3c872faa10e158fcdaa5380f03a5e0602fecea1a0f00e528e19cfe1
-EBUILD simplebayes-1.5.7.ebuild 698 BLAKE2B db1b9e262a9edba57cd535237e0959afa8c908bac422a7a5db682aa54a4759d8293b828c86a1fe968fe38fe51b42c346162c95fba001af90e6cb1fdae4a57f79 SHA512 c41085f3f0da352a32f8a88d0f608b55360e213e3b1a4ce40a9a8644a1cc8c7a1976e15e91ac40614e04233c571f9eda696019bb17cac42c4ff18984e0c89941
-EBUILD simplebayes-1.5.8.ebuild 671 BLAKE2B d53de19a55b87753225a8fbc6ef73483271e6c867610a40064c5ae2c1d36c49d29dfb61ba376613788ad5345b92b027c4086520240fa03f384553c16c81c4f6f SHA512 d7489effe2f731654d9b7a74e267c967d70a0ff2e03e4573c59bdcb4f6c2d2fb9686fc64d7cb16e4a7c6637686a5ce230405f4163581cf622635598776b6d81a
+EBUILD simplebayes-1.5.8.ebuild 473 BLAKE2B 119d403d1c8ddf4a35b728b490063997bad1ebaf5433962f17fe63f107c353843afb5284b3dfb58ee3f2f2a8f90ee853d159722d296c695d152da9ff3df0b44e SHA512 34d72b4f174cbecac73f7d3e3746f30621896c4f4ad6d58abfd0feb7e1030e1e8396c88eed46fe2e3a2800a2ddbb9fe100dee027b5cc60a46aaa7414bd5ff641
 MISC metadata.xml 662 BLAKE2B 2bcf3d9bee30b2cab1146844b57345a35432288de430253a9d56a631e6d8d57c101ccd8b9d4a70e5af68643823ef410fb29a9461b1c3573cbe841bccf595f530 SHA512 43dce6ba6ef084891d6ac7ce8c24dcd44d73f8879f6269ccbbd3683b276ebe93d18088944107e809798eb10bda7f8231c1a98fba292de6ca29fbc1b52b97b2a4
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
deleted file mode 100644
index 0c8758512f65..000000000000
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
-HOMEPAGE="https://github.com/hickeroar/simplebayes"
-SRC_URI="https://github.com/hickeroar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/simplebayes/simplebayes-1.5.8.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
index cebf2f7c2a69..d91e3839c3e9 100644
--- a/dev-python/simplebayes/simplebayes-1.5.8.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.8.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,17 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index c3d23d1a2c9f..270085a69ea3 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 690 BLAKE2B d2223e5c286f3786d7f423ba546257c30d8405f4f853956d6422b13e901ef21544b620f80a8a2d502c4872fac30ac5d4d84200b9737d51ce22f5e9c7816ade80 SHA512 7623d40343fd6881d6df72a5c2bd2f84653ef9c39bb86de1eb84abffcd0b516a97cc616479e9ece7e83bc4eaa03635dd8bd66e50af1d4588079c453d0660fa81
+EBUILD sniffio-1.2.0.ebuild 689 BLAKE2B d3223d90e39f8470592076c8a03c3f36e06fe146528d513a1a4096c21cd25af2c8450ddc3083cb5d8270c8954bcce9423ec8350b169485a9708898f672e77f19 SHA512 286453fbaf083ed514c4d98014dcba0de4fbffaceed4e8d9d2f79ffa6d20f440185617fdec5d0ff6680c6b6bb34aeeeb321481452789296ef3c0195bc6a32e48
 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 d05a53d6dd3a..d7d201ae88cd 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-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 06aff8757f6b..326791f291d1 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 571 BLAKE2B af135714db1918e5b5115b13d0e30dceaf0617358cd9d2321896b3cf5f1db5798c8ff13a7611cb08c888dcdf8ac111a77c9aa7c80910a007e56f747c383325b1 SHA512 c964d854672d670e0bd90295a28cad814e0e9b1fb23111695d65234dc9d6ab7613a1edfb23e450579f3d3e8e2f9c996f9d70c1db9bcb169e876bdfafaee7a40d
+EBUILD sphinx-epytext-0.0.4.ebuild 578 BLAKE2B 314de4eb6cfd4298462a586bbdb4273d356fc7c1ed48a0acc974e5fd73a18c62c5ee75be4dcf280fc629e12fb12bdd6104febed0e3bc66a570381b6d2bfd28ab SHA512 1e3113082ed33b57753db837dda44153040032df29dddef1607adb2ab8a44f65a35c9bdc49248bb981f1c52185b60983e60bba6e3466bb9aaf27cad127e5420c
 MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 173b41169dcb..50e42d406ca6 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 356c20e891e1..39a3ada1af39 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -4,8 +4,8 @@ AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
-DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
+DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4
-EBUILD spyder-5.0.5.ebuild 8065 BLAKE2B f844924aa8896b66229e842ded6e2d3904e81415e18ca0aba398575702da35242f57e8a26a690e0091fe8f5ebfad7e9fd067334881e6c0ab1432cc680e8c228a SHA512 11b32aa695f0df8caaa98a304c547ea300eafbc14e61b1149099a266dd2198ab44b0c0041be1927db972da3ae9a441df5d66274bef471856fb207f9c9d8c8afc
+EBUILD spyder-4.2.5-r2.ebuild 9965 BLAKE2B f94f8de5c81eac740cb34912fd7aedf6f9768fa63c564c5869ab025068d558de4052c9990a95682a8045a5b5e7dbc7c705f4d8d992f978e0f9706888339e0277 SHA512 0e4c1d37d26ff4b02148b28254750cdf5e36f5440e575ae097deabb8606ae32c681e6666a47753c71f411a626d24f5333ab8b8d0c270a447a0723ae93b03d9da
+EBUILD spyder-5.0.5-r1.ebuild 7943 BLAKE2B 8564bf7aae20878fa68a6fa1d9b0abb71c76bd8c87364525808641b97d8da88f86c362cd3b1bae32f3875bf691c5b15ee8043537ddbf5ecd738750d58e69ec8a SHA512 9c206b76177eb1e76757d0586056f2201ae17f9760cfecf7458c0ca1029967b094270ee4302dc94eee09245b33d445f46128dbd3e20e1df9906da59d3964ae64
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-4.2.5-r1.ebuild b/dev-python/spyder/spyder-4.2.5-r1.ebuild
deleted file mode 100644
index cb91fff8bf7a..000000000000
--- a/dev-python/spyder/spyder-4.2.5-r1.ebuild
+++ /dev/null
@@ -1,261 +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} )
-# The warning that this is wrong is a false positive
-# Spyder has setuptools in install_requires
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="78b25754c69a20643258821146e398ad5535c920"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work.
-# Technically spyder requires pyqt5<13, which
-# we do not have in ::gentoo any more. Likely
-# this is the reason many of the tests fail
-# or hang. RESTRICTing because IMO it is
-# not worth the several hours I spend every
-# single version bump checking which tests
-# do and do not work. Spyder itself works
-# fine with pyqt5>13.
-RESTRICT="test"
-
-# White space separated deps are expansion of python-language-server[all] dep
-# As the pyls ebuild does not add flags for optional runtime dependencies
-# we have to manually specify these desp instead of just depending on the [all]
-# flag. The indentation allows us to distinguish them from spyders direct deps.
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
-
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
-	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.0[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.0.3[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.10.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-ordering[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-build.patch"
-	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
-	rm external-deps/* -r || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
-	# The original hasn't been update in over 6 months, and spyder upstream is slow
-	# in making the switch. Because we are running into issues with outdated deps
-	# and a whole dependency mess as a result, we can no longer wait for upstream.
-	find . -name "*.py" -exec sed -i \
-		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
-		-e 's/python-language-server/python-lsp-server/g' \
-		-e 's/python_language_server/python_lsp_server/g' \
-		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
-		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
-		-e 's/pyls/pylsp/g' \
-		-e 's/pylsp-spyder/pyls-spyder/g' \
-		-e 's/pylsp_spyder/pyls_spyder/g' \
-		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-		-e 's/pylsp-black/python-lsp-black/g' \
-		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
-		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
-		{} + || die
-
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-			setup.py || die
-
-	# do not check deps, fails because we removed pyqt5 dependency above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	# KeyError: 'conda: base', need conda??
-	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
-		spyder/widgets/tests/test_status.py || die
-
-	# assert 2 == 1
-	sed -i -e 's:test_pylint_max_history_conf:_&:' \
-		spyder/plugins/pylint/tests/test_pylint.py || die
-
-	# https://bugs.gentoo.org/747211
-	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
-		spyder/plugins/projects/tests/test_plugin.py || die
-
-	# AssertionError: assert '' == 'This is some test text!'
-	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
-		spyder/plugins/editor/widgets/tests/test_editor.py || die
-
-	# hangs till forever
-	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
-		spyder/app/tests/test_mainwindow.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# AssertionError: waitUntil timed out in 20000 miliseconds
-	sed -i -e 's:test_pdb_multiline:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
-	sed -i -e 's:test_undo_return:_&:' \
-		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
-
-	# assert False is True
-	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
-		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
-
-	# AssertionError: waitUntil timed out in 10000 miliseconds
-	sed -i -e 's:test_get_hints:_&:' \
-		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
-
-	# Fatal Python error: Aborted
-	sed -i -e 's:test_module_completion:_&:' \
-		spyder/utils/introspection/tests/test_modulecompletion.py || die
-
-	# assert 0 > 0
-	sed -i -e 's:test_maininterpreter_page:_&:' \
-		spyder/preferences/tests/test_config_dialog.py || die
-
-	# This hangs forever
-	sed -i -e 's:test_load_kernel_file:_&:' \
-		-e 's:test_load_kernel_file_from_location:_&:' \
-		-e 's:test_load_kernel_file_from_id:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here
-# test results should be checked for success manually
-python_test() {
-	${EPYTHON} runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r2.ebuild
new file mode 100644
index 000000000000..04d05d40e107
--- /dev/null
+++ b/dev-python/spyder/spyder-4.2.5-r2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+# The warning that this is wrong is a false positive
+# Spyder has setuptools in install_requires
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="78b25754c69a20643258821146e398ad5535c920"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.0[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.0.3[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.10.2[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-ordering[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-build.patch"
+	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	rm external-deps/* -r || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		{} + || die
+
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-language-server/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# KeyError: 'conda: base', need conda??
+	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
+		spyder/widgets/tests/test_status.py || die
+
+	# assert 2 == 1
+	sed -i -e 's:test_pylint_max_history_conf:_&:' \
+		spyder/plugins/pylint/tests/test_pylint.py || die
+
+	# https://bugs.gentoo.org/747211
+	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
+		spyder/plugins/projects/tests/test_plugin.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# hangs till forever
+	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
+		spyder/app/tests/test_mainwindow.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# AssertionError: waitUntil timed out in 20000 miliseconds
+	sed -i -e 's:test_pdb_multiline:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
+	sed -i -e 's:test_undo_return:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# assert False is True
+	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
+		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
+
+	# AssertionError: waitUntil timed out in 10000 miliseconds
+	sed -i -e 's:test_get_hints:_&:' \
+		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
+
+	# Fatal Python error: Aborted
+	sed -i -e 's:test_module_completion:_&:' \
+		spyder/utils/introspection/tests/test_modulecompletion.py || die
+
+	# assert 0 > 0
+	sed -i -e 's:test_maininterpreter_page:_&:' \
+		spyder/preferences/tests/test_config_dialog.py || die
+
+	# This hangs forever
+	sed -i -e 's:test_load_kernel_file:_&:' \
+		-e 's:test_load_kernel_file_from_location:_&:' \
+		-e 's:test_load_kernel_file_from_id:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here
+# test results should be checked for success manually
+python_test() {
+	${EPYTHON} runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..75ea2dbe52d6
--- /dev/null
+++ b/dev-python/spyder/spyder-5.0.5-r1.ebuild
@@ -0,0 +1,205 @@
+# 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 optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="5eb83118155a3765de4a0f863b936bcbe73bb7aa"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.0.4[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.0.1-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc \
+	dev-python/sphinx-panels \
+	dev-python/pydata-sphinx-theme \
+	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-language-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		{} + || die
+
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-language-server/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here test results
+# should be checked for success manually
+python_test() {
+	"${EPYTHON}" runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild
deleted file mode 100644
index 27d30b0d5a4c..000000000000
--- a/dev-python/spyder/spyder-5.0.5.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work. Technically spyder requires
-# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
-# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
-# several hours I spend every single version bump checking which tests do and
-# do not work. Spyder itself works fine with pyqt5>13.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/parso-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/parso-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
-	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.0.4[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-# python-lsp-server[all] deps
-RDEPEND+="
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
-		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.0.1-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-language-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
-	# The original hasn't been update in over 6 months, and spyder upstream is slow
-	# in making the switch. Because we are running into issues with outdated deps
-	# and a whole dependency mess as a result, we can no longer wait for upstream.
-	# Also relax the parso dependency to allow parso 0.7.1
-	find . -name "*.py" -exec sed -i \
-		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
-		-e 's/python-language-server/python-lsp-server/g' \
-		-e 's/python_language_server/python_lsp_server/g' \
-		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
-		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
-		-e 's/pyls/pylsp/g' \
-		-e 's/pylsp-spyder/pyls-spyder/g' \
-		-e 's/pylsp_spyder/pyls_spyder/g' \
-		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-		-e 's/pylsp-black/python-lsp-black/g' \
-		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
-		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
-		-e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \
-		-e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \
-		{} + || die
-
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-			setup.py || die
-
-	# do not check deps, fails because we removed pyqt5 dependency above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here test results
-# should be checked for success manually
-python_test() {
-	"${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 75a893f38314..49f6c5e0ba80 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,10 +5,12 @@ DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f
 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
+DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 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 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
+EBUILD sqlalchemy-1.4.22.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.22.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/subunit/Manifest b/dev-python/subunit/Manifest
index 55223005e1de..248d61247d19 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.4.0.ebuild 2582 BLAKE2B c9b7618e182ed1259979e8d00b74637b9defc0ee565039e56f7b78ee61cf9c1059f140f0487c6e7e7199e63fa488e21438a1e22cfa4da02582195b98a46bd383 SHA512 47d61c6885a804955a4792e68841863abe959f0e0f959e15aa8539e5ce9762eae3f1f64fd824decc19fcded16dc181adfed6b80f6cae4f7ce06f2fe84d48118f
+EBUILD subunit-1.4.0.ebuild 2589 BLAKE2B 6910487596f619830a195e448eda159753c2a6c776c1ec128086f5fe5f859e028088f16b889559b7256e63668ed86d0fa92d34597442ffee44bc348f699f2a10 SHA512 6ec43969be84272430101edc9e645a182c02951cb5ca6df1dbfcd8b3b82ea262548979cc1a770a3d49ea3838a497e8456d3c82bf41e3bab5e8a21d8f81b996e1
 MISC metadata.xml 474 BLAKE2B c6e5e74bfae996deae0adce7fbdd4262c55c67389b62e549cccca2d42a464bed2dd9d711585ca391cd30ef1f76da30beafa5a8d54ad8f79b539106265757c039 SHA512 d2041aecf3846526bdad951d31ca5d9014efb7cc711f5cb974cbaee3f87e9c705ff8ac6bf02433685d19a57ad7930ee1a25267fffe8db54341e0ca8812fc7008
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 284468711361..f95225ac17d0 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index bc9215c5a702..6d9a94e6b670 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,3 +1,3 @@
 DIST tablib-3.0.0.tar.gz 95049 BLAKE2B 6c7c39f4ba6d8ad08264d3ed6c848ca37d8e2c834aea863a1f79fdcac783ef5fe25779f7d83d38b07c4e2fa47184964e732bb35a8094a98e1350812c2f6bbc6f SHA512 32deac7a05663da9d96f4ef7dc5c4b5e3b8fc4b7a0477c1a807ae83322035e8a99d4f709dfa11ec19af69ac75d7044a469c1b360cdcde3311cdf97d0f584b0e6
 EBUILD tablib-3.0.0.ebuild 999 BLAKE2B 22d35ea9f59c14890f9819d9d30b55dc7f65084a3283fd249afbfd1128eb247cfe82b6a62ef76b7ef83a0df4e885246e887bd584e5666309b46c41313ada44eb SHA512 a6b9abb2b6e1c0d27cc54732b47b2d7683e9c029b9b1f092145e21761c5f60b5fc24d619deb15f6a2adfa67019b92ff03d9bdd02a3d5244f2ae6439fc268fe39
-MISC metadata.xml 565 BLAKE2B c6e792a6ac13ad9d1c75f1da4dbb2bb96a623b9ef8c2aeb97e2aeb13dd68fc1a61039142cca84d42bce8e0975f796c103c36643e2c5705a48c4bb4b1476676c4 SHA512 59a57cd0a1db682043bc4e6ca07c0daee75c0083ab161dc9ee07e46bc3e5c64ffc6e9d6d16f0e3a7d06c2fcaee15ed53a12d07dd4d1b0cadd0db587a77a4e0c1
+MISC metadata.xml 309 BLAKE2B 8e0b88ea2dde7eae92968c2bd92adec98f24d8bc86a55c1b07efbe24db835aeca9cc3babc84ce29552a3f4f27888e52b75f795eb34a82e801365c504d92ffc90 SHA512 27639a075257d7dd9482c3890045d20ce907af90aee977491e410555e5d5d283c57ce8dd6e93a61c25ab7f0021c302171e1be5d374a8b59f76f432905895b3f1
diff --git a/dev-python/tablib/metadata.xml b/dev-python/tablib/metadata.xml
index 42b7a01d6459..ba56e670af44 100644
--- a/dev-python/tablib/metadata.xml
+++ b/dev-python/tablib/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 4ce703c521cc..adf3e2f8642f 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,3 @@
 DIST thunarx-python-0.5.2.tar.bz2 348120 BLAKE2B ddb098857a7411c1ce4dedf8b406cf6583e78f2ca4b012a9e0346c5a7132c40fd9cf279dc5d054ec827028cdc67321a65fab5e9d3912287ea9ed1f0cf4e72248 SHA512 49d009c84d69f0a1938ed6cb46fe04326c7323edecd79f6d9978ce2306fb95f20c901174f1cea31d5e436c85537efcb79c8613be857a3e4143f7b55b895616b6
-EBUILD thunarx-python-0.5.2.ebuild 761 BLAKE2B b274b577081b19404256ca7fed4ad80b7fef58b4fc04c28480a8cf5404ec2acf5da672b5265facbbc57a47c01c4d1a25e70da97da11719a5f0b4adae1c406019 SHA512 df4e390d49a21afa5884c4f8be449d7055d4772cc4a120ccd26de463711dbe04a6d876b2593cb785b8a111ba2f666836068da06538b1dd351202a6d2a7a09ca7
+EBUILD thunarx-python-0.5.2.ebuild 755 BLAKE2B 4ba369507cbaa93f0f5189ffb74f0cddaf4501ae847822ff7d04dbdf503bc2e3c5c36ba0c65709d9ba0300c1962fa689c7f6d3ba8636164161bf910e5b4ad2c9 SHA512 ff0ccb01a740845aa2fcf816e287f2e90b5c95ea17ed42ce69ad3a2b4092a3bd69e2f8c5d005fa79b5b10aa590a0800d953e19e06c814c38fef7f32ea56f28a0
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
index 289fceec2de2..e6c360683a7f 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -19,7 +19,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.20:3
 	>=xfce-base/thunar-1.7.0
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
 	')"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index b399d4d800de..2511b6a0a13d 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,3 +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
+EBUILD tomli-1.0.4.ebuild 580 BLAKE2B e9e88f57f31e27a96b8b6f18a9ddff898864b04c472fca85af88294b7af6a722027e461b6506bf12328546c201b51b030e4088159e0652b5bd5d2b38801af8d6 SHA512 8c829eeffcf790b37f5fb84a3e79e2fb437608488faa223ff5826d6e88f636bca348f89d781a84c06096ac9d3d5449a096322f7d11075fa001bf0cc85fc3b71f
 MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index 770d80a88e1f..ec5349db21ec 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 3d5f8b50f69b..23f3948fed89 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,5 @@
 DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
+DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
 EBUILD twine-3.4.1.ebuild 1726 BLAKE2B 5d2749084f74af80645d6232369ecb693a89a8b309b7618f2de647e13ab1df8e791eae950dfe551c23e0efecd7f311bd76cd10bf51a2c423eb6e30008a82e304 SHA512 72e689f1436fa6ba57035074c4c60bc43ba61cb6ecc03db4b45b4c0539b41fd735e4e183aedb28ae146a7f7067e7761f181ecbb7e952538d7bbd1e9cd0d2e6a0
+EBUILD twine-3.4.2.ebuild 1774 BLAKE2B f21412daf87832f0a107b99438928a94abe1c06011c57ad0350d18b1d9d20b8ade9f1d03e8878e01f1e7db3761ceb9ef66b73a6bb63d2c5d25afc6a46fd61f8c SHA512 c172f89b737e69f0ac75ac055127b65c378971182b13e0aa01bab89244948e9ae138e6c983d1e3f1932e2099a63a73ccd2e3e40310b04f6c7b7740be7c113f3a
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
new file mode 100644
index 000000000000..72a1dedc5390
--- /dev/null
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index ae1c33d9215b..53c723a28aeb 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 1431 BLAKE2B 612bf782686c9814f0a497ca129148c91c4eab5c5078c57d330036e6d99c07bf7a0e442a7f7d722fc4db941a808551c525464e7282ab0cbbac454ecb30e706bf SHA512 5ab7ae041de478d207f5d9423f4da448d7f8c9465e25303823de9b27541d34ef8eb1255dd65640bd7e58f1a1ba02c97e1aabb118fe433e86df4622bc4a11bdab
+EBUILD uvicorn-0.14.0.ebuild 1430 BLAKE2B af1e1fd35aa98b57159d045233bbaaedc13e69a21b95271f2445f44b439d9d316e8601f19da048364a099130f6762d41209375efabb7303706e87f42df6a9d8f SHA512 bbaf9a47ee11762690a74fbf20031a8f0643479b1fa92ec8b0477c01007a0d4cf9c36e55b56c077639428a274c586de3917762b1d9b5bd827daa73421e86de34
 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 a58ea4472de1..494ab6b4faeb 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/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index acbc20687273..4a1dce161658 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
+DIST virtualenv-clone-0.5.5.gh.tar.gz 8679 BLAKE2B 4283de1e7b53083357d68ea556ad68144fff104d531fcc741b2194e7b501de52ade791612a538d87585af75ecf187e0bee2d13a76cc55c0516f8f145a11b58e7 SHA512 b4bcbfbba9d6616d00ecbd574651dc93cdc71ac85e610c924681692665478975f2381e04afb0b9e8b59c76484085ab3519aa4a58b1dfe057a0be0ea83263e93e
 EBUILD virtualenv-clone-0.5.3.ebuild 505 BLAKE2B 26fc9fb7c371e458990d62086417d8f2ffbb18c28d3f019323974cafa80275d1de52baafe787ea362df1f8992b2099be86ea4c7800566b579bbbfa8298517649 SHA512 03120fc0e981b8198b78b6acf86c58a316069d834423dea69d8710b29afd662c5874f2b9279395f242c9f22337500e48807b183341fd8aaecfc19c6d2b78e02a
+EBUILD virtualenv-clone-0.5.5.ebuild 537 BLAKE2B 8e8ee82260203e3c16853f624176da7465be75ad8327f9b58935efecdb1fac7164b4dd591ce364e03b46ff084dfe88f8625e3a05fb70daebfe6d6f5ec87e53d7 SHA512 871a3867eefb7ea48debf44aad2ab26191de7edca37d1c7e0ad3391996632831d22b23cb38626a0fc9c4ef6a1f392cbc142ed7eed61cb2f2e6f88851be5e69c0
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
new file mode 100644
index 000000000000..ffb83dc6e391
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
@@ -0,0 +1,22 @@
+# 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 script for cloning a non-relocatable virtualenv"
+HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone/"
+SRC_URI="
+	https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 9d6cf93125d3..44633f94e67b 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -1,5 +1,5 @@
 DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
 DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
 EBUILD vncdotool-0.13.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
-EBUILD vncdotool-1.0.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
+EBUILD vncdotool-1.0.0.ebuild 1063 BLAKE2B 1cbcfc22c23c5aaebd11edeb7498a94675bb6afff6bb3965629d3600822167e865c26f23856373d9a18f430b79a15ba421228899a11e35ede3bdd6b6d5fab45c SHA512 173836dbe2a94f473dfcd7064c7e90c23f5418a6bbb9ccc439403133f9b116e363ba7a71c4ef81731ebcee7740ed70fa0a694681ceb6b9c8207eabc1c80fdf00
 MISC metadata.xml 354 BLAKE2B 1fc59ea9b7a2940509e9a396bba1612ff4dfe96107cb1c62393eb82911bd11a0f23a796b79087c843dc5b8f17d6e3d0a002a3a4258c1a4f13cc6548356cd59a7 SHA512 f2055d919bdffd5c458676de58cbfe8406e897e26452312b0f7402b5bea17a137d340bc5aed5bfeb0121f178df5c7c5f048c0b6461eab210b1127651c2a35a25
diff --git a/dev-python/vncdotool/vncdotool-1.0.0.ebuild b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
index 5a1b894b8cc8..de7a237c2740 100644
--- a/dev-python/vncdotool/vncdotool-1.0.0.ebuild
+++ b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index d6efd59188eb..e38e28d3fa6e 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,4 +1,6 @@
 AUX websockify-0.9.0-mock-tests.patch 18675 BLAKE2B e7dbb0d77bf264bdeef98a3aadc071c3612bd7cad5f6f72c2a748d75e7197ca59a328e7476e19970fa89a17fa9cdc869493dea7505b708cec4e3a020e1a8c545 SHA512 e14011a7b1aa4992f21e5f4293e04424faab2a740ed362bfd1c65daa16cc2cf0d7329df0511239b104a6a4618fbeadf39344227cc7cdc5f48a6b3cfeebf7e748
+DIST websockify-0.10.0.gh.tar.gz 53402 BLAKE2B e909dc316d6dd0ee03ee23b07ca2d78cc60994a8f361b3968759c382c704637357848e903fb12af002b5d5b2bec957f9a4c2b0ddb0e6d008ff9b4a462f3e8871 SHA512 262071f4858e5e3b6471c6f3731d8715c5c13fcc5f43738a330323958a8f0cbe7797847bdc676f1c6c34055c6f8afb949d005a5607d6b220b893910ff973ddc5
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
+EBUILD websockify-0.10.0.ebuild 862 BLAKE2B 3c24a2475a86246095229c6593749a9bf4255976ad479a17283e3c9c3312b98bb8bcdba3d71486b6d5821bb54f4b12e04476458e14a5856cc7b00a9a97a03891 SHA512 54581f42f9066d514af9efece8df6d9296da674bca00b59dc12860eb42e89af73a8a3de88c9245788c07b44203aac706bdebd6e06a57c4bee022139c88e4edae
 EBUILD websockify-0.9.0-r1.ebuild 772 BLAKE2B 164a5f4e6511a4ccdf068371a366c2c35b652a576ffb723013c76352aa046707f543d782b7cedf38c93ef8a08a055ac5b0b0ea9d4c6cb605e27d31fcd57223db SHA512 9efe158b128ae165c550a0180db533f681e85bf0b59901bb9d041f1370ee4dbcf4b5e82661d5d39d1a14f056753d86ba461092251df3e44f27843a254858b098
 MISC metadata.xml 484 BLAKE2B 27feb7f45e7ff325c6f8a774f75d861bbc96dd26b89bfa24eb7bbbeee78aae7dd6c8c8b03ce24323712e906ec064cb1e486bb0564747b36e76b3209c37ebb969 SHA512 9010dc54f71cfa3aa9a7670ce24e2404d8f615f0dbfc98a8b88cc0d248a8716a384f09eb80132cc3a9b9595b4f52fd5b4cfc20041a3d2b7cba0bdfab38355fd4
diff --git a/dev-python/websockify/websockify-0.10.0.ebuild b/dev-python/websockify/websockify-0.10.0.ebuild
new file mode 100644
index 000000000000..274232de46f3
--- /dev/null
+++ b/dev-python/websockify/websockify-0.10.0.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="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/novnc/websockify"
+SRC_URI="
+	https://github.com/novnc/websockify/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: incompatible with current jwcrypto? (not a regression)
+		tests/test_token_plugins.py::JWSTokenTestCase::test_asymmetric_jwe_token_plugin
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	doman docs/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index c1ec50d5f5dd..b545959aa840 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 535 BLAKE2B f7eaf6a387aff4e1fb7b7d2356f4d884c095f6f62387b10d61b918b4fb3a84baeb74833a2e91e18446b8850c36cca220e103b9a265c9b97f5d6f1e7b01d27cdb SHA512 85b7ac12cd58fef469490bb6cdeb32cd27e1d4808a0c7a78429788ebf93049c5a67f33be0b005465e80028fde3c177a95059316b482269cc62f7bfb1d47674b2
+EBUILD wsproto-1.0.0.ebuild 534 BLAKE2B e2f88d4f19f0ad67a46535b0401f81aeb46d918cceb53e8ac953d4f780610c2d2b9a50c3adaf28d0620cb4d90a54ef38dfd1f3a7df40b7ac0f25529cfdfda2d4 SHA512 1d1b677e34bfa746efd7eb18de8700662c8b43a18eafa380fb107e1cab81c517f8862b242906017a949e7e4f6de5d6c50d7f8110c7f1060a92326f0e3d616b50
 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 d900b8df44b7..3de2d072536e 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/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index a1010c7445a2..dcef709ac2a1 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,5 @@
 DIST wurlitzer-2.1.0.tar.gz 8788 BLAKE2B 9a9e9696446fe31f0ff392eee011f341ee24c102e4e6bac195586b764386d1a835567560306cd3cb6e942b539a57ffa15aa9b3a20fac9224311ed7301130c84d SHA512 cc7291786b0505627129619094218f51c0679c0c3550645af3b94bdd3f10afd5fc8402d89dcb599d874a5c9e4f4966dc49a6f98a1ab0e2bb9adbc3f95d4fcc6a
+DIST wurlitzer-2.1.1.tar.gz 8674 BLAKE2B 08cad7fc0ba0852a5d54b9141b419ed822330b763bc6a906be0be0f7f6e4e0f8d6c83e62fc8a63f5179babbaa6fcd4d8fb1e4a876631e324bd53d21f4f116f68 SHA512 776dfbdbfbe6c87818ce527519730a20dbb43f140751195c67e73eb3fa5a9a9181b8b475336ee43a184dc5b712ddaccbfc74bb0279b47f2d3b3e4d7db4a471ea
 EBUILD wurlitzer-2.1.0.ebuild 611 BLAKE2B 99e65a65cde9d9f26afdaa36690dcf7895ded9391b962c9c03a78c0ac19417816cc40a28de31ed83ab6efbf4edbba77389dbdae43b76eb6227c3b9dd575941d4 SHA512 8af6ed6f1b10126e9b0fc851c452aa1dccd34d343017885405b65c0413b95598ec1978c93b90d3a32db11c78f7c690dd41e22986de70c61893142bfd293c4ffe
+EBUILD wurlitzer-2.1.1.ebuild 475 BLAKE2B 8aa6064965e52171223e2248a54081c39b84525b1f0a078be87cfb4932371dfb798e12e028b9b460c6c71a5756b78e0cc8d397e39b3115c974565a0b459d7372 SHA512 4ca1602d0618afb9087992b91b44ed0c4a5b019b8f10c84c71efc881c9df02a161854faa89c99ddfb2aa43b974d638a098a94e35c4037c1e3c55453c2831d1c3
 MISC metadata.xml 409 BLAKE2B f8a031f6909bc9a775230c8d4680f97d340eb8826b0076cd0e0b2045e14f48b0f0bce1d6404f98c591ac3a74bfc8bf50385ab9f6bb09ecdc79a37a61a097df3c SHA512 281d6539c4fb171a63d7ac0f815aed31212c66d14a1d29abeb08bb64a804a72bb7b27dfce608fcd5ec664772cc169dee61b79f26e1081c58a36ccbe5e7818ffe
diff --git a/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
new file mode 100644
index 000000000000..7a64cf34ebad
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Capture C-level stdout/stderr in Python"
+HOMEPAGE="
+	https://github.com/minrk/wurlitzer/
+	https://pypi.org/project/wurlitzer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest test.py
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index f5639247be64..12569f0fa213 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,9 @@
 DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
 DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
+DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
 EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.33.0.ebuild b/dev-python/zeroconf/zeroconf-0.33.0.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.33.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 78141a401995..2a9c93bd141f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 55a0f5127171..813f28c69830 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,6 +1,7 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd
+AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
-EBUILD qtdeclarative-5.15.2.ebuild 1311 BLAKE2B 2cec9058153bb9ab612ba1abd6bac75aa1975d9e103b5d1b8a13b2b448d91a9c8443da2ebc20af4017590ce2ccacd5836eb9cd62365e63fe50f49a7e868e39b4 SHA512 4896354e4cf5994511a6067f8740780063ab99f7888d1b03b4589bb77609a2d774f3f9704dd5325ec4794377c0bd4afcbb2d707ed8ed984cc51f7c9dab1f6b0a
+EBUILD qtdeclarative-5.15.2.ebuild 1362 BLAKE2B 8b829399abbfe9f1998a72e4ae0eec76e10836a5b2db462d1deb72b1eeb5a905e09120a6e8d35a0c44a2107a7e3ddf3f871a6e188556320845c17f96a69292be SHA512 9ac179472e778823fc120d1e38ccf54c49075246dc1ab24f5088dc41086094a2e297c162420b460d69030d882082cae096031b3fa2bd5ea2615c4456b4ad1e98
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
new file mode 100644
index 000000000000..a619f3db833c
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qml/qml.pro b/src/qml/qml.pro
+index 7d5a92a..01f3b79 100644
+--- a/src/qml/qml.pro
++++ b/src/qml/qml.pro
+@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+ 
+ # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
+ gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
++gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
+ 
+ DEFINES += QT_NO_FOREACH
+
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
index ccbde5b669ef..6b32fc222cd3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
 	"${FILESDIR}/${P}-gcc11.patch" # bug 752093
+	"${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689
 )
 
 src_prepare() {
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a874dacce235..130daacc06c0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,14 +2,9 @@ AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab9077982df3afea7d156e0dbaf11384d7b9ab6ea70ef4dc0b82f1690e455144318734cb50b7bf2349a95b99325e67bbfcbdf5c88f55f3ecc65c7e593c468 SHA512 585dab11bf6cf811b657831292d5b6b90dd01d9e4c1fa4b6a446d0eb66f436c46a6fcd4851e9c6b6b0bda8a41cbea57fe74ca5ecca4e40cb35f85d7c2f5265e7
 AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f
-AUX qtwebengine-5.15.2_p20210406-gcc11.patch 5995 BLAKE2B eb2a24020240c0fb87169c1a90769c085fe8fe676ddd4d7344aacc03c18f30921e2236399c3d3f34f5a86041a7bf623000823f56c552d9c6f5e0ee0e22451a44 SHA512 6290ffe2b229d1a6fcb9ce99617b7609a8a96080637464db635852d262b6b83c8dcbed1262315dcad6cbc891ddd7f66afec0e8cdb181accc1ee515da21ebb953
 AUX qtwebengine-5.15.2_p20210406-glibc-2.33.patch 5361 BLAKE2B 92ead1bfe2be883e7438813441091e23466d060f278bb150f1d8f24e65cd847202142ed6a70a2d2bc683d2af90966ce25555f0d62bde1f3125fdf8a5343ed56f SHA512 827866ea1363273a8efc20793205ec20762ab4bd951fb837510d1cdd0a5df499958a1fb89566e4028f7781b48e439ed41dcfb127882475fc5fde4f82dcf78891
-AUX qtwebengine-5.15.2_p20210406-icu69.patch 3299 BLAKE2B 0b1eaf1c86adc9f95195c1dde4d6a58e66394144f4d4052120748c7560f58b60dabf5b18b5957b8ab7a9777207266669408f4015448409d23a5fdada73e459aa SHA512 4ebfc3307a1ea3ef2297945369682620fdb6c6035590c23c33bc349d5485fbd52e0f046a33d4093a6ada3426cf893e2e7e5b8b9cb28bb9e77e07e605caf0e303
-AUX qtwebengine-5.15.2_p20210421-qtbug-91773.patch 18562 BLAKE2B 5b3575cb967fda8b2a49afb7e9c3993f07a3076e34bb817de17a639631e214566505c97bebfc55873bb407212c2be6c41406190c74625a6289e510d88a4b3b11 SHA512 e850d949f3342e63098c7a97201408cc0ffc6bcd184f10e31457ffa80fdfe4ba646de83d3478728f94bda82e704c2a2bd424ff68dfedefb8c3a849db6ea25f91
 AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb9fb340a65021718802da545bb34a3bc03a02d11e95cf677497588711ff7f3f297ea4a6b4a882c865f87158e69582f8875bba0b0931 SHA512 fdd8da9d4353ce78f6b2c789422a3deee80e74feed5fcce4c8929b0814a9f21734e31fdbb0388a3f152d380b2eb14508be6f4f9ffeaee5913d299873a94135c2
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
-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 7219 BLAKE2B b8880c4a500f1497e875cbd56ab71bf197742aa5a3a69d8c0a44a691a82b8a35e2cc5799132fe514ed059f0a734d9835e25dc96c7350860ad2bc7346e48d1bfe SHA512 6ed27891c804297206ed480d882251c3e3908e32f998b0ff0dd059123305a38caea56a5b14e63dcb81c50854b873ba8caa8fcc0fff2ac10084747727252828a5
+EBUILD qtwebengine-5.15.2_p20210625.ebuild 7217 BLAKE2B 1f7e39942d90132b50ac828d1bdb6f3f8131eeaa2ee684e40729b013bf71cac2db0ba88ca8457dbef46be567ea44ca77f054cc8e58fb63ff5931c8e0cccafd45 SHA512 701b4ef911ab70825e22f9b7ee7b571070147e074f845d3eab91d7ef7a3311bb84ddf67d4b2b48f8a5855412888c5bbcb192184b94e00369ddc8252d66da3939
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch
deleted file mode 100644
index 7411567e74f0..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-index 013f1dfb2..3ce63c192 100644
---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-@@ -9,6 +9,7 @@
- 
- #include "libANGLE/HandleAllocator.h"
- 
-+#include <limits>
- #include <algorithm>
- #include <functional>
- 
-diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc
-index fd651958f..1e8d0606c 100644
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc
-@@ -14,9 +14,9 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/containers/string_pool.h"
- 
--#include <limits>
- 
- #include "perfetto/base/logging.h"
- #include "perfetto/ext/base/utils.h"
-diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc
-index 00496b335..0dccfeb8a 100644
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/db/column.h"
- 
- #include "src/trace_processor/db/compare.h"
-diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc
-index 837bfeba9..cdd56817d 100644
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/types/variadic.h"
- 
- namespace perfetto {
-diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-index be91def6b..73f202356 100644
---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
- }
- 
- GType ax_platform_atk_hyperlink_get_type() {
--  static volatile gsize type_volatile = 0;
-+  static gsize type_volatile = 0;
- 
-   AXPlatformNodeAuraLinux::EnsureGTypeInit();
- 
-diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-index 04125c6fd..6c64e5d8e 100644
---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
- GType GetType() {
-   AXPlatformNodeAuraLinux::EnsureGTypeInit();
- 
--  static volatile gsize type_volatile = 0;
-+  static gsize type_volatile = 0;
-   if (g_once_init_enter(&type_volatile)) {
-     static const GTypeInfo type_info = {
-         sizeof(AXPlatformNodeAuraLinuxClass),  // class_size
-diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-index c663a2074..38a342484 100644
---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
- }
- 
- GType GtkKeyBindingsHandler::HandlerGetType() {
--  static volatile gsize type_id_volatile = 0;
-+  static gsize type_id_volatile = 0;
-   if (g_once_init_enter(&type_id_volatile)) {
-     GType type_id = g_type_register_static_simple(
-         GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-@@ -2,6 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <cstddef>
- #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
- 
- #include <stdint.h>
-diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-index 657a3c96b..ad641a082 100644
---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <cstddef>
-+
- #include "components/bookmarks/browser/base_bookmark_model_observer.h"
- 
- namespace bookmarks {
-diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
-index 19f9aab5b..27fec2168 100644
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
-@@ -37,6 +37,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include "absl/base/internal/hide_ptr.h"
- #include "absl/base/internal/raw_logging.h"
- #include "absl/base/internal/spinlock.h"
- 
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-icu69.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-icu69.patch
deleted file mode 100644
index 457953671a47..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-icu69.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Thu, 15 Oct 2020 22:44:27 -0700
-Subject: [PATCH] [Intl] call new ListFormatter::createInstance
-
-The one we currently using is now marked as internal and to be removed
-for 68. Migrating to the style which already avaiable in ICU 67-1.
-
-Bug: v8:11031
-Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#70638}
----
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-list-format.cc b/src/3rdparty/chromium/v8/src/objects/js-list-format.cc
-index b17d38c..e48a387 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-list-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-list-format.cc
-@@ -29,46 +29,27 @@
- namespace internal {
- 
- namespace {
--const char* kStandard = "standard";
--const char* kOr = "or";
--const char* kUnit = "unit";
--const char* kStandardShort = "standard-short";
--const char* kOrShort = "or-short";
--const char* kUnitShort = "unit-short";
--const char* kStandardNarrow = "standard-narrow";
--const char* kOrNarrow = "or-narrow";
--const char* kUnitNarrow = "unit-narrow";
- 
--const char* GetIcuStyleString(JSListFormat::Style style,
--                              JSListFormat::Type type) {
-+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
-+  switch (style) {
-+    case JSListFormat::Style::LONG:
-+      return ULISTFMT_WIDTH_WIDE;
-+    case JSListFormat::Style::SHORT:
-+      return ULISTFMT_WIDTH_SHORT;
-+    case JSListFormat::Style::NARROW:
-+      return ULISTFMT_WIDTH_NARROW;
-+  }
-+  UNREACHABLE();
-+}
-+
-+UListFormatterType GetIcuType(JSListFormat::Type type) {
-   switch (type) {
-     case JSListFormat::Type::CONJUNCTION:
--      switch (style) {
--        case JSListFormat::Style::LONG:
--          return kStandard;
--        case JSListFormat::Style::SHORT:
--          return kStandardShort;
--        case JSListFormat::Style::NARROW:
--          return kStandardNarrow;
--      }
-+      return ULISTFMT_TYPE_AND;
-     case JSListFormat::Type::DISJUNCTION:
--      switch (style) {
--        case JSListFormat::Style::LONG:
--          return kOr;
--        case JSListFormat::Style::SHORT:
--          return kOrShort;
--        case JSListFormat::Style::NARROW:
--          return kOrNarrow;
--      }
-+      return ULISTFMT_TYPE_OR;
-     case JSListFormat::Type::UNIT:
--      switch (style) {
--        case JSListFormat::Style::LONG:
--          return kUnit;
--        case JSListFormat::Style::SHORT:
--          return kUnitShort;
--        case JSListFormat::Style::NARROW:
--          return kUnitNarrow;
--      }
-+      return ULISTFMT_TYPE_UNITS;
-   }
-   UNREACHABLE();
- }
-@@ -143,7 +124,7 @@
-   icu::Locale icu_locale = r.icu_locale;
-   UErrorCode status = U_ZERO_ERROR;
-   icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
--      icu_locale, GetIcuStyleString(style_enum, type_enum), status);
-+      icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
-   if (U_FAILURE(status) || formatter == nullptr) {
-     delete formatter;
-     THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210421-qtbug-91773.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210421-qtbug-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210421-qtbug-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
deleted file mode 100644
index 21f59ef813ef..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	~dev-qt/qtcore-${QTVER}
-	~dev-qt/qtdeclarative-${QTVER}
-	~dev-qt/qtgui-${QTVER}
-	~dev-qt/qtnetwork-${QTVER}
-	~dev-qt/qtprintsupport-${QTVER}
-	~dev-qt/qtwebchannel-${QTVER}[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/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${QTVER} )
-	geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-68.2:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${QTVER}[widgets]
-		~dev-qt/qtwidgets-${QTVER}
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
-	"${FILESDIR}/${PN}-5.15.2_p20210406-gcc11.patch" # by Fedora, bug 768261
-	"${FILESDIR}/${PN}-5.15.2_p20210406-icu69.patch" # bug 781236
-	"${FILESDIR}/${P}-qtbug-91773.patch" # in Qt "5.15.5"
-)
-
-src_unpack() {
-	# bug 307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-		ewarn
-	fi
-	eshopts_pop
-
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-
-		# We need to make sure this integrates well into Qt 5.15.2 installation.
-		# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-		sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
-	fi
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 630834 - pass appropriate options to ninja when building GN
-	sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 0a38090c5253..96ad0847cb28 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-ros/Manifest.gz b/dev-ros/Manifest.gz
index 242ba84d0276..806cc9190888 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 8fe934d42c1e..83939db14de7 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -5,10 +5,6 @@ AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af9
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD roslaunch-1.15.10.ebuild 1638 BLAKE2B 0aef70b6a9423d1a01bb703f5bdcb14871d602950c778fc143ac643036645c79b381428ff68db92c23b92a5daa08276ebcde11eb80cab95863bfef49704b3b72 SHA512 889c71478fea43c38557a1e8ab8f3800de5fde0a42479eabff930ad4e0385a6a4c01622e91214fe21c63789e29e5b2a08120076e70da63918f95ec21801f16c2
-EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
-EBUILD roslaunch-1.15.9.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
-EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
+EBUILD roslaunch-1.15.10-r1.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
+EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
new file mode 100644
index 000000000000..2cc8912dd83a
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+
+CDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.10.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10.ebuild
deleted file mode 100644
index da9d039bce6a..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.10.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
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
deleted file mode 100644
index b0c3d9412aae..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.9.ebuild b/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
deleted file mode 100644
index b0c3d9412aae..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index b0c3d9412aae..2cc8912dd83a 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,13 @@ ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
 
-inherit ros-catkin user
+inherit ros-catkin
 
 DESCRIPTION="Tool for easily launching multiple ROS nodes"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
-RDEPEND="
+CDEPEND="
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
@@ -24,7 +23,14 @@ RDEPEND="
 	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
-DEPEND="${RDEPEND}
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
 	test? (
 		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
@@ -54,8 +60,3 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins test/xml/noop.launch
 }
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 59d1d9edb5c2..44ed7367308b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index d3597c0f2456..cc962c422440 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,4 +1,3 @@
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
 EBUILD actionpack-xml_parser-2.0.1-r1.ebuild 945 BLAKE2B 1cdfea88ddb72dabdf8fc04bb64064a65877bf11326659402d6e5b6de6beda6dfd3abb8e6c24d6a6d40a3de2c5bf412954a11756247cd07eff14967120250950 SHA512 84f98220c32b41ec0ee35547728806d6dc403d09bc0f7f2b5996567f57e7d4fc0662d0c5dc76eddbe729162304405eac1f330dbcc8d5abea8ecacdadbaeefff0
-EBUILD actionpack-xml_parser-2.0.1.ebuild 965 BLAKE2B 2671125c4de6d806e39e4269c9f1b745da007d263b929091502e13956bc9f58fe4700cf014ebbf56093f96c9f1a87e952a810c98c436a6da7b04d8de269bacaa SHA512 281ab37e0a48485ad1d75d7be5e06d18bacde945f0c13f52b8034d9eefc8fa93f65fa7b7fdaa385d99f38a398efaf153c585f5ea0651f31707cfd66b71229522
 MISC metadata.xml 343 BLAKE2B fae09bfee8e2838dae045fb6920229bf6d0d87affced294d61535b221af86767fc95fec8a7f5f87832d1948e50165369751b6450b84b31d0611e72cb0eafba19 SHA512 2e931999edbe73e74146107d2a75df2050649d682fcbba40cb877b742af15de0d0709a3acbee03722eff1bd1ddc3619a3c2a61e976a526f34f1bbc3bb0b87593
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
deleted file mode 100644
index 48e5bf081edc..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.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
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>5.2"' test/helper.rb || die
-
-	# Skip test that is not compatible with Rails 5.2
-	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index edd8586e8cda..c862b4502328 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
 EBUILD builder-3.2.3.ebuild 849 BLAKE2B 9d7bd80ec5701eb1f2fe664e9b80df6ef0ee9319d2fde95f3eda430b714e6ee41ae7ae3108b0e7df02a34123603a5878e79c6645925bd8ebdd2a87116252b869 SHA512 5b764fc76d45cdc3fb799c07209ecead308e1892ca88820d99d120616f826010149f7a08d9c2a16fd94afbfbdd0988c50635b90feef7e70851c52337a6ffde37
-EBUILD builder-3.2.4.ebuild 813 BLAKE2B 918520f9a03bcec9879d9616700dcd7d75ae4bb4f42cc198f29c2e777382fd3b4df827e33d1b247884857d3a52649e060a45b68d035318eb59391c5da21596e5 SHA512 bfb38e0b001097933833ca3f090c8c05daf569acc5bdc2573a640ad130faf52e934a07300d09e850b27eff33e81e3a63bca6e47a929b8da71349ec6184bd07a4
+EBUILD builder-3.2.4.ebuild 816 BLAKE2B 02bd3df41075391dafe023b98bd4ccdb7c9904a9a195a6993e602db68b988ddc9219160b3c38159badd0dd267882b9f287a9bf6628cbd6fcb81e26ad1375af60 SHA512 af678dba4d691f4c10b855206e24aa35a3845a4af01e98da3f77825e303df6bb92a5bc1a99d53d3983f3891fd29869fba7dac8de42c86584840f421d866d9548
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 7ab39f402cfa..442787e87876 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index ddcf910bed0d..c6c43fec1dcb 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,10 +4,12 @@ DIST bundler-2.2.18.gem 390656 BLAKE2B f06d2e08134fa4e3fcee15de648121aa39742fcee
 DIST bundler-2.2.19.gem 390656 BLAKE2B 212e41d2f5f8e9b689265bc0b3294d25c0ffaa681f63b8c4595d72497752b0e01f4477348699e568bb003b812fb447bcdca6e0933d91cde3680425db3608aa01 SHA512 692460145ac7ee72a5093cc1d7ee4cccdf67b6a7da4006019960c212a147553d447f0218dc15d5e3560ff5b901cd90849e40d5d9c66ad6d098be5de6fa649425
 DIST bundler-2.2.20.gem 391168 BLAKE2B dc53699a56187fca399216d02de5a669bf6f78301b9095eef2047d353c9ed8b33a83063d2a2afec35c445de3d37ef66451c848909150a1b9802745f6d53bf724 SHA512 2e5e651c2bcfea91f6bde57ae635b62e28bed3f081afde33f77be9adb040aafbe61b48f3e4cd6555bc65ca156bad19d727084d8bd7ce8da130c25ab8de00e090
 DIST bundler-2.2.21.gem 391168 BLAKE2B abed6993e00c4e0ea6e0b7a19dc2b48dfd110e00ad47cca77c66143c61fe8b95ef3b4964c3b0d8ed74ff2e49ec4e3b44876f5a692ad0c16ad5d5b9a5d56578da SHA512 2905afc06402cf3f07da1c622279963b4aa68d6e91f65fd8542434fcc2f7ac820abdb24422523ce1089a234dbce6189dd7bd60e509da97d385824fde8f85b892
+DIST bundler-2.2.24.gem 391168 BLAKE2B 2b70c476d2f0e400f52bf5d6caf2ad06394c3d7bf0f3abc7dd9c3b62cb6c4a1c8621589d908c39f7f434e4b204fc4c63e4f40a88f8dda55e7ba9ecab9785867c SHA512 ac50c7d2bbcfa0903511fd0b9a56ebc6da67b0bd54da67ff2f23bd8a60a90f384b6b231e8ea45588a10758d889e561ed5a12866d879c8f47fc289f0a7e650f3f
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.17.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.18.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.19.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.20.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.21.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.21.ebuild 912 BLAKE2B 4174d8c35153e8ecf844cc7492b9c1680a2ed1baaba0d63f4b120ca516b9962c94bdf6a8b203d7a04704a860c1f24548296fd95c0ba6d0a6d848e5fafe68c7f2 SHA512 2c267c6a6017b2ff21f63b17186479748d5abba28f1291879d998b0e3031f258cfdfb6a752417208a60efeb49dcdd7c0133d090add733e3eaea1722d6718443c
+EBUILD bundler-2.2.24.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.2.21.ebuild b/dev-ruby/bundler/bundler-2.2.21.ebuild
index 8256c6960865..14e7e3032791 100644
--- a/dev-ruby/bundler/bundler-2.2.21.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.21.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.2.24.ebuild b/dev-ruby/bundler/bundler-2.2.24.ebuild
new file mode 100644
index 000000000000..e03102a40889
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.24.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
index 1695047d05fd..432fda751cfa 100644
--- a/dev-ruby/c21e/Manifest
+++ b/dev-ruby/c21e/Manifest
@@ -1,3 +1,5 @@
 DIST c21e-1.2.1.gem 6656 BLAKE2B b6c1f8919206e8eea04a33fb3a21c42e1758a2dbfbf2ad06486543e8bfbd37234d3c8a113a10c8473d04873f20076baed042e90eab34b96b6ea10c7cc6684ad7 SHA512 1f36251c4c6c7923d46ab186df1f1d380cb329daa7316327f65d4221493eb988fdaf83f2b43e8eb7eebef9e58f8b475bf4b36095cd4cfdb4a787719eca4b36a7
+DIST c21e-2.0.0.gem 6656 BLAKE2B 64b840ee83bd89ae29486527f4a0f59bc029dc27217bd48944629c357a7c8845cc98521054ed88f4c1cdc967f8248b3bf7a8b74019d181c60312a35f8a6f9dbe SHA512 e36bd75c87608efb1bb776f69b3400a307a2a1d1bb6375246613a5aed53a4673599a61f7723a53cae3a639e1bb2dd03b6635d54979de4e32885fd3cb1f29a1b8
 EBUILD c21e-1.2.1.ebuild 433 BLAKE2B 2e456c2f3943665ca5f094d5c2cbf978a74a027674b14c3c6d441d4d962fce64a47af8bc07fa33c1407d6333297cfdf4fd2580e3f1f27fc4e8616efc4fbc5626 SHA512 ef6cbb25bbc59340296c69560e759670faa04045f01dfc5fd640069b708c6f84723cb048ded1d9a65c720141a27de991751ec81753f57478dd57225a91fed5ef
+EBUILD c21e-2.0.0.ebuild 413 BLAKE2B 91c3a6df024da53504fdfb267609d46e27c11a8328ae2388c13b98b5bc3ef50108141a2c0330de170b81b98a7b343b0fa86f93c5c814ce84fcd90fe8809aaa42 SHA512 6690b86b3c22c4f883529974c029ec71633a12ed1a2f2a0b90e23a6655dc64b4cfaf1d19bad664a07a194b9d970ddd2fa78a34ac2b026aa0870e1f4e351a6d73
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/c21e/c21e-2.0.0.ebuild b/dev-ruby/c21e/c21e-2.0.0.ebuild
new file mode 100644
index 000000000000..965c35068fb9
--- /dev/null
+++ b/dev-ruby/c21e/c21e-2.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run cross-platform executables"
+HOMEPAGE="https://github.com/cucumber/cucumber/blob/master/c21e/ruby"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index a5d0187bf8c7..d747861eea7f 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,9 +1,7 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
-DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
-EBUILD capistrano-2.15.5-r3.ebuild 1243 BLAKE2B 3fdd7e2c2b26a39b2f590b82fa5018d2d95276892fe8a7479d790ec5beaf27c864bb4e4e627059bcdb51c8b184dbec15edd0bfb9570d6f56f4cbd04b22913ab5 SHA512 260ad225666f8229de86fc34f3b69414e9235fd44c80933feaafa4ac5dc1f85e3c7eff574c6a0246b2ab525c79b6ad4c0475588373060bbe30897472d59a616e
-EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
+EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 844be23d3f0cb937c4abda2aad1789096462a24b3b68c41e0a593809f0eb8c20330a7ce31ee1484e00592a6d7b94752a5b911f278e3080c6b9f10997eede3947 SHA512 3aaedc46b4633aff5a29f178e030d9b55f01189dba8e6019f082694f0aeedf7b11f78c5c9b9c90d346145413a1865c8df59e97ca75a968b6db06040d66035bfe
 EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
index 6beebd2f0210..1aa1107403c9 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/capistrano/capistrano-3.13.0.ebuild b/dev-ruby/capistrano/capistrano-3.13.0.ebuild
deleted file mode 100644
index 194a24709889..000000000000
--- a/dev-ruby/capistrano/capistrano-3.13.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=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="https://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/airbrussh-1.0.0
-	>=dev-ruby/sshkit-1.9:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Avoid specs that depend on capistrano already being installed
-	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
-
-	# Avoid specs that require a TTY
-	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
-	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
-}
diff --git a/dev-ruby/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
index a1faadfb62b4..5e4495dfa551 100644
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@@ -1,4 +1,3 @@
 DIST coffee-rails-5.0.0.tar.gz 5892 BLAKE2B 4d3b945ab4b53936bd39599ac7ba8af4d90e6fee073188847dbb157e098f275df5a3a6e91dcf804068b707804047442efc86524935a56cf403b55426466c502c SHA512 f1aac41f8f1f7181e82fbcf8c3007f40116639e4c140f1837be835fdcfa1babc7fc370212a9954ac8398d9a8d20fbd468550cd8b11c31788428769ea7aedf769
 EBUILD coffee-rails-5.0.0-r1.ebuild 1032 BLAKE2B 092c7fe37e77b56e0393a831ec3174086712d1b8875973080cf30436b5801e95353dc446be13c4ce5049709f326e30a984c3d301732c876eb1d2f73439a4cca9 SHA512 da6755f86512573e148c46cba069b2a8bfc25545695e5cace1f3236f8a6f9d2bcef534f3a2bb70a6e5ce953b969a4f19caf03c1b398d5ae2e29a02098d143141
-EBUILD coffee-rails-5.0.0.ebuild 1019 BLAKE2B cfcc0a7673dd733f02f39ad2e05e2091e5cd18d5b54179895b89eef7579f0f194f21524f936661f84c27c525d54b3db49aa4cad2abcd63ed4a31279268599092 SHA512 9f096fd8a2756c4ab0a656daa0f1a9e7c5315b36e3e127c31dd8898301b4f1bde65ad3af5b6ee122bc67b55dcf94cad2f3d058cedeff231455ae2e8ba62806a4
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild
deleted file mode 100644
index 2dc0ad63009c..000000000000
--- a/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
-HOMEPAGE="https://github.com/rails/coffee-rails"
-SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	>dev-ruby/railties-5.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sprockets-rails )"
-
-all_ruby_prepare() {
-	# Avoid dependency on git and bundler.
-	sed -i -e 's/git ls-files/echo/' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Make sure a consistent rails version is loaded.
-	sed -i -e '4igem "railties"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 55a66bcb77d4..b5bbd3fc0fc6 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,7 +1,9 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
 DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
 DIST concurrent-ruby-1.1.8.tar.gz 4921836 BLAKE2B 1a58be0790af7708c58f6542b9bcf09b4f853bd180412f44cc6d18f2c058647384f2bc03f9828664c289eeabfd0721c866a143da4e4b4650d11058a2de7fdb16 SHA512 79b326721107abb972124d5e2cac32a348475d8408079747cca6a624df790c3662a8a460a9d1f0d6aceb4b4dc04fadcdc94777b58cec73d82350b3464f70b679
+DIST concurrent-ruby-1.1.9.tar.gz 4923746 BLAKE2B 2bfea989db31f17c69ee479091135516e2aeef7ac74234ccea91b2e4b3626395683a7b2ebba1d13cb527903d3d83c51e873bdb859f0ff1983062fea4fa90a1e4 SHA512 243fc20795bcd7399bdf77a9b0db9b0bccb1b05edacf4fbc8f5515f59502300b4033a2a59bfb6adea9befdb20759c9f58bbf0e7744e934c85738085bef714ea6
 EBUILD concurrent-ruby-1.0.5.ebuild 1226 BLAKE2B 762a7d9f335a9e60bff70d381d38a6531e7a4b97ad53e7918af5ba4665ffa02150341a4373887e1c8135b74198f7f6b640c3112d110e6be2b6208ea81ac06ed7 SHA512 44c99e6b0ad806b44a876e79a9d6b0fbd65b07fe19458e4449365ae98a0a0263e3dee1dad4da610166760c6175a61a4cc5a419060317e9341356bb84fe234be4
 EBUILD concurrent-ruby-1.1.7.ebuild 1369 BLAKE2B f3d176d753b2541004b005f8d2a81b7631f378c48deace0b20fc0e6896e8fa46e8bdd848c22aaa7d53725098045624adc62a9a775dd38721c82f79b3dc42b320 SHA512 8f2d07eb5b42015759d896cab882fff2967ce98f935317b908fc165e7acc479ff295b61cf37e7031333aceeb5e90f717892cd2139e46a3f829db61baa3598001
 EBUILD concurrent-ruby-1.1.8.ebuild 1376 BLAKE2B 51e7e41057544477ffe7ac5543c2a24dfa976918c21c7ac304e9c45982e1287f6742df4b20e5e0a96777e6388e5f3bcc8da022ca222157fb70e8ea2ad9bf4b4c SHA512 4f1f400ca2f86afd8d27eeeac7a40d98062d91a984964d2e7112d7696d43d02908727b24e545dd7dec401b310eacf2cac15d2b9e5e61936c889848025ca77254
+EBUILD concurrent-ruby-1.1.9.ebuild 1369 BLAKE2B e736b51e6e758346bb47d82c3dc2c3d63eb2eeaed09aaa3f777024458331677bdf71bb5c3c66f71e9cc33cf1d8763d7fb821c76d69ba427d12b624e9edaa864e SHA512 c615517e4e98525a028925cb04bbcd82f6da0050d767cd13df0a37ab944bafc4832d16db2ef3f669aff86ead4891d82a4b76e9554191c67235fa818eae6ed2e8
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
new file mode 100644
index 000000000000..0b5dc7e3e608
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+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/timecop-0.7.4 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index 38bbf705f3fa..645053576af1 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,5 +1,7 @@
 DIST date_validator-0.10.0.gem 12800 BLAKE2B 0cbb11e70cb72a1203c2ec33581d4ed48be346af6998faa89e4323c8c6bf70b5c979b55bc79630153a940697c89ce140eb511538cd55adb0f12566f2f1a317a9 SHA512 4348835898ebfe311a8ea456adc10f7bbfd1dc21daf2678e32b1615ba3eef3d36671f67f533109882f40516c836f23d7e0a4072c9ecaa55a1b0eade0b6aa75b7
 DIST date_validator-0.11.0.gem 12800 BLAKE2B ce45caa57bd1e29900ed0732bdbfbf81c68836de71efbf099bdc595a9b586872175960af40129af6d793ed5ce49ba222a3ca7d0172ef764ee02c88f4eae04e9e SHA512 269f3e234c8157a667c81d725497eafd21621cd35811f35707590242a3dc78065bd6dbe7b772a38761fdb8c95ae40f99976919444dac061f7bd2150fc9178afa
+DIST date_validator-0.12.0.gem 12800 BLAKE2B 235434dbd7e4441698bc90e0dd37bf9e5b8f1f742424e8155876e677e5d7dbe7beb4edd2f7dda7dba2729a024dcda72ac816e4f6a7dd38fdfaa4ea79f21d078e SHA512 e7796375d6d6af2fc9ce6e7d6174d59bd35ddbac90c4e5b54b321e33ed25f3e816c58013fa61f2003724e87fc96495ce81c132d056c9c9331bd1a236eb7dec38
 EBUILD date_validator-0.10.0.ebuild 1048 BLAKE2B 8c86303cd1ff60115e42c0c2e5597725ab5e26e24315f34a54f651a492b2c467fcc4458800f1bfcc880421f0cdae3333b88189342942b9e78bdf8fe5ce7a7b7e SHA512 d8047c2ba77a606f66ff84636ec87c59b55cc3c855a47b92455bfcffcd91e8d79918d93613f86ebb7953ef695046ca9962b646343bff202a60e9a810f89ac519
 EBUILD date_validator-0.11.0.ebuild 1048 BLAKE2B 8c86303cd1ff60115e42c0c2e5597725ab5e26e24315f34a54f651a492b2c467fcc4458800f1bfcc880421f0cdae3333b88189342942b9e78bdf8fe5ce7a7b7e SHA512 d8047c2ba77a606f66ff84636ec87c59b55cc3c855a47b92455bfcffcd91e8d79918d93613f86ebb7953ef695046ca9962b646343bff202a60e9a810f89ac519
+EBUILD date_validator-0.12.0.ebuild 1075 BLAKE2B 79a1b1b05b92fc24485e3ebd853489e74575f4c87ea1cb19796402438e9599c3d6ede48f7ed02c29e20ecf68969c3cfdc94197c88cfa37df6073ac16499b0fb5 SHA512 5f814cb6d97e294d3fc32c4980fd8496c23665c222773b2eeabf329de558cadf719f83fcd225500dce6aa1c4cb49e999b7c9f0c46a3e4dbbaa4440f28b09ed69
 MISC metadata.xml 349 BLAKE2B 4b120116447656e42f1247065f08006f19da25e019491f904eafeb12ce35bb012f2c0330d8ff219f7c2ac72e4c0423b93a2a3ffee36da1de08454c6306856722 SHA512 67be0f0ac5cc6bae9b3d76a371bcceefc5c32c4a384a02f7f13a0fa1da950ff864a106430922a3aad2d8b5522a216ad6d93eba949ba1bd76f37926abc40fd6c8
diff --git a/dev-ruby/date_validator/date_validator-0.12.0.ebuild b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
new file mode 100644
index 000000000000..31f9e00f8e98
--- /dev/null
+++ b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+# if ever needed
+#GITHUB_USER="codegram"
+#GITHUB_PROJECT="${PN}"
+#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails"
+HOMEPAGE="https://github.com/codegram/date_validator"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activemodel-3.0:*
+	>=dev-ruby/activesupport-3.0:*
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest
+		>=dev-ruby/tzinfo-0.3
+		>=dev-ruby/activesupport-3.0
+	)
+	doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/git ls-files/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i \
+		-e '/[Bb]undler/s/^/#/' Rakefile || die
+	# Fix tests
+	sed -i -e "1irequire 'active_support'; require 'active_support/core_ext/time/zones'" test/test_helper.rb || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 008f8be44f59..f4609e775a29 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -5,5 +5,5 @@ DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7f
 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 671 BLAKE2B fd3fdc75cc871aff0a6a79333478b812c9a4267a205a2a5a989b1268cb580e25f329670bd1013a4a0281eefcd0052992b510eba23d8fd0246690b46830ce0db1 SHA512 41e79222761387ffdde89cb974ff43dbcaa2a3360ba6afd8a84218874bf95fb9dc2f101a7029dc159d9d56fa43c43b25b6d73ba5e390343517f626d4abc16bc9
-EBUILD did_you_mean-1.5.0.ebuild 684 BLAKE2B 7bf3abbf2a57e6cd52f5a33002a74d184fd1ec46c2fef3a6bc0fbc48cdac08b4844bea63ab39650e1356728d8efc50e0b4db0501f6eddf0f9e4712fef2ad4d30 SHA512 480c2613442787878fb0faab0fb465c51a162ca075c092b55b494c729de658e3ada4b73ba168b30cc98f1bafb856d9c20c4bd4f9c43e1eaa1d07ccc7d7b25612
+EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
index 054e887df99f..39f5de037118 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.5.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 ~riscv ~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/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 351d0497c866..52075acccfa6 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,5 @@
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
 DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
 EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
-EBUILD dnsruby-1.61.7.ebuild 834 BLAKE2B 483e110ce967a16382d22af8124952ec3c1dad7f20dcca920b0333cf3b8066672d96408b93b116684de514697d489c90d9b6c53237050c8fcf82d69b9fb01b87 SHA512 c9afc4137c0ffd57e928797bba362a7b0c13778b6149416033bbb04c61a0305f4f0cfb6b15631249d966c73212927ee364d6f5fba76522cce5a884c89c7687bc
+EBUILD dnsruby-1.61.7.ebuild 839 BLAKE2B 3327168be71319baa6c6397aa6e1cab35c3fe123f6361331ea0cf818bd3e6e21846f8fe3692cc918d6a200b33e1eadb533da69a9ec3b9945e3fd7faf56c3ee99 SHA512 dadb080f7f6366d88b9ec67a3f9330854a908989b5d13d60ac58f5d5ac3f1c941b16720ffb8981b8b402150d9ccb578ae20d8776f0269dc3a6f34b3125b647e4
 MISC metadata.xml 413 BLAKE2B afeb40e610311f15b7a95117ea91507e9cfcc0e26903cab7e58f0af5dfce580dd782e96338a8a6a7573cb3ac12497541c2c3284fac9f35b045d5a26608c5506f SHA512 4badb70d7bfddbd8d242d1b400672691ccf737a329e365321dc403dff791669417ba0b0df62efd1ad1c5946e11a7756b22a2790b171e3629d2d30ebfefc5c0f9
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
index 17cf8f6cfbec..93a08659a392 100644
--- a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="A pure Ruby DNS client library"
 HOMEPAGE="https://github.com/alexdalitz/dnsruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 4578ba26f1cc..50bd2314e0dc 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,5 @@
 DIST domain_name-0.5.20180417.gem 124928 BLAKE2B 56c8852c09dfabc2291a08d89b4dbb6c9c9c3aecce40fab2a176e2183ebd7b793a6677256f417b0c9cb6cd61680a738038ee2d14e4d15d9ab5a952d666014d27 SHA512 e960aa4445e19ff3e71825d94f85519ec9b1600dab64d139bf21208aec6fe1dc279e9fda6c64fd518ab22783464ba9a4d43f20ceb7699daede981cbf7d5e1876
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
 EBUILD domain_name-0.5.20180417.ebuild 1085 BLAKE2B 833a8ffa75628ed055bccdcd1a554c1f1157f22014ca87d788051970c59d3c45ab82869bd6d5f7b94a30ac19b7ba719afcdcf11df13f64e0b2282713e8ffc391 SHA512 87517d67c3a616102f14417c80c0a9a59f00a6694397c020526f13dbf9f0d7009486bc4aea224bcdb80c7c85974f94728b75a41efac708ac5ddfbeb63b5057a2
-EBUILD domain_name-0.5.20190701.ebuild 1083 BLAKE2B d580417335fe5a558bcd352e72f6625579332c3c5e52a861c781e3ec776f1333142c7c47c57656888a4cc760c8600fcd8af46007a456db578526297c2222307d SHA512 3cfe358b1e6021fdffcd6c7c86baeaa398978ae518b29e5eb8d78cf56cab7821bf1fe12f6c463911d2d89ec588dfbd88f03af0e351fc0dc9916890edc5a0fc68
+EBUILD domain_name-0.5.20190701.ebuild 1080 BLAKE2B 020faeed5e8d645195b1d3116b04948eb45164b8d5a5ace37f3d16a1b10b30fbf3fc187fe543a154a154b257313ec5a4aa17e50f347ba1404f04fa26e8fe34b7 SHA512 fab4de576a80ba1475fe5c1d6771ccf0b1d9dbaf4471dc71b89f5bf902840db04f98f4198ab545e28b07ca773a46e2689ff1503793e6e0046f67985f134acac4
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index 2ff60031a44c..10b318c2f29f 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index a6323beb4e72..b001bbf08ae9 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,7 +1,5 @@
-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
-EBUILD elasticsearch-api-6.8.0.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-api-6.8.1.ebuild 1462 BLAKE2B 625c06f2e263292c4907b06f908829047460bccfd7ab4b1e7639c49c2cb821c893fde21c32ac8699ce3672486c2c9b245de5428704bbccb80832f0ec1f90bcbd SHA512 71850eafc5466f9f13a903b89e129f3d395a1b25355086abc1eb5c8a57f65ecafd5020c53c57ba287318f7a03cc2567f5ff4cb17ce766aa31136e51c75f14ac4
-EBUILD elasticsearch-api-6.8.2.ebuild 1504 BLAKE2B 4c1f50b07a78efb3384503dc975e6d0b604e76b7ad2385a402a6c8c794ca7d7e84b444acfb4e061b9c3f8860515a78d209deabd2608b5fdd11ca46d4273a6294 SHA512 9f1949109070edfe3fc6d0ed96d8a359040057083f5a8a3913d73184edf2c1572bba1a7020ee25aff8d24756a5505c462a978872f5c34c6e99b33593aed16976
+EBUILD elasticsearch-api-6.8.3.ebuild 1532 BLAKE2B 92aba41640caae5faefbf8392435d84c007f3f33c67c34daac0c4cb925fe4854d265d7159c403270626f3c7ede8460c32f3e5bc61287767021e2867d574dd4b1 SHA512 0ac1f18c34bc33a59ea3042c965f045c9946dc9555362afa7f4e4a1306969b9c532f4d53e0563d4135d962f2aa9a3f87fe53f4a161cc317c1bf06114706a77df
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
deleted file mode 100644
index 4dbb938a449e..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api 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/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-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
-
-	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
deleted file mode 100644
index 8b9a274812c2..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api 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/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-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
-
-	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' \
-		-e '/RspecJunitFormatter/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
new file mode 100644
index 000000000000..95e0821f2261
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
@@ -0,0 +1,59 @@
+# 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_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api 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-3)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+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
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-extensions/Manifest b/dev-ruby/elasticsearch-extensions/Manifest
new file mode 100644
index 000000000000..2f132678d422
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST elasticsearch-ruby-0.0.33.tar.gz 1305021 BLAKE2B 5fce0ba8276451863519aa14bccd619a9ed4ad68220928e2f04a1349aaaefeda1027d28d3b130ab593f5643cf8af82a4bd0aeb19f79a0c9c8419a89dd70ea8a9 SHA512 db39555d418ae06f4bbcb7dd5b2c71e9c5523fa434e5acc9d6761e3d90ed64d0f282ffa3720ee4a702aade00e20bdc33935ed462910178d4cc609296970cd325
+EBUILD elasticsearch-extensions-0.0.33.ebuild 1119 BLAKE2B f476891cbe5bd7cee316d7bf5acf6c7bd3fb2aa5b27eedec9d140ef7dc061d4e3794a2d7c97adf10936844ec3ae45654e5fde31be5a27ecb92398ae9e0da5f0b SHA512 5c651bfe30105a90cb2cbdc76d600cbfd5a88dbb6e219e866f876c67298698d4fff67969febcc34984cb2ef82a3c6447eb30024679bac5108ab9c9069c4c9a5e
+MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
new file mode 100644
index 000000000000..b6b127aa4e8c
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+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-extensions 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/ansi
+	dev-ruby/elasticsearch
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		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
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch-extensions/metadata.xml b/dev-ruby/elasticsearch-extensions/metadata.xml
new file mode 100644
index 000000000000..1fa2ebe487b1
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/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>ruby@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index f9294d8162aa..6ab0f3606902 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,9 +1,5 @@
-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
+EBUILD elasticsearch-transport-6.8.3.ebuild 1261 BLAKE2B 8ae7304f830a5c562aed7e42a2fccc8759a70326e686e85f5c49eff00771a9b52e2ebb1e5b9ad01c5770663b7a5f98cf9cb7bdeb12ae744e0c17e529bf358075 SHA512 455635ed089b2a76a1ecdecb3f8a9f8846cd02dbcab6ac86cb135fd2aca68f627401a6f0215fecedab5135b0e7e918719a97365b3901ee5e0bb8d4b68b466215
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
deleted file mode 100644
index 792e50aa53ea..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-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:*
-	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/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/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
deleted file mode 100644
index 1d13774e21d5..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-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/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
index 9e3d3dfb4e1c..59e8b4b1615a 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
@@ -16,7 +16,7 @@ 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)"
+SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 91f476118ce4..a026091d6bd0 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,7 +1,5 @@
-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
-EBUILD elasticsearch-6.8.0.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-6.8.1.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
-EBUILD elasticsearch-6.8.2.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
+EBUILD elasticsearch-6.8.3.ebuild 1194 BLAKE2B 82806cc673d6cfff39bacf9f041dcb98b7ef9f7fbfe8f2315155e2273449fcfd58bdac220ce0e6902aa8d04a29213e39f5636365742894f10435a92a83a08c23 SHA512 a44b2d9dab3cf873494c7930b8c7665750b8839528f5f3207fb11e9401073374b929afdf786a2f35c89ed8ffc7907a65fe302c2600fc99f54c91fbf30ea974c1
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
deleted file mode 100644
index a56db80f2fb5..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch 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/elasticsearch-api-${PV}
-	~dev-ruby/elasticsearch-transport-${PV}
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-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
-}
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
deleted file mode 100644
index be432279d0dc..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch 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/elasticsearch-api-${PV}
-	~dev-ruby/elasticsearch-transport-${PV}
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-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
-}
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
new file mode 100644
index 000000000000..a5542e7c2894
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -0,0 +1,51 @@
+# 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_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch 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-3)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+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
+}
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 479619c3c97c..42d7553c7c69 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,3 @@
-DIST httparty-0.17.3.tar.gz 97444 BLAKE2B 773e40fc35ca44cd3b14a30e7a7ea5783c0c158cdb8488b34ffa36af5a572d5f6eef697cab147c5be1448906c35071284947ba598409be35af54a20846f4d98c SHA512 c06aa4456c692e2a32f8e44b2316d46f664c4e2c8efb370607796f6801d96e989a54e61bdf125cff679b8c5f5abb1557b87aef48d8f3a392c1942ac4821db84d
 DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
-EBUILD httparty-0.17.3.ebuild 1652 BLAKE2B f22b76a26c3f2239daa9f7e9fc83ea04bb38bb2585b32136e3838883af771e01f8b3cce075883e3f361d0596a1b3a12aee5d99eec92cbd5a641f85acad34f33d SHA512 cdd87ab32eb7ddd4ee31671b18278b7d686d9375e666b10e71f5c036d1bddc9b36b55341937c1ade07098663f5ce64d705d4e67faec39c8c18d3a349485a609b
 EBUILD httparty-0.18.1.ebuild 1843 BLAKE2B aa21a61e27231d4b4326463aa0b996947e0d711b40a83b9de78b6920f60a0c4bf397e2f54b7ecf87f0ffbb2e9a021e4ee15eaff259bcd421aa2372870e156d0a SHA512 732404c9aa489e7cc6da4991141ce927ca8ca2f227eeaa1e0343d79051670e235a0309d1fdd15b4d290d68feb995e6576c4ff53ebca126f724ad37dfacace0a0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.17.3.ebuild b/dev-ruby/httparty/httparty-0.17.3.ebuild
deleted file mode 100644
index 568d1d507061..000000000000
--- a/dev-ruby/httparty/httparty-0.17.3.ebuild
+++ /dev/null
@@ -1,57 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-
-	# Avoid test that is not fully compatible with newer multi_xml
-	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 57fe79219c99..14d5c793e423 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,6 +3,6 @@ DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc8
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
 EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
-EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 8b8d2e04bd4d491ddd3bee215c6843412029f03c856755733d07991af3afc5dab4bfa37816bd46e3c5ced33381cf172b90258bfd1565ab1ab8eedba85637f0f6 SHA512 29d35ed79592bd409ea5eb63078ae6a8704b0724174fe9377ae4793b06f56b661378268fd1a13dbe7b3d90558f693e6cf8c652dd15ee3e6a9343a10db92ec6bc
+EBUILD json-2.5.1-r1.ebuild 1950 BLAKE2B 9fda187e857a00ee7b04258a4a2cc30b28678b1658de9ccac5859d7edd59d0fecff9368d7125e26675c9e25928284740f9c59e638bb4ace1afd0557e70cf5311 SHA512 41ebb8bc69c7c97a6ff2cdbe9ffb553956d7e3451ec1dc2b70c33328403690ae607c4ca8ac48c05fd07e2a16b95aa9534aa672cfce54f92b69f0d3f32cbbc4e6
 EBUILD json-2.5.1.ebuild 1995 BLAKE2B 74ca3a0ad79c798925abb2ccf15d0f57284ad7e3c2909b3680695f75cffe8326a7f15ca1673edb6c78a261da946692f21b54a263c1ce778656d1b90aacdca05f SHA512 1905491e97d2672b588e0ed8bc45a89eea6e0798121d3626f81a440dd4447a324b085f1d13b1baed51be7a6fea15bae71387cc0f82bf7ef9e426e342aaf423b1
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
index ee4ed3bbb0f4..96cfc9286d23 100644
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ b/dev-ruby/json/json-2.5.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 15eb03148872..ab8472d7850a 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1,4 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-EBUILD kpeg-1.1.0-r1.ebuild 720 BLAKE2B 02aff0c6e41fd1e503fc33e334a0564d434d7e72309a5f499521e0e010ed948908f1954ee2dfbea6082b59b06e69e8f877ee3cfc31948ca3df70bbb4af2c8402 SHA512 ac4b0a7fcbbec0c41b80ba83fa3e4e26e0bd61da7524f4d1f7c11f5fa050b2438a53ee42f6c840ec6a75a763d6fdd7243c535f88dad668abe013820229766972
+EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index 229517189a1e..9dd6a8adb34d 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 8d966f1f170a..fb67eb41d939 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,7 +1,9 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
+DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
 EBUILD listen-3.5.1.ebuild 1208 BLAKE2B efc9f7ccc344a4272fa0879b6de1652b88041fc2bea9f8b174dfe3bc3daa11fcf773792bb9c55df41f997cc516c4574efce310a592e8519fd0092e5b84c594f9 SHA512 1788a9eaef1d08d9a5c2f09e3e0285daf0f603feeefd6c04db54992d55a2a52e82cfb5d73e7a11380512b295be187ec70d1615a79b0a22884feeed599ab30e19
+EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.6.0.ebuild b/dev-ruby/listen/listen-3.6.0.ebuild
new file mode 100644
index 000000000000..5d10bd2e1352
--- /dev/null
+++ b/dev-ruby/listen/listen-3.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/middleware/Manifest b/dev-ruby/middleware/Manifest
index e5021f17d36b..9574178fba67 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 19a2e3771c010a047dd112402a519a73b33fcf390e6b034ac330aee8874967ff53dc1116ddfcb08daa7e54530a0ce39ef77b20809f7e53b6fdf6449ae4498a2f SHA512 a27d87b99010eb5bb56778d43eb4a25c06bd2f0af207ef66285c84d96e674c31409c450f23c6383f3a79faeca2e9ac6f934ce06b0e40d4a579e9fe15a707dc72
+EBUILD middleware-0.1.0.ebuild 639 BLAKE2B 16122179a6cc58a8dc83a00b3be28389ad16afc7cdc26cc7c9df8a03f76c6e0b8e299b5cef825316be30e4031c33519e2be2ee154090d9d25d7509c390fad83d SHA512 e752c70738b4b0ebb0b25cd6f831ffcd5bdbf8812fed30b643bb46789fd8f9711d90c7358fbb15d3e959cd462a8e4962b58f40c37d6734ec0c5b7074b24cfcc5
 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 a2f671910072..61f4e0ac2f36 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Generalized implementation of the middleware abstraction for Ruby"
 HOMEPAGE="https://github.com/mitchellh/middleware"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index eeb9ca5633bb..4405f9f01f8f 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -7,5 +7,5 @@ EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d0
 EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
 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
+EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
index 414bf91afda4..e11aea35842d 100644
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.4.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 ~riscv ~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/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index a19b6b80606c..aebb5e598cb5 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,3 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
-EBUILD net-telnet-0.2.0.ebuild 949 BLAKE2B 4b3e46a38f01e4621d3e06223f6b3e1227a6c05e4a136e9e27b098ca12b8a7d737d4ee9fbc2da83d7c5580ad33d8dac12ee644612099e55ef543ff071f494860 SHA512 6e3f3f0bd2f1f9fd088afde908eac78e7e778486dd62c245c2e6a697909950ffee01ddb1f7002d7a19de08b141b350ce13cbea55f2c63d60490974cf624ca406
+EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index c35a376da1da..cabf9da5cc46 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 9746ca320693..904c00fdaff2 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -5,5 +5,5 @@ DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf0
 EBUILD power_assert-1.1.5.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 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
+EBUILD power_assert-2.0.0.ebuild 1423 BLAKE2B b7d1caae6dc82831297e1c9835026b190a5aa4e6e9c3f5a166a934f98d97842987985859d95ec66c876a6882583535ed02756b1efd6ce1b06c46abb9e2a73f2d SHA512 eca5293de390a9efd26e01439019c966213f40a53f2770159f52574dc4176d33f73475097181f3c3c2cf4526f530c79bd8ec8b365ea4acd8a50aafb19b135dcd
 MISC metadata.xml 343 BLAKE2B 207ac229bb41b7ab904b4d6e69ac07d36375964057ec90c69cc6d0be5dd90a5bf27b995b5daaa1802246aa7342db9bc904c1ee872b7b2faaa495318ab030537c SHA512 2c8420b8b06271c1bedadef4e94842e6fb80d49eae669f6ae62678c769a7b3af29af42dbb4660c6bd328b54a522902c5bad49e81fe0fe47d2bd3c1d9f89a7d4c
diff --git a/dev-ruby/power_assert/power_assert-2.0.0.ebuild b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
index c44044ae7943..cdd3a84795ff 100644
--- a/dev-ruby/power_assert/power_assert-2.0.0.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby/power_assert"
 SRC_URI="https://github.com/ruby/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 ~riscv ~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/racc/Manifest b/dev-ruby/racc/Manifest
index fcac56fbabde..62f9f96fea5e 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -2,7 +2,7 @@ DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
 EBUILD racc-1.4.14.ebuild 1824 BLAKE2B 1707d38bb941dcfa20e737da4281c9d588830aee6a25c23698ee25cd83831e4c187e181e60c5942e30d4016f9b864354b0c7045bb3bf3811785547d37185c5a8 SHA512 8ff0842b29957a15d063bf7496127d24777af11881b307aa88fd9250345f90d59cd1e749cec8d44e7ffd46e02ccf120d142318deb446d199b75e850150bb95cc
-EBUILD racc-1.4.16-r1.ebuild 1929 BLAKE2B d8614223b4136613ce7d6182b702b45ec7bb37e59c942aab0fba33abb3c7fa7fe0232665e50f7d04891373a50b6139f01862f869d14790f13359aeb35eb85a86 SHA512 3b239f1132a2806d32cd35e66f7e15aa7b2c1b8744e945708c3a27825646f10bd6002985cfe7524d7f0b3ceb3c2349f28eeae7f562d81ff681676f75cc846d93
-EBUILD racc-1.5.2-r1.ebuild 1735 BLAKE2B e911a30772a13a744c312738d687ae8b9698d21d12e9e1123011a602e9c1d9d29877d52878596a622f902b2c69f5e9647946866a804832bffbaa2192b48d6174 SHA512 ec5dd0716975a9ca685a6042e3c3da67a02c8552d688b9c96fec9a88003a7d684b44e8be977c9219f818125f20d39581e6f9073b6cd08c7ddef40a12d1105f92
+EBUILD racc-1.4.16-r1.ebuild 1925 BLAKE2B 3a794b9bb23481a2fbdcf11e36574e0ba2f74bcb49c461583e2be7534a7900de83935ae53d99e13928460f2e3730d825920d729f2007b3d1a7bcee893d68c203 SHA512 dcf1ee7d75203d2e4f47d6faa815701bb2c14696eb7507363992d6d91e5cd16adf8e196e8d7a894e1a1baa13133ce18f26ccc51f4e2dc76ebe68659780450d96
+EBUILD racc-1.5.2-r1.ebuild 1742 BLAKE2B a770ba3bd89dd17eb51246b612bf7928f7740db981e9165d82a49a9a8bf42d1a7c0e8b1d0f7564802130f73407de7190b5eb353c4b5076529a4c48416f27b01f SHA512 97f772ca30602aae276256a3e18f15acc7e64a8467c6d2e1b412bd3ec6b735d515931b35b09d99e22324736d5c64debbb3acf602ecf4d70a2ecdaa56e677ec69
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 0d675db63956..945fc5bb2747 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 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 test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/racc/racc-1.5.2-r1.ebuild b/dev-ruby/racc/racc-1.5.2-r1.ebuild
index 2609e8b6c2d1..08e9adde6cb4 100644
--- a/dev-ruby/racc/racc-1.5.2-r1.ebuild
+++ b/dev-ruby/racc/racc-1.5.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index a5046d6f2658..72b3f594e3b4 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -7,5 +7,5 @@ EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72
 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
+EBUILD rake-13.0.6.ebuild 1495 BLAKE2B a2ac9cd9bc02871fbcd730ff671ef1de072c6f07673f3d6346dfd6531673f3c95fb8c06ecca72956069d3fff3cc6f35b4b9c5d9cbd0e999ddce854b68d4f6948 SHA512 3097bc7c795bee111cd8bf15a8a7e2dfb687dcfc87d35c07576e2479185f331b6e6c681f1622665fc08655a14df4d29ce23a5be18da11f12d68aab04cf68af06
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-13.0.6.ebuild b/dev-ruby/rake/rake-13.0.6.ebuild
index 0ac434efec60..c238697d984c 100644
--- a/dev-ruby/rake/rake-13.0.6.ebuild
+++ b/dev-ruby/rake/rake-13.0.6.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 ~riscv ~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/rbs/Manifest b/dev-ruby/rbs/Manifest
index 2f0bb6b5857a..dab00b64f001 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,9 +1,7 @@
-DIST rbs-1.0.6.tar.gz 519090 BLAKE2B 1614320b8f77fcf4880cec6b7e4dc5fcb6b73f59410aa4dc51fb61b2868313acb242dc5a572c6cb96d9a819bade4b1d3aee2196189ea3fcc84d718ebbe9ff1d7 SHA512 a63c5781e6f73e998ea10c1a821d4f33388387caf6cd8e1ea607a9cd009d3f793e59c93b140e2539291a6b1d50b6ac40be7b484a8de0594f0ccff8a2db1e8425
 DIST rbs-1.1.1.tar.gz 547506 BLAKE2B 5bfb64214d4fe0d19ec1c633b3f42567d2615fb0ed34ec78dd3defa3d185adbeab71ad523285d2877babcac4bb61ed2ec60eba80871cd4c631a2017f49768488 SHA512 f31894c1a52679241ef04f03d1aff545f9cc53a460d8933b7064b8403bbd6ef46fbfcdbda00189b158770389bba38b3978ad7d5dd0e7e0594540841e237adfc2
-DIST rbs-1.2.0.tar.gz 560408 BLAKE2B f1f1491018897ca445bb1e49d6d8965af7bc8f19657130fd1f6233bb2d63cac9ecdffba8e41232d2152a6db3007f597a62b7a1cce6c1cf9b2b794b8550b45de9 SHA512 877341ecbe9764431de95c431aa757533c21ba3b51b625a5b1d74d9b76be4c32829f64859befe252162e5dc40ddb1d30ea569e0d7a1e739777f7c8143389dfe9
 DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
-EBUILD rbs-1.0.6.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
+DIST rbs-1.3.1.tar.gz 632463 BLAKE2B c222430bfa14fa7380cab393448b54e4596fe3984a1d31caf5a41bcd75cfd0a795813b4278ab89d5453cb5f4d090122ebb217cd336c03b31063acf4f4e303b7b SHA512 691ee6466172189e52ec949d361ccf66b82e8343efed5ec36673a4588b8de78e11f03b98c93c90a3c655819a29d56bb502f20fedd40a0515da3acc1aae126f27
 EBUILD rbs-1.1.1.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
-EBUILD rbs-1.2.0.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
-EBUILD rbs-1.2.1.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
+EBUILD rbs-1.2.1.ebuild 1188 BLAKE2B e6eb0b7b25631b6d65779d737381764d6a856d5aaf2369f695fd8d2330eb3f4f5edd67d5dc0becf79581b768f68df19c7420b5bb00cc12e7aa766b8d4f88036e SHA512 21a63c61d4078bbffbed89086551f649398609e1b655f8afc8ab78641a7a0dd978b9dfc37867e2d58ad42606549e90e6d68185ff5e6b4d8059175aec3bb77b30
+EBUILD rbs-1.3.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.6.ebuild b/dev-ruby/rbs/rbs-1.0.6.ebuild
deleted file mode 100644
index 74d2c248f835..000000000000
--- a/dev-ruby/rbs/rbs-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.2.0.ebuild b/dev-ruby/rbs/rbs-1.2.0.ebuild
deleted file mode 100644
index 900ed36a1e92..000000000000
--- a/dev-ruby/rbs/rbs-1.2.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
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.2.1.ebuild b/dev-ruby/rbs/rbs-1.2.1.ebuild
index 900ed36a1e92..6602e2b93a34 100644
--- a/dev-ruby/rbs/rbs-1.2.1.ebuild
+++ b/dev-ruby/rbs/rbs-1.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rbs/rbs-1.3.1.ebuild b/dev-ruby/rbs/rbs-1.3.1.ebuild
new file mode 100644
index 000000000000..6b1c5644770c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-1.3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 249157db7e55..816fd5da29fa 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 2729 BLAKE2B 30f2f991e8bcf192aa431b491e78b4ab818046ecef646b87882fd828fae43b8126abeee6572b2bb63edef4295feca35360b51a16b6ee7545f19322f82e604479 SHA512 422a59699e874e6083255123d2ae6a230b800a50bb14562e968feb0169735631023299e5d15d8e49d7952a0726ba6a3e884d70564691edf874a6f25b29000c73
+EBUILD rdoc-6.3.2.ebuild 2736 BLAKE2B a5a7ad25a416922eecfbd27ce9fe7da6e4e4a8d64077c5033b2cfe440ad25c2d78bcbe9434dcfaa192373f33fe1382fc840351d5494d6ff5d90970fb2703a762 SHA512 4a4ce242605f822b9d99ec612d5c33ef4afaf55cdeae3305a04231a9bd64c2d05fbd8bc1431cd418696775cd9063903ebf7758e82a0f82547a16cf09b83114c5
 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 94a5b480ad32..87fc9755ff0f 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 ~riscv ~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/rexml/Manifest b/dev-ruby/rexml/Manifest
index 8fb323538184..53d0173499b6 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,3 +1,3 @@
 DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
-EBUILD rexml-3.2.5.ebuild 872 BLAKE2B 7979f3121f821d5bd5cbb7ca41589d9edc1b9a1c89656c72ee050c197530a864dc357aa1592400e0103ea2e18238872c26a5af156bb76c0f2505c589d519cd7e SHA512 3d9f0d877372f204b0da689f0269e377134da87fe048471778ac0a58488798ddbbb05f86193e5075ca7776cd2d4fcf5bd577ddacf66ac54d4b525104c765fd2e
+EBUILD rexml-3.2.5.ebuild 879 BLAKE2B d6757afe42842f3b6017ead14d5687705e91f15eb2b4df343f98d0415e2159c2fcbdf34d3856d89ce393383bdb371bdd39b9b4db10b968594f6d56b05dcb37cb SHA512 9f1c01ecc7a344f2e554db9539cd84a093c0d8bc8592d0584fbec695e8813b62c04d01f581f1fc4a6887ca1a4940635b720384f6bbce3ca509069f28520d6156
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/rexml/rexml-3.2.5.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
index 88aceef6cd49..50e13ee6d580 100644
--- a/dev-ruby/rexml/rexml-3.2.5.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index c137fa639151..b05e3f186f16 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,9 +1,7 @@
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
-DIST rmagick-4.1.1.tar.gz 1978761 BLAKE2B 489d355237379b7efb5e1d82b71cb2e6f8607cd644933c4d1d1116f464604262388aaf8534ed322c6b44291aadc3abb75e1bca94110c01fcde228b6fd9bb9ab4 SHA512 08d5a730281e7aa44fa955c8af06649efc77702dbc979f5de34f2f3b39798d494a0df8860a25746d89256c7ecaeaa140e4e5d5cd60017ed4412075a790976a5e
 DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
 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 1848 BLAKE2B da2ae7c6045f67c2c40359cdf747e11fb5952a49dbbd1db4daaaebbbf950b69a235a76b4d6d375124fcac8859c83201048b160c64fed9aa0f7b2577b815222b5 SHA512 1960e449264a4a01412b749cb6bbb00c2a331286bccb52624163ba7076c98ac3cf1c3d11ce928095f1aee8fb4a5f898931d565cf932719ce3da6af7bcc5c47a7
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-4.1.1.ebuild b/dev-ruby/rmagick/rmagick-4.1.1.ebuild
deleted file mode 100644
index 5bf68fa87169..000000000000
--- a/dev-ruby/rmagick/rmagick-4.1.1.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
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[jpeg]"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 5173cc8e45d8..b386e584d0ed 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 3125 BLAKE2B 5ac35a42af2becc7e67ad6d6ce8ca021e01b8e5a468679cc902a3adf96f62ca68e251c6f856f7497e3745e52ecd9269f11443af45c9bd0f45efab4f732e9d0de SHA512 38823ba7b97764a20681b3d4d5bea66dd12c6a196e50a85141efa6ed4f77b222b094fc7364818868f1430d5f133a498c45be94b4f1685c031b8fd65525013403
+EBUILD rspec-core-3.10.1.ebuild 3123 BLAKE2B e3b71067f8cd09b4bb239d3e7ca54b82d0a601ff9e3d041461e75dc15a1e977269e26c7a5092a2fe1d7b6e631f17b747ca390b322a9f9b4fe0476c14a26c891f SHA512 a4a2ec451fc9d8c9ee39ef51b121c4cd1e1a99a70f6561d3a41bcc9b261200644a95689e55fde522ca55a512421d2c73d31343744d843cffce2e35a65bfb96bf
 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 b05bc9ce2287..6c6820a447be 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 2c8456519bb3..1f2261af6e8a 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 1306 BLAKE2B 28372eebcca6d06e0c486c3fa243e058532e7a42f3479be047d159bbca79a2bda41974b417eb349014ec65146ccdc7d069f8b6bae8c50eb9ff5d04cc6b4b63fa SHA512 389c64ca000315648ee7d9db9d3129bdedf5b3446bdbc11486e2e4a6dbf8f196ff352837e5725e41b1c9bd801d17774b456410c76fa50992692c449d0ded1cf3
+EBUILD rspec-expectations-3.10.1.ebuild 1304 BLAKE2B e5ce9e9664d9535b3dc3f24d1493b2574754430af41bbaaaf65281a95948ccfe4f0a4eff26e688a06bb17d179c932d6311a102dc0ab367319b8f429a9f2bdf72 SHA512 0715ef7cfe98ce0acec7864836bf0a79d300a17a5d084f766ed549388cd17abc08863d2e41c9e06808a3f0f4dadee0764b86c0bd3b3c5bb7a682132336f76f0d
 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 7f73a66c60bf..0372144c60f7 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 584b4a4266c3..e3a18e0c244f 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 1437 BLAKE2B f4b39b710accdf9294a3cc292b1f2350056dc420c49121028cf63efd832633294a798ba7d78a27c3fb1b2bf1c154db4af1873f9f0f7063088a4635074d896981 SHA512 181e57bcff9ea21884ee889b894f2a6d0bcc7b08e3d6412fb5bbc28048d62c6eb00288edb404d62a355fb2a627f8bef0f2bdab52b30b2e5bc6a5323a87f894c6
+EBUILD rspec-mocks-3.10.2.ebuild 1435 BLAKE2B 0175a12eced10895ff2794e76c7864c6c0e73f24910e37e5a1b8fd0f86e4e82cb1db8aa5ee89ab18c3bf22f61a758e0dff89acfc03c0e5ec40cc8b545578b8ac SHA512 b4a6e9753e2b307f2ae00ce26d2d2fb4101e2edea7bd78b437653780e941c1fea655e19baa08c3ddb9c28bc93ff7ee3e9e86ae4e1620c408e729a34ad488eac8
 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 d631739fbd92..ca8efabf8ae5 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-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index e2c6e2c97dc6..66e5ce3f2cc1 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,10 +1,8 @@
 DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
-DIST rspec-rails-4.0.1.tar.gz 153383 BLAKE2B b2591fe27e992df11404f792e7efe1e18fa023e0b4b7c076f7ffc86e83228a013f06206c687167966413641aea654f57f0d1c0a057ecdfd9c1579fd38d08fcfd SHA512 97b06a8696181fb0209e376780860935f1c22cd9a2ae5977efd45217ab74e6cc0260687bb2ccd22f28cf69f2a73ded43c51ac8d43d0d0b6b0bd0fb3e547d920b
 DIST rspec-rails-4.0.2.tar.gz 153760 BLAKE2B ba609fe316a27c21f140df41b63916cb9a70e77302e3dbe1fa565024e85504e63d4f7bd575117f91f9762bdadf5b462acadefdde1d36a6a731227fa2e2cd5ed7 SHA512 4b4567ba896a80fd487ddcca466d23d6b9e634354f8b70d0146ddbf0c119628406ba8aad4e16bce577e63cc4d3d476c270c4c2f1ad1956bde7529f318b717cf9
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
 DIST rspec-rails-5.0.1.tar.gz 156435 BLAKE2B e32016bdaf50fc4dccb0700320738aa0ef59e5fb7a3e351f68a1b9ad6d86be07850aa473166b0aee037f9dd2f21935c41c4ec502849ac5eeaf08ec602093d81a SHA512 65b212870524397a922dd7fc6a796c50b56d454378785b1ff36eb9e0fa9e08291bff0360a7e56710322a7edb33b800e55b9f46bacb92b3a65f53489307c57149
 EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
-EBUILD rspec-rails-4.0.1.ebuild 1367 BLAKE2B dd40fa8fe0db77774cbed7425290f70ec91834b72651d1ed6bef4917aa82872b16466be9093afa97d153249238babce110fbd3ab9ec5379a450a0a151ff5d556 SHA512 ee6d372407018a1b9688d5e14277adcec37e0d70e2a76f035d80b7a8df3d513c2214915d5e7361fcddc75d22b73e5d02751fed1eb108e58b15dcac7d4e7da2be
 EBUILD rspec-rails-4.0.2.ebuild 1368 BLAKE2B dc977da2d3b56afa37dd6f4d1385e1ccccb0612eab23376fcc87274601787d789cdef33fe5c10db6cc3a739a2784b093e219118b4228e9ab5b5f23ddb4c2b148 SHA512 6136754bd318992589ec3c988bddbaa767b9c0ea55df2ab133806d51091fbcae8530d00ba2ccb2cd6dc42ada46b0a8c8c1c4a05c99e3b5eb8a4e86295c6e3aef
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.0.1.ebuild 1628 BLAKE2B 19a274bb361718dc4ae3bcb900a32ad9ff43bdac8756e2a9daacccd102e2d96ecbd0bb9550c561dd4255bc3027c23b04ac2f62d76cf52cfb2307ca80e1cf5d28 SHA512 dab4ea66388a1f7ff63f32f454c09a07191e5da24f73c43aebdfe4fd155ed85cc29d3689985013fb61fb6c6e776f36c494afdb44e4d93e7b9fa512ea0ec96af1
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
deleted file mode 100644
index 56a11789674a..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*
-	>=dev-ruby/actionpack-4.2:*
-	>=dev-ruby/railties-4.2:*
-	>=dev-ruby/rspec-3.9:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 7da1f55384cf..7f447ff4301c 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 1760 BLAKE2B 68becc13b331d184866ac26c08e6860408f6e1e7e33dfadb3065c5c6b4a2f39ff6763fee5fdc3f15e40c59f84fb9dcad389928d476df169a4d1359b04a446efe SHA512 1d71453c4e900a03a61093e7bbe217eda35ea299e95c0e4472f02d07bfe93d7ee45c0c5386d4d53027d07c2b5cdf7f567ad61de2e4f1e4e661fe622a49350f24
+EBUILD rspec-support-3.10.2.ebuild 1758 BLAKE2B 7d85cdc4ae2e3164dd4e98dd18148aa3f0c86c9366b1a877e3b8be80dfc4b52dbb424d43a3f836fda6436b808908b793cfddc31a6c259d7c0b724913a8864f71 SHA512 6956fb199f908439ba3aebc0046f36eaa20bfa778452a76a8f761ef1d17eac56b0905d94292b02bef7ee944ee79efd864b06c4376f4ad68e52ba6b9727864cd8
 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 cf0d5e801ecb..03f785d0b401 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 7505b0be86f0..52868cd9b415 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 619 BLAKE2B f4b8ebe12cde5ce7067e005570423763c5a79eb48e157dd8e6f0eb2ddd5f0df17c2f90a88479fb15c5d49c454e3d05ac81fad881c64227e15cfd9bdff90207d8 SHA512 3de4884a68a191d55e78889b00e1d525dfbf94e25bc9adddfb6e5c4d5dbc90e2ea4049ea2fc57c5f87de29b9fc131e10317a85cfe4b6408aefe705bb2569605d
+EBUILD rspec-3.10.0.ebuild 617 BLAKE2B 58609176ea6440751f5289841bc7a1d90b5060637b2c87191b1449c4564240dd506fa35ce949658ba4aa4a9047d9f9bc7489fde4faf7410c7ad1649ec4bde8ee SHA512 398f55c35d40295c6426dd0ad93d1702b64f40f2e9192f9b6801f345148c7597cbcf6e741d100851685cf224e8efaab1501f9b0183d459adffb44f4a9bdc15f7
 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 3fd3135389d8..4a03c0dc3421 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/rss/Manifest b/dev-ruby/rss/Manifest
index bc0b60f2cb98..9f849398dbf2 100644
--- a/dev-ruby/rss/Manifest
+++ b/dev-ruby/rss/Manifest
@@ -1,3 +1,3 @@
 DIST rss-0.2.9.gem 106496 BLAKE2B 4b8b4b8fc59f05b7ed513294a809b0961dcd0c8b94cbfff3cbb09102a9ad056063c4b2a5d00b30e2eebc76701b10c3b28125ba2daf49fb420c5ff37a47dd600b SHA512 24d983ae2ee8570c3e433675f9cdacd1c35d6160beb28689a0f8cf446b6b465147bef68dab644a85cb089870d6a9fb2df85cbaed12ed4d6a6fb2d07b12c6ca3f
-EBUILD rss-0.2.9.ebuild 726 BLAKE2B 7c247c7f14677eed7010c77a7aaf328e8160ebc26a79649de8da26b4110c1ce800eb3f149c5500f85b983f9c83c2f3f3c44b25fbfbcd135bf939c86cd75b15c7 SHA512 c021f2828985eb3476af3e9289e971d60472734f8e68f72b945e4249c83075793f7e3d3bea31d19a53406acee07a4cce52d7cc02a7940f905e36133fff1c3a55
+EBUILD rss-0.2.9.ebuild 733 BLAKE2B d305be4724790dbfa3db7c53f882e496b2e4e7ddb9f736f5a074405d9526a34e074a1dcdaeeff2fb4f9a424b5b0b0645c43cd960ddc7e01a25c26e2049e31b82 SHA512 d1cd3cf76814e76541981894255cbaf4c1f845dfd718adea796b0a52148c27e7ddf37d7ed1ad1072734de36411292710ee669f3a76a601716524fabe85a39ccf
 MISC metadata.xml 334 BLAKE2B faa6cfa109984ab609194cb0a789b45ab89968c3b4e96d32b9bb4210df06780b9bb17d79e9a996de2189e747642b9ffac6858280a38c2fe26e683cec6a008686 SHA512 b857ee7cfa2668de8f7ab897213a8f569aff396668644313b565f43d684fe93c6281486b1c2ff99026744aec4031a378f39d706d22d0f80560bacf8d1b83719c
diff --git a/dev-ruby/rss/rss-0.2.9.ebuild b/dev-ruby/rss/rss-0.2.9.ebuild
index 524b324b7c47..82dab485b7b5 100644
--- a/dev-ruby/rss/rss-0.2.9.ebuild
+++ b/dev-ruby/rss/rss-0.2.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Family of libraries that support various formats of XML feeds."
 HOMEPAGE="https://github.com/ruby/rss"
 
 LICENSE="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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 2cb364fc70d3..2681cc70329e 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,3 +1,3 @@
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
-EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 0a1bad818c3d0e9c81d1646cc9f3aa93b1ad3093c00a88849ede63f72a580faecc999cbb87048244c63d9de627ca6c493f51ec9631f6502d120c602d2f02c5eb SHA512 4b8ff0973d0999ecc2b4df3fe4e15747cd68f1800c1752a666ea27d691eaf1d03f168870c3dd2f250bc7168f7c035ed1bc2d1d76cebf8e410086496ff2718f11
+EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 64bf78664622e40e948ab0f46a67c9c8a62ac8c3bed7db4de66e67ca57dd40393ace7e669659de2192cc16e918847991ad87fe767fcff901f1f60ede9d341a1c SHA512 a2bebbf5e0003a74322a760cb0ea09e0c76a4c663cc4897d465c3a188df3d045e9f1f68bfbdffa8af42ab53b797315fbe8e1107a95c1b80ec3ad3a50deac2d0b
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index ad7aa9bec7e2..4b2a0c2e01ad 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 4aa2f5f58746..771868597158 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -20,5 +20,5 @@ EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cac
 EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
 EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.13.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
-EBUILD rubygems-3.2.14.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
+EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.2.14.ebuild b/dev-ruby/rubygems/rubygems-3.2.14.ebuild
index e97a3f747765..647e0f26cabb 100644
--- a/dev-ruby/rubygems/rubygems-3.2.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.14.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index fa1feacd3c62..3555edcdc552 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,5 +1,7 @@
 DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
 DIST semantic_puppet-1.0.3.gem 32256 BLAKE2B bbde7e40e2d7361b09906974b451a33a2698dcc33db1ab3c790968318b21f4c72d2ce775eb56c331b0509666972cde2e5a1db64580eb6e558d604ff025e389d0 SHA512 bdca6793a064d37d15010551c579f61837b1095025d84469ed8893d4bbed4372cde005ed452460a8d771c8e4bf842283628f2c613295bab0af3834cdc163f7ba
+DIST semantic_puppet-1.0.4.gem 32256 BLAKE2B 4704a6d913388d10cf32442511d66d742bcdba792d81d67de960209dbffc8ade970431e794934152b71031de83a75d9e09bda830e6e66838b68913d2bbb9da0a SHA512 8b830626e973bc74fb4f4147e83ca8048d412751ff48dbe96ec6e790645eae7a51c665b75a09d0f0fdec3b29d3798158c38b613e2f83d115d1ba2a4c8d24362a
 EBUILD semantic_puppet-1.0.2.ebuild 516 BLAKE2B 82ded36da2a07bb20348ed9cb670f7a8bd50cdd62f8497059725748dcc4e7b189e203c8263244f0815d04a790253d9ec3182fffbbea6eee3e2fb8dc2655d800d SHA512 7d098d0348cc26239bee23bd761f2dffcd586b21dac5e3bd63a39c47fcccb77a80c813d7e7920bc0b2856a19177934866a435838c0f565b4066dd39d7d776a37
 EBUILD semantic_puppet-1.0.3.ebuild 482 BLAKE2B f22e33abd253f07d0c2e1baabe1256640ce4f9c0620201f8474eef412b014baaca5c6628686aa85acf7405ea55dca63a3fa2e0777d66ea3979aed8624c073a98 SHA512 9cf20a9c8b6310f00e604d89e74ccd2d3b86012f9d454c241822071bb782007d67ed239aed049300b0dff6ea375311440ae253f6d4d95282aaf07a9328b77446
+EBUILD semantic_puppet-1.0.4.ebuild 482 BLAKE2B 4df9360b9302780fa2353281f8f2b7c8a90b9674820bc1e9e771bd7ea909ac8570e76acd76f325edf15314d8f1baf8b3803b7a18493a07ad3ed9e42ecd536bb1 SHA512 ebb87ba54b16f58ce0a63a99f1fd8babc29633b3e89b7666b3f780622a180a52c5855560140cb39d69823bf69c6be3063b0f2b19e6807a93dda5dafe91ea9395
 MISC metadata.xml 453 BLAKE2B 04500569e8aa9cf4f1e775f0a963db272a82ea8cb4bc33cac1e8c12a6199542e40bb379e3036d8e18e0ac040e78ccc1379d96b6d25f84f52062268d291693bbf SHA512 18ff722caef29f1aae91072feec01611995b7d3c6c4bb30c262007cd8e6731ddf7e94a9bc767f3a1910f28eb4d4d02fc82a531e2434c442757da77bf3e6cfffc
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
new file mode 100644
index 000000000000..b1454420a1f8
--- /dev/null
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
+HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
index 63682b9d9fe7..92d1a2edb3d8 100644
--- a/dev-ruby/simpleidn/Manifest
+++ b/dev-ruby/simpleidn/Manifest
@@ -1,3 +1,3 @@
 DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
-EBUILD simpleidn-0.2.1.ebuild 821 BLAKE2B accedc61cf51d4a33129ec15d93395d3c66637ae8b260f0ef78b66c2db5283826ba7aa8d716580a7fd4b4ad7f173ad056ee8d2a8c16a05b0d7f508f4f4e2860f SHA512 2f02c2009c17a1e04b461479f52bf2865bf5d1d9a10decd186c0c6033efcc4591edb40b735569ad8b3ea05bcd7d29b49e41495ff7dbc5711b7c9fd1cc11132a2
+EBUILD simpleidn-0.2.1.ebuild 826 BLAKE2B 4a1a2a4d970a3b8b2167bb0a6486b31eccec4fa1657d607ceba846a7532619fc78d3281e948031b32d7d295956164363c6ebc690480e3c62e327e450e957e2ae SHA512 d2d424ba6277b6f78568ffc0ac7d3cb5d98d3ee4d619cca73b9145dda63ca969823afbd1bc0154851a420ea058978c73d0142614a3d22bff07fb4294d61de37a
 MISC metadata.xml 332 BLAKE2B 78418b3ccf476ca37796b952dabf3d685564fa862fbf17662bcea1cc05c847de1760b145d272a0cadf7ba66431e2c2c382c84bc5cd84a9b332e179676bf2fb69 SHA512 82b171110796fea6ff5c7bd2489f7794dbf506526100452ae58e889849d15aa08e24f77b6e6cac414bbef8f050c03e842c16fe109326b3adc9c096d5eebc0990
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
index f446bb84e2af..5b3359f39dd6 100644
--- a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings a
 HOMEPAGE="https://github.com/mmriis/simpleidn"
 SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 209af0a5df5c..6603ce698343 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,3 +1,4 @@
 DIST term-ansicolor-1.7.1.gem 44544 BLAKE2B 2c2c2de0a18d1f9a975901f8a7005f740ac81a609c43705d8c184deb26dc9010876deeca411488c787132a3d8b78339c75b0776f3c9bba1ff71efa23ce3671a6 SHA512 d49f8825c31accfaa58a2f34ed5fbdaf503d4b47c23f07c52cc82bbf6cce457bd9371e197da1ec36dc83e32b95e9ea9a349922d9759a827923456ea46f81ff50
+EBUILD term-ansicolor-1.7.1-r1.ebuild 848 BLAKE2B 20847f88cb3068a9861e4e77aaac4c321a0823a77dfe0074145e2c5294e95753bf51ff42acc32e1993aacfd76f91c2bd6540b5fd94917c236e048a5efb837dc9 SHA512 f0a5d7e50bb0bf8d8fd07fde8edd143d9788943e801c462dc694bd04baaa28555416d33966f315ba566405eabc0c908f7ee19e39af78b8dce646ab07a456a6a5
 EBUILD term-ansicolor-1.7.1.ebuild 881 BLAKE2B 61750474d28ab6ec06820649b6f35ad7051313bd2e675fc96a7296072cfb375d1ca1bb7fd6dddf870780aa2df9febb87d7d21b2283c8f405679b5f16d155cf0a SHA512 5ddc4eb19f69d42c9bb57473b945ef7053779a100f2b2b89864dce25ff98259a350caf0b76a8d9825252eda50e6ba4807fca9fbb77517a24288091e8693f1b99
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..9bc6f621f421
--- /dev/null
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
+HOMEPAGE="https://flori.github.io/term-ansicolor/"
+LICENSE="GPL-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"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/tins-1.0"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index b61343443368..024eff5da323 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -11,5 +11,5 @@ EBUILD test-unit-3.3.9.ebuild 875 BLAKE2B 058537c3ba43bc70be921613ad746bab15e183
 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
-EBUILD test-unit-3.4.4.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.4.4.ebuild 888 BLAKE2B 3718d27da7b490d46aea6b7e30c45a4471c00e6e059d6d9baa98eeb96dd8f3e5c605ed24ba60aac83639bc998f241237a94bb1740d475a35fea262001503ff1e SHA512 2b0f6e819f6f20eb49e9c235f4799d61573bb130f53de53bad79f9b9e1f2ca3c76599ca98836a5a180c5822a55f8681434d2a9f470697c47906902b3230d3564
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.4.4.ebuild b/dev-ruby/test-unit/test-unit-3.4.4.ebuild
index 805bffe784ad..5d882fd99648 100644
--- a/dev-ruby/test-unit/test-unit-3.4.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.4.4.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 ~riscv ~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/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 07868c95d124..4eb213c1af3a 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -2,8 +2,10 @@ DIST typeprof-0.11.0.tar.gz 496673 BLAKE2B 215bd738a4a4b9e7de78943a944fd63dd4f16
 DIST typeprof-0.12.0.tar.gz 497398 BLAKE2B 149d382c5598ce3cfa023133095190e00e083ac445019c4aedf59d66005db93241dacd9c724f2b62e64d02aa3d7f4a58a3fa4546256c872030687574112c7333 SHA512 a28bc10ce19f7a3afe940cb01fd443c89a87497be2be0b03d92684581c4ffdc061e8e5119652116884e4cf0e5c0ea7d9a73c0f8be2a666d6bbe71e81bada323b
 DIST typeprof-0.13.0.tar.gz 498218 BLAKE2B f6b8566dd25cf08952c136bf59cc7f10f01609d8c2e7633054892f296c6c35cc0f0121e086f465d9ee97776d803829f27895e1544772bff33e3fdb562ad0b9df SHA512 dda9b5d84a2fc6473ddf71b897e13aac9675a4e4ef5dfe71fe6929a3025ac2b3ab051a5882d936112de86ecddb96e0b665741ba08748a6d94c6540bc13c171b0
 DIST typeprof-0.14.1.tar.gz 499209 BLAKE2B 5c6332f6c91ebb0fb451e108d3f4ea2523740c4097f09ccedd76821f79a9f94bf9eaba6dd0ffd6ea8e9985ec56d618c802accf08dd70c92bea860fb3729f219f SHA512 071d379b304a5b37770bc86001c3e2074f11749e439f0debf311c4afdd183814c5e168baefbe3f4866e57c3b82e3d7d006201dc1cf25c6ce924e92e61c945344
+DIST typeprof-0.15.0.tar.gz 500851 BLAKE2B 7865e4f3ccde48c6c7b7d9b0e136cdd301ea018d92627eb92b8a0def5239d52f343d8b071304e09fc458b7c08c00e83a080b69c42e643d96b569e4fc6312db7a SHA512 8b2d5cf59fe4a3d80898e48eca62dab4807fb953260ee686516d7fa5d31141e29d0f01ddfa8192d8d65c6acd152be130c1cca12dd9e8794850f905b550154ac6
 EBUILD typeprof-0.11.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 EBUILD typeprof-0.12.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 EBUILD typeprof-0.13.0.ebuild 978 BLAKE2B b94c723691165ef6576b3f71aedc48e47873b605fae9ec5e8c9258e37ae077500475f087db9cab0c98856593915fdb02a8d630445c6371e9671c88a4a7ac0340 SHA512 53fd39c4503faaa9093716fa22788723adcb416d321bcbd0aa143f5f6c57568c26502850365561a12a5cb2377ea07adf9f55b4e7570d6ef2b88de2bc204bd27a
-EBUILD typeprof-0.14.1.ebuild 978 BLAKE2B a6e0b3b2079fe5af5af4cc32c25f527ced0f06952df201792a5a1f2de732e756fd32d34aee32be810c55c992309d06b69e2d4d1c485d378534e07c45fbc828c5 SHA512 31fe8db29d2345915bbe56a497566348fae3dc5da54da0938871813fe31adfcd0ac88e648acd3cd76b303eb396422059e1ddb462b7b231fb1e8354b44daf24b4
+EBUILD typeprof-0.14.1.ebuild 985 BLAKE2B 1ee3bd59bc7dfa525e9a217de535aed36bb2755f5acec9f89243ab0854047c6f081f6004e7ac2cb47758b8c4de447338f0c60eec096deea264845be187383cd5 SHA512 79974e703b2ba9315e7ff960d403f605b3f955ac7970f072a200f0ccda3630d83bd9c78ee6d252b898db1bbb286a1d26e156bab524448edd899def7b0fc317ab
+EBUILD typeprof-0.15.0.ebuild 985 BLAKE2B 9953eb127d328f709ea14b150e2f59fa0e728ba82a3eca9e43ed5299140efa1bca9453e75ecf525f488d86a5ac6e554d54896d080b9725e50cc4c7e052ab23fa SHA512 9ee2f341ec5352d2b6f0433d4dbf12ecc2408917955937c5a1bdcec6b557e8a341d18772b71d05edf39a1d4b9abc23d1f22c45bcd65163ae58ef58b7bb4842d7
 MISC metadata.xml 339 BLAKE2B ca2bb0c0a59ddafbf4c57b268985a52e02a15089f6784cab9dfa3aa6645275c51df7a95288d2464e357a2a1f9a53735e9e9fdc13195a7383eba5d821d89baa2a SHA512 79d803bea464c53a176d07b5bb9bba5d434b1f24a97e8091fd85fb36a842abe93cb0adf82ccbdbd1ef7adafab3210f4bcf80a79c99b0a792869360f7e47e6b70
diff --git a/dev-ruby/typeprof/typeprof-0.14.1.ebuild b/dev-ruby/typeprof/typeprof-0.14.1.ebuild
index 0ab491fba016..54c0c82ba183 100644
--- a/dev-ruby/typeprof/typeprof-0.14.1.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.14.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/typeprof"
 SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/typeprof/typeprof-0.15.0.ebuild b/dev-ruby/typeprof/typeprof-0.15.0.ebuild
new file mode 100644
index 000000000000..ac6c1869b325
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.3.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 5308fa12c2fa..32247610c674 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -2,6 +2,6 @@ DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb
 DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
 EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
-EBUILD tzinfo-1.2.8.ebuild 1023 BLAKE2B 3c7a9d1b003d817659cd17e32d6ccfab73b576369606b7e786eabbdf41df3c59c61db766d6a5ca2e790bd6779678b06543994b3488d994ed047153480ca108a2 SHA512 2cf403232ec92ca991e6440e1f9b110d20e7ec354d0a4ac93e535b091d8cb2efaaaa18483942c8c1c06f0fcaaae026201887508a6ea64b8c08e932fd6be6fa4f
-EBUILD tzinfo-2.0.4.ebuild 1425 BLAKE2B 08b1cc9420c12a6ce87caa0db3a186da7e2faa91c9bc6fd1097ed4072a87622e21b8225a400bdd5b4d909fc866d79e4679f624b2fc3fa19a0589fef1a4126d1c SHA512 0df2d8e0f1286dd3b2335a233827cf98c66d092fc86db08058e4ca51d931ef475d61278b82f2bc1ab24293f7d1c581c94059042c31aa313ae49ebe5bc7acf156
+EBUILD tzinfo-1.2.8.ebuild 1021 BLAKE2B bf4ae323f458082e67f70991a24c166fa9aaeeafacd6b298ebe0035b1301f6064be9af5f367132b79ebf3d45f18a66839eaee46c213f2e77e0faeb03b7aa8246 SHA512 7feb29bd530d927b3fe63ba0aa63caaa403dd9e1e106186bb7d1d9096beab7484fa7f90860ba9c9cb0fda31a66ec489efb61f313dbb346da1de1a28829e0f142
+EBUILD tzinfo-2.0.4.ebuild 1423 BLAKE2B 4111153c511b854e9b61489c60177c5d627b1bc9cf67d279a4a9c7afe52d54fac6f381f2cedd0d1f80db88a836383dbe7c11d82c1f8ee1c7b7b824a19b57055b SHA512 7b041a1c36b41082af9d82764f595320aec7aa5d33f6909cd560a04a027ec1b919309e9ccc61e2a9fe83307c8f0860692bab3757911cca8011ce2d63552571e2
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
index a45b6afdaa73..d6ad4d055d5a 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 0647fdee7b7a..59b0a6ac89ba 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 4352ffcca540..c1d990345a0a 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,5 +1,5 @@
 DIST unf_ext-0.0.7.5.gem 398848 BLAKE2B 3c7b2a6765360f59b7b921155bb6532981c8b31fd1fcebf1adc1e113da2404fa752ef95bb385155de1a6025d51f4564e52b497c5396624a0a5e99357fff88662 SHA512 5d60740172034253fec9659bec49e60f639e93d8f147582e26a012712ec2e5fca30674efc52695def0c3cd145c5ddd93a56a6d0f854ab04e7fc81544e6aede16
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
 EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
-EBUILD unf_ext-0.0.7.7-r1.ebuild 809 BLAKE2B bb21b550a306ae8a195be8b6e7d100140ff0925dbb8e87534dc2aabfbd39a8dc4b71eba5458148d17882d853d76c629d2249c1f84470f76bd4a8b64b5832c3b9 SHA512 3dd6775f3acbbdfdb5aa7ae926f094d7c72b6656c644ec87e09d5b9711b105ae035d3d56661e9ec9b0010b26d7132f8b76985ddf68d513152f5ed3c4c87e8713
+EBUILD unf_ext-0.0.7.7-r1.ebuild 806 BLAKE2B cbaeb4717d3499033406748390d878b14c3eb60d0a32045774d30c9379e88305b341ce357b2b700a9637f8cff12ee1144951a2e798d0a07b240e8c8b0c02bcb1 SHA512 56cfa8780d6bbc30afb2f1de6bb6fe2c17a22bebe40600f5c7fda5274541e773f00eccf10b0e89521e5e56cab48d60eab5c9310a9ae371450143b9adfc5be454
 MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
index 75f86896daed..8da5ec5885e0 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 75dedd52dd04..98311bc85d70 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,5 @@
 DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
 DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
-DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
 EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
 EBUILD webmock-3.13.0.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
-EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.8.3.ebuild b/dev-ruby/webmock/webmock-3.8.3.ebuild
deleted file mode 100644
index 282df8949275..000000000000
--- a/dev-ruby/webmock/webmock-3.8.3.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
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index 97027be35a3a..d31f701e8e6b 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1,3 +1,3 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
-EBUILD webrick-1.7.0.ebuild 755 BLAKE2B 1de1d17bc607601982dfa1e0be148a66577e69cc689b5d5c8d4af7014f6d0854fb7ddad5812cf98247a5f481b23c4964affa2477ef57c89b65caa4237f36f874 SHA512 d1c7b8f1e667780c18cb4200042d955156cb2e1c10925c3c4a68a1e0d65e7059555b26198a766c8a77929b1751ae0bfa1031ffaea98d26a7791cb3a84167fac8
+EBUILD webrick-1.7.0.ebuild 762 BLAKE2B 397e5d38527a4ef0fbcd4b26847fa4440ba46507843effd50080d24681d10c7c25a0abbc65e259eff661cf3773cca065f1a0f928cd57ae5f93ea7379941025b1 SHA512 5b103c4865586435f636d2cfcdea93eb2858074b82043e9cddea6354b6686f74a3afb26a37438480bd3eea46bd9466695cd64d481ecd6a4af4490b811c47a239
 MISC metadata.xml 338 BLAKE2B 70e4f4b9ea621374729cc2fd646216c39f4d8f1e3e5d58411daffe4f7a03e19a815c021c6de445d19b1ff6165c347ec7447cd61ece07b464956198de7d512df3 SHA512 5c58d1a1c9a3c13e0be8299f17aabe5ea7038139eee231d53f892c73d8dfd6549f0ce762a2494fc9617e59bc0617bec01a742989bc03506f0a7408e691ad8166
diff --git a/dev-ruby/webrick/webrick-1.7.0.ebuild b/dev-ruby/webrick/webrick-1.7.0.ebuild
index 5a90a1379b5c..142c4339db93 100644
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 83d3cd38c499..543ec36a9384 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -3,5 +3,5 @@ DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b470
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
 EBUILD xmlrpc-0.3.0.ebuild 952 BLAKE2B dcb23f5f7cc72761644256e00b4f1ceedf6bbf28574fb82a3839dc602554ab448da49771485681bbb913def3c571e8cdf4757db3a84c2ac608de59f3f7ffee59 SHA512 394593ec1e7fa9e503565de9ea64289d0d6b96bbc2fd8264e941642fb698a7388d53b5466d4697b0f7a5aa5daa57535b9b73579ad13251f547cdf864bea8fa1d
 EBUILD xmlrpc-0.3.1.ebuild 922 BLAKE2B b902641c965a750d20770924be81f08e415d23b41ab41bb01318538898f083f6af692a3bc7fcf1d6c3e26ecf35eafd3803192caa5d307b09e0f184ec7008e8a4 SHA512 356462d336d8994a1e7ea6139da9631d054a6a619b73608fe6c2ba6e2ac8259d0c9fe10791c786dca8316e7fd43611223637c6295da4edd4f113598385de8f11
-EBUILD xmlrpc-0.3.2.ebuild 929 BLAKE2B 09836e4c83ae4c7fe5131e3607990b1e4a94f3c9d04f6df361b6dab726d264e733a4f91fe85b80e3ad57c28c69ffb560fdf746917bc1624157bb53ff2e90f5dc SHA512 a56fbca5004ded2be730406d814ece148b975e397b3f42ebf2018ffa34a09f5b8a02aaf860508d964dd93653eae4f0ba35fe4f4f15e4fb890750d2788da2962e
+EBUILD xmlrpc-0.3.2.ebuild 936 BLAKE2B db9e3117a0b84476f2c7833722cd5c9a9e0edca3ef3850f29ee71f94a9d9793532f84b75c7f4acaba25a76215e958495d54270c2e31719f5f1ee7f2d82daeda3 SHA512 12ea35f526efaa9f382deb1cf6a4cf10c42075b1be34b30745840eebd3721e3175e5b5b4c7f9e71a1f9782e2fab0dc00ce852a20ea22a526a9f832ce25e6a895
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
index 902854a7d964..0451f271de91 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2128ee784506..fd12c9453db0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 7352d1d40576..4aa502528028 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,3 +1,3 @@
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
-EBUILD anjuta-3.34.0.ebuild 4527 BLAKE2B 7cfaf43f52163c2374f40d57062695b42d22583c492641cfc05db5e3d455ae4ef93a15d09440c09b17d2c8f38940a1b13dc64c0defb48c1fbc345525319d95f3 SHA512 2cda924e4aaf3fe1c090126bc423030de0f45b8bedb54cc080a775b399a5e315a17283fc5e0958ff52456396bf22a4df8829a113f9a2923ad91c625355287641
+EBUILD anjuta-3.34.0.ebuild 4521 BLAKE2B 6a3211fc969afe6b7d24a98f1e69d3736b6e2d2b407c5dc109511ca3005210a4b15ebd2143758c92f7ac47cedc524d1fe4a404615c16a3d238bd0fd3a84e42ff SHA512 237574505b46bc368cd3a27bb37ce0fa08a090ae673ef26f163e2d34dd1eb5c884c3a4c54bc193301aadd7e56c8278c1f03e87dd00746749740d0952f5c6d9b5
 MISC metadata.xml 484 BLAKE2B c5b7715c5b6fb11c942e2505cc727cd72866cb497aecd009df54a969c158af224fe83653c014bf4e81b8ccc04328dd5b03669d3aea4b8f7d652428e2472fd477 SHA512 3a2982297046c18fcb92d9f7ffe04a29b59890938188f00cf0386208aa42d2603393f169679b18469e591a24da5a956d4c7d981eab58a3ea7597058b8911d5ac
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0.ebuild
index 4e3d1619f0dc..865d18e33fbe 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 # libanjuta-language-vala.so links to a specific slot of libvala; we want to
 # avoid automagic behavior.
 VALA_MIN_API_VERSION="0.46" # 3.34.0 upstream release supports up to 0.44, but 0.46 vala LTS support was added without any other adjustments post-release; 0.48 will need patches
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	introspection? (
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
 		')
 	)
 	gnome-base/gsettings-desktop-schemas
diff --git a/dev-util/archdiff/Manifest b/dev-util/archdiff/Manifest
index 5203d5887c21..2df0da598305 100644
--- a/dev-util/archdiff/Manifest
+++ b/dev-util/archdiff/Manifest
@@ -1,3 +1,3 @@
 DIST archdiff-1.1.6.tar.gz 96743 BLAKE2B 387d9476d0c47540a415993799476a5f5648dff4a25ba786fda8bf810897469f0a9edc1247699c17ad7ab343865dd719f56bb0a83be3a130b1e0e2c938c6051f SHA512 0f924418c2aea8bc966b6967038b60d40d727037739e75fa785a4f4fa452558287cc6e2c51d93a3066994e67cbac989e96120561e460a4d543c451229f7420b2
-EBUILD archdiff-1.1.6.ebuild 609 BLAKE2B 4fc2908cdcfea7767fc8b67dff7865a23f4f6e62fc6857529a9acd75137cbc8b7a82b21d3584603cb35f8c3a85faae1ccb64beb5db5b3701ccfbe5eed3967565 SHA512 8b3764fc4053a5c76c1eda4f90f04479f2e7603c98a5fa1739d531a104d772bea8606dabcb3d7c8f0ecb0ed1e6fa8bcf5daf54f6ae3b073e2c1bda9c6f0bbfd7
+EBUILD archdiff-1.1.6.ebuild 614 BLAKE2B 0ff73284b1795160d91e0e01e0dd589729a7f14811d74eb1d9de9124f48ca51fea6686cd165bc82a0da606aa0dc4febb9436e0f2bd6e8d6bdbc533f9f00417d3 SHA512 a79afa41acbbf3027a94998811bbb1ff85756066acd926ce7abc3cd45565e168a3ef0f5e0ff7030d8ee2065b5db285c2790679ee25772857ec31528c4fcd765f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/archdiff/archdiff-1.1.6.ebuild b/dev-util/archdiff/archdiff-1.1.6.ebuild
index 9ae08696e947..4b48705b0c7e 100644
--- a/dev-util/archdiff/archdiff-1.1.6.ebuild
+++ b/dev-util/archdiff/archdiff-1.1.6.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,10 +10,10 @@ SRC_URI="https://frigidcode.com/code/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+bzip2 +lzma +gzip"
+IUSE="+bzip2 +lzma +zlib"
 
 DEPEND="app-arch/libarchive[bzip2?,lzma?]
-	gzip? ( app-arch/libarchive[zlib] )
+	zlib? ( app-arch/libarchive[zlib] )
 	dev-libs/rremove"
 RDEPEND="${DEPEND}
 	app-misc/colordiff"
@@ -21,6 +21,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	econf \
 		$(use_enable bzip2) \
-		$(use_enable gzip) \
+		$(use_enable zlib gzip) \
 		$(use_enable lzma)
 }
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 9e810ddeb375..46e8add80879 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,9 +2,11 @@ DIST aruba-0.14.14.gem 172544 BLAKE2B 085a0a030c5c4d1527e80ce004adeb80fc8a9eca85
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
 DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
+DIST aruba-1.1.2.tar.gz 132680 BLAKE2B 328c012eccfb988eec280a102da94150d1811fc67816c09aa2b94f1b6a06ca68e21cd4612e87fba089f4eb9f3b90716cfe121bda306936eeb53019cec539e651 SHA512 58f658c118fe83ddfbb6c361ab3ce6ae5e6084e4233dba62350eba1c911d8ad0558d1ca604206691d097a48453d608042bd992730b92971cdd3d2475d8f6ca4e
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 967 BLAKE2B 6a11fa4ca7af64f825b1251d470190a64608279aa1f2735e1ffd458479e22e9ffa6739bef16d3e714cab5ec53a16fd31401d1a47c675538a5fe8b2480d48204b SHA512 c922d4e5a19162aefb55b4415547222d1b799bcb7f239e6e9167a96349c76804b569829b60f91289e781c1dd4211361ac7b3ef547be92a8b35712dd5075b6916
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
+EBUILD aruba-1.1.2.ebuild 1974 BLAKE2B e72155ac6254e637f690956f5f8c5ee8fddc820ad53431c895c3934f512e20569c0ac90e027d3d6148fea9751683d59863cc41feb4319ea1911dd05cc315d623 SHA512 5a86831f7a0679f1e40b64f4c028d60636bb8b6417f5b3c86126fec17a4e8e00484089398b71c58456616e9a83e08a8944be0fc2c04e3249132ac4ea561922e8
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.1.2.ebuild b/dev-util/aruba/aruba-1.1.2.ebuild
new file mode 100644
index 000000000000..1b77e133244a
--- /dev/null
+++ b/dev-util/aruba/aruba-1.1.2.ebuild
@@ -0,0 +1,63 @@
+# 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="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	=dev-ruby/bundler-2*
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0 <dev-ruby/contracts-0.18:0
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-7"
+
+ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+	# Avoid feature that requires aruba to be installed already
+	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 184c1f8c9d51..1fd45ff06f9a 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
 DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
-EBUILD bats-1.3.0.ebuild 807 BLAKE2B 0564de4f00562b8d05e7135a38a645a7795ed68ef7125a3cf4bd9bbece95e9ca682b0f57e25d629fd69f8e03f5b70cd004a0767b90e6aa675282d6964e4c8185 SHA512 8c4864cd19796ea92926fbb918c7b2635562216226ac913a856332f0d38194b4cf7f0331fc36e75f8cbf4ce5976a4c9d2b0b81aaa6a407ba96cfde8cdee8e06c
+EBUILD bats-1.3.0.ebuild 814 BLAKE2B eb9e4b8b39ccf123feb41ff3afc027537d9fcfc157b74c252cd37829ebb99a741c82dd710e6787636fcc96140894f810da5243de41122fea3fa890ca8b3c86a4 SHA512 9b8d60b1748431da443626a04672a547e2b6a217344e4c06653835a13d4ad035d5b8a430c72077bb37998468710acaf4d3f74f4a6d6e8dc2a3bb5c6daa25594d
 MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
index dec3ecfe24f0..452bf442d004 100644
--- a/dev-util/bats/bats-1.3.0.ebuild
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 
 DEPEND="app-shells/bash:*"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index f35b4f955aeb..b65295e9aec9 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -3,5 +3,5 @@ DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1
 DIST byacc-20210619.tgz 880118 BLAKE2B 29a8f586c191c46fcec8d2a4203332621a9f03875aea81d7ba21a4e4676843320213e765709f22a385cf4328060496c154d036d4d757dd925ae81857f0977fc1 SHA512 878c7b5ab17bcfb0acb29ab06066630ee42cae7e768c7386308ec1f58e61744b5b6baaf7e9416cef32f9be406af65eb8f791ccf6e192caaf3f34954e6bcc1642
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
 EBUILD byacc-20210520.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210619.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
+EBUILD byacc-20210619.ebuild 601 BLAKE2B 893a38c0cacec74dbe447eea7e0aaa5f8dc93ec93235d117ad57ac724ea83f970b690ba4d9b4e62bb5b6cf9211889ecb77f0b1a2669759b0fb5a7ab4d712fc71 SHA512 e5f89a5a2220e005ae9ba46fa6eab4fdf33a17f74f19b7723a1f8e0a5d97bb6c9cecb46fb148dedd4dcd7eda664dc95055e4faca9179b05d55fdab17dd0d7f77
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210619.ebuild b/dev-util/byacc/byacc-20210619.ebuild
index 556684fdc8ae..47e4355f4390 100644
--- a/dev-util/byacc/byacc-20210619.ebuild
+++ b/dev-util/byacc/byacc-20210619.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4a2a6cf4f5e0..80bbab1e1af9 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,6 +4,7 @@ AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b39554906727
 AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba39181ac7193445299870a00f8168d6d1602d1ef17881ed32acae27ccb68a1cbc3b386e6c88a2bf5e8ee341 SHA512 2c71fccb53f6205e99995e66b2666834d5c3fd106933b715bc4325bafc27121e8cf6b7925ce1c9d524aac6941f444137c249bda837cfc7be4c08cf6cb5a49f8f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
-EBUILD ccache-4.3-r2.ebuild 2047 BLAKE2B 5fe18afc473289fd0d9b754d80e6b1e9751af18de361c4fefce62f25103417ea1bfb4794119ac7d828e87ef32bf6e9df03ea9a75d253902768c3c1219ebf8002 SHA512 306b5baad390e1872ceebab5b9bbd2a16a855321be67a7edf4e0c15264e7c56683a3351dae952cea1f6e9afdf03ac74f4d08b6518e654acd51f5928204001d85
+EBUILD ccache-4.3-r2.ebuild 2044 BLAKE2B 1d846843d74254fa53f5ced3db1c6c5b4365c8041fd73317b286b78b96ddfdb9da8435eb4e17c55a70bf1fd0fab3fdcf725948a3d5f47984f55023f54ce8a39d SHA512 841cb4160bd84c180b820ccbf70091c9bd07491baeab3788fad1fabb38374ab86824f116752467a697ff82b3bde0728b87a25aa84efa8bb8408e05b7f551132b
+EBUILD ccache-4.3-r3.ebuild 2125 BLAKE2B c2390d35d1f1f32cd4861eadc080b06b35047207937c6a71eb88b175b849adb2af58f61713375e664328ae47bd0a07392461a611b0085344dbf29990934977dd SHA512 8c2b00b7f810beac432b18ce61620eef5d1a8187d0f9a7b5f29658291af6ad6f1498148fc2f422026871d068b8c8267b9c8460f4a980bcab560b601a883b7cde
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 MISC metadata.xml 538 BLAKE2B 5d70ae3ee732e530a300eddb61097898034fd227dbc9f9b7d1a86004c755b247f3d7e23737e23a68028fa35d07d9fa76a940bbadcb2e279e80e297d0562fe169 SHA512 1688d981f12ab344da5a579da421675dded7bc1a1e7db5f784f4ab757c630a012e377802aff6b30a59d1928ec0f026d9a60a7d84e9eb0593f1de02b980a7d86a
diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild b/dev-util/ccache/ccache-4.3-r2.ebuild
index 987b811477e6..f2388e4e31fa 100644
--- a/dev-util/ccache/ccache-4.3-r2.ebuild
+++ b/dev-util/ccache/ccache-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-c++ test"
 
 DEPEND=""
diff --git a/dev-util/ccache/ccache-4.3-r3.ebuild b/dev-util/ccache/ccache-4.3-r3.ebuild
new file mode 100644
index 000000000000..4cf06452a86b
--- /dev/null
+++ b/dev-util/ccache/ccache-4.3-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="+static-c++ test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/zstd:0=
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )
+"
+BDEPEND="
+	app-text/asciidoc
+"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+	"${FILESDIR}"/${P}-PWD.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+	use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DUSE_FASTER_LINKER=OFF
+		-DZSTD_FROM_INTERNET=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
new file mode 100644
index 000000000000..dd51529e181a
--- /dev/null
+++ b/dev-util/codespell/Manifest
@@ -0,0 +1,3 @@
+DIST codespell-2.1.0.tar.gz 187490 BLAKE2B 6114aa3a7ad8cd37ab868a3f27f641501dd0cc5bfe80bef0aa5cad0a86f8e2bba6e1f1030d5ac6fb06f78f9e01e37359d0fc17d17eb54608060300f676d3d56c SHA512 16d9a4239ae18fad6a06825a2afae6adc903d50eb90b759cdc61b1e1d145458bbfb1385837c4465b0a9858da100be074c597343c4816ca0260bbf6710d9c84e8
+EBUILD codespell-2.1.0.ebuild 907 BLAKE2B 77862a42865e8ba9ccf826c27b61b4d16e22c83603adcb6a7d5d9e6195b703ceb71a469cb7485ad5c20b9a10ef6c24211ab33b4815637cd9d707bf1f66eaef36 SHA512 022f821f35cbb25c29309e2e5318bb61bfb958912c4e4b4ee49c47a4ec16b3a74051831924dac03f43cd1ca3ddb8e70d8a9858ecfc6f0ffc228a8b661cfcd4d2
+MISC metadata.xml 773 BLAKE2B e59130789e41560f757b37ee030b14ecb31eefc6048bd846c00417adddac9f7f68386d18edae9c4919f045746abc1d24458269e3ff6eed219dc9fd09c9f4c5f8 SHA512 e17dee80ebd0d7b45b51144d6faa4c38c4345cdd8523d35e3d2f3134fc921555329da7b3ec97f68c422c7ac7662ce4e1ba048f9d0120cd7a838c17d99bc99996
diff --git a/dev-util/codespell/codespell-2.1.0.ebuild b/dev-util/codespell/codespell-2.1.0.ebuild
new file mode 100644
index 000000000000..f2f620ef41d1
--- /dev/null
+++ b/dev-util/codespell/codespell-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check text files for common misspellings"
+HOMEPAGE="https://github.com/codespell-project/codespell"
+SRC_URI="https://github.com/codespell-project/codespell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Code licensed under GPL-2
+# Dictionary licensed under CC-BY-SA-3.0
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	sys-apps/help2man
+	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# do not depend on pytest-cov
+	sed -e '/addopts/d' -i setup.cfg || die
+}
+
+python_compile_all() {
+	# generate included man page
+	emake ${PN}.1
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman ${PN}.1
+}
diff --git a/dev-util/codespell/metadata.xml b/dev-util/codespell/metadata.xml
new file mode 100644
index 000000000000..93753e364603
--- /dev/null
+++ b/dev-util/codespell/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person" proxied="yes">
+	<email>waebbl-gentoo@posteo.net</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project" proxied="proxy">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Gentoo Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	A tool to fix common misspellings in text files. It's designed primarily
+	checking misspelled words in source code, but can be used with other
+	text files as well.
+</longdescription>
+<upstream>
+	<bugs-to>https://github.com/codespell-project/codespell/issues</bugs-to>
+	<remote-id type="github">codespell-project/codespell</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index b1fb97161976..3b5cfde71091 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -4,5 +4,5 @@ DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf28
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
-EBUILD colm-0.14.7.ebuild 1290 BLAKE2B b57f17bdb8d9640ef7982b963ce8134417b9304bc1d7a78bab29399302b3cb8add5710a4ba3cd820ce10134a451a2db3087cb2dd8ec28363e406946cb8287fe4 SHA512 c9cb61a20ad63618a30807d6e4e610fa9056f36d6a73c5f43c2e342b3b83802b402617d5579496e902d229bddebde1c42f8be70eaf9c977b25772226db7007aa
+EBUILD colm-0.14.7.ebuild 1297 BLAKE2B bac14be64a953ea07d4dae75d510534141f40830d667f5976870aa9fa720d44e598af9e8fa17c6d9073521c2de92b2ce918a90d6b47e0b97076010aba23b9a9a SHA512 4ee5a2377e031ba1a0b09697a9054f4de914a4d4779555103b0672a26de190371200bd4db72148315217a679347bdd0576ec468211cc4722354711f696660a7c
 MISC metadata.xml 252 BLAKE2B 323a806a1835a9dbb966b4257d22c4f5a168f09aa7a32d795fe0a7beba83b2d1441d91cee89b2ffa81f84077667a360bc54323ef69d84c5724f59383c15066c4 SHA512 2218696694d0749b13193d7ef6168ab43aba15c9f39f98f5faf306d80205684f84c207eb8d3dd65d70428f5d8419b4feb94d87feb62922a8532d18d4045b2e80
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 33fee87525e5..5f7cb7c88f4f 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 01e930d76fbc..e73e9f707654 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST p5.9.20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
 EBUILD ctags-20190331.ebuild 1795 BLAKE2B d6f51668cc3fbbaf4b8921bf7d27d01dd7f62ea5faa424bdd6f962d9a8e0b5f9b971b08955efa5efba67894be4b0c78ea4a7be5225184fa6fe16c54979289da3 SHA512 42f0b6f7c8929e668acb8a4b79577d92fe72d641a18f90dad96be9e57a888c7387f47a0dfd1f142375ea6f109890e27bdd22d655d7d775560f826e6f3d6bd4e1
-EBUILD ctags-20210321.0.ebuild 1825 BLAKE2B 2a0e097d2626d364c2344db4e72f0c7c2e717f73c3560d2aaf2012c234c3ad858d8f6ca9e543ee48c11a1324f93d6cc5e50d93ef6ae20331b7ca263446cc2a63 SHA512 8463c98b9fb2a0c6b556ab1785f7b128dde90a05dd6a1e765afd146e4d692af7ef88f7ee22294e561fb270a20408137fddb637b72cfb32c73aa1ac56f05bbdfe
+EBUILD ctags-20210321.0.ebuild 1832 BLAKE2B a6be46af0437025d5daec0be988a0e2969b362fb9f59bb953fb33018aab20e59e79b5d870697104ea8323bf82a67926f6ff2026f6253db31312cf89e849ed403 SHA512 7ceba5b08fcfa6b2b00679d9bca52a9556bfecae442b7cb06999346754e153adaf6e245209df7daf04087daa70a55c9dc50b0cb03c02cd66f6f31c5b4c9ca067
 EBUILD ctags-99999999.ebuild 1825 BLAKE2B 2a0e097d2626d364c2344db4e72f0c7c2e717f73c3560d2aaf2012c234c3ad858d8f6ca9e543ee48c11a1324f93d6cc5e50d93ef6ae20331b7ca263446cc2a63 SHA512 8463c98b9fb2a0c6b556ab1785f7b128dde90a05dd6a1e765afd146e4d692af7ef88f7ee22294e561fb270a20408137fddb637b72cfb32c73aa1ac56f05bbdfe
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20210321.0.ebuild b/dev-util/ctags/ctags-20210321.0.ebuild
index 398cfa10dcb4..797f050afc93 100644
--- a/dev-util/ctags/ctags-20210321.0.ebuild
+++ b/dev-util/ctags/ctags-20210321.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *99999999* ]] ; then
 else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 3f2b2c47951f..eebbb07ff0cb 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-core-10.0.0.tar.gz 47173 BLAKE2B 3ce81c4ae9de1dafe444fcae4b2609b786e34d8efdf16e02c05ceaf7f077c13289bea23f6fc22616cb8ce16598ffd3f07cbc51751b3151455d65ecf396ac0e92 SHA512 7ed559ae5e9071f1697da74aa067fcbc42858d51c9d470280c0695df0ab0836b069be2e1ae8948ff01a674ca45be7eb2ac63c37d666d40c7ac333a0a5315c65a
+DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a754ce642c365c5f71696f450c2f8fbccd27e3d809980c96929f75a2afb11c216a3b1ce40a0b7f81dfff7495d46f531e SHA512 c7ff950f7fd81824822de0ec485c1890808126c36be4c25ed15048c35491e8891851cf7438ef806bb1456b68281853ac3a0b1f7a598414f794793db83530406b
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.0.0.ebuild 937 BLAKE2B 03ed124e774bbccac900eeb53342b7485613d325ff3719e8d1bbd9d6e935ce7444cb8548626fc959509aaed2304942552f5aec2c9b21ff40f12dec388cf13d57 SHA512 576f76e49e010f70a546d1a3e866f762c469e983d4517d228619498ac02d92b543a8c5e6e8b2c4adfe727786ec048df9b75fed86d43a2295285e97bbdf0e5406
+EBUILD cucumber-core-10.0.1.ebuild 937 BLAKE2B 4f95ffb7f2326d08a2cbb6c269bb2a5855811e0fabb1178f643ad9c31ff75e80c52303584678701fcbdd9f5ea9e61b13544ab99f5838344bc03f1568659db3f7 SHA512 018b6cc7c7e820e78327278f99228da78abe383483bc366ddd3c2db21434ab73752dfc5755b4efa4fe750e52213283c2134caa0426f4fc2d7951b82988e37a2e
 EBUILD cucumber-core-3.2.1.ebuild 1063 BLAKE2B 115e5a34df2654655c4c4d4eaafa34bbec22b277a35f484370f73e9987bc3be3809ecd61cd352a76a28b09a9afb929cfc034f82617aaf58bde424a7be07be9fb SHA512 4d0273470f96259204c7f909ddf29704c46adb498524304e4bd19f69505a5c0a78be29ebc32269fbcefce56f69c3ad27ef83df02b00aed40b8095e4b927b6d4b
-EBUILD cucumber-core-9.0.1.ebuild 1078 BLAKE2B 50ab41b1ab6d16d95878bcec0d268490c891daa5c8640f97006f0811e772270054ffaa45e01a07b81eb681b2d1821cfe9a051fd0e9cf9dc8ce4d27f74cad36fc SHA512 994e5aeafc446eb5c9640b56677db9fc024b803a45b7827e6c26c42c0d329de5abd49839fc75e09781327b825c4effc08c129d00314bf0beb3a51cb3c6d3eb27
+EBUILD cucumber-core-9.0.1.ebuild 1114 BLAKE2B 6f903f9d6eb8d860a14ed5cc9226a1790b25745b33c534779a1fb8206b49469f28c1716062cdb2a95dd2727c7e95dbc0534b94121ed7d822f9cc9332411235be SHA512 c513872452013c2d2084b80a09308863eef8fc8fc5b5f9b87c571cb7b549b61551c56cd672df134ed78d7ae05525d350c190a463da43407aaa7d43fdbffc6a3f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
new file mode 100644
index 000000000000..252f0e7f4eeb
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://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.1:20
+	>=dev-util/cucumber-messages-17.0.1: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-9.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
index d8262286e453..c1e53c1d8cc8 100644
--- a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
@@ -37,5 +37,5 @@ all_ruby_prepare() {
 	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
+	sed -i -e '1igem "cucumber-messages", "~> 15.0" ; gem "cucumber-gherkin", "~> 18.0"' $(find spec -name '*_spec.rb') || die
 }
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
index 6e147b6c4f18..43ea4e93dfb6 100644
--- a/dev-util/cucumber-create-meta/Manifest
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
+DIST cucumber-create-meta-6.0.1.gem 8704 BLAKE2B 6e438871ffea3723d5466d24a0ccf1d672b05222de5063a6d9587b951357e631a938eac3b93dfc5f01155ace5dafafbf9d4a08f828b972c7f8b3e35f74ece26e SHA512 6e61bf4163a3575a2988c5a8fc351ad360d3b55e5bd615ee915f0f66064675514777868311d53f40d1fbfcdf7ffae2795c0d84c4f90c710f7d27a56009463b1c
 EBUILD cucumber-create-meta-4.0.0.ebuild 541 BLAKE2B 30663bf142ff28bed66fa9aa2af38a49212346bd33ba8e71e622434cb7dc08d3cd53298cf227464b3864d0af66455ab755badc4b807d589a6724677f49680d02 SHA512 b15ffc99ab68640015465868012d0426eadeab527f646a0708d8ef417b827fc51d5c8bcef4fe0244d15901b5dc341bbf0bec634cbf7f4264af32dc57ed43f0fa
+EBUILD cucumber-create-meta-6.0.1.ebuild 548 BLAKE2B 5df01687659f5a7ab9d26022aa7c75c39f394b3e506ab3fdc6b25a7182f4a56af061c235c7e1f8fac8cf99c45b548d08c2475e64fc8ca77d810511693094c104 SHA512 2c021a91b52baf138fe75dae1125ba7a9c010e8b88cb226b9e0da25a0502da9ff32769487093806667572ffb7b9cc08850ea7c0a28de6c9121012c27aef841e3
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
new file mode 100644
index 000000000000..a0a3e7dbf181
--- /dev/null
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-17.0.1:17
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/cucumber/create_meta_spec.rb || die
+}
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index f15146c14c74..e041791ac4f9 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-gherkin-18.1.1.tar.gz 12436812 BLAKE2B 5434d3133f35156d131283dff7cbdebb6523911ffca481ec61b6cb7fc41288e8deaa9afadfb4f34afc57729e92212c513fa203b279a54e5f09a389fe9bdef1dd SHA512 c6f329ea2f46e224b802a1a4062b8d66314c2ee124fd261cfeed390775acf184e1098879c17cae4838ef361ffcd0cf43b1eb77978da7376a87afc09576d25085
 DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be59c6b550e256fdfc21b50883c7d6acf9aca75f61c6f87c86f6ab72ef8e6f9672814dd23ce2ba093bb0fe9a447027c2469ab6f SHA512 25a3180482166a1e6e7d63946b2ed8618558b62c5506c366c5a18b59064259473ea34b3169b666a366a271ddab08bc235a16bdedd34e184157cbd6f12068b1cb
+DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
 EBUILD cucumber-gherkin-18.1.1.ebuild 932 BLAKE2B 0e2f1fdc98a4145a594de994c1bda515cf38803b242ad41457e18ebaed620727bc62a2cd57f34ef6201970a2568d836a00c4235c5ce08454723966b746b6f3e8 SHA512 6eb87604c3953f1a422ed035796639ba91a2d8aebfa666bc82bda0646a26929cd6d2bc5dafbd3c0f10bf9c207ab6489f1374563b77d94f65de834295da790023
 EBUILD cucumber-gherkin-20.0.0.ebuild 741 BLAKE2B d8afd727a9ae4f2b5ecf8fed65fa63cdb963b615e3c2093a1b1c6b44766d2add104984599ce79ade9c99e42a165f6afd7ea4c7d9acc3c4d242acff05d4ee7a04 SHA512 6cc882826dd95d6e83fd9a78fcb4094d9689494f6c0471ee610fa43a40159f15f75383be959d621a212e8f44c0421c596299e291adb52071a0b3976a83461ed5
+EBUILD cucumber-gherkin-20.0.1.ebuild 741 BLAKE2B 4a8e108acc05df454d632ca2b51c4dfe5573277e750e6f676fadac1588b40cae636c967af76202f6b5075550090f7cf62f20e2a6f3f67dc3872e0ce713eece22 SHA512 77110126734efb2aca5d3c611ef05c55520d4ba518c7de9e00d2179df3fd2d70150a47ecdf898d5e811d23340788b8b7e6cb3352e266f7c9bc79c6a8862c0fb8
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
new file mode 100644
index 000000000000..7972f4775849
--- /dev/null
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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.1:17"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 3f296299d51d..211303f4b54e 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95af83128e426817c749f64de8c8b2c475893a0da02ee72ea00ccf2d5d5745d94f93924ef52e9a1c01bebaca9cde889cba49f32270 SHA512 687ccb9245213ff9e59b85cf729fad05de385c94a31ae70cb770ba515c57309107fea16756853d93b1af39c68c3f936f7975540070b4b45bbdd79baf94513dc4
+DIST cucumber-html-formatter-16.0.1.gem 432128 BLAKE2B b1b53566d15573f6f4fa87a9a87ce5c1844d9bd6f43715aee1a08ab45d66baa211631a612aedd59f97c24364ce9b6b607697763744906ec78f96adf0c5ca260d SHA512 2bcdd55e0d3dfebc60c25e2a64a0d2b132e561fdb0f77ca0a491464c9b338cffad5a436123d3ed5e85816d509caa60badda958d7b435a42d89ed27a17f97edbc
 EBUILD cucumber-html-formatter-13.0.0-r1.ebuild 541 BLAKE2B 024d0d68440f966a86fceb1a6a5dd095b0e92f8ae52d7b8dcddde9f7d9f33e9f04a27d4015fc1f5d69e1ecae041b2c0aef4bb216bf022d00fe6fa7765182a325 SHA512 73dab6b1483dc1a91e1ab41c75095ef6f1b1af0c7694612acc090251670fa1122d3bbe399e90b4c36f751e10092f83bf544504e7966835a2ae33594ce65ec298
+EBUILD cucumber-html-formatter-16.0.1.ebuild 548 BLAKE2B 9726a4c2398928feefb92b8be7d0a70a3ecbe16dfc8f7f4bdf7dc5d467bd164e1d4b3de837453ece67d07e413d58607d332c6640afab5028ce2225a8119ebb8c SHA512 7e0d7e0e62cf29cf95a12b9c58cff5eae018a12bee207e1ec6c82ce49f3bfdaf36cc0aa61adc340dcd43e5c21f1ded114bac2a00293eb82eb09a36b10c382051
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild
new file mode 100644
index 000000000000..d62ce4899168
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-17.0.1:17
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/html_formatter_spec.rb || die
+}
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 78ea8d4600ea..bba18f7b1a63 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -2,8 +2,10 @@ DIST cucumber-messages-13.2.1.gem 11264 BLAKE2B ed5fdd87a5e9bbeaee2bf39779f24841
 DIST cucumber-messages-14.0.1.gem 11264 BLAKE2B aff0eac711df831708126bedccec15f945933df9345924a27398508194849a4a9a0155d20249dbdf2ddc68886affd22f8cc450f87696f4f81049219a7212e107 SHA512 fee0fe8fb0efb3b1bf4b9f2f56e3e2f305ff727767500fa869198b668bcb63e8af80898afc106242724c5aa1c94ff5511be7c3ce0e433be9be03dd66d8e2e09d
 DIST cucumber-messages-15.0.0.gem 11264 BLAKE2B 41586a540fd4b092a25b3516419e912900f229f43ba3f8699733bdb67a2783d4e83c50df3b0605abb511894c6a466aa7cae7ee82bae8f48a2cab878349a54a63 SHA512 906a09517dfa6b44519b24ad9dbe5092d1ee24f0fa0e08291206f9b81e1611d988074b063f493ddc2034e05429b7c218380fe0412184c07ba8b2f7af2e3c9ead
 DIST cucumber-messages-17.0.0.gem 21504 BLAKE2B 3dbe6a8f2e486c790c05bb77105fc5ff9ec0acd5074df5a5fe4048a8ace5ce58267992fabfb58e1ed3881d510e18605d0a3fde69d5335f2f3fe47bba429d367f SHA512 fefd84e07ef8cc9e301ac299e969643b8977cf9ad8f9990401df8c71e4c35e7435a815a5922166f52c49052345451c06df6bafce3c139f28287172594bdc9e85
+DIST cucumber-messages-17.0.1.gem 21504 BLAKE2B 7bcddbc42fe9abb1deee0b4bd02bfc2187236ab0d90357ab5904a4d486dddf91fe60ccbe894c64b6093d98499e79dd7506a7d36d78132c0336044819ab85af95 SHA512 71ec1cd2490ac27e2bbd3b7f498062b4c97c693ede9fa826a2fe859e1ce766a1a5b263fd520d77b0a6a0f3955e528f1729011e60b598aea6a930cd3bf71d4825
 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
+EBUILD cucumber-messages-17.0.1.ebuild 477 BLAKE2B 4dcf2d501afc34f316f187f605c946f4cb652081ad9090ab4f5908906d8b0b6ed64f95e17f3150a2fc8707de4dd065abf76a8f815057837eecee6682ee7f3daa SHA512 ecc1206ed87bd99ec483a0475b376ab27b0e72e58caa12cb81e2a22f7d41fd27cceb5ceb95860c9a71f6a963c4fec9271bc183ae841e1ad709483558a24a6c5b
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
new file mode 100644
index 000000000000..e0ab32d1bfb2
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+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 e5f54ee237ef..99a2f4eb8120 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,7 +1,9 @@
 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
+DIST cucumber-rails-2.4.0.tar.gz 41130 BLAKE2B abe10f72aad684691f863a7aeb952a7e45c945d22e1998dbd860ff47808c253607d6502fdb9dbcb1d573a0e3d615859ab56b9e34eabc5de33ff3c47483f8314d SHA512 b57134227e807da4f64d5d8d1435e597f28adab27f2f4d7148b8e997cedf721916dfa73de5a226953827053db2dbc3f3300a88f71d72327514585ae9fada9e0c
 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
+EBUILD cucumber-rails-2.4.0.ebuild 1324 BLAKE2B 9758ef2b398869d3258fd2a6b8f1c9f3558277a6a3802a63c3ad94246d27d8bd5c29630fcd8268e1faf22c200ebfc31330e75abc295084a048f2decb9713ebe1 SHA512 d71a95087d9822fa979c8b34088b783ba9cfbb96e66ace17ab13ae5e6d104762cb8e49e0614e5367e324fb6600c183cff354b499c23999bca32d030b7ce35926
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
new file mode 100644
index 000000000000..0dec57043e00
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
@@ -0,0 +1,51 @@
+# 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-8
+	>=dev-ruby/mime-types-3.3:3
+	>=dev-ruby/nokogiri-1.10
+	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
+	dev-ruby/rexml:3
+	>=dev-ruby/webrick-1.7:0
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 1acfc5bc2ba5..953493a106a5 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
 DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
+DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
 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
+EBUILD cucumber-wire-6.0.1.ebuild 595 BLAKE2B 599993204effb4cf222da3f7d4020ff390c2e3f47da0a2f3294c1ed988a51f12ec60cbc60b3030143156093bd48177946052f442c2f0a6739be42536ad539ec4 SHA512 b68b7f74b487b2badce911854231b45ed252eb52b5aa489c091eead86e654710941ee7f00512e76454d20e0ded87295092e8af970ba65cc7fd89207c44cf4979
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
new file mode 100644
index 000000000000..4ee1d24410fd
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-core-10.0.1:10
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-messages-17.0.1:17
+"
+
+ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index d84c5ad30405..c120c1e5aa1b 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.16.ebuild 1023 BLAKE2B e94d2c4922ca6a81f8174e697263e74c854562d6a7f15e8e7a4a6255f0de8dcc57834d5fef15a993bbebdad7c6edb1feecaf015ee8a6c9656d730f828bd42d5b SHA512 5fa0a5fa27438b853e24bf059054c9851791d74a9d9c099a035e42c754b3775c8cbbe73b76db7b79240d7092f1fd7d8294647c20e1d9386c543b6d6eb128e17b
+EBUILD d-feet-0.3.16.ebuild 1017 BLAKE2B 32ed5c7812f30a4cfa06a9d3b383f28f58a0138614ec0fc62dfdc0e9a3ed1ba3373ccbe01e497093a47268074181d5174fce4975ba1afee6c490388b0f8168d3 SHA512 e8b881c969a80222695341c03601a2bc81214d1e6c487cfce80d708e0afa48a269ce069c47cde5199d21184e9b2e93f672f383fe14af3331f29afaf96a112347
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 2e12dec01e63..78b248d5ae38 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome2 meson python-single-r1 virtualx
 
@@ -26,7 +26,7 @@ RDEPEND="
 	${DEPEND}
 	>=dev-libs/glib-2.34:2
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.3.91:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
 	')
 	>=sys-apps/dbus-1
 	X? ( x11-libs/libwnck:3[introspection] )
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 298afeda8ae3..89827cc2250b 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r1.ebuild 1253 BLAKE2B 79a6a93570b9d1e5d7692592a1eb94ff2fb186b58969f8d524eb6a66c34c0c565296afa982aa1b7e99f3c2c1898e224d2455af573a9718bfa9f25d40857fd800 SHA512 2324959238cf623e60998fe4541dc2b6024a55bb9b2ea35dd854d94e7a0bcf822dd76fc55c57670633fcbc629bdbab582501e8349dec4e5eec46a3c2dce1dc59
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1241 BLAKE2B b8456b3472aed023c2b019fbe985cb3b0cf9619d5b71fb91906528a2be776834fba8880817e683249df55543a2782aad0a2766d21b7023b08859d91f2488f95d SHA512 9c4983e9b4266988820488312e3432ca7eec7efdcf30d9193631e0c848d8ea26510710dc81ae3e8a476c1f5709069bf3a2a7060a60a29c54bc6c5818598df617
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
index cf00bde12d28..9cc536054dcf 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit flag-o-matic python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
@@ -30,13 +30,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 DEPEND="${COMMON_DEPEND}
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbusmock[${PYTHON_USEDEP}]
 		')
 	)
 "
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbusmock[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 47d833d575f5..0c53e25e1421 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
 EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
-EBUILD dejagnu-1.6.3.ebuild 587 BLAKE2B dd15eb0157032ea560bb607241df5ac6311859144e855213c6a4ab507689d212bf80eed3888265c63c080470cb71c66bef283cc41637bb2611b8feb763a896db SHA512 4fd91692ae5a67cbfebf80eff16a1f33e8ab92dff6ac534a929ac2b82b2ab5d9e5ab31ffa38467d9ae2a8ea700fd96a6323f251c65430fbef6054e2689222aee
+EBUILD dejagnu-1.6.3.ebuild 584 BLAKE2B 7bff1476424d562391a3cc9e2915ac3bbfd10aea4265d9732d9e77bf5b6efaf1035055553f3788dd87ae9bca698e861e7c2e744c9cbf437f7292d6b364a56321 SHA512 3f078de56d30cf3aab4cdecd85e0a5e12d6b9f20f2bad60fea0419237944852783b7649e824fd074dae999e489ff6c5facc12d1fcf37343f5813b4db7df8e45b
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 443cbff69da8..ce4a4650f4f9 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 #RESTRICT="!test? ( test )"
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 30779383acca..5fc3e5976c29 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,4 +1,4 @@
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
-EBUILD devhelp-40.0.ebuild 1787 BLAKE2B 623ca0412768d8c04bc8637bf95e5b4e6d708fedf1f3b7d58ae4dcbf6e0c1b05065ef86be30405df3655648c0db9078815dc9a39611f330b64dfabd6beab23bf SHA512 af0d7acdb175458102553ab2006c505d36d5bb11657b3bec012eb36c55e45534958dedb775792fa0b954bf0cdab2f469e9aa024c57d157d18dc2e3c1e28c1340
+EBUILD devhelp-40.0.ebuild 1781 BLAKE2B ed190ff0984a757e3a3cfcbc7d9ac3fbd5eb97d516bbfa1c21931f91334364148fdb76bb436af362f1424a0981861497946fa77a1871db735a8bdc5ede77b52a SHA512 fe83470f41a3530c4ef091a63cd0de81cb8b9536a6f3f702427867e099e76a32ba977e4287e77647331fa1e30518990bd7a47496f87ef1d9d8d8f4692f166bef
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
index ecba9547e03a..6fd8e3d4278a 100644
--- a/dev-util/devhelp/devhelp-40.0.ebuild
+++ b/dev-util/devhelp/devhelp-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1c6fff123210..34593c6df0e1 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
 DIST dialog-1.3-20210530.tgz 562950 BLAKE2B 2aa33c4e2568f91a08d173c3a02d0d64f3b02127e70fc942fa76904fda9bd929fcb19b5254874199fc00e873e7dfb18365beba04350e80939bea5d75d8df8438 SHA512 8f39cfa5f3ba70795927c261861bc55bde668d68d3b45559542cf980e1cfabefb3d1ebabc91715e29a4a9ffca5cdb6affa640ed155539692c868942f6014e7e0
 DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
-EBUILD dialog-1.3.20200327.ebuild 1180 BLAKE2B e78b39cdfe37a0e49cd2db3299e5688802e692cb264842d7414b9fb1318117bca20e144137ff452feba85bb8c649e53691cfb010ad852efb1d8e49b56f356d2f SHA512 ec810cb43d692cec37720782c8c664923b0326581c1292f118e6bf061d7425b2e4a2bb4223d21315a3e5c9d6d30d9537949f4464d6445474343d47d655c4f190
-EBUILD dialog-1.3.20210530.ebuild 1285 BLAKE2B 448ab949823378994f96c6605ac3cea79f35439192ffeb6fd27ef6f264f88edd197daaeb96eefa72ae49f6b48646f3e5b877614eabd4bfcf85df93a83f561ccb SHA512 7d752febab17aa2d2f27d5b24c3dcfc51df913f2ae1411406e17598568f376df48ffe1350de5495091021df7e0d2016c2eca9c1dbc9eaf6c1e34111f8734612d
-EBUILD dialog-1.3.20210621.ebuild 1285 BLAKE2B 448ab949823378994f96c6605ac3cea79f35439192ffeb6fd27ef6f264f88edd197daaeb96eefa72ae49f6b48646f3e5b877614eabd4bfcf85df93a83f561ccb SHA512 7d752febab17aa2d2f27d5b24c3dcfc51df913f2ae1411406e17598568f376df48ffe1350de5495091021df7e0d2016c2eca9c1dbc9eaf6c1e34111f8734612d
+EBUILD dialog-1.3.20200327-r1.ebuild 1183 BLAKE2B 1d0444786f3f407017ccffcf3b44bef2bd72ae9aaa8a318ebc8c875efb02e2ef2140582b61b9c4c499e2fd02d6aa1713208a61818f812a054257473e2a70303d SHA512 0360d757aafb6df51c48171b198b9a4be9e693b6faa88a9a587141e9a879a2d63d0e7436008022eb213ecb85cc7f6afa11c07957c4689bd9cc98467bbd292fbd
+EBUILD dialog-1.3.20210530-r1.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
+EBUILD dialog-1.3.20210621-r1.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20200327-r1.ebuild b/dev-util/dialog/dialog-1.3.20200327-r1.ebuild
new file mode 100644
index 000000000000..4ad9c4b2c30e
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20200327-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIA_P=${PN}-$(ver_cut 1-2)-$(ver_cut 3)
+DESCRIPTION="tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="examples minimal nls static-libs unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!minimal? ( sys-devel/libtool )
+"
+S=${WORKDIR}/${DIA_P}
+
+src_prepare() {
+	default
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-rpath-hack \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts=$(usex static-libs '' '-shared') \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/dialog-1.3.20200327.ebuild b/dev-util/dialog/dialog-1.3.20200327.ebuild
deleted file mode 100644
index 3be5a5d049b2..000000000000
--- a/dev-util/dialog/dialog-1.3.20200327.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
-
-DIA_P=${PN}-$(ver_cut 1-2)-$(ver_cut 3)
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dialog/dialog-1.3.20210530-r1.ebuild b/dev-util/dialog/dialog-1.3.20210530-r1.ebuild
new file mode 100644
index 000000000000..d9eb069d20c7
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20210530-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	econf \
+		--disable-rpath-hack \
+		--with-pkg-config \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts='-shared' \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/dialog-1.3.20210530.ebuild b/dev-util/dialog/dialog-1.3.20210530.ebuild
deleted file mode 100644
index a52bf225f8db..000000000000
--- a/dev-util/dialog/dialog-1.3.20210530.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
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dialog/dialog-1.3.20210621-r1.ebuild b/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
new file mode 100644
index 000000000000..d9eb069d20c7
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	econf \
+		--disable-rpath-hack \
+		--with-pkg-config \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts='-shared' \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/dialog-1.3.20210621.ebuild b/dev-util/dialog/dialog-1.3.20210621.ebuild
deleted file mode 100644
index a52bf225f8db..000000000000
--- a/dev-util/dialog/dialog-1.3.20210621.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
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 2d87ddfe6de4..24854b03e79b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +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-177-r1.ebuild 3325 BLAKE2B b11da425c3c3f5cbf6b6c654bc203c3d6bf56908e2dbdf35d9262a1e5b969655a62aab9aadf7501d6ffcf5c51a7c27a088dca858e81d6b041b72c52d53323da0 SHA512 137eee2580e2693c71fdc72c6cad6499c8be5bc5bb9c3eb302ae95578cbcd15b91a003357eca753392c69aa726797a8e550d7665811370b76fa54dc67bf3a55e
 EBUILD diffoscope-178.ebuild 3328 BLAKE2B 7711971921a72b58027c472d38f78cfcc3e493ec5c7ce6de6fd75d8194c3858a496b647e77d8b8e89cba86177c006619e9a9b66501aa14cf7c02533a54672821 SHA512 d7f3ec25d7831bf5cb38c4fdee047e246965dbbe135509c932af77edbaab29384342cd6ff2f7efb1f0aa176d6cde6f752696a60d420bfa70e03cbaab6c7f468d
 MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272
diff --git a/dev-util/diffoscope/diffoscope-177-r1.ebuild b/dev-util/diffoscope/diffoscope-177-r1.ebuild
index d2d8b5e5dda3..93a178abbdcc 100644
--- a/dev-util/diffoscope/diffoscope-177-r1.ebuild
+++ b/dev-util/diffoscope/diffoscope-177-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+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
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index eed9fe4d4af4..9c20e3fb90af 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,3 @@
 DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
-EBUILD diffuse-0.6.0.ebuild 1356 BLAKE2B 90d9cfbbdfd808ad3dbe96b5d5096ae1d7948bf5261540ba651d2c380b9afe61a8745e3e90edef3d27239fadfab3a73a3de4a99480ef435671cfe5548265dc7e SHA512 8a43b4807b1679209e4f46d58f49c1f19523545c9a76ccef7a6856bd1252d79c851ba2e300947191201f5069ee8cc79024da1d6dc9a27d11681b36d475055fe4
+EBUILD diffuse-0.6.0.ebuild 1350 BLAKE2B 8e7abd2f25376e92f92af19fa9af96f24f691593fa89d2f71ed66454dd55ddfff435be4d8e3cc2cc795ac122b514e42970072748be67ea26f62734bd094bfab3 SHA512 3a06bd7033665dfd1d5c73826cd4d1307cddc66f1b20c4f6b4811a9525dc622ba92669921cdcbe41856693ddc437730e85916d0be65d0d80e88450f7a1e5b803
 MISC metadata.xml 323 BLAKE2B cc8163e0d9562747e2d52729e8298b38ba93b077f3b6a387a800c4720d52ad90bc13482f4120ba9ca9a41ee65e15e2ed2d52b81c41d9906c0ee2b677d4c67b8f SHA512 327c3e242485b96d7923358eb647b5a711d87b6b75c0cf76f01b6118b5b9a3436b0286de1e390a07a76d78d752b701a51319f5c35e24af2160dd6745521d965c
diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
index 45e2c14bd2c8..7f6bd593c6d2 100644
--- a/dev-util/diffuse/diffuse-0.6.0.ebuild
+++ b/dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
 inherit meson plocale python-single-r1 xdg-utils
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	')
 	x11-libs/gtk+:3[introspection]"
 # file collision, bug #279018
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index cbc68667fa5a..e848b8d7c621 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,3 +1,3 @@
 DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
-EBUILD dput-ng-1.32.ebuild 1887 BLAKE2B 1bc7632022db9a31432a0e0aff656dd85ed98285e5bba4db7f396fc5f4932df74257bd3def1e254b2f5fdd56aba0988f9901925cd88040636d58ba3c961d2c3e SHA512 d3821e7902422740155533c50f24751427c0518f4a1af1417683ef9b470c9aa999e458333dd3d98a0bfcfa4d4266cb0367162ace06f51c60914c679dba3b29f2
+EBUILD dput-ng-1.32.ebuild 1855 BLAKE2B 45688011fe8b9982a1547e82274f3a750a8c00cb9f1b835dbb9971d58500309449a333f3d93b468e458687a04917215e6d238814a54bb2b9ea60368cb5fc0331 SHA512 23696609e78a0e2ed84b2177adccadf519987d38e34c9c55ec53d0cbff10f200c292ff02c7986cc28cf7a1a6cfe27f1a60f85c5df3e98d029bd3e25240d0be18
 MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/dput-ng/dput-ng-1.32.ebuild b/dev-util/dput-ng/dput-ng-1.32.ebuild
index 62870638d55b..2d26f0d0c72d 100644
--- a/dev-util/dput-ng/dput-ng-1.32.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.32.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1
@@ -18,17 +18,17 @@ IUSE="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
-		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-util/distro-info[python,${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/python-debian[${PYTHON_USEDEP}]
 		')
 		dev-util/debhelper
 	)"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 8c12fd1dd797..e82390c40985 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
-EBUILD glade-3.38.2.ebuild 1901 BLAKE2B fffc06f96b689fb79a3a4205a1548381515ad4684eac495f776f9ce1204c30dad405c359258efb2030e64f7d6186490bc242fbcd040b456a4fdfa823995377b9 SHA512 9f04fc0e8caed1df5254bc9f7fd7ae5350f4a598fd374c8b047c52af8f587767d8716011166f162947e1edcbd66232577b80d95eb8f43099779521c6626d02ff
+EBUILD glade-3.38.2.ebuild 1895 BLAKE2B 6b6567a45fa1bc8298613fb029d448a5e40f85920e7648b443a934e772e764cfb933332cba206483782690cedc3ff14c8a100c9895ea5fbbb5d97eddbbdd85e3 SHA512 f3c050c504d111678095de0f001c65a8116c7ca187c67a0e2f09d497a3c80540ff38c9c01cdda7f128c38d5eebcfcf6c76e7167186e358a892da3b163c232058
 MISC metadata.xml 442 BLAKE2B aff6c373736411da1244bc230767cce9e4edd0d10f51f4157f1cfecbb134b54f282d2504901b621e988e7973fc43e5253d6b0aaefa3c3015ddace6c0790ba13b SHA512 c819e5ce58646f681aa536d6c859bba6e847aa27ba651ea0574bd81008030e359610eb68663a610a20a899a8aa4e94fa215a4085524eed09ab84d5c50fd9a536
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index 532d2e1e78e7..b904db0e2b54 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome2 python-single-r1 meson optfeature virtualx
 
@@ -29,7 +29,7 @@ DEPEND="
 		${PYTHON_DEPS}
 		x11-libs/gtk+:3[introspection]
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
 		')
 	)
 	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index de247a5ed8d5..9d9aceaaf707 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
-EBUILD gtk-doc-1.33.2.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570
+EBUILD gtk-doc-1.33.2.ebuild 2608 BLAKE2B a9ced9caf3a7becd8ecf9ce95ae33616d85da976fabda79941236b3e39d7b18058ce3fdd99a0faa9e675402c0ca8b1c2c6ca006767af8555ef3b8bfd3a694ba3 SHA512 7ccfb1249b5d2a5ce22ad3d7c11908dfb731d2f13311bedbc6bc86ec696da536dcec205685173deabbb5b2ac967af7f2809a3d4b0da80321efd6677c16283c6d
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
index 18c12d44b238..7babddaa211d 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
 
@@ -28,7 +28,7 @@ RDEPEND="
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( >=app-editors/emacs-23.1:* )
 	$(python_gen_cond_dep '
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index e16e7168bd5a..9c1fbe0468b8 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.6-r1.ebuild 1013 BLAKE2B 4e76bff7f168f500e78fa129336b9d9ff52b578074fdba5bf1a275f881b5ea5886067212f329062cf9851f03cfd92f74a9b27b15d69359b39d02cd7f91077b7b SHA512 07ab446f2cb2965763b617c92d9c50b0fa0bf080ab30750f2aebb04fc0ee17a2242f1d778ec9e39107ecaec089627dcfa548899191a67bc81047a582792c97a2
+EBUILD itstool-2.0.6-r1.ebuild 1005 BLAKE2B bdab16e99d662120dfa830c3ffb4c70201fc2c58911f485de1e3201e9ed5d75f1f13118bab0d24af4a1832b115da5849929f78e7bec336b981dca8133592d9c6 SHA512 cc46cd2dcec0fd94f463d226a1da75377259dee1cb09c42d507a0fdaa26f36fcf53f2e372c8c5671bd158a4af218b64d429a2a153d3c69e5bb3cf22a72e4e14e
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index b19f6de375fd..2589d4c2e9bb 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	')"
 DEPEND="${RDEPEND}"
 BDEPEND=""
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 635b5294622c..ded1d0a22a54 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
-EBUILD kdevelop-python-5.6.2.ebuild 1271 BLAKE2B d23f3824f85ec88ca8eaf1497fe8a2c98b0cb0249d8383228a7cdb58aceb51d6d3e889854c445fb0b39d74864a50399f3c0a19db74afde94c73e6635a090806e SHA512 0de7df8c6a2e9c1db9b2e67ea0deaab68fbf586d4542f1bdecdec7ffd9e23d4105f68c0a63f6194c523876f56cdfdb1dece8b8da4f509ac3006f7deb47bb9e2d
+EBUILD kdevelop-python-5.6.2.ebuild 1263 BLAKE2B dacec10c605ac5f2ec3f141181cc1b60a29642e032bddd8b47e2d22ecd17046b8a0bb56cb6d84ef7b81904ded84db7549a924654f1e0a5e785ceec51f36fd937 SHA512 be531cd721d8635b7d931d20ddc407cffe25a0a508393541c432829e47a86ff24bffd588414e57aab2ba875f91d128e0528424af3b66ab5dc1e10264bbb63f6e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
index cab587824b4e..35d6e1973aed 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 KFMIN=5.77.0
 QTMIN=5.15.2
 inherit ecm kde.org python-single-r1
@@ -44,7 +44,7 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 9368e578bf80..79df85ac813a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,9 +2,9 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
-EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
-EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 12061d64f8e264dd341e4831a575473bd16b92b70a12d25e6b9f4197d784bb1f671f3591eeeac2b0e8c3ae529880fa58acaae7da5ea3a174e823c3dfe6412f6f SHA512 ae8afe01ff6959cac205830a811eab50588568f9d0016ff9ff468894375b64deb4d359140636066b72efd2eca12019522647b2b4b59b5ed1d9a90c3aeef25d7a
+EBUILD lldb-10.0.1.ebuild 2324 BLAKE2B a09d486d0feab20c3bee3a61d2e7443883624bfd51f0a27079163092a38dc69f52d0f2ecbc65bd88c5f6a5eed8e07b8c823f19d231498ead36f4ab70958bf231 SHA512 05248c1d41f860dac014d40f8330ca85bcd3085198652d5c6b011b71ae03311336f5f7cd68b49cb22e325ea1d9043261cbc99727a08a10317b39d7cdae97d5d1
+EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B 7ac5a408af2ac8e74f9ca3bc7e8ea636e394a325cd2dfdeaa5c5521b7a6d7b97ad846514fd131c5d432fe92ba3373c6ce546a999862dfbc63eba361cab63d0b2 SHA512 52ad596b0264f162667ddf3357fbb3a06c4976e9af0451fc999fe27e84ce36cf08336edbec49581248bf3865ca6432770b0202aedfcb0bb3d87dff090c3bcabb
+EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 72591b9369461530face31022adfedb46c27e973a05c19c55dc33c580fda116b1e8f22df0b760cbdffafc60ccee438009c7bb1175fcbfd15cb9f55c0084c34f1 SHA512 abce2969538626084d680561ca85ece8fdb999fdf9ad41487e60f6fad62bd628ccebee369b56d394588403f7a6c3a2911ac4f699d0c51b284a6ffcbcd22dff22
 EBUILD lldb-12.0.1.ebuild 2420 BLAKE2B 8fd461752260d2e7d3cde1112863d43b0681d46ad129d36056b73b03c67b13c1263656e3577ab04ec729b70af167796991d20c91cfda5643fd63c898a3f2a993 SHA512 d14631da412a5e822f98ae6bc703e66383d848ace0d705363a4d0bf8e8f4f9126a1c7a472a4805b495b185d91098748d35a7a89f4047456904edb97735f5925c
 EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
index cfa0554e3d16..743ddb9fbd5a 100644
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
@@ -25,7 +25,7 @@ RDEPEND="
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
 	)
@@ -37,7 +37,7 @@ BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
 		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
diff --git a/dev-util/lldb/lldb-11.1.0.ebuild b/dev-util/lldb/lldb-11.1.0.ebuild
index 0286a1fce5d7..9a2dddf2454e 100644
--- a/dev-util/lldb/lldb-11.1.0.ebuild
+++ b/dev-util/lldb/lldb-11.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
diff --git a/dev-util/lldb/lldb-12.0.0.ebuild b/dev-util/lldb/lldb-12.0.0.ebuild
index dfe90ba3774b..5da42464158a 100644
--- a/dev-util/lldb/lldb-12.0.0.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index c37c0d75ea14..f3058592e4f3 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,6 +7,6 @@ DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
 EBUILD lttng-ust-2.11.3.ebuild 732 BLAKE2B 0fe4bbd05e5c18daf01e825f82bfcb9e4be762f845dcac1da730a0a88237c75ffa6cfbc6351af3b62be7a86cdddd998825c78f59a515e61a5e8d825fd638c81f SHA512 9301586063911e0b975e8ed003295d1f5acac7071b2ca75122bd9f8577a035fc41776f4c87bee92cb1292e2ad8161199670eb7f1689137858453a6444ce5145e
 EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
-EBUILD lttng-ust-2.12.1.ebuild 793 BLAKE2B a05a3918a6f8faec02e3723cde8f9c16bc26eafb3570168df4b5772ec2efe08162b9729b6e781ecdc0dde77f0f03d59ff331287eda94cc3c3e977a830c19f101 SHA512 4c76ea166e6d0e541eeda4450da7fdd2dbaaae1381e899d589918db6b7db95749004b466bcdd6460691589255bb4f3956952a69be303aa959daba7bd57625c70
+EBUILD lttng-ust-2.12.1.ebuild 800 BLAKE2B 04aaf542a0ecfcf44b633a6bc42607593bb7c16e1833642a3cc7357fb3b2c033cb97e978744e158c197ba967b5095b08484d09284b02256ec6ef56a305ab0d82 SHA512 25f15f709e164c333ea28dc806c0571ddea1a9fdfb6eb5f3e941b710b289543b7e588c8d5895b6bce69ac9246787add425224fad352c1dc708a9db69b042e901
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild
index 623e9c254e42..9fe070a2451a 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 75d59d239d04..cfa73b806c05 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -1,4 +1,5 @@
 DIST addr2line-0.15.1.crate 32936 BLAKE2B 5dc101a84434607a2432346440324b35e829fb7843d3a76a918516929867e6186ea004aed8b939d216822d29115a9f8f11b4e86844ca50ffa5598ad6c84a53ba SHA512 beb2c7683e350c98538cd7a83aa4aec86fb95bfd079ccdce27fae84f988a58f9e59ff5a2e3c431436f8ab033d53232732731da52f5d7fbb5d80f24fac2f76041
+DIST addr2line-0.15.2.crate 32966 BLAKE2B 471658962dc1ce9dbc44a6e44173114eea110c3ef5673d90d4e12935263ce99f7dcd9bf474e5e7d8d1bb458b914d1ab50ed3a55a17cfc3afc990d05c7a5c6d0f SHA512 9c36be4a476a54da90cff00ddc1621e827c995bacc04e3e382a6d22e724e6e03abc5228d24e13073c5cde63ffc2ed4f26a66c3814e8d183cc062ba6c6cb178d7
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
 DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54d54d538943d5afabd3f88db139c459574e6694e7fa86e4d77eaa3f75c11e3a9376f45429848c91889530980b SHA512 620b38b2a6437caf393e84625beb27afdf448acb52d7adbc9cba1152ea385bdf05a68795eee0f48fd90b5edfc25fd9cc3d42a0f2593dfa2f90d4f4f9cc893ebe
@@ -6,10 +7,12 @@ DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
 DIST ascii-0.9.3.crate 28283 BLAKE2B fce32863fd75ef1badd496db55387f1abfce5eac7a7a61ea07e1475f555fcfaeb2726ca80e69577c4cd05c366f8c46842f064fd9325955eacb8ad38d0cee990e SHA512 ee8ad37b0a3db9524db22a9abe0c348e30364f108039bf761aea8e3eed07c08849924a0a287fb17c019e14b654d2c6db3848112047a1fa8db58247c9e138dca8
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.59.crate 70925 BLAKE2B e518263adcbe0f352ae2b7032f231649b6259665403041f301dc7de208b4eaecdae63501e367ea28029a2854d6802ae833ded52e881c198879a71f27a8a746e1 SHA512 298ca370d46993d499a836c425c3fb5a9a4bdf2fccbb22a2f7fc174041d77cd6997abe5867da251a3e58fa1f06ecac8afa3c1bab436b290f785a8a7d8fb0056e
+DIST backtrace-0.3.60.crate 70983 BLAKE2B d47ad8fecb2a200e1d0e0cbad54df070186bddba33a6115aa2223db5ad0d458ec6608224d5f5311cfccc911f1cb35235dcee79a203480240e280ec89428559cb SHA512 f8b39daeff3ad26b2c66dd0712d177ee8ee2e1007377af9abec7e5197780aaee2d3a7e89ba311f4dc38185cf2a20e45e2ac4502e862e6d9aa6498493df522f46
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -17,16 +20,21 @@ DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c9
 DIST block-modes-0.7.0.crate 13464 BLAKE2B 70b4b199607925e338b22e04d48fffa4591942c6d8321c684cd34ab4ca28e6ae16a75b36845867fe99fffc47af62ed5b27e5c17ee860e1b87fc5d3526f34a9df SHA512 255475599706befd36756100abe350520076aafc3eb069beb5a5daad4c017f3c547a9699e7152b935d09a59f9a8762e0b23e5e3eec5a09ee2377978d272232b6
 DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
 DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
+DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
 DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
 DIST bzip2-0.3.3.crate 15346 BLAKE2B b3e5178400a2235f500c3f77ad538fa3c271e261cbb4a4128d89371fac0f117a12c6a84696cc8ae9462a9a1a8712ed5a2086c94af14ffc575e0ee1676fb2207a SHA512 f2a844655fbd9abc866e691b57ddad166f09a183b8bd33cc6ff5952fe7f11141b1843728c6ad23fdf88a181fd40a3599df3e716c5f004ef097af6b99162a55d2
+DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
 DIST bzip2-sys-0.1.10+1.0.8.crate 633563 BLAKE2B cef12d8992e9b5b8c82d2aa0274bb9d755368fa584eb8d87259e4358f38ab02fa6e319a8cd64ed2a3079d691ba54d5f4b023834b9364df481b2cea32abef0d5a SHA512 1f730176812669fdd9fb79e36c03db2e6270f107fcc4f63f84cfc1084cb78a5c0ee3f0659397e5b42b626629a42c0da7805fb3f5311719e45422ec8b0745851b
+DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST camino-1.0.4.crate 29586 BLAKE2B a0f4591d5f68632cc23e9fbb0eef8cf37bcad4db1c80fde0f64df81b457e7bfedf961d32df849bca5b00997b2fdf4cb34b4ce8d9c5fa698071cbbc249e577bb6 SHA512 d095e5d35920647a2b03f8fa5a1a699bb25b2f2368c47a60457e65cfc87ca1a0447e574e0894f57bb2705148e1deb480893b3fd92ae7f2745ac6edcff6217ea6
 DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
 DIST cargo_metadata-0.13.1.crate 16917 BLAKE2B da9f09bf8a0267ab3c6993a4802dc38f1b6de34b75d750f4472aa5b48106a327050221c10dd89453d02ad3020b0b9e4a3edef64e1c999ba7f07314fbb8435b46 SHA512 107e47e3f26fd129a13015b71b00e51029e76881b90a18c0a591a2b0c476f45ad33661392e64feb2a17159b5a9c5c6f986020d6aadef5148fbb9e575efe7beb5
+DIST cargo_metadata-0.14.0.crate 17008 BLAKE2B 00fd6841170d5dae463a60daf442eb3033d616ab171dfb7efc201596196571b06df83f6ab23e88397c77baf3135745bc3ac6051557ebad2c3ea96440f00e1d2b SHA512 d33f691d56df56bdea260363cd29864b17f0326b90b4b9688781c37d3eba4437b93b48e6448dc1d012a8542d7d2495f0acb73322340269db9cc4a4aa955f9605
 DIST cbindgen-0.19.0.crate 181286 BLAKE2B e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438 SHA512 dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST charset-0.1.2.crate 14490 BLAKE2B 78e776003334cb5a7c8980b8f6f5563b0eb3da8b9c039106347b6ce47f9f0147647c7c643acc18ba3fd9b2a7c897974e2433cfeb3725b5287362ad73ed80a7f1 SHA512 8a740dbd4f7088653addb6fa4293a7d62b8f6a9f727413e2ee46289179b36d6c18ad48b1f3d548f9c153166e16937d9c60b79fcb0ecb5412a635bc6fad11b54a
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
@@ -34,9 +42,11 @@ DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST combine-3.8.1.crate 103773 BLAKE2B c8ecccda28eb7253e14ef112707166f14892fec858941adb302a866eb0495878d091592c770307948fc040fe459a525af643db9798a601aaa331ca7959ebadd9 SHA512 12cf00c23fa6ce6a73d562214456799a9aa98eaf2defe9e4884dc729cdaca26efe2965ada3390892940644e6cae4644363a65ff5aca1bf1a1a684cfd4a8d7f60
 DIST configparser-2.0.1.crate 17742 BLAKE2B d90e04ef3579cf6ce6e0863c4c116c3d6402dbdafca4f9730614f08fdb563024e8625bff7a0e9bf4c0314e12be230c0a619994a4e22f22bb127713d2261db057 SHA512 272850e6a87860da6ff1cd95983cfb41f042148f3b6fa9d66da471e4210f7db986c6a0e8adcc1bfdeeceaf826988d0ef91324902e23c8e4de0ff5f0e4e9cd95b
+DIST configparser-2.1.0.crate 20039 BLAKE2B 708fb01160097215d3cbd449bb89f8ecb8dab09dc4b675ab410e8e636ffb96f7623bfc7e8c55621915652140e2ae4379dcfad61efaf7386c8d9f0ed99de13c4c SHA512 af459b2a3c228ebff981b1b6a158ab84af44a2037b499abc45c43234ba1014c826407a6212a9c36fc6a7acb6bf6407cfcbf52b72a35176cf7dfec94d0515fd6a
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
 DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c
+DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crypto-mac-0.10.0.crate 9476 BLAKE2B c9d2507012f3e88cc6a8933db4b879f90a93f8cc16a573436a200a386c67434fd8e33b1cd6aed1298a50681de554b7b3f9ffbbaf46d411ecd3323a12218c0bcf SHA512 8b406db46a08f64d899eb26597fac99576b3fa892eb83bbe089eeef7e6452f43dd138232ed4fe75cdbac2966f94b71f92910c14c53b39e5501990a9976ed1b59
 DIST ctor-0.1.19.crate 9307 BLAKE2B e1f4a431956afab00475f42c59a05a0004a87440ff6f97713c8ae3af99b621124f47447d0c9504eb7f69a60ea056b5ee449ec331609a6fa6e278b9eab799b953 SHA512 3e0cae34b23bea47935ce5a2df3004c0e77eb08e94978cf23586e6cb839168c67a4ba1d732bf0ecab8264dad60829886ae0946fd3b8355cf03a4b7462f7dc76d
@@ -50,6 +60,7 @@ DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70
 DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST fat-macho-0.4.3.crate 19126 BLAKE2B e4f70c15f8c01bd405c7bde898e8ae74fa66edb68e7bc83bbe6e793619ee436e7605ef99fd47e8b96e1cf3a5bb4e134d5df59723287ef32b0322e1b8a0acdc4b SHA512 ffc7a015cfbd72aab00f907537e401afd29938429fc5622f848ca679c0bec75d1232527f2407f8f84fa0ca0cd9881b14924cd20474de90c472249b5ab921b05f
+DIST fat-macho-0.4.4.crate 19004 BLAKE2B b367700a9fca6f0772cced25691a63d7f8be1cd89dcf7aa41e3f1567365a3469eec50898cd89b8006c448c9c1ebe19190f34613d4c7a2cea37ffc198066946a2 SHA512 7f0438439b09455832cc3d2a00399cd1c4e7abb4330a712b4d8e1fb44b4fa41e08cac59e7539ab987eb608af1a2fcaaf2d818c82ebf997634c0c0dfe7e8cb942
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -69,22 +80,29 @@ DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990
 DIST gimli-0.24.0.crate 703534 BLAKE2B a0103b03d3ab369f3dad8d8aee3e36dd8db402b700c5b5b6ecec568e8579dba8f5d9c09c21381ec9de51988d9121873cbdb66f8e1fae7d8643ea1ca73f4ae1b3 SHA512 b4d088b25f177975a1a301b742e38acab5151f510771c4c276d9cfbb27b3c1421c4bc09ad789ecc64a9764ef95ea50c2d4b7a3cf1ed8042270d5652991ea494e
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST goblin-0.4.0.crate 159039 BLAKE2B 4dfa518da4c084813d68640ecc459cf683597487106a7c8461d89d6df3256f97b88c98e25780058d53820ad1e2d5ecba61b4629cc6d5159e32f20f27c6df301f SHA512 fc1dad036a25e69af7b6228f38cf67ddbaf2589cf59484494856acf206793a543f72bedf50a0588b0b1a4f9344e5cb4dd68030c76fdc1abc3488bf7502bd3197
+DIST goblin-0.4.2.crate 159808 BLAKE2B 01cd850662769b3674e25947dee191a9b56fa94e7dc5548c669f614aa84bf100f675a224a0b3db5b214ba0464bcd45e1c9a278ebb9ddeaa29fada6963f555efe SHA512 92e17f3e12342a93f59cf864c62e3b4e96b93e44a2730b3ab8bd8903ccc469f1e6b988296d2c01ec3b21eb3af4f0a707fdb3c9fa968d7ca225046d2e0c9ddf06
 DIST h2-0.3.3.crate 158845 BLAKE2B 4c9d0f9ebc34a3aeafd7492876b90f43e49adee4f99d031de53245e87f8fb0b2cdbf1aa98db5beb27bb8e852218241f8fd2f8a50631e68839c2fbd98a9aebf97 SHA512 7f7ac1d513b6c6068700b41c19cdf74a57ddb6090b5457ed247df93f0a4bb877fc44f9081c962692adb4731c82e0802a0d2151d69c59cc5af754102e83613a42
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hkdf-0.10.0.crate 13966 BLAKE2B d808517dbee7340d10baa994dae118135ff3907b204ec6f92ecbeac8796946969e1ef54532594bec0669834dfe2b80108ecb30b9d8906202182e5e30f8995b64 SHA512 c75ea5b79953d28a793ddef5eabae8754ba74b5e57bd7953be6e4e8f9ebbc3b62d29e06b1e15eb101b849d51f91df61f45766d4ccecffddad33c39ec5d5668ef
 DIST hmac-0.10.1.crate 11120 BLAKE2B eabb92f1f276f2397f7e28d306f4bc3ef0928f83b4b622f120dcf1203cdd420c331ecbe430e8f8424e6709523118fe01d425712cb8e520aebee620144f666834 SHA512 ab61133d280fb1b149ad097e29f6028a1998475d2f1995e3ed4f354a8fc91eaff01cf9437a13da637ff433fa05b43d7b144b5726c1edba1130c7004bf18b1c3d
 DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
 DIST http-body-0.4.2.crate 7603 BLAKE2B cb3739c4207e678dace73889a621d56ce85cb87c32df8174112bd3812e1d804454694679a38c268d13bfe49de4f364ffca3c279317beeb26e89949c86b335b58 SHA512 69bd0a9324626953d2114ef4dddb69da8bb9f90236529e6d40cde0ed92c210f6b6849fe4558fcae50a578dff74e70c57fe8853bac4980101404fffc0b0cfb6fe
 DIST httparse-1.4.1.crate 25592 BLAKE2B 4527521876c4c44306819336bb4b53ca92b427b1b7e6d41f7b1c284812d6c5256870f074bf5273e63922da50297fbeead19c451816f76d9b9b500a5a4316dfb3 SHA512 0dd0f41076009616a80e6b43b317e8560918f5ffffa7467d58fc9885bcfec758ee521beecd665e75d1ee6fcf7dc7c9bf8aa560c2eb885b4e42b84e24bf2ed9a4
 DIST httpdate-1.0.0.crate 10219 BLAKE2B 52c267f813d63446e9ae80a13375b150782659ae9b98204558695166714c79a60ae194f3f90f106232a23ec3ffc402b5f4fb83045e874d7e8fd6979b698d54d2 SHA512 0acbc19020546293ed8f05019b31d9bf73c13bc11612b06d1ce1ba1b6f3329ae6551e090840a54905492a4eeffe1b012caf44bcaa8e3e2e85225db6b1f1b0ab5
+DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
 DIST human-panic-1.0.3.crate 18064 BLAKE2B 5dbf7c696da12f912a86ff886dbbd6801320520450a8c735da9f99166a4e534aa79e51f6a498626d40ec4309c1676b20b1e7881f341070522c3dc37cb7ead030 SHA512 3de653521aa3ba9180768e04dee8be4f0f52849f1051e8bfd21c80361836603bcf7a5292fe325e2f556446cb176a5bf0eaed1e7bb218cc1fe6c7258cb3f92497
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST hyper-0.14.10.crate 168209 BLAKE2B 516ac859336c08b72b20e18144d353bbfb6b932adaf2799e420eb682eefa34b8518921fc90dc86f00c920d10a8d50b6fc2cb22647441e82c74f5dc03cde6c390 SHA512 6b7a610563836b6fab4a90c3a2e64657929d38aead05dc4573a37cd7a54dc11f8e76e2d304343401b112b1ca1709df104d91ac2a834041538a75a31b753b6af7
 DIST hyper-0.14.7.crate 162955 BLAKE2B 00e514d9267a8283529cfc3048dda14229bcc1a3ed0cf8c4001d6ac441cc56832a916df833e707aa8c669b812242851ad787b6bc20686e12dac4f82af1f3f2d9 SHA512 30289b175cfc45c76fbc4a7908b88df23af85eb71171c2b5d608e9cd8cbff8b5fc49ce55910dbf23a3037459a518af60cde11000c8a1fb3dc2aec2d877c39dc1
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-1.0.3.crate 13137 BLAKE2B ac50bb2bbeb989d78ea583595b9b4518c6a71c0a3b3fdd07581dae0c56525d55d631a81151e4592cb632c1821a0fe4166471246fbe542f16e747895a6d564cd7 SHA512 7567c260678386226a3fa6839a7a4d603091096a8df19039584c296b4953cc333ec1dca0a13d1192ea6433743d5ff44ab78b4e8a89414f6ae93d5401d3d2e3f1
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
@@ -92,6 +110,7 @@ DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b
 DIST inventory-0.1.10.crate 11572 BLAKE2B 8b5044c9996fd53f726652617ad7f25e3c57e5c54aac12edf0c2b41ec7d4d9388e37d8613a7e39301130d9ce4f3412b48380fa9e04bba8229d5ed2ce383a8879 SHA512 5c5f34ab3ef5b89b27a353ac5c570b9f2970288f10ae3dcaf7356ef48affcba8ae7d17406206c88e319a95f133ae69a33d43b219814b682df34219bd0cfd5eae
 DIST inventory-impl-0.1.10.crate 6228 BLAKE2B 4aa7cddfc306e192ca635e5d32fa9cc61d59824f24bbc67ad6b6996578ca0fecf8e7d04e970720b9261eaef2977dd0773ac1eed35ddffe6c075a6d92007fc276 SHA512 860cb40c77d269b8f8c71db96ee71917a33f8d9b7ed5f24e06e38d0adc5e93dad73ee6688627798cabc7536c42c519788d74ee3bc8abb13b754f7e70be663a32
 DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
+DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f3b47ba8dca1734f959683f17506d4ce071072b8f288e7c494b3daba9054770b9f5f9959e9a450b82a0baf SHA512 db74ad4850e61b20b5280d0637a33a0a1dc2e3388bda38efbbdc221c04dfe04d304d57c3704fa68a824e65e8a3bdea2e743b2d0c2d06b1a8710c192cec1b6100
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
 DIST keyring-0.10.1.crate 20169 BLAKE2B 0509c3a512124e08cced67c227373a3817f70c78e065f2d391609b4801905fd774e7524688470a5c9eee23cf64e0158f8ffef545d25a88859df76f37c29c416d SHA512 a133d3908906d7b48c2986eba7525018bcf52d9e0690a2b1342580f9d4b9ab5165b800a853c57d7a7f41fca26487fd42b01eb7b75f5c4f0b623fb9f564ffd011
@@ -100,6 +119,7 @@ DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53
 DIST libc-0.2.90.crate 521685 BLAKE2B 31442f5a69f888980051fc8877be252277934088690df84924215dc09a4a4bb5d2dd222b8bfb1bec070fa291f8fb4b7cc96c69f40b21c912a7102231f0eb482c SHA512 c05c409c5afb55aca064db78a79b197081ec38a57989f0eb8c3f3095a400f1f298cccbb8132030e3532058e40aa32d1fdabbe2fcfd3437a0e5bc2c9122f88f0f
 DIST libc-0.2.92.crate 522480 BLAKE2B 4390c54531fc908b8d8e200fe271cd8536660b907dab3da07056b650f13fab0dda83969518438eac7ee75761bc1913ffd056a7cf98b58ab31d4ef98676193220 SHA512 bee1495a75cce8d117d5a565dcd9e2050b9b308aeef40dffe5b970cec4a0840eef07e8d65a64558cb75494a77a6b0023923ee451b29288e02573b54121fc7b34
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST llvm-bitcode-0.1.2.crate 13096 BLAKE2B c010fbf089d7e921717112d9bb5674022d4adbf16abbb2c1088d8bbd0d90197b389080078741ea9b311a0957f73d0351e028252688b6ba90120bd4a1afeee840 SHA512 1afa9c8e5cae38bf9d8c26c847e48d76bff31a940df8c538f758a3676f68a5de60a8277b6de7c37c582c051432f093bf2d3f74a4b975b5a06fe0dea3c13db96e
 DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31
@@ -108,11 +128,13 @@ DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8
 DIST mailparse-0.13.4.crate 31832 BLAKE2B 0ff6a27bb185a3c389381019c3382bd53e1262ffb2824806e9273085e87d7b96ce7f53643662b05d05bdd96726340b9b53acefa92c8a4b115c65d8b27d091907 SHA512 18df5cccb44e749d91507f708f1d8f639d712dab96363f9fd09b95cfa7518cab06964e6cae41b4f7941f99340818b42797c68c07e0ed0966eea24335c5e32ed2
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maturin-0.10.6.tar.gz 217409 BLAKE2B 395caeead99c1bb7e8c21e76e15d5650fa609f6126dfe25e4658102d7417b9e5c9b6f2109256cf2c995206c929c748e991c395d4123d21bb97cca5760fa70874 SHA512 967c9275b2dca7ca0ebc597686680d2d33e7271b0beb0f477aac3776a3592e939ae9b155466a2cb5c8684e427217cc7d7e69b86c959ae8e6cbbd5f4cc8987501
+DIST maturin-0.11.1.tar.gz 221500 BLAKE2B 3c3078bf5c503f296d9bdebebbc1a8610a036e476ec706e351850f9b45ae4e9029bb33ebdd8f5f51eec449745c0cf86e52e30e2dafda2f5f5295562b536cb7f7 SHA512 a24fe5780db63bd9e50eb9b93d81087b5b557ee656b928fdd86ebe040aa8d3c67023b78addf444b16742ad1db7b9414a404ce9164bb39637debfc8a9dbca6785
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
+DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-0.3.1.crate 9414 BLAKE2B b3b4ab10882c481cc2a8777eb44fb268a5ae1e76768df4f16b7c4f76bacfb6974a9ffa9d0b510c9763af49aa30b3cdfdc344a919700e65da5402d90c3d5ad083 SHA512 38eaf591bdd1a8f758f80f6fcd815f32c064738ba21fd97078200945cc5a2025f88b79efb36538e425df43441adb33144e20e68dc351101845074260d10ab85c
@@ -126,7 +148,9 @@ DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a7783
 DIST num_enum-0.5.1.crate 8210 BLAKE2B 45d15065b7baa1ecae1860315865e502038dce1bd79631bf8e659dd5346ad1e7ec61df0aef1ad64caa73fc615b3aadd894f490adb34c9227c671c079b11d154d SHA512 96e31e53697e70a91afc49f5474dadb88e6fcf772dc9f14d39a153aaed7e12500500c6a9395b1fd4870be29ea13d13818b30cd5b1d59844773bf2edbc76d7677
 DIST num_enum_derive-0.5.1.crate 7579 BLAKE2B 0bfbaeef5f7b565254c4a3017ce38ca462142accfedeae5ee03f4110ad987255445209ca9a3883dd37f1ae0254755badde9daf251b74739c436573191729bc40 SHA512 fce1142f78ccad3cef1de504a0c89d38e057849abc5ad0c8e27d284c599b39b521cecf3ec70e055ed82871657e6aacbdc6e7b38d637a5d151aa9956e9ca9df09
 DIST object-0.24.0.crate 223436 BLAKE2B df92c1565dccd221df4a38a38d66061c0adaee8ce915b4a4b696c831ae90812cb6df02c270897ffee397a18c93e6dc7a81c3d39e392846226c4d8bb03bded7ef SHA512 5f1c21bbff324bc3117dcf26a04cc4ca6bcd86f43bb5a075f4637fc9e2d9ac5771fe5e9b52c26bb135f1059aeaa46301622bd570b626980e0fc43639c4a2904b
+DIST object-0.25.3.crate 230711 BLAKE2B aee91423c1e5da1c2221c6fc2048b1764fcced2853e7e2f3d9ce4b86b13fceb4f5f909ffb03981c1131b79fadc1bc7fc5756c7ebecfd4a9af0b4b4442446e378 SHA512 33e6394962a7b566554e4aeb71826e344646a41601ef9e28875582d4fd5b64ac6eb6a99944273dda0d5d2e1401c3ed4be299b3bc7e446cec2638cbd82535dd01
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
+DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST os_type-2.3.0.crate 7931 BLAKE2B b046f8752e2c55718d604c516fc585e874bd704d8fb5b64f6e85182642174699d2f3d0af1804f9d708760ccd36b6f326e059ac13909a9c65de54e0460e2923b4 SHA512 1b482b77a6d30673e1c2917faffdac92636873101207fc8f097464b44943b17e350441709ce8ddcaafeab1f0fec8bd95c5e2c992dd9d3c39590f2f5ed332e920
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
@@ -138,6 +162,7 @@ DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a
 DIST pin-project-1.0.7.crate 54847 BLAKE2B d902d2bd9008ffb0f254adbf0fff3c55614abec67db5a5814707f00ce50690e47890c2ab89ac488e12661c59db7692502eb7003cffafb4a57a66959a01f139b4 SHA512 e3903b508abb9a1412d8fe31f04d01c2bf634c770b1d6f697da1ec4eaee023ed95d5488e1fb4f3aca62afe145b52730c40781eb6d52deb55d5f9820503a92f86
 DIST pin-project-internal-1.0.7.crate 27884 BLAKE2B 52ef94e6c2fb44ee36d7d5bcda09fe65dc69386f6df6e4573674c6e796ce506ba672c1421603ca7501a7b3747f7277cd8f4e9c121e4068d5e857232de08cb1be SHA512 14d96d6cc73c7b86151f206383d24e1c7d79d70f586ff59f1bc47fccf271bef4a0561eecf86f7b03cd14520040f80ec00c266df79b2eeb04506582d80cd2ef97
 DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
@@ -153,29 +178,42 @@ DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b49
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
+DIST pyo3-0.14.0.crate 311988 BLAKE2B d678be98f550c0aa9a36c362b24402dfadf442d06b1462fe65c068fae32907c954a5006f1a104f0836b05ed6fa615343869bf6af9f33196bfeb1bef54ea14b65 SHA512 88ac5b34ebbee5b3f6098a7283cfbf221ac19ed70bb2825234f0869be8403e709ba19e97785a83434093891a41477672790a19a8bdbfc3861877ff8ed622fd46
+DIST pyo3-build-config-0.14.0.crate 15392 BLAKE2B 93057db500e4d08bf5745ef7ff85406f025f307888c6fd3e01ad1d76c6280754ee676c3ffd280693dd1c24db6792f83ac4de9dd8520b56523ef97e4093e2a9ee SHA512 e9f79efda01404835952f9b322c610c9e078d635cc63af0c39b62c51299b673dfad4f612e08ce54b8c68de91c39bdaa89984066b57502c92cd029bea51162476
 DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
+DIST pyo3-macros-0.14.0.crate 7646 BLAKE2B f179d2371db62cec1f4876ccc929b3006c4604223a25ae8375c5c4d86832d16dc2dc976a05a48bf88b5c5b3f01ebce7b05d7815b5a63fac841af87301306a59a SHA512 7fc2203fc8bb59231931c08f21020254112fe12b2039ead43e3c0331bc7b9773ae0e447452aa4f4bf53b881f63adf56e64807145747551761e53f2ab7f6d29dc
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
+DIST pyo3-macros-backend-0.14.0.crate 38804 BLAKE2B 268d59807cb1dc9adf1e389dfc6d051cb140e6c7ac41c628a2450b634306ffa5ede6ded4033139ace203fe13d514d966ef203e39a6fed18249acaa2bcf2505c3 SHA512 ad944b91e8a63945b59423ac47f574d7aeeda3198c229e9f728b8593577b3514e56e5b0974987a952ea030f8dc661a9ea0052b70929ee87064be7809cef4389a
+DIST pyproject-toml-0.1.1.crate 4442 BLAKE2B 1eaa1dd5ae188825a0e2329591ff144655d69fe20dbcabe6f07645a7838a7868d7b72a3531d88117c576ed57c15b32a781cbabb71666da272db5d3c6784695bf SHA512 e21e93061964d3de4a0f8eba14b5cc1ccbf80d3a057c5984bc8de1f8cf8d570847acaebdb933e30083cfad9425521125129017c9fd3c529d265a43faafa86d0a
+DIST python-pkginfo-0.4.0.crate 106646 BLAKE2B 8c4bcc68819b1b7c5c05140161ee874c0ef40bf267fe90f63aeadebffa316002e5942812080be233804e3b876842546454c3b78a000f9c0c65d2310576bd7d67 SHA512 7ba053effd37b147eb2225fe274f0a9c426ecafa358961ce7938c736dfed22fffaa07361b292e04301c65e81e155eb93ceea2f97239b75aded74db8ba8642876
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST quoted_printable-0.4.3.crate 6141 BLAKE2B 77a3d6b5ecf43336316baa72df3bed2485c014d56aa26c461ab5c699a8756acb62a157818db1fe2fafa7e5a3808791f2778e738c15e32e9362735f86fe87df2a SHA512 95542a68a88b81b59f937d7cee9c13459f92c4c1c88f8901b656e7eecdbd705b79e511908731cfbeb797cecfb3acdfb9b18bddd43c7d2dc115a3c93ec56458f5
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
+DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST reqwest-0.11.3.crate 129367 BLAKE2B 7f64ec4095f1c01391b17bbeb041043c7f6fb7535d2108b3a174ea97c2e5d26806ffa11fc442f53a502c487a43f641649783094b5a7b11512c8638a17375b006 SHA512 140751c42180a20e3302a0bf266f2b3c19a720764ed7114b57a4310756f343b41c9935cc47d232e0946a0dceb3a21cc6c21681121c9f2e351c93980cb198b8c8
+DIST reqwest-0.11.4.crate 132776 BLAKE2B 2cd8e0a1e2256c93fd03c4676210dab24980fa87d0575e5c8a9fbb5428547c4bea1059449809472bc53f3d6adb3ca8bff086e1c5a48ebffcffb9bf7593e94ab7 SHA512 89bc5ce3658d90b090dbc7952faffc0045304a7d4e1f59a0f7b0c266d2dcae0bc8c5174f4b3b74ceab7b5b8638b5f10ed2b60831ce91972360d849328647e1e1
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
 DIST rustc-demangle-0.1.19.crate 20667 BLAKE2B 060b68f4d9f66badc33cae692a5ac3e76f9d8605dd9d729eedee1882026465ddb42f88e3770bfacf644176fa2e02eb3450f9f987cb4fe7db6607266a9db46afb SHA512 ac43c87f4ef0015923114160be64649f07ab82eb6b63538e7e6307ed35681c3232d05f75e37ffc6db9de7d5ea56e7ff3be3685533f2a8848f2a1336f8d7a55b7
+DIST rustc-demangle-0.1.20.crate 23298 BLAKE2B 74479b2724130d67a934176be4b667b9db38603bc093ac547ddcaa9263dedd6e52a5ee690349d75519c173e74a098a20dee234c8fbe14b003cc77109a0efa16b SHA512 edb31174340fc3956eb225c2175a9e8868a8b70f30991531bdbdde77e5924e7a778a7a5ef44ebaca776def262c9045d82c046a83e0ba407431744e1259add001
 DIST rustls-0.19.1.crate 208143 BLAKE2B 2ec02f40bac911d85db013cd99fc859fc4815f98114abe7041cee61bc106e83334378711d0acda916d9cb72a78f8d1a7237bd5d0a51ceb928d98bbe75cab93f6 SHA512 c86b0809f7cb2b31cf9c87d7744334ea3a0c743e26303026ab48194435289b1face6a7009aa4971f719cf31d7f84bb0e56e923cfd326ce0bc4ed990b8c9aeab9
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -187,6 +225,7 @@ DIST secret-service-1.1.3.crate 23126 BLAKE2B 6ed10ca8a8e458c45b67475fecab18559c
 DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
 DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
+DIST semver-1.0.3.crate 28918 BLAKE2B 81a737f6d13d14f9cbab939829d514dc85c14f8e1efac5a3274d6965ca3b7b07d94a5c2faa1a3913cc9b46c4506d988104aea26341e2f903bf5b4be4d8625e1a SHA512 8af01b90d00873587f113b30d750bc5af89ad0e24ca6c2d71d2afd7244023e321effd6aa25b6cbfffaf173ae646ff8a701148e6bfd3a625f9d14e37baec65c19
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
@@ -200,23 +239,30 @@ DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST subtle-2.4.0.crate 12411 BLAKE2B 32968997d71c6eab4bf2736090469afdb1adab3d2064afd1ab34a2711294bed1f00a715c2c748b25412ef9732c96bd132e20384019ca6bcc0a01ab602ec24117 SHA512 ffa173d6678879c382d9165ed8ac4480bfda2f03a451ff120767d90b2fa17ecaf234af15c2d153be0d96c8363de82f0be1fffb7770f3bd417e2567d146b61c86
 DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.64.crate 231549 BLAKE2B c039cdfb1701a2ed88aaa14fdb983f614266c006380c197a85c46fcdd20d7319bf864013ef84810aec73dfc6a586229dce601a4ce829ab66536e890247ca0cff SHA512 b43574c8d48743697bc46c17593347d0e98062b0086582f835281b6c52a8f3eac8cb59c212c77fee7f0a2be8525b5e0d8a807ff532a922f6dbd13ef7efc7fc22
 DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
+DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
 DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
+DIST tar-0.4.35.crate 46219 BLAKE2B f8bcdf4d92c66bf8ff1fe68ea8eef07ef919eaba16755a2783fbd2658e42d0c342efc8e64d4fa08e8beeac1e0d0d209e78478a17fd70ab5987f37598a26c936b SHA512 5e6f1030d4042704ae166fdc32fb6397d9e8bd588ca6d9526583909fbb3df3d09aa2a5da673b769acb0a9020e4f2bfd59f7e68f84b055d32574331ff5a224f2e
 DIST target-lexicon-0.12.0.crate 22025 BLAKE2B bf92692a45effcd4459cd2e70bd46eef7e43fea24b1e53f8f837498c9372465ae2dac63d142278b9a11892f1fbf574880c3aeae7a5aee7fec74941c4cc2eb7d0 SHA512 d2845086ae62b12a64f424c0255a389e3e3eb158fa73da1c8d3fa571a21b895c92115aa111750ed307cc2a4b6eae7f1b9e3aee59c195046a07fd6ee7f88fc184
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
+DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
+DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tokio-1.6.0.crate 463953 BLAKE2B 7c99d6c254fd3ab11b5b0d81bd648ddba72d1ca4e600a4e35bc2974dde69dd02b0ca060a90995ccb12e5705ea3638d9143116e3cccdf535e0ed536fcb463467b SHA512 bbc560a01e108155e2f6d30f3301acc09a67ef2cb3af88e62d46fe81433686c80e4a0b05041f2b88a811090d654d782c59baee069e7e82eaa4458449f0411753
+DIST tokio-1.8.1.crate 491381 BLAKE2B 69969959b035a22f83e755978686a515ba4d1afe206d7a7958bb46aafde28c9e162bfd5549e250b5efd7e0892820b6ae1e8ccd5031e404e33f54600498e5c114 SHA512 c82f55c511041a46953e99d5d1bbd7b067b01f1c89f111c5a6981f2b2a2e9c33a4cab2ef267717eebb3b070b84b7ef6ad6a8375d980f11ae568cf770e84297a7
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
 DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
@@ -230,7 +276,9 @@ DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -262,5 +310,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.5.12.crate 43857 BLAKE2B 9b1b0dcd5f04300efd3c7e480eb0d14e7c36f2819a187c9b435da99f61c4ee93ca469fa4810a1bd52624138e51ac276a68e9d05df75bea5bbfe89d845f1c2662 SHA512 8ead1f24eb7c8c7624c80f8fdc17d85c397686b2cb45174bdc8cfab44417738e1d1a49ae3f776dc0fbb698b20b7de71e94afe1526f8814061289f229891d95f0
+DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
 EBUILD maturin-0.10.6.ebuild 5504 BLAKE2B 7d0a8021900294b36c10575624bc87f7f1ecc9b25b8048bec94aeaa4fa75834f68ad8106325da8d3d431b88e71278ebec9b966b0727dd0607941d90a839b6e0d SHA512 3634ff3687b1397214cfbb1a89a65dcba9dbb50837c91158e7b2601ae3e08ee1e0723cd7b0fada0826a6d07fd1ffd74147ac7a83c25edccee4d928079d78391a
+EBUILD maturin-0.11.1.ebuild 5275 BLAKE2B 9f97bf1e93b11e3835e9b3b971a3b84c581e386f931c40a32932d838a84d431e9df70e1af00cf15850e91eff081121c49cd4a81bec96a7cd551c7adf0a18338c SHA512 94f9ea78018432bea6a102f7019cb81e695df088182a4e5eb03a0515fa091fcdeda15ce199915fd7319ec5b1c6ee8a07a7975e2158ba1702391eaa384afdd329
 MISC metadata.xml 352 BLAKE2B cad9bf3c006716d6da86816331364ec341c26b178e332c130a9d7b462953bc5cebc6a60c8aebd9ea2a646df0d930f044d51ea103ca4c6db3108dac334250d50e SHA512 db5a72b5ca9e76a008c4a5dcf81d420fe816cc82dceca2aebf810b0de5660279a92169b233f00997895bcc325257fb55c489ee107675c635ae8636f249775c68
diff --git a/dev-util/maturin/maturin-0.11.1.ebuild b/dev-util/maturin/maturin-0.11.1.ebuild
new file mode 100644
index 000000000000..b3ac2856379b
--- /dev/null
+++ b/dev-util/maturin/maturin-0.11.1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+addr2line-0.15.2
+adler-1.0.2
+aes-0.6.0
+aes-soft-0.6.4
+aesni-0.10.0
+aho-corasick-0.7.18
+ansi_term-0.11.0
+anyhow-1.0.42
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.60
+base64-0.10.1
+base64-0.13.0
+bitflags-1.2.1
+block-buffer-0.9.0
+block-modes-0.7.0
+block-padding-0.2.1
+bumpalo-3.7.0
+byteorder-1.4.3
+bytes-1.0.1
+bytesize-1.0.1
+bzip2-0.4.3
+bzip2-sys-0.1.11+1.0.8
+camino-1.0.4
+cargo-platform-0.1.1
+cargo_metadata-0.14.0
+cbindgen-0.19.0
+cc-1.0.68
+cfg-if-1.0.0
+charset-0.1.2
+cipher-0.2.5
+clap-2.33.3
+configparser-2.1.0
+core-foundation-0.7.0
+core-foundation-sys-0.7.0
+cpufeatures-0.1.5
+crc32fast-1.2.1
+crypto-mac-0.10.0
+dbus-0.2.3
+digest-0.9.0
+dirs-3.0.2
+dirs-sys-0.3.6
+encoding_rs-0.8.28
+env_logger-0.7.1
+fat-macho-0.4.4
+filetime-0.2.14
+flate2-1.0.20
+fnv-1.0.7
+form_urlencoded-1.0.1
+fs-err-2.6.0
+futures-channel-0.3.15
+futures-core-0.3.15
+futures-io-0.3.15
+futures-macro-0.3.15
+futures-sink-0.3.15
+futures-task-0.3.15
+futures-util-0.3.15
+generic-array-0.14.4
+getrandom-0.1.16
+getrandom-0.2.3
+gimli-0.24.0
+glob-0.3.0
+goblin-0.4.2
+h2-0.3.3
+hashbrown-0.11.2
+heck-0.3.3
+hermit-abi-0.1.19
+hkdf-0.10.0
+hmac-0.10.1
+http-0.2.4
+http-body-0.4.2
+httparse-1.4.1
+httpdate-1.0.1
+human-panic-1.0.3
+humantime-1.3.0
+hyper-0.14.10
+hyper-rustls-0.22.1
+idna-0.2.3
+indexmap-1.7.0
+indoc-1.0.3
+ipnet-2.3.1
+itoa-0.4.7
+js-sys-0.3.51
+keyring-0.10.1
+lazy_static-1.4.0
+libc-0.2.98
+log-0.4.14
+mailparse-0.13.4
+matches-0.1.8
+memchr-2.4.0
+mime-0.3.16
+mime_guess-2.0.3
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+ntapi-0.3.6
+num-0.3.1
+num-bigint-0.3.2
+num-complex-0.3.1
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+object-0.25.3
+once_cell-1.8.0
+opaque-debug-0.3.0
+os_type-2.3.0
+percent-encoding-2.1.0
+pin-project-lite-0.2.7
+pin-utils-0.1.0
+pkg-config-0.3.19
+plain-0.2.3
+platform-info-0.1.0
+ppv-lite86-0.2.10
+pretty_env_logger-0.4.0
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+proc-macro2-1.0.27
+pyproject-toml-0.1.1
+python-pkginfo-0.4.0
+quick-error-1.2.3
+quote-1.0.9
+quoted_printable-0.4.3
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-1.5.4
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+reqwest-0.11.4
+ring-0.16.20
+rpassword-5.0.1
+rustc-demangle-0.1.20
+rustls-0.19.1
+ryu-1.0.5
+same-file-1.0.6
+scroll-0.10.2
+scroll_derive-0.10.5
+sct-0.6.1
+secret-service-1.1.3
+security-framework-0.4.4
+security-framework-sys-0.4.3
+semver-1.0.3
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+serde_urlencoded-0.7.0
+sha2-0.9.5
+shlex-1.0.0
+slab-0.4.3
+socket2-0.4.0
+spin-0.5.2
+strsim-0.8.0
+structopt-0.3.22
+structopt-derive-0.4.15
+subtle-2.4.0
+syn-1.0.73
+tar-0.4.35
+target-lexicon-0.12.0
+tempfile-3.2.0
+termcolor-1.1.2
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+time-0.1.43
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+tokio-1.8.1
+tokio-rustls-0.22.0
+tokio-util-0.6.7
+toml-0.5.8
+tower-service-0.3.1
+tracing-0.1.26
+tracing-core-0.1.18
+try-lock-0.2.3
+typenum-1.13.0
+unicase-2.6.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+unindent-0.1.7
+untrusted-0.7.1
+url-2.2.2
+uuid-0.8.2
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+want-0.3.0
+wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+wasm-bindgen-0.2.74
+wasm-bindgen-backend-0.2.74
+wasm-bindgen-futures-0.4.24
+wasm-bindgen-macro-0.2.74
+wasm-bindgen-macro-support-0.2.74
+wasm-bindgen-shared-0.2.74
+web-sys-0.3.51
+webpki-0.21.4
+webpki-roots-0.21.1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.7.0
+xattr-0.2.2
+zip-0.5.13
+"
+CRATES_TEST="
+ctor-0.1.19
+ctor-0.1.20
+ghost-0.1.2
+indoc-0.3.6
+indoc-impl-0.3.6
+instant-0.1.9
+inventory-0.1.10
+inventory-impl-0.1.10
+libc-0.2.86
+libc-0.2.90
+libc-0.2.92
+lock_api-0.4.2
+lock_api-0.4.3
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+paste-0.1.18
+paste-impl-0.1.18
+proc-macro2-1.0.24
+proc-macro2-1.0.26
+pyo3-0.14.0
+pyo3-build-config-0.14.0
+pyo3-macros-0.14.0
+pyo3-macros-backend-0.14.0
+redox_syscall-0.2.5
+scopeguard-1.1.0
+smallvec-1.6.1
+syn-1.0.60
+syn-1.0.64
+syn-1.0.68
+unicode-xid-0.2.1
+"
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cargo python-any-r1
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://github.com/PyO3/maturin"
+SRC_URI="https://github.com/PyO3/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? (
+		$(python_gen_any_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+			dev-python/pycparser[${PYTHON_USEDEP}]
+		')
+	)"
+BDEPEND=""
+
+QA_FLAGS_IGNORED="usr/bin/maturin"
+
+python_check_deps() {
+	has_version -d "dev-python/cffi[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/pycparser[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	cargo_src_install
+	dodoc Readme.md
+}
+
+src_test() {
+	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
+}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index aacbcbf7d440..15b29e4bc912 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
-EBUILD meld-3.20.3.ebuild 1564 BLAKE2B b030fd9c51c5c37f32b79e5f1f6f7a773bf95b075e2bd596ea8e5846bc56eb298d4613c316e77da91abae80f9873fd088347f4b9cbea9c97cc75c5c1c9c13cf0 SHA512 cc2d17d216c78cd4bc58cf6b31752efad2b2e58cf960bd9cc416be455ca797bc5412fd1bfbe3262cfcb66cbf9b4f8b607978ee78476ed7b6bd362322d87ed2e9
+EBUILD meld-3.20.3.ebuild 1558 BLAKE2B 679c2847a81bdbc3c10c7d5f264b0f2a1141cb653f30ec4549735514002cb254e879928169808705909da112f0f965280bd195caa107c125091deed03e2560e4 SHA512 e4056c9e458f1fafb954df2edfe531fe23d5939b8da1837e9e4ab31be6fcd8c2ca736825d8af626cf0ff3d20d629983cb6cd50f478f5694e7e42f1bddcfef917
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
index a7542f758299..79754373eef7 100644
--- a/dev-util/meld/meld-3.20.3.ebuild
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -20,7 +20,7 @@ IUSE=""
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
 	')
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.20:3[introspection]
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 277f9e0ffb16..b7038d7c1d7b 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
 DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
 EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
-EBUILD meson-0.58.1.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
+EBUILD meson-0.58.1.ebuild 2681 BLAKE2B b180bd4d776dcdb607e549df1f98453f744a1d51656b9a332868148209a4ae04a16f1cf86658d8bb112ce176b9440b17d73b830987f4e89ea073feeea946582b SHA512 c247cabf8c3ca23b101cf5d29c8caf6e13e91e3c2747e04ac87ed8bca287f3c70682efaca9e915df1975e63e7422297a17447b12297bb2fcb144de32c0e571cf
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.58.1.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index e2a175666ca3..7fa4a6188189 100644
--- a/dev-util/meson/meson-0.58.1.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index cdde6d2169b4..6e8744af1e55 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,18 +1,13 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
-AUX nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch 617 BLAKE2B b5e53c8eca4462c828e8e55d83ef4807416e5a1fdef79bdfbbbcf36f5b4957d3168c3bcb7adb6d485359df85c218f17af25f62cc119e76025edab46da6f0b890 SHA512 238595801bd1248c5c0caf860a8f641eaed4d2760a20c1a85c374f4475418cf915d4010b5c7c5db6c1a11abb50aa9606d291fab8de1b40fa3f834a7cd1a386f4
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
-DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
 DIST cuda_11.2.2_460.32.03_linux.run 3057439068 BLAKE2B c3f3cd9eaaa4f91eb8080e7cafe1280f9bbc9cfc71ce1a6115af1dd348b83d30eed945609bf87e00d4873bede1fa9136fc4a7f393fd31db4e6406dc76086bc22 SHA512 e28d7d2eabd96df9e18f8e55f61adda39b07c2223605f77a6c2d92a02f7b57e9ce8b83d4b4de1124faa5670509d204d3db70c03b18af5cc5964b6ed6653d6a22
-DIST cuda_11.3.0_465.19.01_linux.run 3029622552 BLAKE2B ca64af09dc68b085a589b5756e3bfce72550e262b778aad06eb1f5b77d9cb30447fb8b57f5f6c3d210b49cd300e0db153c5eec1d51384b6889855a076ee62d07 SHA512 3120455e9513f62f82108539c5a4ccb4e9aa64beb66f816644e559bb8b573ff582c865c6a346ca39c6afb775c0c5fd567f5d31f0a0c5b927d6be849cd2905749
 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 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
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch
deleted file mode 100644
index 721514729c5c..000000000000
--- a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/builds/integration/nsight-systems/nsight-sys
-+++ b/builds/integration/nsight-systems/nsight-sys
-@@ -24,7 +24,7 @@
- 
- DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
- CUDA_INSTALL_DIR=$(cd "$DIR/.." && pwd)
--try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsight-sys "$@"
--try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsight-sys "$@"
-+try_exec "$CUDA_INSTALL_DIR"/nsight-systems-2020.4.3/host-linux-x64/nsys-ui "$@"
-+try_exec /opt/nvidia/nsight-systems/2020.4.3/host-linux-x64/nsys-ui "$@"
- 
- die "Error: Nsight Systems 2020.4.3 hasn't been installed with CUDA Toolkit 11.2"
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
deleted file mode 100644
index 4e8988a19e88..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="460.27.04"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger nsight profiler vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-11_pre[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
-	debugger? (
-		dev-libs/openssl
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	vis-profiler? (
-		dev-libs/openssl
-		>=virtual/jre-1.8:*
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="6800M"
-
-PATCHES=( "${FILESDIR}"/${P}-nsight-systems-launcher.patch )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	# ATTENTION: change requires revbump
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3 10.2"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
-		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend
-	fi
-
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-		eend
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-		)
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
-		eend
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle openssl
-		# TODO: unbundle mesa
-		# TODO: unbundle libz
-		# TODO: unbundle libstdc++
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-		# TODO: unbundle libpfm ?
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-	# TODO: Add pkgconfig files for installed libraries
-}
-
-pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			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}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
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
deleted file mode 100644
index 3f17f8437a86..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="465.19.01"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger nsight profiler vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-11_pre[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
-	debugger? (
-		dev-libs/openssl
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	vis-profiler? (
-		dev-libs/openssl
-		>=virtual/jre-1.8:*
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# ATTENTION: change requires revbump
-	local cuda_supported_gcc="6.5 7.5 8.4 9.3 10.2 10.3"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
-		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend
-	fi
-
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
-		eend
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-		)
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
-		eend
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle openssl
-		# TODO: unbundle mesa
-		# TODO: unbundle libz
-		# TODO: unbundle libstdc++
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-		# TODO: unbundle libpfm ?
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-	# TODO: Add pkgconfig files for installed libraries
-}
-
-pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			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}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/objconv/Manifest b/dev-util/objconv/Manifest
index d5f964998a90..4f551ff21182 100644
--- a/dev-util/objconv/Manifest
+++ b/dev-util/objconv/Manifest
@@ -1,3 +1,3 @@
 DIST objconv-2.51.zip 1033450 BLAKE2B 1029e8001bee969f177e7e47e735dc132dbf640bb472ae148cd2a33af522c190066f226a55da3bb3b47902a68eecf437edc025622781bda691a10956c84561c3 SHA512 12991b98fafbb5fad709471b25bf8acd2944f862ca1f3cbae5a6f7fd53a6009dbb6e67a2fcfa180965b519a2d6010d9b2f7585748ea58d36b28d86c0981f13d8
 EBUILD objconv-2.51.ebuild 1010 BLAKE2B 6574210bd8b1add496028615fc4b168aac24bebdb61e2d3b84213acecd3a16211e46c0da7278329fb425a4bcd131932607fd731fe46cd2994d591a677ee7d56f SHA512 cd37c3e72bde6775c7635c3c91002c99d3fbb204a8d1a781258b41413f02c7f4cd0379b9a9de4d3bb3462def75bee5118a7056c91c6de5768d746263604786c2
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/objconv/metadata.xml b/dev-util/objconv/metadata.xml
index c5298995d2d4..7a38bb900964 100644
--- a/dev-util/objconv/metadata.xml
+++ b/dev-util/objconv/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index e3aa1cb8a9dc..12280e00c0b5 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,7 +1,4 @@
-AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
 AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca7773b53b0efd1557f3e2366110685d673e2140e15855bee4220c6306a06d9ff1358bf6cbfd2 SHA512 fb9515de16bfa621fbb2f83a446b976ea8c123f779c2955a8740234310fdca66e1ea005d1c5a643b785ecf3797f658eec1a96b673b3cb534a55f30b182444a72
-DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
-EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
-EBUILD oprofile-1.4.0.ebuild 2021 BLAKE2B 4c27f9fbb958f855252d0e8568875e5e75610f967f44fd5ac76dc00b15d711f1231800aa68e88b36e0b9b1f4dce016f7ed1e94f19fe1a5aa9bbdfefc682bb68a SHA512 882385b613be7f0d92693705d709ffabcf5d779d8f8eeb8b2d98bfaa5fd95a65018b0b3053f7b529cacaddea9bb3006df251a803852f5c16035be81908944fc1
+EBUILD oprofile-1.4.0.ebuild 2018 BLAKE2B f80721f05dbd4fa4fdc219442ca36e5b4ea55d89237cdbde91e35305fb743b27acbe7a3748aa8b2466a581ce22cadc03b134cb493576e7474bb116e9b8ac4737 SHA512 0d27b9a67d9068461450c0497e082c2d47c385dd611c0cb5461a7bfe2a15c15c7be75839a178a918047e00c4fd2d0a5ebb52e7eec3e6e6c6e93f8324c86f6ad5
 MISC metadata.xml 423 BLAKE2B 18e22d9fcde7236f7aacf9513bb12e7ae4a7eb07445b1b2c56b563a816b02d600722865d8460e810ae0206632b7b52703cac1812aea9626dcd47fd173d4b8cc5 SHA512 2bc1c9012a9f410cc206abf7b5471c1f8b3adf214241ab3ce1da36f34597a2ccc309ee627582c766d1988440a21e8df7a90668691fd57015b6cdd4db34661f22
diff --git a/dev-util/oprofile/files/binutils-2.34.patch b/dev-util/oprofile/files/binutils-2.34.patch
deleted file mode 100644
index 6337191a21d4..000000000000
--- a/dev-util/oprofile/files/binutils-2.34.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6
-Author: William Cohen <wcohen@redhat.com>
-Date:   Wed Mar 18 21:19:16 2020 -0400
-
-    Macro wrappers to handle the binutils 2.34 api changes
-    
-    Changes in binutils 2.34 API prevented oprofile from compiling with
-    it.  This patch tests for the changes in the binutils API during
-    configuration and selects the appropiate wrappers to allow oprofile to
-    compile.  This allows oprofile to compile with both older and newer
-    versions of binutils.
-
-diff --git a/configure.ac b/configure.ac
-index ac2fd35e..df032a78 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then
- fi
- AC_SUBST(PFM_LIB)
- 
-+HAVE_BINUTILS_234='1'
-+AC_MSG_CHECKING([whether binutils 2.34 is being used])
-+rm -f test-for-BINUTILS
-+AC_LANG_CONFTEST(
-+	[AC_LANG_PROGRAM([[#include <bfd.h>]],
-+		[[asection * sect;
-+		bfd_size_type buildid_sect_size = bfd_section_size(sect);
-+		return 0;]])
-+	])
-+$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS  > /dev/null 2>&1
-+if test -f test-for-BINUTILS; then
-+	echo "yes"
-+	HAVE_BINUTILS_234='1'
-+else
-+	echo "no"
-+	HAVE_BINUTILS_234='0'
-+fi
-+AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34])
-+rm -f test-for-BINUTILS*
-+
- AC_ARG_WITH(java,
- [  --with-java=java-home        Path to Java home directory (default is "no"; "yes" will use /usr as Java home)],
- JAVA_HOMEDIR=$with_java, [with_java=no])
-diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp
-index fa904839..cd0f4f71 100644
---- a/libutil++/bfd_support.cpp
-+++ b/libutil++/bfd_support.cpp
-@@ -19,6 +19,7 @@
- #include "locate_images.h"
- #include "op_libiberty.h"
- #include "op_exception.h"
-+#include "op_bfd_wrappers.h"
- 
- #include <unistd.h>
- #include <errno.h>
-@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id)
- 		}
- 	}
- 
--	bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect);
-+	bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect);
- 	char * contents = (char *) xmalloc(buildid_sect_size);
- 	errno = 0;
- 	if (!bfd_get_section_contents(ibfd, sect,
-@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32)
- 	if (sect == NULL)
- 		return false;
- 	
--	bfd_size_type debuglink_size = bfd_section_size(ibfd, sect);  
-+	bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect);
- 	char * contents = (char *) xmalloc(debuglink_size);
- 	cverb << vbfd
- 	      << ".gnu_debuglink section has size " << debuglink_size << endl;
-@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms,
- 	// first restrict the search on a sensible range of vma, 16 is
- 	// an intuitive value based on epilog code look
- 	size_t max_search = 16;
--	size_t section_size = bfd_section_size(abfd, section);
-+	size_t section_size = op_bfd_section_size(abfd, section);
- 	if (pc + max_search > section_size)
- 		max_search = section_size - pc;
- 
-@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym,
- 	else
- 		pc = (sym.value() + offset) - sym.filepos();
- 
--	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-+	if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
- 		goto fail;
- 
--	if (pc >= bfd_section_size(abfd, section))
-+	if (pc >= op_bfd_section_size(abfd, section))
- 		goto fail;
- 
- 	ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename,
-diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h
-new file mode 100644
-index 00000000..b229cc12
---- /dev/null
-+++ b/libutil/op_bfd_wrappers.h
-@@ -0,0 +1,28 @@
-+/**
-+ * @file op_bfd_wrappers.h
-+ * Wrappers to hide API changes in binutils 2.34
-+ *
-+ * @remark Copyright 2020 OProfile authors
-+ * @remark Read the file COPYING
-+ *
-+ * @author William Cohen
-+ */
-+
-+#ifndef OP_BFD_WRAPPERS_H
-+#define OP_BFD_WRAPPERS_H
-+
-+#if HAVE_BINUTILS_234
-+#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec)
-+#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec)
-+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags)
-+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma)
-+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size)
-+#else
-+#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec)
-+#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec)
-+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags)
-+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma)
-+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size)
-+#endif
-+
-+#endif /* !OP_BFD_WRAPPERS_H */
-diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c
-index 48db143b..da1e6d29 100644
---- a/opjitconv/create_bfd.c
-+++ b/opjitconv/create_bfd.c
-@@ -16,6 +16,7 @@
- 
- #include "opjitconv.h"
- #include "op_libiberty.h"
-+#include "op_bfd_wrappers.h"
- 
- #include <bfd.h>
- #include <assert.h>
-@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name,
- 		bfd_perror("bfd_make_section");
- 		goto error;
- 	}
--	bfd_set_section_vma(abfd, section, vma);
--	if (bfd_set_section_size(abfd, section, size) == FALSE) {
-+	op_bfd_set_section_vma(abfd, section, vma);
-+	if (op_bfd_set_section_size(abfd, section, size) == FALSE) {
- 		bfd_perror("bfd_set_section_size");
- 		goto error;
- 	}
--	if (bfd_set_section_flags(abfd, section, flags) == FALSE) {
-+	if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) {
- 		bfd_perror("bfd_set_section_flags");
- 		goto error;
- 	}
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
deleted file mode 100644
index da8d69f7b576..000000000000
--- a/dev-util/oprofile/oprofile-1.3.0.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 java-pkg-opt-2 linux-info user
-
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://oprofile.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE="java pch"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
-	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
-	java? ( >=virtual/jdk-1.5:= )
-	ppc64? ( dev-libs/libpfm )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.31"
-
-CONFIG_CHECK="PERF_EVENTS"
-ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! kernel_is -ge 2 6 31; then
-		echo
-		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
-		echo
-	fi
-
-	# Required for JIT support, see README_PACKAGERS
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
-	use java && java-pkg_init
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/binutils-2.34.patch"
-	java-pkg-opt-2_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable pch) \
-		$(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
-	dodoc ChangeLog* README TODO
-	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die
-	doenvd "${T}/10${PN}"
-}
-
-pkg_postinst() {
-	echo
-	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
-	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
-	elog "Please read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/${PN}.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index 605ba6b31711..2526034bec1b 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="apidoc java pch static-libs"
 
 BDEPEND="
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 7da643c4f155..53739437b5d8 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -3,4 +3,4 @@ DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 EBUILD radare2-5.3.1.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
 EBUILD radare2-9999.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
-MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
+MISC metadata.xml 396 BLAKE2B 264f50317693f9929b7995e1188ffe4ab7616fbdb9be8a5a445cf03dfb9fed58742a11ab6df154c20395441195c64fb3ee68278612478527579f3beec202c0e0 SHA512 0632b981dc48dbd6432ef940c5a8e8c3836773e14a67bb81bde469410b6bdace1c4eeb7d27ff6ac72291213d201435f9f884535378bedfe7957d72240cf707c2
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 4f934568ee58..72bff73de1e0 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 44b2d308b123..94510778056a 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -6,5 +6,5 @@ DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833
 EBUILD ragel-6.10.ebuild 837 BLAKE2B 797418aa818b3dc163611d057c6c2d348b716945ca1632ef93e7c1183429c57bc9150a4c1ba594b751b53c0473d9066d056dbf4bbed75b962cd35c331f3b0c22 SHA512 243802350f28a11f6fa8e194e7562e672d4121b3e45632e09551569dc30594672afbde8e8ca1faa51d9c7d4aa71053ca9d389ea8994244d9399922ce3689c541
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
 EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
-EBUILD ragel-7.0.4.ebuild 1478 BLAKE2B 17ad356f6a3949644e78172c0b955b971c8fc7d307bc08614629ca2c1e060aad10fb7ed2bf25ce09dd795f76b32f4d136b1401835e617e242b4a6b365b66cb8a SHA512 992555f161ee2665ef29be80f97fd75ed6cc4ceb7ef5726b522b15a7808ed5129df1623980a80d0420703136a82b8875cb4bf7bc18aebe19d414ae092fc6b689
+EBUILD ragel-7.0.4.ebuild 1485 BLAKE2B f634a273d1c4ed92bf651fb29a776b2369476d2db0a2ce717168a4152482bc88573472a56178eb62f12c1fff23b0610500a09622c22b36fc3bec65cb1371fa30 SHA512 12ed48d54c938db60bd496b5b310bb137f8427ccde847bd79ad880efb8d904be83557dde9c0046466becea7de8b860b250a9d1b2ca2d9467477fbe3f7b843df3
 MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index 38a9bda6fb70..e807923ac0d7 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 # Notes from bug #766090
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 6351651e3b8e..cc80527846b5 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,6 @@
 DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
 DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
-EBUILD redo-0.42a.ebuild 1211 BLAKE2B 32594bad0a59d457ef9bdd41cb425290b8222ef9c67caa9e474f671c431b10ba2f5627784e4650949aeee640e75164bc0e07dbc3336ddb849043247af000a5a7 SHA512 27982c9a435a8fd52aca0b7ae885fbb740eefa279de7d6f57acf7354c4f08c3e4e8255be42f45dd1203ad30fc25cfdbb7877a43b713c0b0316e6f6db813156f6
-EBUILD redo-0.42c.ebuild 1211 BLAKE2B 32594bad0a59d457ef9bdd41cb425290b8222ef9c67caa9e474f671c431b10ba2f5627784e4650949aeee640e75164bc0e07dbc3336ddb849043247af000a5a7 SHA512 27982c9a435a8fd52aca0b7ae885fbb740eefa279de7d6f57acf7354c4f08c3e4e8255be42f45dd1203ad30fc25cfdbb7877a43b713c0b0316e6f6db813156f6
-EBUILD redo-99999.ebuild 1163 BLAKE2B ef7946eb272f0847b34ef3eda4287f5616c219210035921d44b9a1d2bf60967f7699cd64cdd62f5cd511dc9b3c1312b27bdc43fd464ac33794bc0764094e213b SHA512 c5e1fbc7339f2510f050fd5b6e50d468f5616f2a0cdbc4dde69f96b36f95c3b7d2d0de18e4b6e44a543200967a99d387c1e786e6e9f47c385a15a3f98e342af9
+EBUILD redo-0.42a.ebuild 1195 BLAKE2B a684dc3ec946edfe053e29f58cb2581e9f7254935408024b50d87c0a81c2b34270cdac9ce84ab48a5e28c7c55574c8f6787ab93985f9db5306ab80210148caaa SHA512 a26450af153b60b4f17bbc5156d298ae6264927ef33e3e072eeab84a189a560b39c2c027e7f22306ded1d061be7cad2786e6997c9d8cf52e37976f0d5e056157
+EBUILD redo-0.42c.ebuild 1195 BLAKE2B a684dc3ec946edfe053e29f58cb2581e9f7254935408024b50d87c0a81c2b34270cdac9ce84ab48a5e28c7c55574c8f6787ab93985f9db5306ab80210148caaa SHA512 a26450af153b60b4f17bbc5156d298ae6264927ef33e3e072eeab84a189a560b39c2c027e7f22306ded1d061be7cad2786e6997c9d8cf52e37976f0d5e056157
+EBUILD redo-99999.ebuild 1147 BLAKE2B d6481362b06d8e8fd2a071430149223e3592b5572c0cf9f042d85038a1ba2c800bf674d451995dbf4957dc00aee3458df4ad176081acb0e9f6d0b4579c66abc5 SHA512 ef402dcbf2da25f19b94ff91a17e4e4e9edd0586e18712ea30cb4784a311b0229207f54ca2b73ffae3d05aa5afb49626f6b4c4c75805f10c19912eb612670e7a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/redo/redo-0.42a.ebuild b/dev-util/redo/redo-0.42a.ebuild
index 6644c7229edf..0d80a00e9098 100644
--- a/dev-util/redo/redo-0.42a.ebuild
+++ b/dev-util/redo/redo-0.42a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 inherit multilib multiprocessing python-utils-r1 python-single-r1
 
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 "
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42c.ebuild
index 6644c7229edf..0d80a00e9098 100644
--- a/dev-util/redo/redo-0.42c.ebuild
+++ b/dev-util/redo/redo-0.42c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 inherit multilib multiprocessing python-utils-r1 python-single-r1
 
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 "
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 6db64d628276..340844257a28 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 inherit git-r3 multilib multiprocessing python-utils-r1 python-single-r1
 
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 "
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 6cfa3e44053b..bb0666df562c 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
 DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
-EBUILD rr-5.4.0.ebuild 1351 BLAKE2B d35326089497c3cb4750356c441f98e9eabd9aa3dea656df70176a4b6bc003462533a7944b78eda781cf52a9b5ad4f91e153de0e3f5a7c1ba7b77891d08eacec SHA512 5c03f2c6b9b4c17b7ba99e54e83c2ee5ba854814657838c63b8addcb16cce6a7dcbdeab26688ed760457d19a091fbf2d405524a17fca717b665cfe8e29233f81
+EBUILD rr-5.4.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
 MISC metadata.xml 443 BLAKE2B d70c790352f2bb15eba6c51faf34dafd53ee72d263608e3a449e0af2ba552bfebb98688de88c48bd087cbe884be5d330152a760e0922be35623a16216ffa3076 SHA512 2470f85fee8847c9346e37eefb7c3dc384e38e9fdfee47a70a88b5737669a1321910cfe7fa1b381818515165ec9aa94ada2ec331cca312a9b9be73531979eb2a
diff --git a/dev-util/rr/rr-5.4.0.ebuild b/dev-util/rr/rr-5.4.0.ebuild
index 1911dcc648aa..73cc6777d148 100644
--- a/dev-util/rr/rr-5.4.0.ebuild
+++ b/dev-util/rr/rr-5.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 CMAKE_BUILD_TYPE=Release
 
 inherit cmake linux-info python-single-r1
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/pexpect[${PYTHON_MULTI_USEDEP}]
+			dev-python/pexpect[${PYTHON_USEDEP}]
 		')
 		sys-devel/gdb[xml]
 	)"
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 2fc02e182a12..3a582e650b2d 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,4 +1,4 @@
 DIST crystal-molinillo-0.2.0.tar.gz 23959 BLAKE2B 257dcca66583db87a802b27b1f100e226eb0b6ac53708d110040d7b5560f429a82f11595e303af4922f22917d922d60ea380fb395d254dc3b3ce24f4183395b6 SHA512 7c00a6a3ee4864b712ad8b703557f10498ba0b25491a55ae2f6c02d574034ec5bf8b87df777c3d34eb9cc4c87eebdcf6567c153e9edf3bc3c1b9ac4306ce3dc2
 DIST shards-0.15.0.tar.gz 62648 BLAKE2B bd36733e4a98fcc4a02038745ac2b838c61109edc593a333ebb35474d5a7ecb2767c8c1a54f7116c76e83fceb59d151813d3dd23e8afc37c29f00e6b879daf3c SHA512 cbd428627c08658213494215db78c94513482aaa54038c159e8fea4819291552eda8a8f6decf5cf90134c89e98ad7fdaee5f666f02df054fb44c703179f428ca
 EBUILD shards-0.15.0.ebuild 1054 BLAKE2B 142d0f7d1ffc9a778a5489a356bc7ceb30766999c66001a1bf95bc30a1f727edcd002ab9d03aa8afe78a9530faa02fc04ddcf3f85dad5389382f58c78b5c5680 SHA512 cbf2761c1c58479beecf65477d547c71a0426318b9c3d7829ac3a4f1487b1994bf77f48ab72730a315f936a35b1a692af71c5b64688811a5a2b9c07a473b934f
-MISC metadata.xml 333 BLAKE2B 5aaa8a509bd10e9a7e109960503d257388133ade4ec87394855e78b8e19b7bde217cc129ac30ca61c7ec7d893216a3843b4319dc0509caea1eb60dd5beab54c6 SHA512 982fbd4d41b30594cec235354f7d8fe091f3c183ba49bfc28497fd00f94055a06ac2d72e8160fd906d79f853d864b6d00d298fc00bcc0ece5c69085912ae9a33
+MISC metadata.xml 249 BLAKE2B 6677e5e64f70eea28677a22bdd91559e39a1e4fdc31610fff873a793c4b9f89731f8f846dc8a86b7ca781fd56ae3697fb668aba13811c041bdf64589e9bf124f SHA512 2c9161e6cac80acad55a53383a504a985c8229fd2e42adfa71994aab9caf58003935706291b6437f4ad6aad187d7b73a535ab15a4b626d12720e82f80ce15023
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
index a6998f23f29d..5e1a38e3cf7b 100644
--- a/dev-util/shards/metadata.xml
+++ b/dev-util/shards/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ysbaddaden/shards</remote-id>
 	</upstream>
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 97fd4ceba255..000c0957b34b 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,5 @@
 AUX source-highlight-3.1.9-test-clang-p1.patch 998 BLAKE2B 7867aff751170990c48343977f6d92380c1f84ad8f18d9def453b39c6e6a8b97f23727f6cb1419f0b9d82f0fc368517d19f321f23752410ba84fb1cf6335d5dd SHA512 b64f44a9f5c1fff05aaa1a6f025d61cc095e9f22944a1983aca457085f348535ad27a7b7f79ec6358f64fc72fa0869ee3c22659f44f1a0d105ef23d68f466c32
 AUX source-highlight-3.1.9-test-clang-p2.patch 1413 BLAKE2B f66b090bb5004cf4ee344868479b1a1999339d71799e6e6150104f99c0a8ea5ffebe836b8d185ecb52416aaed6da80e24c5870910274ce381cfab6ab3276035c SHA512 a6573d376753dda6e8f64dd9b81c4e8f209ea5cb3dee1dc9a495db6b671d88840baa2fd9c128085cb62d9acbc41e1f88d3a9e6a319b76199755b43008d7ab0de
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
-EBUILD source-highlight-3.1.9-r1.ebuild 1498 BLAKE2B d9b913fe8aa2f1320ca61d33ada6e5378633d7808049195a0e99058709a3ff9683b0c8e5e0c5a6fc4a94ac0f506e4201165ab1c03ab30d46e7a02fec004d30fc SHA512 8ecfa1f7a7c553f04cc6fdfbcf089ace940a7bfe91e2cddacfb2461b54134630633016eb0b943a307a90f348e028af9aa068e1dbad723e6415e67cd1c3974d61
+EBUILD source-highlight-3.1.9-r1.ebuild 1505 BLAKE2B 52b69557dfcda55dae144e54c0e2b7798de42276f84802ce05c97e8b0c6dbf95e8919312f3503d919306d81a5008f31fbdef7e1fa22337ed6cc1f26cfdaf7297 SHA512 374a5cb534406cba88bafb1beb1ae59bb61a0f7846602fe3b330e829eafbda6ea51a1fbf97cca4926bdeea63d80bfa0a8c47b538a54c09bcb5890893b27edbc1
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.9-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.9-r1.ebuild
index 5216da452563..f2fb6102e07c 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9-r1.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 4352cce6e1a8..b212213eafb9 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -3,6 +3,6 @@ DIST spirv-tools-2021.0_pre20210327.tar.gz 2591201 BLAKE2B e850bb2ccdd83bbd618de
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
 EBUILD spirv-tools-2021.0_pre20210327.ebuild 1243 BLAKE2B 81b3d871bbb9b6cea243057ee94379cfb24ae80fe6b53586d0929d40634e8bfdca891c1f793319cfefcc11334ae8dfb2cefe5b5f0e7d5ed6cdc096d22a7bd848 SHA512 016926e221828e62db8c27539e94fc4368cb21cf5db3262f5e73f9d692c06b257b4bd9c815080cd428d8641d633fc137aab5aeec7418ecf77cfbdec0ec21516a
-EBUILD spirv-tools-2021.1.ebuild 1249 BLAKE2B ef5963a81caf3bd3e8215d795bc5f78722caa44121818a368f7b66ce6fb58042913a8313fa43fed62b812b55cc51e8a0c14e215ea6e6297011c7b3e59ab43579 SHA512 609fd9d0c6ccbd6350ee7052f07406b97bb948c2bb427b3b744822cd5f5271453dc32af46df4f4a04333a572eb52d626f9ac112a9ed25d5efd701e801a101c50
+EBUILD spirv-tools-2021.1.ebuild 1260 BLAKE2B 3769f033a8d70dbba1c022f33b73ac530607ec05f5df8b5942d86fb5f6a6eb6b90e4b67589f94263cb840e76de7a2ecfc8d8d505336e039ff5122d044e1710db SHA512 ca681cb2f4d05a35dd0a5a9b85d1bd31f82a07f21877c9c9a34ac754cda2f8e713450a9373d94e549b3c0c338787c4bde3fa57406517df693a035ba3a0110d6a
 EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
index 9fb9e28bebd0..1d32288308fe 100644
--- a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
@@ -34,7 +34,7 @@ BDEPEND="${PYTHON_DEPS}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
 		"-DSPIRV_WERROR=OFF"
 		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
 		"-DBUILD_SHARED_LIBS=ON"
diff --git a/dev-util/src-cli/Manifest b/dev-util/src-cli/Manifest
index 8939007a0972..3900008df10e 100644
--- a/dev-util/src-cli/Manifest
+++ b/dev-util/src-cli/Manifest
@@ -1,67 +1,289 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod 39 BLAKE2B 013c2db2238182e2b9b4b5aaf9dc8a744ba371ba0c6e8a6c45a0f78d6704a1514fea45f6b6c585975dcaf094f709be2e6c80964cc053d32bec015ad8342c1fe2 SHA512 f50e5abcaac0ba2453bb7e8f674ef126673e5235069d4755dc38922427952dd3cb56748db564ff1d18f733e183480ff139e4a7029416ddd362eb61b560cf4d9a
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod 106 BLAKE2B 9972b1d0c688fa76ac59768ddf33e159556f54ed776babf06c15d8fa562c201748a0d2d5e011b07adb2fcf5ee120e348ff6643baabb53fdc61c7e5c339a6c64e SHA512 ff8b1d90d4e4a62c86c2540c22cf472dc432f29768b3387d2e39b333deee1c19b24752f8642684624ba483c699d77128f619d3d880ceac7003294e7a3a27cfaa
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip 34145 BLAKE2B adf1ef98583a39129b844c3e639ee8d6832f75f68e33d6a17e35e26575a843be589f4829da2ea6f9fa3674cbab92072175aa57fce5ea9e203d79800fc435d758 SHA512 c99d74ac69a1eab02263c6a5273204ecdc0ec7857af7f66912de94658f26cb1214f0bedda384038b1c19f40028bb2a7825d6599c4ef5e0406dbd16a03b1c320a
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!cloudy!kit%2Ffastprinter%2F@v%2Fv0.0.0-20170127035650-74b38d55f37a.mod 40 BLAKE2B 388366c988b1d10fc1d99ae9a31b5d48e4c10bf779c48914816ee443dfd3f97ab29cd3230e142b339b46e97d82edb7aea9944eb0aa11f5acbfee8adf786682f7 SHA512 8747a27d929f34afe6f667da0debcf5f6372fcf62fe67dcd9dbfa92dd4f2a89541eb958995145bb3222720f486cc3a6127f233913fb91ecde220edbed539d016
+DIST github.com%2F!cloudy!kit%2Fjet%2F@v%2Fv2.1.3-0.20180809161101-62edd43e4f88+incompatible.mod 32 BLAKE2B 763ae89ca424bc43df255ca3868b34d609d257725b24392576b29f5468df99014c6d7e81f056d761e3df5b06a99d5784b532a21178d7bd43af53dc785f289fcb SHA512 38b2491a2332733aa5cf9617e766da7e896e63f64dcd606b4fc22479e44033226baaf44c24becfd15c6fc98b4431fe384fce79ba57a8dc600b183b626f26c794
+DIST github.com%2F!joker%2Fhpp%2F@v%2Fv1.0.0.mod 98 BLAKE2B 29e07729b8977e510989ec0907c519ff3151e35986fbeadd2aa66d8dd154bba385a2cd21002b161e791b93ba1ebd48ecf6c3f00c6bad5c9c8dfac9161b2953f4 SHA512 bb31f4a406af881b433ab3ab199c4f0fe2820d83da5efbf9f15ca2acbb5ff15b1f9dee3df7eb99971ac2a256c9502ca45d52270415c109f794280da5e84ef3a8
+DIST github.com%2F!joker%2Fjade%2F@v%2Fv1.0.1-0.20190614124447-d475f43051e7.mod 168 BLAKE2B ebb72c5ab6834ecc45b31f7498189115a5852f650262d6ba4c99dc77724321ec345e5602973fb7e3f66343b0753405c374b294765ff812a18ed121e3452ccefa SHA512 c65b35d3248df0c2a5808f95a41b75bf6259b3bee20e6c100eb1ebca44bc514fb531778c14562c91cc90b6b32b593ac4fc789aa37a3f0deb571d6bb8235ab3e4
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip 38193 BLAKE2B 13e82289c645e2a34250f8822274767c45c79bd6e54f505f20995c0c17a83b807be68b490c481fc9595637dbf2e0da4494cc230763a7138658a11aca9cc6b3f1 SHA512 4500f7ea6c626f82689009f5439d541a048918a986adb2d5e2d629fa96d2877783a33bb0c059a510788722a8ebf324c6c6a7ebc23174d1d9e7842cf5da55a96b
+DIST github.com%2F!shopify%2Fgoreferrer%2F@v%2Fv0.0.0-20181106222321-ec9c9a553398.mod 37 BLAKE2B 73a9553b4d87bb10e4cf5332481c3b5806f1545851a9bdc2380b204043fc77fe9370bf640fb8adad72b157d1e2ac357f0a8c756b9494b0d3ae4a1ffe768f9113 SHA512 7b1fafbe8e526875268a8e8ec7b4dd360efabe3d73caf62cbce09e9476b33bf2bb0e6f482f10e8a8d7c941968d01e9c8c698dc021e7218eb941dea8406846563
+DIST github.com%2Fajg%2Fform%2F@v%2Fv1.5.1.mod 27 BLAKE2B e5a06029c7ead844b78cad50f7bae2880be1a0e0f4542a790e046f61d33cf67bfdd966d1cc095e17ed0372f5bc966f48635e381a5f1e59448fa8a235fbd29163 SHA512 dee62b6bf7369781ec5bb31ce88c6738314f4bc55d9d6a1a89bb6e646b08e85724994bca9fba49f07fe355a91093023f5a0867b40e9c1d8c645a26174ed45f29
+DIST github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod 37 BLAKE2B 61c62f7fd2c1558dcf6c405ee3a5e6e701d8cbd6062343ac39c6247f2c7a80913d983fa6fec80f039a077a49a4457970750d41d68f104f5bb2ad16ca37e0e593 SHA512 220bfd19201b9bcf210f4aebb287c35fc66b0240ab756ab9ca4bd76d338c68bfcaeacee7229483d18e3943a009de7c1dc69d69c7ac4473f12b61e8cf2dc40d10
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.mod 88 BLAKE2B e68b2a7a39626a64da57cc09c741191628925ed60bb5558f7250d670ee75533d3e9f8142232f0d8388399a6fc2c15687bc148db4005638780c5214738035f818 SHA512 16082151aea1835d72dfa9fef4af569b923c60122fe916b062934ab469884f736e93835b411750dd6bc27b28665af0a05c1918f37720496c8336736ecba3b6f2
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Faymerick%2Fraymond%2F@v%2Fv2.0.3-0.20180322193309-b565731e1464+incompatible.mod 35 BLAKE2B 79e3d41279e7f7d581ff9274f79c22a7f53286265627c7c7044ff2cd39284ca70dba57fce6d2cc611e3d4d34e5b89016597fc02ca8750739d40d1e5a34d6941a SHA512 aca5f138018066019037bacbc77a8e2373cfc2cc48928fdcd9e175e0c9596c9bbc8a5c3a6ddb182b067492f57db76499f8c33a212c73291009ce8bcef0180a96
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+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%2Fv1.0.0.mod 181 BLAKE2B 7b734f9d4d948b17c48dc7da45bbf7c18d1bf8a18e1d8d5073becf6aa7b54d3c92feb6587e7c4bf7035774ce4c2261b29a0fefa8975e67cbc9a89a2565c6da05 SHA512 a93310f6426b1ac0789372fada7983b0cc9480b387256ed78a220746d632e1d90168eb4c95fd6973de60a8960aef7b047b4d1db757a78626ac9e8437bbcebea6
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.6.1.mod 441 BLAKE2B b294cb65c7a9872d80e7ec103590ab1f8ddee1e1bfcaae785a5fc4f6f22dee23ce0d45f479e28d09037b8f4d8cd1c356e4e127c299f2130e4c720a6e16796e67 SHA512 c0cf5ed3dc18b410aa2904a90b130d1811e136746327857d0fe2f4d7c655743a4a9fe6640155fcc2b5192ff73fb52cc92270d3ddcee44a610ba0754fd311ebd6
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.8.4.mod 631 BLAKE2B ef965949e1e99834016fbd25ff4c8c5060d6a6540325cfbff22e1892fe8977be7dba308b5823b9986b0b45a71b42c7cf16c35dedcbe105bc81be6505d516cdb0 SHA512 7d916e2e7a231333aeecd542c77ff7ce476be68f5f1eccd38c2773514c3a97f7395077e4c94a2df3267742d9e86d4bca623119ee47503c1caa43c74c48add270
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.8.4.zip 341125 BLAKE2B f08882407696e3f95b00deb3a0422b506d1c5247aea0103951be927798a6e0714470ae819ef3de72e7b698af5d2149ba6155311a77cade313ce9407bc7d04a75 SHA512 449691991ebbdbdc1d4740d49b894cb363321d874a49f76cde5a2929cd8f4446a71115dcb6b8ee10389fdccd2c9d45233f5e7a2376a4d2990dbbeb0586d3a114
+DIST github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod 38 BLAKE2B 2b11ff7691f470b19935549dd6f4c0f112c2efcabf9d32a1b1e8130685b328f14c54907a51188deb8521cd6179a2d92a2c0f63d9a8dedb63a5bbbaa50f077232 SHA512 38726c73deabf25e639f9887a0f3787e43109d9c788427664d138ced64d883133c68cc75a2373483c3f54abd13daef92e0ca8d243f545058f0c0c59f995a6763
+DIST github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.zip 10900 BLAKE2B ffa7b16838c7d8faa4145da4ff60a8e602988ce9722e69b79bf4ed0deb4180554849256083e0f09afd762572d73d1796b97b91bc5e399e2d1a59aaad6d6a96fb SHA512 6860441048d1edb1abcca59f89d5e6f27c3d4cb3895b5e127d7024267dad809fe4e3107c49df40b0fd96078653dc1ff219c7d0f3a4faf53a61a69100fab4a637
+DIST github.com%2Fcockroachdb%2Fredact%2F@v%2Fv1.0.8.mod 46 BLAKE2B 79c37e689d94abe9b43e7e5fa6c4c89c8475c98961641bfd224bddbb560cdc2babc87fe8c0b1b1958bba72e6123eb0eea41580c06dea325bd890bc433f1f9e4a SHA512 e2aaf1edd97eeb253f94cbde14858b3c7edf50718eb569ef59448da13406959802196f2026e21d39eb33d130486c5be9de835be25c1a13b2d6df039811865e84
+DIST github.com%2Fcockroachdb%2Fredact%2F@v%2Fv1.0.8.zip 51862 BLAKE2B 03b92683af07c37eba6ee4df96c5ff1e44ad187be4bdcea2abdce47afd07c1660da376903acc15b0188285ce2f201c41f2faaf81a95c4850a5784a88c48227c5 SHA512 ec5c124c30a9d939bdfdbd136fc2c3c9cf554faed6de4e221ddf330ec32ea2e20b4e15b04241c0b1ad8c8e68d5c25e9197d66659bc4204d112b7d38d9d4df0cd
+DIST github.com%2Fcockroachdb%2Fsentry-go%2F@v%2Fv0.6.1-cockroachdb.2.mod 1413 BLAKE2B 910f321c00b1e3008cf396251cdd0c065655b2569798c71db629bd4b7f35b68d46afc0131e121619bec3dbd460040dffe40728cdb5aeb45f4bd646ec434eff0c SHA512 3705ba7ac49d90c13f56a6e4a437c2e46fe6c4bf058fddb743d12f5c2fb180812e31e08ef16ee35cbdc40178070682fdd6bc586cb57b687e8c19cd880b58abb1
+DIST github.com%2Fcockroachdb%2Fsentry-go%2F@v%2Fv0.6.1-cockroachdb.2.zip 114329 BLAKE2B 9646a92f68435a27e053838d5c05a20ac29b9589839b2d4cd2e9a2100661560f28c2db1684e632b4fb0eff7a6799d9438eaba8c6c6da80abdacc289b1bd30e0e SHA512 28fafec68476c62287c74af85061ccf41a426e70caaf3ee412163ddbfcedac35dddd2ddbcb4dc81ca40bbe97315be3006c654566d6cd99c153471c7654db88d9
+DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod 37 BLAKE2B 2eba24c8176edb0f06c1c186ae603a840629c759182375dab9d574ed3a0b5fd28ba9d329ff01b3fa6bb908b3f50a6a739863cce2b808067d89bcc121edb31e6e SHA512 e31d6cb7f9669adba2a4b79be3af5724ba5807233750bb2273ac1aa4817c58477fffa079775709eb2f93a6c2accf0f1291c663f068b31ec20ebe22b39b6b6249
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip 19702 BLAKE2B ee009befd8861b2556869434d14c1d4ce130d432ba5f43821b0cc2f6fa493bc8a4f93a011f05f5789f7c388b2a74f272623d6dc2689a5c29dde0b3c307598173 SHA512 d7c39c78c074d060973433f5f4c1405260fa9f49ba9ff020630bb17404412337b536275aac71ae30c0e3783b95585c46cc492f722572b941fa1476898a6f7e8c
+DIST github.com%2Fdave%2Fjennifer%2F@v%2Fv1.4.1.mod 41 BLAKE2B 5c7b8f7ab54ab0e2fab8974af84c26d1624ecc595cfd1c31caa75c260485851de341c241203a62ef767bd5537a9022cbbfc77f7c491e344268a756fafaee576b SHA512 bd4596dec01e0a54ce518998de8e87329f3156e875f6dc6d6dcb382a207993547a53ed39c57a3b629a827a23203ccc1af5896fdf455bbb70ffb2d485b81b16de
 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%2Fderision-test%2Fgo-mockgen%2F@v%2Fv1.1.2.mod 780 BLAKE2B e69146190327f68b218ae7265da4fb276204d3bc95238cc2f093732f345627f57221ec741e8bbc17c2bfca5eb39c8cbb865ec2434b436f513526b7a1d29f7df7 SHA512 8ec2ab2679cf4946d56d9274e8765b526b70c9ea4c97451401525625659038318759f804fabfd504bcac49090834e3dfc6116c86759502f819780124506333fb
+DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod 464 BLAKE2B 9792b2a4b32abb5a24e6f1b72b23c5cea641c403c04f376bc33c6e8323fad08380a9902570a6d26e6643c2011adc86b83db849f5cca1b0e46bda10fbf85280ee SHA512 4935cefbad5769054ca778dfca985e715354a193c35aa44895cbffaf1c485185d2066583358ecc9a7087033b8a8ae1a89630f8af2d920e7e8d9292d1ef343e18
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
 DIST github.com%2Fefritz%2Fpentimento%2F@v%2Fv0.0.0-20190429011147-ade47d831101.mod 349 BLAKE2B e0dde208bdd99c251e87c5b78b39b887d9ed49a0d91462a99860ea5d60cbe7efdaecc131beea014c1131cb7cf06e6577bef409db3417ba900fef5f1db8e0fe4c SHA512 18a8d7fa26f72c819825d1212d4e217249cfe245df029ff45d299019cc4cacef0a7348ef3952a8dc834a45d5dbd029faf4b44f96ee72367e660e0dc2253d7995
 DIST github.com%2Fefritz%2Fpentimento%2F@v%2Fv0.0.0-20190429011147-ade47d831101.zip 8980 BLAKE2B 085cd7018d6988d3703e1e038da8d3dd7aa79b22a59af55d757248cd2cc04ce97631ccd3b904e936aede8fb81ef025d0c466388f16a598d8a573644bd24674d1 SHA512 7eddfe3527f1d6be831f224a0f34b11d242a467d3b298753e8527c9124f325249597e21c2ba7da421c7263d7868313667218690e27d13afc5f6a0f1ffd4745dc
+DIST github.com%2Feknkc%2Famber%2F@v%2Fv0.0.0-20171010120322-cdade1c07385.mod 30 BLAKE2B 2f944ac15e0f25795af1d3d45409e9710c7c4d73b5cb75be48fb82fe57dc3509c5660011149a3212248413dfb88777aca7a2ea65d0bbe4e68ef73c0c51972c86 SHA512 67109d9fba9f50883cee6d5b1bab95d8e5504a91a74d4df9ee2784ef79b0a56f7b5199548c8342c2e72d6505d1209024cabc4b233906aec58675f4caae6b5671
+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.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%2Fetcd-io%2Fbbolt%2F@v%2Fv1.3.3.mod 32 BLAKE2B 551eca2f7385fcabbec12497128dce64b1043f4d05b432dcb83add43a572ea3e28338b1e8585483685663d1379af1677f2f75902ceaef19a0afdd02edb0d3733 SHA512 0987fc59bb64fa24225a19c91786770fa3a843fa9c0616e69d19aa5aa25ae68199dd788ac35b8b0ea156e48577204a386ee9356d50037c414500787e73fe14a8
+DIST github.com%2Ffasthttp-contrib%2Fwebsocket%2F@v%2Fv0.0.0-20160511215533-1f3b11f56072.mod 45 BLAKE2B 45aa7448ad91e3c18a968328a4693d43cffd095495a1bc56b150682ee2cf66195c5f1b04aa70d2061dec5a4b90f177e7bd309901cf828b1ad067d3ad9fec5f37 SHA512 2003a03038c4470afdb14cd5eb330ba11a071e10c6a40c97ca587baeb8d9b94d94e5afd824d6f654299127de0bef2142e29080a934b74a4136867a624d8ba6ec
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20190707114632-bbf5a6c351f4.mod 564 BLAKE2B b9aa2abec10e688e589355dc52e29b02a69d0f75c1cdadeb7da265485d2867295e9d7e0ad64c17739ca7029e37a5972fe49a5749fad2857593c17eacd7eae798 SHA512 09e10337fb8ff18580a578792acaf57095d39760f63baae92199fe264ed7ae0c7964968a471259f136486c50f27970f61efbef39762d3c3e59830af765841bcd
+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%2Fgavv%2Fhttpexpect%2F@v%2Fv2.0.0+incompatible.mod 34 BLAKE2B 0d129400a58541b2b4b3ed9eaf7b8d6487eaeb889b32228704124c79e676bd38389ab9289bb5431d7774626c28ac73afce63226c6f73a878125bdce3043f2dec SHA512 706dd822fc49466d6f6440b7dbc5039a4ca194bf4ee4729d163c1ad7375addd00d9c5022d3ecde341a15c131b1ee4d06c99c5c39c15e75702fb9ce0cbf2ec243
+DIST github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.0.0-20190301062529-5545eab6dad3.mod 34 BLAKE2B 73600e41541161e3a226094fbae6f7cdf65b713ba2ec605f841b16850ae99681ce281984e903dd400d750c0b2b4927e20b9d25aa5d67bf738917903324f75a97 SHA512 f8a5b7c52bdfd30b513dce644a30e8616fc31f0db149ff7cdef58ff5db94306a8b0a4d807f9837abe5793cdf385b16c4120474ad297bf68687a38fb21b1cac39
+DIST github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.4.0.mod 594 BLAKE2B a888e1152b1685720dbe0b9819f87b07272b1bca90093c5907ffb18277eff65762766a0dba44e02f25b42639ba22404a8af316d21cd9d4e6337a553afd9d089f SHA512 035addba725861e7750a29e20fe2350ede4bae5d1477ca3d596cbb004f96381329d0298d1868e610922bb5d3ca8a761ad591d6a497fac6e32450bbfec24a12c9
+DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39aa911465f17b41e15574564dd9f6711ddac8fefb6db2fcdcb1c9da86d352aea7ed9ec53ffc01d16361985cefa171c240e55a8689d3f16e01f3a64d SHA512 c11ab427de7456beca56fe2c3539161bd92c20dfc345e8b52f5752bad387e93396929bc42057e09f82038f0e59471f0a0450b66693d11e2199a7ad69eba79f01
+DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod 37 BLAKE2B 2ebc74d62cb97bf929cc59df3774562560bc2c1c5e1717380b05fd79f98b1a4396082d62c4992751207915c03c7ea983f8eb91b604d03f628b06d3dc804815dc SHA512 94811e2f653bfc9aa65b2f21212d65e96e0415541152a8607f9ab0d44bc1ab46175f39362cc9c1174aa0b1ea60e00fa977287905096a66a0ecfe62ee75ae1c6d
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod 142 BLAKE2B 54253a74012ab95ea6c91a438b815a4350aeaf4bf2ca1792cefe7c240e563a261567eda5338f05e4fec09e6342229ff00f09098919d1bd00e1cc73ba05d84a59 SHA512 a40438b84b2cbe6be587841e249d934f84f3a05335859ae5406f206e69b972095b51629c55a492114c4fb24c0f7b70ceb7650d97af73fe820b4f781e0411df4f
 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%2Fgobwas%2Fhttphead%2F@v%2Fv0.0.0-20180130184737-2c6c146eadee.mod 34 BLAKE2B d0276e3bc36acb1c6c2a17b186bc2ba8ab5f82381004ecee1da5a2f90b61e66b1a83154806573692a35a4b672ceac49d9bda8a93811fb566b3bb0625891392ee SHA512 73bc8769cbc0938d92daa7242da3c117fb1fb3d26c40b8d3c055a325b684145a59e6c80a84cf59f0f2d9bd85175e9fc797e41658feb9c299b0607dbd9fe30d19
+DIST github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.0.mod 30 BLAKE2B f12a3a75e2765f49e486ef54e17e6a122b055a32903cca353479c8c10add5f668ed5620df715cd41e6a4bd12b86dfb715e99d48af53a1dd68fa55f1308cf9bcd SHA512 d204c7c36bed4fddd03de8ea40d6e9b3e5713604d0a02481bbdc91e052a9ec85a9b67ab19c3912f43894dc754c84b3e3bf5553df7c0236a5722c585555276c21
+DIST github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.2.mod 28 BLAKE2B 2daa5b0044012f78113be9e697e05a7b3319673508cf66016b12c6034c70c4cebc3767183137f58b40c04bda484832dcc9bf53e7886eb6bdf055b7ed7c3463ae SHA512 58d5f162a23fd51ffd8f2b732904e17090bc1e96f079d18d8e13c0f3a01dbc288dbd32541bfd4a6e6ee3f9002ae0fdde9194c7c10c84823599f18bd4ca4c130c
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv0.0.0-20180223154316-0cd9801be74a.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod 84 BLAKE2B c25f6962ddcb02b08459d3ea1063e6c3f20e5565e0a70673b7f7c505ca25e219e1e365cccac9d75054b23446e4957a5b136479a35e0d261e2e16519d17781e78 SHA512 be902a6eafa64bbbf2f347367265450369fcbd47a132c3937a7b72946aab00c85c8cae9f98c49dcededc5854362fd78786df3f54ef07e58cd5c92d2b5904828b
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.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
+DIST github.com%2Fgogo%2Fstatus%2F@v%2Fv1.1.0.mod 344 BLAKE2B 421bb9e030633cd324113eb3dbbde77e91998fd556bae37ac63a8106eea5ab3c9f5d1348f55b5eb662cf5c0cbf40a9049176da76afb7678876d1c7374c86bb3a SHA512 695171daa7d4b09bf066c21f738e3b607661170f7fb3ad15c947583d76648b86d2ca7c3d04cdb1c21a198745dd4d9c2115d8c85afa8c7654ab0f58c3e94b2549
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.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.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.7.1-0.20190724094224-574c33c3df38.mod 34 BLAKE2B 5d28e3d6f80a29fbe97b4972674feeffcba15ba0aa148c2bc2be1d4f30744eac4d47add18a78e6ea9407c74da84e882d80868377439831e0df522a3540e3c960 SHA512 f0d5e9057d61f2b7e89418e6d82567167c1083bf00f763b4744a6226911f31a9372772a888b227041cb3948c1b4683945760dd38bdb311cdf2612ef313fda934
+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
+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.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.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-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip 9497 BLAKE2B 57ea3f82d59d1a6815a0f37a6175648f3be2bea0cd867c3cee1472f50e64097c9723462c4afb543b6eb7a64c687d2098cc1a1e03efece05d9bf89cd1a8174a60 SHA512 8065dc99eacbda55ab187ddcc5ff4792246c8b623b2c978df0bfbb2149c07966ca701dd6f36e7660074f47d082e1654eee0de01347fecd65bbd90f386346e110
 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-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhexops%2Fautogold%2F@v%2Fv0.8.1.mod 126 BLAKE2B 3e50e1aa6bc505597ec3eb12b7816ba3a316424773bc267c62569f4705c64d58c50dd3dce424f509912ab1c9cac0d7e81f8479b1781cf93139ce780e0e6d00a0 SHA512 c2c8dc02dc70610c06efc013ebfd432b9484a66866e8347db739d45476e91709248df8dbca0fc30e83fb6e93004e8ec73d89117a5a61d463e7d1695df74fda42
+DIST github.com%2Fhexops%2Fautogold%2F@v%2Fv1.3.0.mod 407 BLAKE2B 12d146c9ff9f960cfe8f7ed98867f909848ee63c8bf8ddc914344830afce54eac89a5afb6c12c5e075a1ff14c5cf5b939ca403c50b3f00ec559ae6b9ec8e9853 SHA512 074049c23fba73dee52065e8a9055300e1ce4d2384337b96d42cd6a6c74224bf60698c965d82500256aa1208868d066506535b3344706c97745956037359603a
+DIST github.com%2Fhexops%2Fgotextdiff%2F@v%2Fv1.0.3.mod 45 BLAKE2B e6415a702238f26db259396fddc08f60bc0c6a392689b17272d4673a5915392e6a52747eac557b83e78e7995b6a6c967aa143686bea55670285936216f6468dd SHA512 32a99c31b8df76ee98aa596f9495799322e0fbd74869b3bcf8a6b458452b58c3383f82531a11e15411142653f2db08866e568c0a10c5989f1efa9fdfca01a879
+DIST github.com%2Fhexops%2Fvalast%2F@v%2Fv1.4.0.mod 261 BLAKE2B d5c7117f6449d9d1fa00d516288fda73c113309d9dad55e5e8d2db0f3798abaae143601d1843ff7eca42fb8a4152ab1e7e335c8e80f6fa68a632df9358a67f19 SHA512 0c5231dde82f38597517f0df44c583d2f9731a0dba267e11f1eeb3f260fc83d35680d489c193c2510729fe4e6203cf517422de52dbd8103c567b38b778fde439
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhydrogen18%2Fmemlistener%2F@v%2Fv0.0.0-20141126152155-54553eb933fb.mod 41 BLAKE2B f3d138d4f5de9a2b0ad854eaf977305cf53a842cf89480ed1a1f053bbff4b0651fff91e5afe84ded72c4a5a393bbd15b52fb1013093ece353c0dedaf4b4782f4 SHA512 a4a3e302d371a3f615b0a85b0b8d71307c71a4ec92705577af7ccbbda79b837f3225303853cd0a0f2bd08ed4b682fdd77a17119ee31500cefcae2c254399ce8c
+DIST github.com%2Fimkira%2Fgo-interpol%2F@v%2Fv1.1.0.mod 37 BLAKE2B b4d77a31d1c212dd337177226fe2bebfd488628820a36722179b49b4a279ff3f18269326a241dd03b188ad77ab5153973c2023f04d5b749de0bb29785feb73d4 SHA512 36aab9e1ddcf690324f1e6c9357402581dfb1f641cff3548db754c221492eaccc7d6cdf69d114b56334f4ce813bb92645acb6d2f61bed2ccd467b341d38815bd
+DIST github.com%2Finconshreveable%2Flog15%2F@v%2Fv0.0.0-20201112154412-8562bdadbbac.mod 40 BLAKE2B 9e91736a8dd6f0715870e3cf0a4ef3d6bfc7aaf3ed92b934ed782691bacfa982410b179d586dd9ff8ff84c2ffd16a6cf445ecf2fda413713d81c935f29734b58 SHA512 e7567e8fabb34d0f31bb6f73a1282839bf08b91b1a5ae76a69eec337e791e03db0e218e9da1a93b1810bb5b1ea76a7a4c562f314cb062296d920e44d77b77669
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Firis-contrib%2Fblackfriday%2F@v%2Fv2.0.0+incompatible.mod 43 BLAKE2B 1d4c7881b1d3a19be9aae437d503c8e2cdc85afde7ef72e3cc82f9de983809982728f9344e0fe3bc36ff1d3befbcbfa59ea7ac4b5668ff946b86f5f25bfc9115 SHA512 6e4c4c150a25048f7928ce9a616cd32f5d9a92f64f359349a4ca171816065e7517bb3e63375b2c8d8b2f475965d8ff3088f68aedacb05047f7e43508881898dd
+DIST github.com%2Firis-contrib%2Fgo.uuid%2F@v%2Fv2.0.0+incompatible.mod 39 BLAKE2B 55e2f3aaa8593892b2d46f59d4d61aef4834a3fcf22096f151c688cb724cb72547b917a2a92c3b9103d729ae58ee0b30a2a3c555f0684fb3a739c361fa793f4d SHA512 31e2a9e9cca4f4673de03756d8e211be1936501eaae1cb393ff7fac2b76714779770d44e89e23b15b1ec8cc4207d81f41d8572d8d8af90948d07efcd071a2230
+DIST github.com%2Firis-contrib%2Fi18n%2F@v%2Fv0.0.0-20171121225848-987a633949d0.mod 36 BLAKE2B a4713f18dd354ec352073fb6227ba15879866a78ea43093bad0fa15f601ef59a0caf2ec95b652bf45ad96b5f076ded82c0c695330d18fe3018ae982dfd059364 SHA512 a265dfb1fe84fd4da5d775b26735974e34f0f9fd5f6a1955d62a304e5144b7fdba407bbb394339bf1766ac2b7083fe68d768e92112d2a4effbfc254981f3838c
+DIST github.com%2Firis-contrib%2Fschema%2F@v%2Fv0.0.1.mod 47 BLAKE2B 75269f763e8e6e86baaf82d0e14ad8fbba20208d8debcda3ca9758248dce94b5a9a73aa9c4a8a98e6a957685a958c6b8155209543016f469baa345aa82c9e84c SHA512 ce73d8c8cc26c55239fd2b071ed8f1f8f99a2127f17172b835fb64df6db4e56366bb1ff51c4dc1fee4ba3c934cd59589334490cfb65cc5edda2c3358f083736d
 DIST github.com%2Fjig%2Fteereadcloser%2F@v%2Fv0.0.0-20181016160506-953720c48e05.mod 36 BLAKE2B 7178870bc69ad99cf5a1cc33ec84bf560316eb636f0311c7ee67c4b68143ceaf34b8a6b2d5e35e6a64deadff0b82db7b8623370cd72a9c451c026bba02f11d63 SHA512 265c9eb7ed6acefb43e7b6dc6c6e917cb83a0e603c3a10f00ca5e39f18db875433a85fded4dcd4a9507d85cc9212305966e48666c28cbf9d0220d79ed1ce9364
 DIST github.com%2Fjig%2Fteereadcloser%2F@v%2Fv0.0.0-20181016160506-953720c48e05.zip 6812 BLAKE2B 5e82c6e3aea958e46f95d24701fdac2a8d0818b6bbbbf390a07d0083352e3b79346fb7af248e268d01feecf0e12dbf1324c84a7650c3795b5f40d07b1a5180ff SHA512 4d3492a705137a7fcabe17301bcc65493a6723e9aa2c346a9b978b3f5bd05a16f6837733b367a7ff13b3e73d8f08294a7a0683759e4c410daff06148ecdc7739
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip 139812 BLAKE2B 508f9a7823b1b52f042ecfd5bf1f12abc59d3a1d059e6168c10f2e9f0bfe6692e2a3eab75fd061d961459a2b98ffe21d29230c0a0f29f3871a5f95310eef792b SHA512 f922b107c536ef5b737ac5555074c237e92046bf0a8754f062c3f2dd0ec04820e32474b5ae3d9b32ef8272800e21fcfb90c5225b8bb466f0022b4adf1d79e910
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20181118221551-089d3ea4e4d5.mod 30 BLAKE2B f0fc0eb010769136b8fdca121a1581e1fd3c118944ddf37bbd2353295cbd27c79ee7a37a040e8962299fa8b1a57c838c572a07cf5e50c907cf066c3b17cb1cd4 SHA512 f97b798a5ecc3edf5fcb0698c20ad0d52d956794b271b21a5c0c337abe75b193459048b3464c851746c3aad896461a2db3af4e7a3432fb2df400a167c30a9e48
+DIST github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20180524022052-584905176618.mod 29 BLAKE2B 5a28f36b46dc341293da50b734f59bcc53c0153f0ed52b6cdefd2a3edd6221934b8d54a827fd0f5a8be9794cdf952025e91f7cb6e8b58b053cbcc5800581f2fd SHA512 ae6c7ed9b6a5316e28d91ea5108c804424fc3862755ce2c3d537a204b4ab481299aa664bd45363388c50174f1d733b205bb9e0de2ef87d3ce915becbca6f3f5b
+DIST github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20180920084828-472a3e8b2073.mod 31 BLAKE2B b0302ff3ab85203c266e1c0df16220fb21e8e1319bd6ceac6c5a3e2eb6db69c10b4c8178e5ccff922daf53f56418d504babef74e15540a75014355f84f58df5f SHA512 75b333aa1f9246447e0a85fa3584afb777eabe6864b51445280c3c94bd2377cd194d532d6d119e9484b5e5026e1986f5b5dcc2e4e17ffc6b5c8dea7238f61999
+DIST github.com%2Fk0kubun%2Fcolorstring%2F@v%2Fv0.0.0-20150214042306-9440f1994b88.mod 38 BLAKE2B e09a843c58cd9c0c2275a91be41927bd001f06d95d6c1661f3453f21e4e69e873008f7ded72c7c4284e7558075db269f17371be2b1323fff2358c2804d6415a1 SHA512 aedabd0037b8a7dc4721dbdb8e14f8dae33994f74528b78e07d11e927152c16a26b527e1f312cbbcf87866a4d00e0fc3f3347a0d1b86673ab27fe6b27b7fd346
+DIST github.com%2Fkataras%2Fgolog%2F@v%2Fv0.0.9.mod 108 BLAKE2B 44b7952f46da06222bce26aa224c3be2420feb07ebccb95b151cdf7bc83795d1cb022ec077a4b2edc3e53d0db62c116c106f63c5fac0dc9b667e4355c6d6aaea SHA512 a14e421cef4a75a0a02d93116740345f55c0f350c15c7013263e0306ad2c997b67358ba367e9817da8f9a9562dad42415e7d12599730ee6294471667622f838c
+DIST github.com%2Fkataras%2Firis%2Fv12%2F@v%2Fv12.0.1.mod 1631 BLAKE2B a9476bbf63dd578d68f80705cef6d9c27bcd07540a437557db9fd22f0b5b75205bcde6f09f3deaa9763e1cd7e7a02ee7ce8755f20ef1ec97138f3b2371e66178 SHA512 5cb94469e6c701e7ec855a928d8052e55d44f7de22b868a988671f6b0925aea675c91e85d915c7f51544351a231e3ee1f7382551a66250d51c2e3aad1fd37742
+DIST github.com%2Fkataras%2Fneffos%2F@v%2Fv0.0.10.mod 382 BLAKE2B eaad7d0131f4ec7b6704f76800d05ca8b349c7a936c679ce951c82de985c7af1e984198507ac01fd3b506321a79502ab091ba4d57937b98787b8dfb4b3d90fbd SHA512 7ce6a7878f1a81899ed7f4c36ea4bdd6783fdd7373090e4156dff6e2aedb5eb84ec657366eb1f125146f01f9fb6691cec4bc56ad13249dfd4fff0005f473664e
+DIST github.com%2Fkataras%2Fpio%2F@v%2Fv0.0.0-20190103105442-ea782b38602d.mod 30 BLAKE2B a465db0f0595d5cb1aa4aecefef768cda5ce5a9f883c64f5fa98b9671872cf3c3ef88bacf590061e17ee8b5040f57af35551762c6c550d2c05f2aca9a147beb0 SHA512 672acdb933f6d38d8627673e0645bdc8b3c88e91832f3030cb8a4a5c6c998bd417b5976e77ab2e0285a48bcd5ca1c6d23f35639d6e91d3136d9be8093591e91d
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip 15435518 BLAKE2B ac317e36f17db299bc02c59be373cc11dcb528b0365ce2ea389411323b2f677015c62a26d30a53323fe5e5b92a19c5ec707dea4ec5355d9e325a4cf112c7b54f SHA512 ea969e3eb563a1a729d44341f263cc4f1223e71c6343b8dd3058094c86cb8f590d888cb50aba38a37252aaf3876f4cc3974b1f04a76bc8982e5a24dac611c340
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod 34 BLAKE2B 9a841f2f76972fa5d9b89395c421d1b4addf03a137703bc8f5296a2071a3db169c993468489e59ae3eb51c4668c1eac2a8dd27b742c5af923d379dfd0651e826 SHA512 cd08026364570f1acaca890fe4929ca5bafe90b4088f764a077952ce4b52e8d92a8a09e4bf264abd209a161ed47d9b6f572ebd904af2025da3696dbf79b63d5c
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip 127654 BLAKE2B 2339218b7256f2319a9d3c2518b1256f200a421923bbd99f72044968a890e482a282b8a5d24e75a86585c83cc8935c16c3268c8c4a369de133b0f9bc50275d01 SHA512 3deeeb2edc9b02fa384d3a69439c9ce19d8206700b5b0420f361bd9ddf17d0a8062629c9addacf9663e1f70e22108991723d375ef6d4c2af559d62a76213e162
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Flabstack%2Fecho%2Fv4%2F@v%2Fv4.1.11.mod 273 BLAKE2B 5a64886cd6389e39cb9eae6da516e404c977f9c2c6e5f8a976e0e19fb991dc7028b7d38a0acbe58f2ac72bd49cacc852235abc52a2be536debaafdacf1617a65 SHA512 781af538125cb961b267a8301d057926c00cabfafa815ef05f14480aa27d57686b0a81dcc9f90ce83de23eca3c61f5e138bd562de44329aa6955a7eee982789c
+DIST github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.mod 205 BLAKE2B eef043d3215773a25c3caa1b744edf92fed91eb6574ee5e41affb1575779404de9247fe0197a9653055ee53d7133c91daae259adf62f0863bd2804e2cab36fc2 SHA512 55556ccd01e407be90eaf0818419d88be225e0296c4cd7610cc48e753f990bee5dc0f77f40ac824def0574f6f396f1401a3ab5130e1d4edc606a8d0cc09632e8
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod 95 BLAKE2B 21f86775ef310fa5f1cbd773890d231e9dc64fbf2dfabaa3b7dab027f5cb1ee9880adaadf6b8a9a2b181db838e5fe26d7349442b591d925ca24ec7788d887ef5 SHA512 64b61a0f9ba20ae004a305963046d91b7b66e3659b67fc15350a0afa625ecf4892854e1829dabd589482d844a248aa73a56dc970784f2a03f6492a0010c5c665
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20977 BLAKE2B e9a9da9c1383fd4011c9d934467ce94b00b04cdfb58faa0a531fa4b71d956b45cc1e6b9afc9011a2dad60fadd3a0c1fce7eda5de1e6eeabd53cc9f541ed48029 SHA512 05a554dc62146f8251376ec07e521594941e6f7c0173fb0c0ca48e6d9e512a92a29e059acdce83a5a0af503c0391fee4bbab57d2e256efb44b1ac137bfae59c2
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
+DIST github.com%2Fmediocregopher%2Fmediocre-go-lib%2F@v%2Fv0.0.0-20181029021733-cb65787f37ed.mod 49 BLAKE2B e55322722fd6679d0f8a8c3fff7427cf08eb08a5b65fe52ddc1791b1340bbd80328a6ced75e7c5755c1f231aeb6ec8b7db40310f3a5736d3ce6c1583810a7cce SHA512 f64470958f220b7c74cfbc2d20d92dcd5d763a4382ef19829ef75ba8733ccb07d95529f844238cd1920cbb7726f2c9c5c3727d8cdfcec5a7410d817c4144b6ba
+DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.3.0.mod 266 BLAKE2B aac257fd8598836636b6d89195c1660203653e4710311f889c44b66a2a404bbb1cb435e65ca50e7d88545ac824ecc2a59e887dd577a2a35728106943ce008ced SHA512 ec7380b6d013698c6e3d2fe4cf7a33acf061d6b480e92ba211cc08f75e8986d9d6b7b877874167612b50bf8e8f7ad2d17d98c5a068d042d690725aea3d6e2025
+DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.2.0.mod 100 BLAKE2B a8becbd84072f58a4795ee2fdd6128454a788336cbc69d374c7e8e683cc23fe9d837c00042a0eae9dea61c06e876459f9870e7312c664de441d5fdf41cb0765b SHA512 6c5521402c1c468d52b70403d09ce637701227e3aaa58f0b6fde2defc13599ddde4a2817346512fb837482793ed57a01f05f96b6f940c48a6792a1422971abdd
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.2.0.zip 12351 BLAKE2B fdd45d19f5b49159c02b166afaad8835489b92e49f7158d7dc8d512328d947b0fa5fd27e91c44ae07f12b7948153240b39362e704511aa7214fd5cccdd6321f8 SHA512 4d77c7e5a9c3c0603d25263fdfd480d3f4cca19012ba6714536cb205043dd1f5400acc1cf91a12533d35131b92e1f24632317eab1400270046ab1240308ffb2e
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.mod 49 BLAKE2B e24bba94c32d1da53c6ad3333da9292b3b7dbdf4407f9741c5dfd9b949f73bb48a863435daa6c7b0b23e56e391208f7ea73cf50265389e4435cc47a9a8d3e7a0 SHA512 01fd9da74a329cefac997f48f887a75e3b71c58ea66ac8df86e97cc2e086b3ffe21447ea4d1ad4fcfaf9b36b37f299e4bae52583f4aff385128942b2d4a1aef8
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.2.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.2.zip 8412 BLAKE2B 2d406aa5a57006bd8b903f15b0a79d05b26655c3a00cef3ca907dd275720d1010a769ce1c2a3e9d7c65fe22845c18fe4958db404628757799e00298885ba4698 SHA512 0105a41c3be65ddef321daa7ab811d9f021b0ea2718876e23beda73dfc1a68a0f98cdb2898f139647e384d4ea1d4c1e0fb1d5cefdd1e333d471420eeb8012df2
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210619224110-3f7ff695adc6.mod 298 BLAKE2B 6697a3dd3ecc8f418cdb6f10aa76e2c24b681378c8118b42106bee2d24096478a6795ca00c42f0336d34f9b47d301e3324996ed813beaf8ef6ab99123dbb4f94 SHA512 129991c4087066b8dfc469f7f936aaf3d86aab4f82afb2624630558749d80e3ee404013f40632fb11fc4c54fa07095f5e297654e3a2fd95eb3cc7706a0cb36af
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210619224110-3f7ff695adc6.zip 22571 BLAKE2B 67fe98d00cc13ba512656e99bea0129803d280af3689ed226d39c027ee2e253d5edd4cb220c0604e1e1282d8e133cf5711f983a7532dc8b98828ce435f332e3c SHA512 0398b4474fae0806a046b0f508954415f7a56426d2665fae11e570556e559d7139201eebca8c76e0a0ff28a32d6a88fb9fed4017f9822637abe28bed3a2cd3db
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 6840 BLAKE2B fd31c7c067d62fa45add54abba9b29b205bd525e389b37eaced2f3c99ecd1a748a9a248e32c44820d4003cec7b598b3786163af26a6142ec789b246a6025c979 SHA512 3351800fe88326135f6f9b401d8d6ee9ceb83a5a30865d103dba4d22198a48751e79d9b5a8a964705107049924ab9bef128186a5796b6cde33d89a3a921f6b9d
+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%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 27732 BLAKE2B e81d64b0ad8f66484eef94d0b8aa352e9923aa3122ece6736536720e03416e05aee4f6d0e0445edc2f1918e0e67330df4e12796af81984c546b04c20b4ce5250 SHA512 4ed6c37c3f6341a596770a186bdca2255456bbbc646231e007dbde73a56eee253a9d00a6b2673eba421193e8a4ba7d8b8bcaf8057bdeb110ac6b56ed0e35b8b6
+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%2Fmoul%2Fhttp2curl%2F@v%2Fv1.0.0.mod 33 BLAKE2B 01c3c11ba2c96d27213e200a8a4513cc803b2c61576dbdc4a7adcc6a4fc8d87ac7c0d006cef37103b8e59943f53f4b96689585104759785d9dfea6d7e27cd02f SHA512 7180068115216c7a74e067bbacf0be17ccf932f3bb34283e44d054e48f681caa279f65bed09a184ca4438f4b050933454b6b4a7e1730f666b80c3828833599e2
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.8.1.mod 112 BLAKE2B 067722c60d74699ba76f2d885f06c1ab7a63bedc777cc1d5b6235f06c8152e65b4df160342273296911fb25b7b1b7e197a84d75652f6089b411e0ace5011932e SHA512 6c8343382ccd1ab0b017aad2e16cb551c098c8d0215e7a4b82b26bddb5b39254ec570415e25f6d828963d23db9aabc13ed6db9cc9537250e196a1f24ac8d6248
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.0.2.mod 96 BLAKE2B 2f824c445541ee2d7a1891d4eb84d21e95ad66147b50b0daee3d36dbe7bdbdbda74ee43c83cd24f3975aad1f65fe0beac18ee8c0ae74dac5458f249e0915bb4b SHA512 065b826b197da37a88727c4ee87e9d451e15384e77825099517bb5f2255013b5b4d589ff9de4276cc45dcea63b0bec23a56ca435d16e9a0af7afeb0dec7bdf5b
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
 DIST github.com%2Fneelance%2Fparallel%2F@v%2Fv0.0.0-20160708114440-4de9ce63d14c.mod 36 BLAKE2B b820a0213f9b8c8b0b3a3de26a50a7df892b35b54a4d96e9d91511a4412242f08d757470e04ded27e347d5f6fd23b60a35f7cb334621823288c914739569b183 SHA512 d8696f24732ce3a51a54ff8fbc6406449ef7d8ed209200c3b5820c1a2959b01b41859f6db80efd41a9658cceacce94d45e5a63c7d5a639f82272e582b98643a2
 DIST github.com%2Fneelance%2Fparallel%2F@v%2Fv0.0.0-20160708114440-4de9ce63d14c.zip 2085 BLAKE2B 4c53791e8635a67e8877abf59bb67c2292ddda1a02b5ea730abe1fd5869d11b520251b7c9ea183fef555af9ec8859891cef33bc8f1ab9db8a38a53ba5d6965d7 SHA512 c492f15bd49e7b786e757294ae496801cbace9c93aaa6ebb43137b1b4a49e0d3de52000b6b7c0fb952464001a3277509da78ff10a78c30e292f228b56026dac4
+DIST github.com%2Fnightlyone%2Flockfile%2F@v%2Fv1.0.0.mod 47 BLAKE2B d04df814051c8aeb8b3d4c99cd01e10e7f32d84f315b4bd1ac9d4a27c06a983069dfd20e0bdf290b9e1330496d3635b8caf70d24eaa6680656024d04b80f2eb0 SHA512 8f7b1be4ab7f3cf0da1b9d81bb4c61d1625a2903768dfc8272d9300f27a45c5650f0d45ed898821d28bc4656c7da10e4f5d3cbbacef1506cbdf1e3ce66bb1e72
 DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.mod 33 BLAKE2B 3b94575248b0ca76fa0f9ace94919d628824ba1328d5dc087b270247c29817ad0d4fd6f24cb218541f598443828d440efad018d1d96c26ff070554fce840cd49 SHA512 d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876
 DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.zip 46747 BLAKE2B 43b996369a2f47691254036500f1443acb25027d19093b3d40199422c78b7147895a79f47794aea594529436fafc2b80dd3b1fb3c2cdedf1871c17a2ab924acf SHA512 4541502796fc10bba0b9898ecf54a6b8c476678a86786a2d783231e39a4715490cdd1314b2cea79c42628c71d3e2e4e31f6fe6019ac34b673961c5cd83563268
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod 206 BLAKE2B 67500c3221887c3dd9f65540736ad077a412eb394a302c2dca06abe3a9313ef8fa1d42a24f5df385bab8146a2e291728bd0fc4da0069af9e6919588c630abe5c SHA512 b8aff850aff011830e02c0ad21b0c4bd70bcd09dae13d720262691299a180fa1039365a6695bf0329ad1a9dfdbd71ddf28ce51a7d3289248eef51cf472cb3a00
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod 141 BLAKE2B e690296e75b3bd7a25e31adbb55351c991d61666c6ecaf13439ac29b8e0244726dc0fa4f3f5fddb9c08b24d823274f21b57157eda90809ad5f9befc2dad2c628 SHA512 e28417ec57ad5bd2062351f8fd71e3f70036a09c8033931c5598e601ad497053d768ad7a08982d8cf9ba2ea07293856f154d99b934069385a3d2befebc87b5e6
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip 24551 BLAKE2B 4b7736d36b9c2b2d38decacecef3b6411e190d6504caf1376f6adbb0d4458889eb9c0aca1ff936e0223eaa26c7cc2e077671c490f998e071a6e63cb7645580c0 SHA512 bedaa028d6450dafaa54f17c444b8d2923cbce008bdf73ca442297793b1b5bf60e829cbb6175d5b24fcadb8b91470e07baa369180a61d3e9a43ccee5ba18c150
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod 166 BLAKE2B 8fad24303bf57553db631ffbce484b05ac3e7db117503b7ce555c55053a0550770ba6d7c6b831e3daea69a9733d98592e98f90b2e9f5b5f3020024b55c3d5cb2 SHA512 06e7e8754384929043159942b2d873ea872b974d9fae1971465592e44eeb26b072539de290adbd79402bad2a2c7fa38556a7597f5e8157e82d7576cad6b49692
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.13.0.mod 314 BLAKE2B cfdd06d2c2784759a4d19672b14a72d7adabe1b7e616acfba9cdc4267023150c55569b57bfafcadc2a614d5002d4cf21fc9aea4c6d1a16fe868db462cb85e0a0 SHA512 66f9d7d9e99c4ecec2e36c99dced2df70a414b256d8f788f1666bc19f28e294c3d0518995ace0906bc954f0a4b4f129f3ed9dcb9ca4b3d996de7fba0345af0e0
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod 288 BLAKE2B 54894e7b679e652f482e824318ac795dc4500cdfb48a4a35f606726d99206ca9d4992f8a4199aa4bb60bfc06a95eeed797507772af168eb6884dd563da3c886c SHA512 1d886d0bb74668946d7aa2cadf770235d83447422d91a020ec2e049d19ebacb01799d9cbc22e4a2e190f205c1398a495d2069790ba30d87d8f4cc6ccd76ae04a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod 197 BLAKE2B b5a4df38443c9a98e3440ccaac22bc6ed23bfae91f553521d18ba3af06037ac145cbc7b9d7e4173429d046aeff7fc8eb517d0d1fdb7aa29059396c80b976b1ba SHA512 df0e3adffe3b888e5888e5a646023ac828e4e20d024aff2496a20c26157f56e5dbfdf577ccc4ba833f8cec9443c73a68bcf1bdbc5b5fa11182eed22832d52a29
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.mod 33 BLAKE2B 37da35f84a60095d026c99fae27c8bc1746ca178fea198d541aa952be6cc13ba6f357145e9129c43a7022d66943ae0cfb97d1198ec2c07a3fbdb52c80c136678 SHA512 827481bdca63b9d92f7322d135b30c2b076459ec327f1c7c136b513634bf43c4303f3b5e68a1a0f16f88e9296bb43562a94727732016cab8d2e7c13a67cc7cd4
+DIST github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.zip 18851 BLAKE2B 1626a8b10baac23ea68ff0d30e3131c9c757af1cdebdbb6897a495c78fd98915af6be6caa3e3bbf9dcd4a44b5cb34c36633eb7b2a985bead096cfbf198efea24 SHA512 3a3dbbc7fa2c12bb1dd907dcf517136382b7b73ad974f4ab08192df965f8a1c2edca98cb2c1dc99e5cfa67854625cc521de3bdd8f7b3bc818f93014a20e2ad40
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
+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%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%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsclevine%2Fagouti%2F@v%2Fv3.0.0+incompatible.mod 34 BLAKE2B dfcd88980ac60d3f3e57adec7241b656944c556e781b6dcfc93e283114e2fc4acb3d9ccbbd4eef90dffd3823a386db9df0ac249c8bd0de86943423c0f8c7cb05 SHA512 c7a7dfcd7354959350eeb489741d4bdc9497829567bae491787ce56095a90175dc58829e51896f2fcb102c7b83ddc946cde91e0dc2cc0e257712375d2cdeebc9
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
 DIST github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod 30 BLAKE2B a19bc3a2a838d03257065184fc24526f5bc8881ef06e4217e0439c05200efd72d8c1f9f7f3288ae69f8317fe21ddeba7fcd35d4431f29743260d0c96c59f6e40 SHA512 2fe62b980dfafee660aef1ea4113fba52dae15e24470b7ff258f055d7f7cd7f6b55b9afa1d46b1cf9fabc804e00c00c452e9bd72ed160dcad2e459dfe5b245c7
 DIST github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod 35 BLAKE2B b4c85147e92e894346c0376cf7dca7e581ba04be40caa18e941b6bbfef1f10e3dd9c5c2df662d3a1758328b3198a04bc00472578043ef3568ee95caf689f111a SHA512 aae1d53204f15d9feec965460e46a299bf85072a40711174d8db5ee21ff50776fd401ee965b2c45ecdb352535c9e4b6e6275fbf589482a27a84baaad5b7807a5
+DIST github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20210110234559-7585751d9a17.mod 35 BLAKE2B b4c85147e92e894346c0376cf7dca7e581ba04be40caa18e941b6bbfef1f10e3dd9c5c2df662d3a1758328b3198a04bc00472578043ef3568ee95caf689f111a SHA512 aae1d53204f15d9feec965460e46a299bf85072a40711174d8db5ee21ff50776fd401ee965b2c45ecdb352535c9e4b6e6275fbf589482a27a84baaad5b7807a5
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+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%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210309183117-206c057cc03e.mod 504 BLAKE2B 79c09c53c2d640da60fb3098f294af4f7866912c1cca14e88c69e019d71cfe8231ecd686bbfeab97558ab7920054b63818024a6c471190cb96f8d0a323d28c1a SHA512 cbd27da2b2b221eddccf840e05ce1e10b5e01dfe8bbb829fef0424c4f38a49456f76008fbe0babb1d35167fee27b9f9f9f9f4726804925fbca0b4aa89bfc20d2
 DIST github.com%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210309183117-206c057cc03e.zip 26429 BLAKE2B b9aa83cae01948066a69f9e17c2d9a7c8bb31b69f4032210e9b61aaef88f2876820565778f79d66f1179001c34ed06481fa9c89f7ab405c8efeaf412ea752b27 SHA512 c1ee274d03ad77972ba47153b15941dfa138c160d8b1c7b8fa3d9b2801a4968ed26da50032e1e29b8d4e9232f96a87bb3f41fde4fcd46a76982d12af5c429a4a
+DIST github.com%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210708162152-c9f35b905d94.mod 504 BLAKE2B 79c09c53c2d640da60fb3098f294af4f7866912c1cca14e88c69e019d71cfe8231ecd686bbfeab97558ab7920054b63818024a6c471190cb96f8d0a323d28c1a SHA512 cbd27da2b2b221eddccf840e05ce1e10b5e01dfe8bbb829fef0424c4f38a49456f76008fbe0babb1d35167fee27b9f9f9f9f4726804925fbca0b4aa89bfc20d2
+DIST github.com%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210708162152-c9f35b905d94.zip 26412 BLAKE2B 822e9f29ef1a642dffc9dc4f559ebf61ee74ee25bb53b8aaae7c598aac5d997d2c0ad5728a6a5fd8c55589425bd639650dd52557081742e6b45a0b2f9c01a1a0 SHA512 e821b8aa0a482ff7014aa97a829694c2f1f96217f2f311d9954fd9f07ce6ef096d858bc7a54fe9cc56995aa1e3486851313414107fa9aaa7211dc48a597b1e5c
 DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.mod 228 BLAKE2B 3d82b1f856e1d6b0bc4b6bbe14a387204e94819364481ea6e70a7c6e836b5f9038a1159c458ad21441c0efe337cbb6baeda76777ad44196631c1abd2b0cb2f21 SHA512 626835ee301ce98b8dfaeb91823a0283316bbdcfd6e656a42923ae58ff5724bf3d5bb5039de0c6b4aa509b70e72cf414981b1a127448717cf91f1bbe27386a26
 DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.zip 80666 BLAKE2B 98bd007eaa31569ec8018642d7a5c226d2f1e8f96c259a59df319c899a7246089c211ba02fd48666973b8c53b6006e0404549c2c60b514a843bbf67399d4e7ee SHA512 f7ffa0cd4a8ef7e16ce834de1959a6a9b60dd4f65a4f010fd1ded019b1334b1afe9393227fc2d4528e5e7e75be89a74b6fdf4aa3b4653d4e07475f6d96c3195e
 DIST github.com%2Fsourcegraph%2Fjsonx%2F@v%2Fv0.0.0-20200629203448-1a936bd500cf.mod 120 BLAKE2B f1ee46f4113515404ef569e6c6bd56e0655de552d46b2afda44e5adb0dd99799d528126009527d369165dd43ce2582b76e4247a774c91b2ccfc64d36d349bbd4 SHA512 fe7e5fd9889e5775dc845a86cf8099ec67e5285262f48c7873fc2853a99a4ad1112446747754334901cc60c581e0b59e30148ca594d060f016c32713b2a56aa0
 DIST github.com%2Fsourcegraph%2Fjsonx%2F@v%2Fv0.0.0-20200629203448-1a936bd500cf.zip 31695 BLAKE2B e0ab3ba5fe6abd393f0215df04255ee0ec1f3fe2445ab7d283b83e86415e5ef3edf9bababd52a40b159384d096c378f2e2ed4e478e442fe38facd9860de3e029 SHA512 d1679e6cddcbdb27e30dc89262747db4bd93ad90bc8a713db65a97cb40a7af98b071ef301a6b2a90f461fc9d496dc35f602af73b40a3a710a3fcd652d03dbbb0
 DIST github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210312004335-4dae89dd19bc.mod 235 BLAKE2B 1097aab8929e0ddcb303e9018a8076947c9fa9f4fc8327fb0240c7d18e1572406e2d168c0309e53a42d23c1cd2d37562bb8b6351eb3d812b8ae2c7ea7168a9f1 SHA512 20c4cef4cb7f37be1c6b80a47071442bd63137e6f1820c681791e379fc60565daaec33a7f1cfc52264384e96da7b39a02b3e4f09207bd37d5d550aa03672d655
 DIST github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210312004335-4dae89dd19bc.zip 16792 BLAKE2B 54271e293d34fe5da91ff08853b9b0167f410105bdde73ef037d5802135168bcb29dc8d8e472c4f275cad024bfd06311a1c76f4b3faa3aa557399b6ee13ccce0 SHA512 7c91b889780da6b6e92715d4795c2bb3b2d51b74ca66d637d7bb5ad65faf3f47a5b0968c80928141671db1d00dfb03f625c2684ecfd5aa5824cd86fcfb1df827
+DIST github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210628190057-faa35110fad5.mod 1002 BLAKE2B bf24761ea5423222362496029cf9db253f8326bb6d82645d2ef82324bc79f1494f5b0f8b02e551d41459b16488bd89d4f90bcf159f00a6e45a729714143f588f SHA512 3e4972463e0bd306edeba99eae9c1482369fcff2eaeda240a1b160b7e6fd2b8932e8dcafb1775e4c02be893e23d6493b8f98f0a26577bea3674bd7baf699b9a0
+DIST github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210628190057-faa35110fad5.zip 306463 BLAKE2B c24e52c2d9d6d8d5cef032407f45e36993a7661bf3dc5e0aca000c6c8b02676369510a200866b5f16409af9b1b4c10422f36fd015b26d4f05960291db442ecda SHA512 6ab17ad1776847a33d19021d2379c5e588facb0f0e178381e392c805033fcf9fbcc615151023e6000e7dc6821883218fd3cc48b500e95c62f367e50b8fb97207
 DIST github.com%2Fsourcegraph%2Fyaml%2F@v%2Fv1.0.1-0.20200714132230-56936252f152.mod 63 BLAKE2B e418e27df957221db7dab3effe8b7b68da72098f4a90ff3f78902c446dcd25d720874a1d5f8fc6dc916f32fd7d87a79ced65c792e6e7b2f670d32cb78c8fff8f SHA512 041fc2aa6cc90c78e270fb4d902d857f83b7837d3bc0c4073cd4efacb078016d740fbd9b3e0d78eb1984071974a2efe1a04dd5d2cc474b8b29de60e6fd1638c9
 DIST github.com%2Fsourcegraph%2Fyaml%2F@v%2Fv1.0.1-0.20200714132230-56936252f152.zip 18313 BLAKE2B 308624950d63eb2461ec151fdc04e31e5558f35277885c0589cc024de65a2a1234971d361b5bb9de65acad02cb1f75099b71fa7eb702fed591f65560e120377c SHA512 c7aa65f81ebb272fdc793d31fb3481e70cdb63bfdc2c987efc04d508f3a34882909e3655651668b43ca332dccefdd9995e29ab74bdff0cdfad727186b88a0862
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%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%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.mod 27 BLAKE2B 9dffca418389d3ec06a4d153b24ee0ae125d83661449f325096d7da41ac6636ef83cb72e4f3b09660daa0bfe984e8921bdc78404555ea2271bbabef599b0285e SHA512 a7b93a8318845c58a3eaed2495342f8630d62c022fb3e4698b514e08f6796737efff0088162faa96c48a3219a78f48dba26a0cdd56a87eaa17e756d11a0b000f
 DIST github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.zip 2796 BLAKE2B 6eb19a76e481d31c6459509356fccf2d13c98b6535b0dc5028c9dbfc881bbdf9bbc893393f7be470cc0ac45b64284abe7b95543e4d391dce1a5b743c9fb28b30 SHA512 94b67f94a9ac40f997cbf1e4ab0652f048867a5b92180761b7ee7425b876607c279bab7372d90f9b613ca86bf3d03d076823b4558a7d8e1c092a5d77e235d2b5
 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.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod 33 BLAKE2B 1ec43f923edea0edf1f795f14184b3b320765e69beaada55115d54eec3a694f82eac2f15f9a955ef66fabae4a7cca7b98220d6a5231b792cafe2916c98d7f2c0 SHA512 e166de678d1574543eb71f61da6aeaf00396e370d7d6a408c3e24074ea161778e0e836132eed85c364e08bb93909fde32ffb1dc1be5d8eb3c9da09d7f5cc7ce5
+DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
+DIST github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.6.0.mod 302 BLAKE2B f285f62469dd377ca3745063b6d105d7643343fb8840bc992e73ebda9349b357c2f35a870b7df2358f1289df3df883e7f6a9ec195408852c0b6e5eb290cc756c SHA512 f20a6e4a6a6903bc6fe4800465ef2754118dffc2751a1fe43ae24fba50fb3d9bd9b26f1c5f2e0bed9d8f81c23258c5d7448b10b3a0ae301518b1a50a835ef1bb
+DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod 36 BLAKE2B 4867e6ad22da67000c8f082852df43453cba9814cdbd8370c83bae347da0c426c2e2d705a85572e08a47c872bbb880f7b8befed360edcc8a866609c9486b4e0b SHA512 971639e43bdaee2891c655fa90626dd50be715f1d8493980d6fb081deee7940ad71bdb35887a3425b600869be75dd32e344b2c5d68e54e2ef3d6397c8fbe6490
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip 9404 BLAKE2B 8fae721a960dca1495c2f7e6e1aa2193ee724541533988232fdee5b711816576d76f7c285d407b2565ef48af8b8c79b15e7fd8173950e01a598c46059bbfe0ea SHA512 ec5b6b970f5204f758cf0c1ab8ab76db4a9099bfee86163759957f60932543b7b52e35acb8b484740b3cec91ae1a2a7895a55049837f87f642feeecdffb98618
@@ -69,52 +291,174 @@ DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7b
 DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod 240 BLAKE2B 0177599cd72c2547b6ab045588b64eab43cfe222a27ba0852f535300f41b39123916b3e1e0a222eda9ba72a29316e610617707246834e2b56a5a7fa23d4d3345 SHA512 d01fd1c1874dc5d24d9435452bbc641d2b6f199580abf24030be4d6465a68f6ae1f5afc4c83ea8ff9366649341ca167397dbbe1e6c8988c3117e2082338711b1
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip 138176 BLAKE2B b8e4a71e4d9b39de77936d971c532e591f529edeae89f47b66b671f42da6e07cf4121d2810bc0625e04619499a50609c5ccba7b8fb7f568d93cae27aaf7830bd SHA512 cb6d1b8b17ed8a8ad025e99f54ba05ad9b025d750b40ab53a0a9446dd7323465cf66585c1b1879ff9318b65c693c95ff41f4de0b77c99aa778f82125cedc58d8
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyalp%2Fjsonpath%2F@v%2Fv0.0.0-20180802001716-5cc68e5049a0.mod 32 BLAKE2B 7710a3ec63c8b4f11ef8861968b3c9b9dc7b77f97ad440306bea133762d07be9d03e951c1d23c5da16590aa3e35f7545a5e588a6a81759b113eace067c69be86 SHA512 fce709e315cccd79e676b1a1b70fa434b0cec229735d2304e4d6c77f1b3a415f0222c834f7391cc10ba6c76cbd6871974d7dc14126d570221976ac4c5aaf47a0
+DIST github.com%2Fyudai%2Fgojsondiff%2F@v%2Fv1.0.0.mod 35 BLAKE2B 7a94571fb3e383da6f2348ee53d7974db186f146d938dad150cca09e8afebb17563b97edbb9407831bee8ea1c03a2a6635c94c5c88de09ac6347a91d1a5d1853 SHA512 e5dc6180ea267205fe919e99d2da58d41695dea3d122c13f687aa2ae427f0cff1c4b7e308bd80007ea8b48295d2ab7f36de353dc0dff182ce61d3c0da3cfda43
+DIST github.com%2Fyudai%2Fgolcs%2F@v%2Fv0.0.0-20170316035057-ecda9a501e82.mod 30 BLAKE2B 0cb0cf07d40c6dda9ca160785a9099f3af4cc2f6d90295aecb692980283cd13553e41c7fd59a756b2ab9e695e0e810761ea1056ad1f54fde379120a091cb4fc7 SHA512 01215436dbaf0d558237ee3b568a4b5b82d691260efdaa94527e5b4583e12242342f6d78356761fda0f3a2c8e606bec69ceb95532bc28e35ae3a3ce706181aeb
+DIST github.com%2Fyudai%2Fpp%2F@v%2Fv2.0.1+incompatible.mod 27 BLAKE2B 812d02f5407062dcd8442be6e13f7f407e8ba2bb7bc85aff63505bbace0f3c156e3465555ae55715e2d0a8fe2f72ee6a5442ddb5ce77249915ed021c75c6aaca SHA512 b704c91c3a1ad3d8b2a0fd904e6a1837ed4b78fac7dcfa48bd2de4da82ffae7b17ec70c1d8ba68f91bd37c036bc1d4373617472448156776e5f5d869e1a1c98c
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%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
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 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%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190327091125-710a502c58a2.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-20190424112056-4829fb13d2c6.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-20190620200207-3b0461eec859.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-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-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-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod 179 BLAKE2B 48e3d89e20ae78bf2300c3004911d5247c6a682b66e213cb0bb23e516b52d75215bcffc85a1f8cfeef888775b8eaf7c90f850bca034e49218c1f93e6aec6a7ff SHA512 98c9784c584e8141a9a51bfa8e4b361f3b8a62b83a922ee4fc02e0da396250d6d4d0ccd2a8ac6d1dda8e445859d09760010296191e95b86e15088425a2989b0c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip 1566909 BLAKE2B f1871b07e4d6376e257d1308dd2b2a27541cddf0b0f446b324eade87f5c47d2a3f7fb5672fbf6765f1c7804a2ac5964a7a62b09ebe2b0409d08bcafcb1cf363d SHA512 acea0db53572e8a5fb06af5a06c7cbf0f7ce91733275a8676595b0b03fd1ebd6ed6cd9f86dbdbbeae0cd7ce20599f2f954e6ef62a791354887da3ddef5b1d023
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%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-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-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-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-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-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190428183149-804c0c7841b5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.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-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.zip 1479021 BLAKE2B 871ef0085bc9e5600f7dad363d19fa336712c924a07b177e05e577c01eb165dd4fe6fdf8288de4a5a4181e026b56c5da2008d39b136dfe03f415a1e5bc8824e4 SHA512 5db5145d3a2b3a504b29f2ca33ed8427c78786b47b8e991a07c204ca8a67d3c213bb3c2c44ce7fbc77626e7e53c0ed8ba24ea315adfeed47d6a5bc77c55c9dcf
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210218084038-e8e29180ff58.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210611083646-a4fc73990273.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip 1646022 BLAKE2B 43422147410009bbb57e2ead1bb85d91bd2e86f46c15a1ad776a750c52844d70ef8626bc11570bb9b8f22ad59bfd0ec37b3ffa719a40bfb06743b049664aede1 SHA512 940cdcbbe336f6c795cb5bb09ab06b339ec1736df5b8970ec5c3bb641c1816d93cd758e933b3423d4b7bb692a9a36e80b118e596139ab47053a2b9259c5c3a41
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181221001348-537d06c36207.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.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-20190428024724-550556f78a90.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-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 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-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200624163319-25775e59acb7.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
 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%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%2Fgenproto%2F@v%2Fv0.0.0-20180518175338-11a468237815.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.12.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.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.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+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.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-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%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod 40 BLAKE2B 8aee00863956b07c84ec69b5c8315b78a3646d9dfc3a371ec2c22e1663a5e633befff9b20bc260cf44d8072a64eee0a5e00cebbd592773cb489bb0620c2ec534 SHA512 474e4b0bbf9972d8e3d6381a9ededb13356f34252549f8c44f91501df15e05fa23c6c50d29a1d71411af8b6c4920f42a130f5df5a7b369d786701a99648e5cd4
+DIST gopkg.in%2Fgo-playground%2Fvalidator.v8%2F@v%2Fv8.18.2.mod 43 BLAKE2B 07bb73839ae0336a21666821fd6cb16c678bfece4f8ccd8cbde74b2e94e749808325c6e100b60e62e5421b1a9b0e98dfc7252490ec17790622e67baa42f810d7 SHA512 a973019f395820fd325a2a718f032cbb3ccdf03bc79418788fcde987ef51b5448b7131f9f6198c79edcdbe24c527dd2ca98646ef2cfdde15549abc111e87f3e6
+DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 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.4.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.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST jaytaylor.com%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.mod 31 BLAKE2B f76844ac45dfb2f826813e3277b1b8cf3df1708dca841825dbc773a6d06ec85affd6d36b71fe515c423e35224aafb143a798de91190a43715f799ccdcc50569f SHA512 fefc8cee93e5eaceb9cc12d13e88dd62a2e60a966a3a0a7b98540b91b684f92f77f80dc759a39dfa1f6efd70be98b4c405d64db1590e5d7a20160fd577f6ddb9
 DIST jaytaylor.com%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.zip 17752 BLAKE2B a752c67083d89d471656ec2f0fcd07b7c3c240acd781b01d050637f6dacbcce36b6ea2b194798fd0d7c0b5b983cc800fdaf3f0ba0d86daa931696df1a9df53bc SHA512 bf78ce9abfea5e74bcee2d6a2c54c894433f7e88ddde0ebb67647bcaad158d6981ff979cfe4eac530f81294cd07a72de93efc8776a5008b9e6aaf71f445fe744
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.0.0-20210107193838-d24d34e18d44.mod 265 BLAKE2B 4232ab3ecc78532cc067fa124745e08caa46b0e645bdd40f9001e895a0521b2741c0e36811fb69356124514a494a4545807d7a1cadecceb10fc373656557a943 SHA512 e27aff713fba5d9157eb7f201e72d23f89ad65c18cfa7205f1e5e456772e7fba975ea54fad8841229370bf21fad6a2a2baec6b2d377c23bd0a6c4b5b48e1e3e3
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.0.mod 265 BLAKE2B 4232ab3ecc78532cc067fa124745e08caa46b0e645bdd40f9001e895a0521b2741c0e36811fb69356124514a494a4545807d7a1cadecceb10fc373656557a943 SHA512 e27aff713fba5d9157eb7f201e72d23f89ad65c18cfa7205f1e5e456772e7fba975ea54fad8841229370bf21fad6a2a2baec6b2d377c23bd0a6c4b5b48e1e3e3
 DIST src-cli-3.26.2.tar.gz 193123 BLAKE2B d7973697e4a83248228f9db0cc04a168afbc18d0ad7a818df5c107dee219d3a5fdffbdda1c6cdffaa5ce3d54e193436bfd47f23a2453532224217a4c9b0ac6ba SHA512 784f9972b7661bec78ef06bbf529f79fdd340adacb7a957aaf756500e52525ca980b661aced6f755cdf1521135afcd94cb0e0e65187ae25d7c10278b43d5828e
 DIST src-cli-3.26.3.tar.gz 193771 BLAKE2B 713ee83c856de22385b473cb063370639996cca25b296846debca24dbadaf072992170339f0a25f07d4f225c4cc457e3210fcc96f3b59f2686c4263aaec67097 SHA512 cdb7362dc6508ac50b00e0db26a5679787cfc8512c5d3f2251635c02b808aa40039b4544c4b8c7fd9d829957e09541ebbdae66ebca352dcdf6960359fcdf4e86
 DIST src-cli-3.27.0.tar.gz 194630 BLAKE2B 9d5d971d17a33bd8d41f7a121399f598f6718acda4d52626b856dbb53cb489846dcf8ae5f33d86db6e26c1d3d858dbc0a006efc79baba8fadc149275c087660c SHA512 09e236c5311c29b2ab29e1f0388cd62c9ee92419922ac80d4a417fa268c64fee7733abfee6f54d83e95bd3b3dc7b27d77c98dbfb19987f79dc4dd259d28086e3
+DIST src-cli-3.30.1.tar.gz 218461 BLAKE2B 591a44f1c8f3ef6db7a814338cfbf5f1bfa3e009a1d069ecb17bb419bb46e29b74ff38587b5a1b73bc2f748528c40c2b1d3202a41186d9d38aecc9cb0adfe5d3 SHA512 aeacd1d4359e72f9850959bb10ceb26abecfb87ea8b7650093d46a8910252729a833b78526c8e6eae45fd754a7e730c25ebc1299e5adc20b328ab0a217c92d4c
 EBUILD src-cli-3.26.2.ebuild 6996 BLAKE2B 941ea3782b883f574b1adf41d32bb8aaf20131b97ee00dd0a624d557a031fb863f3ff46f095a48b9ec0481adecbd39530cbb4fdc32dd5981f9a00ce26b56b56a SHA512 a7479a82628c7404ac4682f7de1f697f7d273cb2f0a764affb2028a47543e5fcd21a7c009437459000dc46c924cf6a645d01ad293e4ee3354348d6761a9bdc7a
 EBUILD src-cli-3.26.3.ebuild 6996 BLAKE2B 941ea3782b883f574b1adf41d32bb8aaf20131b97ee00dd0a624d557a031fb863f3ff46f095a48b9ec0481adecbd39530cbb4fdc32dd5981f9a00ce26b56b56a SHA512 a7479a82628c7404ac4682f7de1f697f7d273cb2f0a764affb2028a47543e5fcd21a7c009437459000dc46c924cf6a645d01ad293e4ee3354348d6761a9bdc7a
 EBUILD src-cli-3.27.0.ebuild 6995 BLAKE2B 8b157c3c1b9d675484cdd7d7304aba6165fc5d500e3840a2dd436d50a17938796b5351639f3d7b7b69c9479f0abf5aafa47ef7cbff107da2da30e30ba033b8bf SHA512 c9de5e0baa6c9e9ec28e4c12ece3ec2d3d756ee4499807825e19391914e0e148bdf076817208d8dac74d9c1ce267440d4eee13c86682c485f25488f71c45ddb7
+EBUILD src-cli-3.30.1.ebuild 23936 BLAKE2B 146c9dde8abdec2a7087c3797fc3d00f069a2a511ceed312603178950296cf243f8d633d10f7a2e71e2f210ba4fcb6b1ff4a18698eaa2c94ea79059feba4e003 SHA512 ad5804a27a7945399f57e542a9cd557c109b02ab7c27851d8eb137cdeebf025177574ec41ad5b9457f72c48cb18979c62737ffae20d8269062ac1a69bd7402ff
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-util/src-cli/src-cli-3.30.1.ebuild b/dev-util/src-cli/src-cli-3.30.1.ebuild
new file mode 100644
index 000000000000..90e14a65d3fa
--- /dev/null
+++ b/dev-util/src-cli/src-cli-3.30.1.ebuild
@@ -0,0 +1,458 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="command line interface for the Sourcegraph code search tool"
+HOMEPAGE="https://www.sourcegraph.com https://docs.sourcegraph.com/cli"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1"
+	"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod"
+	"github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod"
+	"github.com/Joker/hpp v1.0.0/go.mod"
+	"github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod"
+	"github.com/ajg/form v1.5.1/go.mod"
+	"github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/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/cockroachdb/datadriven v1.0.0/go.mod"
+	"github.com/cockroachdb/errors v1.6.1/go.mod"
+	"github.com/cockroachdb/errors v1.8.4"
+	"github.com/cockroachdb/errors v1.8.4/go.mod"
+	"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f"
+	"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod"
+	"github.com/cockroachdb/redact v1.0.8"
+	"github.com/cockroachdb/redact v1.0.8/go.mod"
+	"github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2"
+	"github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/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-semver v0.2.0/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/creack/pty v1.1.11"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/dave/jennifer v1.4.1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/derision-test/go-mockgen v1.1.2/go.mod"
+	"github.com/dgraph-io/badger v1.6.0/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101/go.mod"
+	"github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/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/etcd-io/bbolt v1.3.3/go.mod"
+	"github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod"
+	"github.com/fatih/color v1.11.0/go.mod"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/gavv/httpexpect v2.0.0+incompatible/go.mod"
+	"github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod"
+	"github.com/gin-gonic/gin v1.4.0/go.mod"
+	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod"
+	"github.com/go-errors/errors v1.0.1"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod"
+	"github.com/gobwas/pool v0.2.0/go.mod"
+	"github.com/gobwas/ws v1.0.2/go.mod"
+	"github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod"
+	"github.com/gogo/googleapis v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/gogo/status v1.1.0/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.3/go.mod"
+	"github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/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/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hexops/autogold v0.8.1/go.mod"
+	"github.com/hexops/autogold v1.3.0/go.mod"
+	"github.com/hexops/gotextdiff v1.0.3/go.mod"
+	"github.com/hexops/valast v1.4.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod"
+	"github.com/imkira/go-interpol v1.1.0/go.mod"
+	"github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod"
+	"github.com/iris-contrib/schema v0.0.1/go.mod"
+	"github.com/jig/teereadcloser v0.0.0-20181016160506-953720c48e05"
+	"github.com/jig/teereadcloser v0.0.0-20181016160506-953720c48e05/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.11"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod"
+	"github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod"
+	"github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod"
+	"github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod"
+	"github.com/kataras/golog v0.0.9/go.mod"
+	"github.com/kataras/iris/v12 v12.0.1/go.mod"
+	"github.com/kataras/neffos v0.0.10/go.mod"
+	"github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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.8.2/go.mod"
+	"github.com/klauspost/compress v1.9.0/go.mod"
+	"github.com/klauspost/compress v1.12.2"
+	"github.com/klauspost/compress v1.12.2/go.mod"
+	"github.com/klauspost/cpuid v1.2.1/go.mod"
+	"github.com/klauspost/pgzip v1.2.5"
+	"github.com/klauspost/pgzip v1.2.5/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/labstack/echo/v4 v4.1.11/go.mod"
+	"github.com/labstack/gommon v0.3.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.9/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.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.12"
+	"github.com/mattn/go-runewidth v0.0.12/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod"
+	"github.com/mediocregopher/radix/v3 v3.3.0/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/mitchellh/copystructure v1.2.0"
+	"github.com/mitchellh/copystructure v1.2.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.1/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.2"
+	"github.com/mitchellh/reflectwalk v1.0.2/go.mod"
+	"github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6"
+	"github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/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/moul/http2curl v1.0.0/go.mod"
+	"github.com/nats-io/nats.go v1.8.1/go.mod"
+	"github.com/nats-io/nkeys v0.0.2/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/neelance/parallel v0.0.0-20160708114440-4de9ce63d14c"
+	"github.com/neelance/parallel v0.0.0-20160708114440-4de9ce63d14c/go.mod"
+	"github.com/nightlyone/lockfile v1.0.0/go.mod"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/nxadm/tail v1.4.8/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.1/go.mod"
+	"github.com/onsi/ginkgo v1.13.0/go.mod"
+	"github.com/onsi/ginkgo v1.16.2/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/onsi/gomega v1.13.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pingcap/errors v0.11.4"
+	"github.com/pingcap/errors v0.11.4/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.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_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.6.2/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/sclevine/agouti v3.0.0+incompatible/go.mod"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.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/sourcegraph/batch-change-utils v0.0.0-20210708162152-c9f35b905d94"
+	"github.com/sourcegraph/batch-change-utils v0.0.0-20210708162152-c9f35b905d94/go.mod"
+	"github.com/sourcegraph/go-diff v0.6.1"
+	"github.com/sourcegraph/go-diff v0.6.1/go.mod"
+	"github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf"
+	"github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod"
+	"github.com/sourcegraph/sourcegraph/lib v0.0.0-20210628190057-faa35110fad5"
+	"github.com/sourcegraph/sourcegraph/lib v0.0.0-20210628190057-faa35110fad5/go.mod"
+	"github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152"
+	"github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod"
+	"github.com/spf13/afero v1.1.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 v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/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/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.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/negroni v1.0.0/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.6.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod"
+	"github.com/yudai/gojsondiff v1.0.0/go.mod"
+	"github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod"
+	"github.com/yudai/pp v2.0.1+incompatible/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/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/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/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-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-20190327091125-710a502c58a2/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/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-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190428183149-804c0c7841b5/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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-20200519105757-fe76b779f299/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-20210112080510-489259a85091/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210218084038-e8e29180ff58/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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-20210611083646-a4fc73990273/go.mod"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.3.0/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/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20181221001348-537d06c36207/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-20190327201419-c70d86f8b7cf/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190428024724-550556f78a90/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200624163319-25775e59acb7/go.mod"
+	"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
+	"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/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.3/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.12.0/go.mod"
+	"google.golang.org/grpc v1.19.0/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.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0/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/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/go-playground/assert.v1 v1.2.1/go.mod"
+	"gopkg.in/go-playground/validator.v8 v8.18.2/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/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.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools/v3 v3.0.2"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7"
+	"jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod"
+	"mvdan.cc/gofumpt v0.0.0-20210107193838-d24d34e18d44/go.mod"
+	"mvdan.cc/gofumpt v0.1.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/sourcegraph/src-cli/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build ./cmd/src || die
+}
+
+src_install() {
+	dobin src
+	dodoc AUTH_PROXY.md CHANGELOG.md
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index be190cb17d9b..89a8d0c45666 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,7 +1,9 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
 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.13.tar.xz 2040116 BLAKE2B a604342d68f504b42ff1cb4918aa9ced6575f589caeb62f53e0b125f24cfaf0423f1911f352f21ecea0d702197d65edc85d3e97ffca3561f619f9c4c80386cdc SHA512 ba8b0eae396fa2b762bf17cbcdcd84b0660b2a5d5e7e9caf098ef3414a87fd28d4140dd10136483f35904560e5044e40be2bf6117462868a360306d62887c8ed
 EBUILD strace-5.11.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c
 EBUILD strace-5.12.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
+EBUILD strace-5.13.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 EBUILD strace-9999.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 MISC metadata.xml 760 BLAKE2B 05d51ee681a1103d9619582b1f7788c1c0f2ff180b55fd26cbed2f5aea52cae0e9333ae31fc93a90f8c33798f5caeaf6bc1039cac9a023f114c79c71abfb8480 SHA512 3a7445fe5210eaf6c98ed5193f3e79567e6e815e295671669c2894f3f53a2decd5f2b4db5c87e85cf8b71cc4743fc94cc4a800fb33493c5f99f40ec83b6e57b3
diff --git a/dev-util/strace/strace-5.13.ebuild b/dev-util/strace/strace-5.13.ebuild
new file mode 100644
index 000000000000..73df00d83ec8
--- /dev/null
+++ b/dev-util/strace/strace-5.13.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--disable-gcc-Werror
+		--enable-mpers=check
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index d5a92945f985..00b58a1d3ed5 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -3,5 +3,5 @@ DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc
 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-capture-3.36.0-r1.ebuild 754 BLAKE2B bab0ff01030d72f2ab0df460e5972b32cfc72a16f5e924a85575e060ff1f796ddf3fdb4f67670204988088dfe838c561888d47486cfe93aaffa2c128501857d4 SHA512 9d7cf4c5d7e569d751a097d1d71e6451b7bff42993bc88c5d0e136d3422b6e30780bfd93fdaaa5477a17df3a5da6503c162f16e6adfc0e775d8c22041125ed40
 EBUILD sysprof-capture-3.38.1-r1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
-EBUILD sysprof-capture-3.40.1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
+EBUILD sysprof-capture-3.40.1.ebuild 807 BLAKE2B 09e39959667a1a05f9828732fc9b8c7012f2c4dee0cb354f3133f954cb73dbecc33893d76d478b5a7ce32cc99651fc538553c1f8b48251dc401dfd1eb2c56ef0 SHA512 1574481b6dea0337d8464a3d1bacde8e829299472f5bfe36dff5b773af40963ff248a287b0364c532042d0fc5854df7219e182a636c3d0dc612cb1b74c8a3af7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
index 0c08f4b82662..d81e5301f8e3 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="!=dev-util/sysprof-3.34.1-r0"
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index 357ac3e3ea7b..94a4dc7b5bf4 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-common-3.38.1.ebuild 494 BLAKE2B 9508543ab0484eb5ed0348dfd83f8273554f0610c2bec17727b459030044885416fb9e22c9b7c20cec762a64f5239cdbedb185f87d85c23cdf7c972f9b7755bf SHA512 95862717922174ff70179a7f150432620990a4888c928707326d607500d14dad7a40e54f2385ace9e253738618dc09ce7b987c61ee07c1b5c916bc561b45f689
-EBUILD sysprof-common-3.40.1.ebuild 499 BLAKE2B 403f1d1bc228f49ffb23f8a40c908e3a659c3fd5adb34cddba6e0b69c8cb25b1884f0a5cbdea57b4cf0cfede52d3fb43145abd707f5794f615faeb3dc70378f9 SHA512 7f0b2114a3d015e37f52630a5bc9d83a1ffc31818195a21855161a0735a508bc60e7b2aabc3b9ee1eafec24e037d4892228dd4711f7bbb75e931e917fda9ce5d
+EBUILD sysprof-common-3.40.1.ebuild 506 BLAKE2B b4719544edf03c1ff5391f9d39f616ef0afcccd609e4e46118d2638a518cc0fb0120073ce78365e9ae1e8e5122863e9f776cb9ea9d6ec356030174baa19c8c1e SHA512 e9d9dcea2c6e6feb0b156568f9693fce8b2978dafad9524c433361ce920f5ab78810226e4ea69e3366b52101a22e418edc37a8316e4d362d3bfba442a20b8365
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
index 6f87bc9b52ab..5d888ca7d08a 100644
--- a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
+++ b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	!=dev-util/sysprof-3.34.1-r0
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 1cf376f13040..a155d0ff05fe 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-3.38.1-r1.ebuild 2277 BLAKE2B 87bc003c5230751fd2b4d0e4e1f12aaf158a537782cd508b0bc6f41cf298e3086b9ef1db94ece81c583b30968d347f9c98a6d16b46bc91b699cac3a54844e153 SHA512 09c022e05fc883bc4a58087c6e82d086182d2f3d7df766792ebfb17a3a00b2a72112f6fda3de71942a18d6cc25dafb0f2a776ffc730a740067394ab52077c260
-EBUILD sysprof-3.40.1-r1.ebuild 2297 BLAKE2B b68aafd3ee618ca18f2d788933e7a914f3ff7c7ba46088cbd817ed2e4d57bdfa1f9aa949b02c1ec527ee8c98ee9e15e432cf0082c1b8522c4743916a2509bbde SHA512 22a659fd761ca6693d4f3d98fbd7e6522b3399681dba49daa037f34030b797b97b697a521f2b0323ce6adb20bc6ae1ffc07ee52aaba9fa992c83a66accb449c1
+EBUILD sysprof-3.40.1-r1.ebuild 2304 BLAKE2B 18539b824c808106bf0d7628020b618c47b2312938c55a385c8ae8a54ef957af170899e4d8ed80e392c6aedf6d1ddc73554fb351301284abd8537b451f48ec12 SHA512 34186f124c49962252bf938f7ddbcb09967a8be0aa5eade53bfd7732545e1135b2653f9e1be8eb3e22d06d7ee53aee9351bac9c69f465e7e60f977e99f43f2e1
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
index 8d316efc9e52..1fd30c26d759 100644
--- a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
+++ b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="4"
 SLOT="0/${API_VERSION}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gtk +unwind"
 
 RDEPEND="
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 6674e6382dc9..0147270e8620 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -3,5 +3,5 @@ AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14af
 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.4.ebuild 2885 BLAKE2B 04f70fad16bf1f3fce92e19101301695d458fd3aee80df40527eed5eda260fe0a294c282ae9d8406143d2aafd031bdb3b9d387efda674c760ba250b29d6a9639 SHA512 ba502e7d961c53ce0c2f3a1de9c1fe4791e38fb3fc8769dc22c5e98b3a7403b465c5ad53edbe642b6b7df519064ab0a437a2201edddd22a0888900eafcc1b2cc
-EBUILD systemtap-4.5.ebuild 2814 BLAKE2B 87e36a708642922311fd473e6bab8e63ae557b92dc21ee0697c913277caec30c9cac05a50b210aa98a8f536ad8c24916b536f103431d63d50f8ea85e536b8efb SHA512 902ae8baea053c0c9cb793a8268d97037dd07ce58679c1cda8c2c20e416ac1e002ca215c3780ed230639f16f38153d7334ce2660ebe039039f586c4c7ebf0697
+EBUILD systemtap-4.5.ebuild 2821 BLAKE2B ea81c5de36484c89c145fa275c8bf4a63642562dda782f6ca334ed7b1e44752d6e3b9e2d6034022aae6a4a7c25248183b5f6fd875f552bcd2a717ea7ec2d5ea9 SHA512 a8a1f562da5a596d9f38cfa7e4bcba3ec1030d732ce1c47506e17043055ea2b196e2a5b0adf99b2d27e39c65593534b5397dc701db3da6f0620037815934bb0b
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.5.ebuild b/dev-util/systemtap/systemtap-4.5.ebuild
index 5a36994ebf65..9a169b901427 100644
--- a/dev-util/systemtap/systemtap-4.5.ebuild
+++ b/dev-util/systemtap/systemtap-4.5.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 ~riscv ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index ed9e7db3f42b..84e9cc8584ef 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,4 +1,6 @@
+DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
+EBUILD tup-0.7.10.ebuild 2663 BLAKE2B ba8ade6dc91e53ba36c7d15d00b943fa27408d50df38590ec76f3cdfcc020db8a0e1e111a4292aec3649c82bd7732fe7ada9676b656ddc3e70196138e34c868c SHA512 e8c6fe14791d25fee951d4b21740a8a4523e2eee083fe182d99c7089876397861a6bd343b4951743ca946755d9a2e0122777de0f6273c12feba6f299f438e72c
 EBUILD tup-0.7.8.ebuild 2430 BLAKE2B 4957aa1a9f0a98ba486ecee3785a38b3676f5f8aec55ba7d202559ca19ed77d556d01f433eb9b27ac75a9c44cf2bce4724720a9647ea10fe634a4c48d1a5d06e SHA512 19e0df9bc0287d7c9fe5611f7532aa7839af5ff204dd4c32c6aa2e997c31cf5579dd00407ac0ae3821c647ec61400e0cc7d3e689597ab93ce339bd9169abfb76
 EBUILD tup-9999.ebuild 2447 BLAKE2B 3e33c0e837b8469e1906b63c96ef7a6944ff29b9c16c0e5c519b1555b044c4155ec7d787443143a2d54a1ce7356808c280294aae5211ab6ec17b18cf67325d7f SHA512 fcd9a127f316d2eb520ed14c9f8cf5da3458058f58c2dd6715fd4aa90c28c002b9cfa9a905e255f78b96b9695caf26b5d73b2185f28c162ede7fdceca9fe1f38
 MISC metadata.xml 242 BLAKE2B 1e34d8d82a789942bfacaa7957c074695a55b4363e2982752b4dd2c8242ad50ccaa6537bfc584a31cdf360bfb31849a39422997924ad2dac438ddbf7e25798e7 SHA512 a487da6c7fc5c14c9cbaceb95c356ceb039824f29855537f8ff45c09b2973087140481fa052603d0e8c1a7244de43bf05727c6e9fca06963f5f3e3d3e8ecf0d4
diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild
new file mode 100644
index 000000000000..7dd82f378397
--- /dev/null
+++ b/dev-util/tup/tup-0.7.10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A file-based build system"
+HOMEPAGE="http://gittup.org/tup"
+# Tup itself is GPLv2, but it bundles differently licensed software:
+# - lua: MIT
+# - sqlite (unused in this ebuild): public domain
+# - inih: 3-clause BSD
+# - red-black tree implementation: 2-clause BSD
+# - queue implementation: 3-clause BSD
+LICENSE="GPL-2 MIT public-domain BSD BSD-2"
+SLOT="0"
+
+if [[ "${PV}" == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gittup/tup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	dev-db/sqlite:=
+	dev-libs/libpcre:=
+	sys-fs/fuse:3=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
+WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
+WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
+
+src_prepare() {
+	# Use our toolchain
+	sed -i Tuprules.tup \
+		-e "s|CC = gcc|CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}|" \
+		-e "s|ar crs|$(tc-getAR) crs|" || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# Avoid invoking `git` to find version, use ours
+		sed -i src/tup/link.sh \
+			-e 's|`git describe`|v'"${PV}|" || die
+	fi
+
+	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
+
+	default
+}
+
+src_compile() {
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+	./bootstrap-nofuse.sh || die
+	unset TUP_NO_NAMESPACING
+}
+
+src_install() {
+	dobin tup
+	dolib.a libtup_client.a
+	doheader tup_client.h
+	doman tup.1
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
+	# tup uses fuse when tracking dependencies.
+	addwrite /dev/fuse
+
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+
+	# Skip tests which require namespacing or root privileges.
+	pushd test || die
+	rm -v ./*full-deps*.sh \
+	      t2150-lua-tupdefault.sh \
+	      t2172-lua-relativedir.sh \
+	      t2187-tupdefault.sh \
+	      t2197-tupdefault-ghost.sh \
+	      t4069-gcc-coverage.sh \
+	      t4072-proc-self.sh \
+	      t4074-getpwd.sh \
+	      t4131-proc-self-exe.sh \
+	      t4132-proc-meminfo.sh \
+	      t4171-dev-null.sh \
+	      t4200-ccache.sh \
+	      t4201-ccache2.sh \
+	      t4202-clang.sh \
+	      t5083-symlink-fullpath.sh \
+	      t5084-symlink-fullpath2.sh \
+	      t5103-python-sh.sh || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 80ec41741ef5..6a4ce25ba537 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -2,6 +2,8 @@ AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edb
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
 DIST visualvm-2.0.6.tar.gz 39086223 BLAKE2B f5657d4ccc0063281226b4d70c35820c78333db5574bae5acadc321938cfe42a3e0e4c1752badcc3e01b5694f6081213f5da898f5a13587d44e36d18fbd5c2c7 SHA512 03ad628f753e31f26217366d8f5f184f4657ba55badd55f1466dbf00cda61e9c320cc8ddb82b228863b9c6416aec3e94a01c5429e2b2f4664c9daaccd02f5d7b
 DIST visualvm-2.0.7.tar.gz 39155599 BLAKE2B 8a460cb161357114d829d41a7e4b2306e9e0023a6995aceed89cc12fc0b54d5e05402bc1b8c72d4cb3caba5a4844bfbebb4734d7f7c5663343dfb3bd4470945a SHA512 d75217fb1b2a8c4d1c44b600dc42d488be8447fc569f78c10c59954c7c64f8e1ccdeef2e6a7936e7708b9392bbd7634d7149c6d6cc797df1f0036c6c473398ff
+DIST visualvm-2.1.tar.gz 37175908 BLAKE2B 2bc435b09af9061122eb62a8de4b4b9ce47bb8cc2b7e2bfba57767bee380f6db041ec758a54f5a90e21d9ee3a5e6db5af8c0f89fc347d8e49322caeb07db4233 SHA512 ae662df96224a366c54210b85d6a859fd7412ea6ebbbb4d6a5e6b1a75c04a8060ac08a524d8e58aa9a037ecebf7ada142d9633db389cd5332742a21d26e5ed17
 EBUILD visualvm-2.0.6.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
 EBUILD visualvm-2.0.7.ebuild 1904 BLAKE2B 302b2318c8f5be891333ff791de2834a47f2c1a67225a1837c181190c55008ea03e5ad96c8766b6a0d738f47dc9ecd5398b72391bff572de68dfe5d5843b1b92 SHA512 c4c921215285343094f8e31faf4b3cde7bfca6e77e23b2fad60e91ebf0e098626b160f47fcc50faf12b9ae7b796cbbe31a50b5389af8fbe6c757a93200942bf9
+EBUILD visualvm-2.1.ebuild 2347 BLAKE2B 8a095af10ab1e2020e23b95e09721e67afbcd33419387394c4155a50d0dc9dee5237082c2d2e6fe198c9325611ce8251cbf4fa8d9e63cc42bf639f459001220e SHA512 12bc18fad16a35bced42e2104a36975870d2efb79b689c127c7536a7d8e3aeb70963c019bcb59f70180dad5524e1c39ddb8fd783915cb4c2f9121ed9369fc0f9
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/visualvm-2.1.ebuild b/dev-util/visualvm/visualvm-2.1.ebuild
new file mode 100644
index 000000000000..d72289ba971a
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NBV=124
+NBT=21062021
+NBZ=nb${NBV}_platform_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2 desktop
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+# Netbeans plattform is already included in the main archive this time
+#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+# it does not compile with java 11
+DEPEND="
+	virtual/jdk:1.8"
+
+S="${WORKDIR}/${P}/${PN}"
+
+QA_PREBUILT="
+	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
+"
+
+EANT_BUILD_TARGET=build
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
+}
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{harness,platform}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins launcher/visualvm.conf ${PN}.conf
+	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
+	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
+	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" || die "Failed to set jdk detection"
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 12fe6c95ab24..fac170123402 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -2,4 +2,4 @@ AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
 EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1092 BLAKE2B f32dccc300df7796a66093cf7dd5f36884bd97639779c78b48df702dc5701bc96ce8336e8dbd46f2c61e4f903336ee3c84c86991f2c07919bb851d50461f5b9f SHA512 5401e2786759e852bcfa6ae7cbbbee3b01fbb934279999f5ad7d6fc468325403a5c340489d4030207aa4349af960d3baa2a7de673ec4e74b4d4595c3d1e9be09
-MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
+MISC metadata.xml 323 BLAKE2B 4e427ef7d3b3d816fa51f1c310bf7117a6423a6c05e477daabfdda151aac0789b2d7b3c5c61122a813dd759a27bccfb6af17e7381bfe4c9acf9ddd9293d49d4a SHA512 e9af68684a6a26f8437d744d043b930eab8590cce74b6643b50a33df18f71c93325f61220c39e8bd94d0c519421bf3ae0c55921058e8c90edd9ffbcdb3848c8c
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index 95131383c5a8..7d0909db1047 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xxdiff</remote-id>
 	</upstream>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c60518e31845..f8cb37390b78 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 1c252fe99b1c..c352d35de90f 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3398 BLAKE2B 116d7988d71fd55dc4e7fa0e707f0909d
 AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c056b97962a11e4aa4f56f48695fac5dbcc77b8a44cfea3f4ace27fc24a894b7968c7b843476ea78a4560ce648 SHA512 eca9b73848d4d219de2f29021f6b5376ce507ea4b4cbf17b7007c96f75b8598feebf9d18750dbd617b903cfbdfd9ed0ec2d83c6f05462e1dfc4b100bc3745ca1
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1-r1.ebuild 897 BLAKE2B 3311f1046316e3a44c2356a53dadc1731bd709d3b1d633749f8d00519bc0c8eb29e2922853896a47f9b1eea5d8b304b432c3abdb88e478fdc3100fb903969d15 SHA512 84ac2273640bd0885f49298c185ef548ac7aeeb2c6a147a6d0c4706ce511f45b2d7011ec9d3847f22ca059c08fe4fcbdd3398a8aae7a808b18fc33a4571c1f11
-EBUILD cvsps-3.13-r2.ebuild 987 BLAKE2B 77283271a66311dc892d5f8c6d8a8f36cae17478628024be9c95322e5e14bcdb3c847124a7fed60836c8c37301da404491dfedd08aa38f439fc50f0ce9f26f33 SHA512 ff5f42b2c6af241543ce23e26bc069b80c69c76d61560501135f00cdfc097e041355b0359125e7f040d45e3cafac880cc8aa40e6f0ff2729ec9f244e11f85fc5
+EBUILD cvsps-2.2_beta1-r1.ebuild 904 BLAKE2B 96c62507b55ef9f1f506c76b7d2a66746e390dc9736c9915f8b2c8bd2f96b769dd4c119c0c872f3912962882a0cd9b1fde1b3f6b6b39b9abf42f2e76db6ea733 SHA512 4fb361e3183f1274d67cc4cc4b317e1ca35b9baa0b35bb04d1e00b1893a6ba76404ae468257a07b47a6184449c6a6990fec90474d0b64c9a5cd64ab2bf500065
+EBUILD cvsps-3.13-r2.ebuild 994 BLAKE2B 4f1bbaa9121d7ba23b7456c599955808f6f4ccd2caea692528aa7fbf6eedf7456a8c9265422754be8c68befb16fbb0cbd3419b766016866e8565dbcf6018741b SHA512 2f73e96bb7e3c3f12a259dfba05096d846ee06cb4269c89afcc7e8716058864bd4930122ceb9a787716f6ac58033eba5c9d84bfb20ae4ea883735206e129f09e
 MISC metadata.xml 239 BLAKE2B 6b66b8a8b38252d9a4aaed04e58757e67b48376a587e96dc4e08f4eb3a0df2e2e04c1f2a0bd287e3495685fb56826f36b0a96cfd8f49d210a6765ca8f056eeed SHA512 4f448ef290908204e9729332c120d18dbd7811e5fabd5807f009e37ebbf5c60b5319e9a8c576ebb0dc2ecb36bdca239b4d51e123e8005a8a255b3723bb3d119c
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 1510bc252bab..41a453738252 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 30d01e388c45..1cfad7729221 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-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=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 332d8415f249..c0967f934666 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,7 +4,7 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395
-EBUILD git-cola-3.5-r1.ebuild 2706 BLAKE2B ae347bfb42eef709c9620900f8dae3e215fcffdf2e6a2bd6eadb9eb9054cbfbef814b08be395a1dcb8bdfa77ce9fa17510b65219a0e728a523730271b9d30dd3 SHA512 83765a40e7217641dd6a6819f1dfe72d829ee2652398e249a6b40c5c7d874567d5d49027340aef999e3ef9935ba797eae2e1b9eab178583a072a1197949f9bb3
-EBUILD git-cola-3.8.ebuild 2525 BLAKE2B 141b9770a44592c08ca6da7ffa26e96fc078b7510a21a14e4a2a573ccd483c916e0b725f5e2aafdf43d05f0ede948afe328be4b61dbbdc747c336c8ae06e15bb SHA512 2e60b40364b5b336bbf349937eec3cce2e521c5ce8631b70520bfc6dab52b7bccb4afc1a2c9f5535bd6f7185f8d9f11fb89da499d195fb1c86ce341738755a17
-EBUILD git-cola-3.9.ebuild 2485 BLAKE2B d38134cc923f23c0f83a0d93688d5216f56ad9948318e709e1f6a6bfd70d1dd274c0855e3f3e95816c177150b50ae781eea47508ff498216922bb851d2114582 SHA512 d5a6fedca17d935ab671358fbbac0b8ccd27fba133af3011c4ce3b74f45f4e7768079d6bd985d609b22487709658c8b380288eaca5fcf880035b069924fb4548
+EBUILD git-cola-3.5-r1.ebuild 2660 BLAKE2B a050b4ab593d2e50044162069c3fc993839490417c525aee6883b3ea8e39ca8803ce952610a53dc7aae43c9698ed2b2c9707a17ad667e6a3d975bf32ea548463 SHA512 1ca2ffb28b7bd31459e4ab26683cf12601723a562b8296fedc1568d556e9ad0b4387ec15ddf215e1c66cde798a3b365fa0ebca9fa6b55dec1cc0c48561e9a939
+EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012
+EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c
 MISC metadata.xml 594 BLAKE2B 13b00c0c9e670e5144d90689403127d05c55306213d7aa8fcc04c84a4006ee507542ff89a29c0f969ce97f930fc511e1e8d8f453ad0e6d39340449c530d8f3f3 SHA512 a6eeb13098e2e39aeaa150afd71e8b52405238021943c45335e1bd5cc70eafa79d2bdcb4564db32b9e1b96ef78c5740abac358d72ea64dbe90f279e72c8fe4f8
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 986d6b90c280..4dae0de9e541 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,20 +21,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git"
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
 		)
 	")"
 
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index f8f01dccb51e..d467fc38d90b 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,22 +21,22 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
 "
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
 	")
 "
diff --git a/dev-vcs/git-cola/git-cola-3.9.ebuild b/dev-vcs/git-cola/git-cola-3.9.ebuild
index 11cb88f55b7f..ef74afe09e0a 100644
--- a/dev-vcs/git-cola/git-cola-3.9.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -21,22 +21,22 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
 	dev-vcs/git
 "
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
 		test? (
 			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
 	")
 "
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a93a9008da6a..03b0cecc0296 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -119,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 6539 BLAKE2B ef357b3e9436bd096323853c7006c0c07e1173c91b80519cc89e2f9046eb3760c0124f6406c8c5c8b5a5f032c5a1f202c3213bd3d79d28cbb9c96b1988874c42 SHA512 c960787e85e1788c7626b12763688ce420898c6fd8942dbd0efa9be3f40b9d742c47f51d29f729c38775bef4f7e888f84fb18704c7c4ccecdda74c90f5761bd0
+EBUILD mercurial-5.8.1.ebuild 6567 BLAKE2B 2dcce7d10b14de07c75121905e7a350f3e634efa8c4ece5864bb062635045930f9b1aea928c38dd3fd280a600b3274e865370a92ebb10abcc9346ffa97f8b34a SHA512 8875884de5a50eaceb45ad82bed02275eae4ae0fff6c348e13885580dea9d03446c5101e436c072943a76a9f0c65f23f1fef652c947646e90b25d4a53a591025
 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
-EBUILD mercurial-9999.ebuild 4433 BLAKE2B 0fdd9ea821d61deb3e7edc2c14f5406f9d407220c20b40199d4fc82f6a02bbefda3b90427d1e1bd4e2a7143a73ce95162b63f5b4bb0a9730f34316f4688b27e7 SHA512 690cca0e6d2da5e453c5d4507e0861eaff27b2abb995f332dd3f5dff8e11d7be07c6e1ec2fdfef0425de6259a4262f5e650486498a73c1d619a9ff573ee7dfe2
+EBUILD mercurial-9999.ebuild 4246 BLAKE2B 0e975acf5ad01cf1ff7fcba3e7ddf8a21752d72a35faf7cdee242f3dd579b48b7ecb8c745bb5da4fc713f4222ea2bb9c59134477723c2a4960a33148fea8ddb0 SHA512 0347db61939c870577c2beb0a67e6451d359cc7ba43c4a7217e0904680b90148a5d0093137c683333e6abce95623e13d8b9cc21c4112ef77c0e7de2600c4a079
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index ec426005148e..f189a3abc49a 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -158,6 +158,8 @@ PATCHES=(
 
 SITEFILE="70${PN}-gentoo.el"
 
+RESTRICT="!test? ( test )"
+
 src_unpack() {
 	default_src_unpack
 	if use rust; then
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 516f17871e10..1fa18749e4a6 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 CARGO_OPTIONAL=1
 
-inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic
+inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
@@ -25,18 +25,18 @@ BDEPEND="
 
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-"
+	tk? ( dev-lang/tk )"
+
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+		)"
 
 SITEFILE="70${PN}-gentoo.el"
 
-# Too many tests fail #608720
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 src_unpack() {
 	mercurial_src_unpack
@@ -50,11 +50,7 @@ python_prepare_all() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	sed -i -e '/    hgenv =/a\' -e '    hgenv.pop("PYTHONPATH", None)' setup.py || 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
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
 
 	distutils-r1_python_prepare_all
 }
@@ -62,7 +58,7 @@ python_prepare_all() {
 src_compile() {
 	if use rust; then
 		pushd rust/hg-cpython || die
-		cargo_src_compile
+		cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs)
 		popd
 	fi
 	distutils-r1_src_compile
@@ -74,7 +70,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() {
@@ -97,7 +93,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() {
@@ -151,6 +147,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*
@@ -168,12 +165,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/tig/Manifest b/dev-vcs/tig/Manifest
index fc72a1240459..bbf60a7d4ec5 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,8 +1,8 @@
 DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6 SHA512 e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0
 DIST tig-2.5.3.tar.gz 1165632 BLAKE2B 398174578b9723d7825c7162b59d2a1a92da161b3f3b8896c1d121ed36c8a0a1c52f676325b3a3fdd0cea9961c7f4234bd1ac594d9057cf6707cad22a3eda35b SHA512 2339c6c93808b6fbcda4ae29e014e7f4edda5f16df46e466d1d14a9f65dba10bff9df6363f37c369418336f362d5e38dbaf7fc4d99761997cc39722ba6132aec
 DIST tig-2.5.4.tar.gz 1167930 BLAKE2B 620dea0d5c4cd670b11e143195145dd268ba4762ce5b3e56a393bc6af6e508349c5f3581dff9f118d047ab8e7b431b64c85431f5af5719cbb9c63117394b265b SHA512 8c2c1d3aa980d3a6619501a770bb5210db445200e46939e2c122db1fd684ae9857eee4a06a8b6622d5d683457f11629522b121e0b429eec6d11dce4f4020dfb3
-EBUILD tig-2.5.1.ebuild 1290 BLAKE2B 55ac7685c1797ab2de86865e5c19f4d011ab498b23fb3f91375b7017395cf60ec66e67addf8d96ebdf09926aa0d3d94cce2d4a2513ff8fc9c93e5069699a1a76 SHA512 a6f9bb48b4b7bffaad5a8475f3f75c611c91d8d50cc9f67e8cdbf307f3c293fb4e760a36dff3c7a6919b7f4eb4c90223a64c19cf9ac698f815e4ef867d971904
-EBUILD tig-2.5.3-r1.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
-EBUILD tig-2.5.4.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
-EBUILD tig-9999.ebuild 1295 BLAKE2B 1cc93adc21d1da03403dc196674871555a68f2e5ddf59d94a320dddbb5d03f4b49c6d9255cc64b6721e1bee791b86dd42f980ae5eb116c66e93345eff2d946d8 SHA512 54f2ce9cac3858d74ca03255654eaa9310de703311a7d10cb3aa9f1df66d5e89d051a810ff47648bbd6a2cd1b0b4aa8c9f00318d64b6f83dc83da31fa4e30f41
+EBUILD tig-2.5.1-r1.ebuild 1292 BLAKE2B 4d3e05ff64db4eb174d646ae2e560bf3d4b1f3042c0684ead2d4476dd0aace2795b6f028e208e17f70ba02498ecb3ee05e9c92437d9df31ffbd110ab32895925 SHA512 12171f912ba5c1a6defd8d6a5abea086ff7bbed7672d6bb9b11a260eadb8709284c7abdb046c2e29bfca7492dc703a6962c4fae4cf0e0900849094cecc905139
+EBUILD tig-2.5.3-r2.ebuild 1283 BLAKE2B 6ffab61b7f4f4187a7f0b0a1559fe32789dac14caa545055703d8faec6d7ec5f9a8e405aed34f3da28caf902c13f9fca90fff733ae0842f59b4c04cf37d1bad3 SHA512 4ba1422e5e1f2ebabd9bdc8297aacba7910c298fdf2fe91ee3f8bd53fb5fef109574c0f84642a4cdd659864dc79feb009105feba24ed4aa01dd2cfbc9b24f4dc
+EBUILD tig-2.5.4-r1.ebuild 1290 BLAKE2B 8812b950ece1bcf3923758eb5ec6303163f731ec6401736b319eb875c6d9aec6bc052fb93ee7beb6cfe0f5e93eb572fa2849bd647d25c1e0114e930aac373173 SHA512 20baf997a446ceb658474166d6acf4072f7068463040b3b8abbb39a920d628dcf14615db42da21521b943b3699e7b867e64ae48f5c960ae769e3631fdfac9f31
+EBUILD tig-9999.ebuild 1304 BLAKE2B 66644d8a2804c5f2156563a90a68361624e3b9743de11452337824d588385ca3f44fcd5412fcf363e09a59ee2692bc1b445362686456c69bdbff381a272b198c SHA512 e042d94027f1101204ecf32f12d0a6328395c2dce5ee7713e9855213b8089e7bb62b42334bc7786e461cd6b91d71e54750d4e9f930aa9fde2d091139f4cd23a5
 MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/tig-2.5.1-r1.ebuild b/dev-vcs/tig/tig-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..ec9bc85c8658
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-2.5.1.ebuild b/dev-vcs/tig/tig-2.5.1.ebuild
deleted file mode 100644
index b754dd3aa733..000000000000
--- a/dev-vcs/tig/tig-2.5.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.5.3-r1.ebuild b/dev-vcs/tig/tig-2.5.3-r1.ebuild
deleted file mode 100644
index 9164067a481e..000000000000
--- a/dev-vcs/tig/tig-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.5.3-r2.ebuild b/dev-vcs/tig/tig-2.5.3-r2.ebuild
new file mode 100644
index 000000000000..5b0369afb915
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-2.5.4-r1.ebuild b/dev-vcs/tig/tig-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..873645fe5017
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-2.5.4.ebuild b/dev-vcs/tig/tig-2.5.4.ebuild
deleted file mode 100644
index 9164067a481e..000000000000
--- a/dev-vcs/tig/tig-2.5.4.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 bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index 855228f38d1c..3ea9666006a2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	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
 
 DESCRIPTION="text mode interface for git"
@@ -22,7 +22,7 @@ IUSE="test unicode"
 REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0="
 RDEPEND="${DEPEND}
 	dev-vcs/git"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index bb6eabd4d62e..b401a6e2a622 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,4 +1,6 @@
+DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f
 DIST tortoisehg-5.8.tar.gz 8636455 BLAKE2B 1f4171ca4eb465aabacaf53b97785c5f05fc501a11329af008695f706d8d2cb9c5eee5e64bb5a60fdf7234f33ed6a937dfacce49cb36ac9e9b8505be271b4f35 SHA512 b9fe80a98cfafe0dbc90be5fe6f83b466fe596b4ec135d0eacc5618e39c0249a3a352bed640a7cecb99d53eaf60908d60d7748009492cbd8202fc191ef428278
-EBUILD tortoisehg-5.8.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
-EBUILD tortoisehg-9999.ebuild 2130 BLAKE2B d839112c2667f8d9c2a1f77e6a39f03bab7e00ffccd7155d0f237aaa02cdad43ee0f765e5abdde2aa0b3f502683a0073594e74242c77872e6183ad17b84d617e SHA512 f2a901430c69089581175679d3af8ddc636d29dc71fbb5c594a6878b6433240d4c067c3e13375f6f9894daaf44cd8b8942c785e7e98efaccc0e77d7246b225bb
+EBUILD tortoisehg-5.8.1.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
+EBUILD tortoisehg-5.8.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
+EBUILD tortoisehg-9999.ebuild 2130 BLAKE2B b0f89f298951d001f963f03c19d8c7a468d8704b322d844e543ce2212a01a4de5e4507249cd4254a9dee028356d7ea6a69381bca029e693c93ac5323c9c074a7 SHA512 7e15dfe356dd5bc92bd1c97a182726b177a858a7e0d342a45cc8b52451e1bd673bf084feaa982b4a3b978b3e7d31b1d25a9b82d7b811ef39f59db34189a1f707
 MISC metadata.xml 804 BLAKE2B 23d41703f9bdd446ac385fae5919c21684a73c4bfd468f7a0a18c9dc728964e71ee9724dfa4eacb544da54e79c2b9a5f4009ba8318d1e97f2314826cbe4429a9 SHA512 14fcda893984839424b6bcc6d6b0b966edb862fdd3b483f909c552da2775dba413b2155915480526780afec05a5ad7e3652391ccdbe5e76f7daa265fdfd6ef75
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild
new file mode 100644
index 000000000000..702819ea4b0b
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-5.8.1.ebuild
@@ -0,0 +1,80 @@
+# 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=no
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]
+		<dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pytest
+	)
+"
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die
+	${EPYTHON} tests/run-tests.py -m largefiles tests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+
+	optfeature "the core git extension support" dev-python/pygit2
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
index f54b981fe3da..702819ea4b0b 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index f54b981fe3da..702819ea4b0b 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 4da1fdc826bb..69d6e3f96550 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index a67597447ba3..3da388952c4c 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -10,7 +10,7 @@
 # This eclass handles apache-2.x ebuild functions such as LoadModule generation
 # and inter-module dependency checking.
 
-inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs
+inherit autotools flag-o-matic multilib ssl-cert toolchain-funcs
 
 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
 	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
@@ -136,6 +136,8 @@ unset -f _apache2_set_mpms
 
 # Dependencies
 RDEPEND="
+	acct-group/apache
+	acct-user/apache
 	dev-lang/perl
 	>=dev-libs/apr-1.5.1:=
 	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
@@ -435,10 +437,6 @@ check_upgrade() {
 apache-2_pkg_setup() {
 	check_upgrade
 
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
 	setup_mpm
 	setup_modules
 
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 9d0c71703e49..2409cfcda5be 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -69,6 +69,9 @@ if [[ ! ${_FORTRAN_2_CLASS} ]]; then
 for _f_use in ${FORTRAN_NEEDED}; do
 	case ${_f_use} in
 		always)
+			if [[ ${EAPI} != [56] ]]; then
+				BDEPEND+=" virtual/fortran"
+			fi
 			DEPEND+=" virtual/fortran"
 			RDEPEND+=" virtual/fortran"
 			break
@@ -77,9 +80,16 @@ for _f_use in ${FORTRAN_NEEDED}; do
 			break
 			;;
 		test)
-			DEPEND+=" ${_f_use}? ( virtual/fortran )"
+			if [[ ${EAPI} != [56] ]]; then
+				BDEPEND+=" ${_f_use}? ( virtual/fortran )"
+			else
+				DEPEND+=" ${_f_use}? ( virtual/fortran )"
+			fi
 			;;
 		*)
+			if [[ ${EAPI} != [56] ]]; then
+				BDEPEND+=" ${_f_use}? ( virtual/fortran )"
+			fi
 			DEPEND+=" ${_f_use}? ( virtual/fortran )"
 			RDEPEND+=" ${_f_use}? ( virtual/fortran )"
 			;;
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 831dd5b5dd40..f94dd9c43982 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -8,7 +8,7 @@
 # John Mylchreest <johnm@gentoo.org>
 # Mike Pagano <mpagano@gentoo.org>
 # <so many, many others, please add yourself>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for kernel packages
 # @DESCRIPTION:
 # This is the kernel.eclass rewrite for a clean base regarding the 2.6
@@ -201,7 +201,7 @@
 inherit estack toolchain-funcs
 [[ ${EAPI:-0} == 6 ]] && inherit eapi7-ver
 case ${EAPI:-0} in
-	6|7)
+	6|7|8)
 		EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
 			pkg_{setup,preinst,postinst,postrm} ;;
 	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index e6b9cbe45c0e..b80a8d6ea93b 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -388,11 +388,23 @@ kernel-install_src_test() {
 
 # @FUNCTION: kernel-install_pkg_preinst
 # @DESCRIPTION:
-# Stub out mount-boot.eclass.
+# Verify whether the kernel has been installed correctly.
 kernel-install_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	# (no-op)
+	local ver="${PV}${KV_LOCALVERSION}"
+	local kdir="${ED}/usr/src/linux-${ver}"
+	local relfile="${kdir}/include/config/kernel.release"
+	[[ ! -d ${kdir} ]] && die "Kernel directory ${kdir} not installed!"
+	[[ ! -f ${relfile} ]] && die "Release file ${relfile} not installed!"
+	local release="$(<"${relfile}")"
+	if [[ ${release} != ${PV}* ]]; then
+		eerror "Kernel release mismatch!"
+		eerror "  expected (PV): ${PV}*"
+		eerror "          found: ${release}"
+		eerror "Please verify that you are applying the correct patches."
+		die "Kernel release mismatch (${release} instead of ${PV}*)"
+	fi
 }
 
 # @FUNCTION: kernel-install_install_all
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 7f4aa723e0a5..83f8127a4bd7 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common bits for fetching & unpacking llvm.org projects
 # @DESCRIPTION:
 # The llvm.org eclass provides common code to fetch and unpack parts
@@ -30,7 +30,7 @@
 # @CODE
 
 case "${EAPI:-0}" in
-	7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
@@ -167,10 +167,7 @@ llvm.org_set_globals() {
 
 # == phase functions ==
 
-EXPORT_FUNCTIONS src_unpack
-if ver_test -ge 10.0.1_rc; then
-	EXPORT_FUNCTIONS src_prepare
-fi
+EXPORT_FUNCTIONS src_unpack src_prepare
 
 # @FUNCTION: llvm.org_src_unpack
 # @DESCRIPTION:
@@ -205,6 +202,12 @@ llvm.org_src_unpack() {
 	fi
 
 	if [[ -n ${LLVM_PATCHSET} ]]; then
+		local nocomp=$(grep -r -L "^Gentoo-Component:" \
+			"${WORKDIR}/llvm-gentoo-patchset-${LLVM_PATCHSET}")
+		if [[ -n ${nocomp} ]]; then
+			die "Patches lacking Gentoo-Component found: ${nocomp}"
+		fi
+
 		# strip patches that don't match current components
 		local IFS='|'
 		grep -E -r -L "^Gentoo-Component:.*(${components[*]})" \
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 9b2fd39ccf14..76a80f6b9be2 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -8,7 +8,7 @@
 # Author: Diego E. Pettenò <flameeyes@gentoo.org>
 # Author: Alex Legler <a3li@gentoo.org>
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 4 5 6 7 8
 # @BLURB: An eclass for installing Ruby packages to behave like RubyGems.
 # @DESCRIPTION:
 # This eclass allows to install arbitrary Ruby libraries (including Gems),
@@ -60,7 +60,7 @@ RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}"
 #  - yard (calls `yard`, adds dev-ruby/yard to the dependencies);
 #  - none
 case ${EAPI} in
-	4|5|6)
+	5|6)
 		RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}"
 		;;
 	*)
@@ -129,17 +129,11 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
 # legacy way to install extensions for a long time.
 RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
 
-case "${EAPI:-0}" in
-	0|1|2|3)
-		die "Unsupported EAPI=${EAPI} (too old) for ruby-fakegem.eclass" ;;
-	4|5|6|7)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	5|6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-
 RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}"
 
 
@@ -203,7 +197,7 @@ SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}$
 ruby_add_bdepend "virtual/rubygems !!dev-ruby/psych"
 ruby_add_rdepend virtual/rubygems
 case ${EAPI} in
-	4|5|6)
+	5|6)
 		;;
 	*)
 		ruby_add_depend virtual/rubygems
@@ -318,7 +312,7 @@ ruby_fakegem_metadata_gemspec() {
 # See RUBY_FAKEGEM_REQUIRE_PATHS for setting extra require paths.
 ruby_fakegem_genspec() {
 	case ${EAPI} in
-		4|5|6) ;;
+		5|6) ;;
 		*)
 			eqawarn "Generating generic fallback gemspec *without* dependencies"
 			eqawarn "This will only work when there are no runtime dependencies"
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 0c569bfcdcc6..ac9c117c0c02 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -8,7 +8,7 @@
 # Author: Diego E. Pettenò <flameeyes@gentoo.org>
 # Author: Alex Legler <a3li@gentoo.org>
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots.
 # @DESCRIPTION:
 # The Ruby eclass is designed to allow an easier installation of Ruby packages
@@ -68,7 +68,7 @@
 
 local inherits=""
 case ${EAPI} in
-	4|5)
+	5)
 		inherits="eutils toolchain-funcs"
 		;;
 	6)
@@ -83,15 +83,12 @@ inherit ${inherits} multilib ruby-utils
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup
 
+# S is no longer automatically assigned when it doesn't exist.
+S="${WORKDIR}"
+
 case ${EAPI} in
-	0|1|2|3)
-		die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;;
-	4|5|6|7)
-		# S is no longer automatically assigned when it doesn't exist.
-		S="${WORKDIR}"
-		;;
-	*)
-		die "Unknown EAPI=${EAPI} for ruby-ng.eclass"
+	5|6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @FUNCTION: ruby_implementation_depend
@@ -210,7 +207,7 @@ ruby_add_rdepend() {
 		1) ;;
 		2)
 			case ${EAPI} in
-				4|5|6)
+				5|6)
 					[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF"
 					ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")"
 					return
@@ -232,7 +229,7 @@ ruby_add_rdepend() {
 	# Add the dependency as a test-dependency since we're going to
 	# execute the code during test phase.
 	case ${EAPI} in
-		4|5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
+		5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
 		*) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
 	esac
 	if ! has test "$IUSE"; then
@@ -255,7 +252,7 @@ ruby_add_bdepend() {
 		1) ;;
 		2)
 			case ${EAPI} in
-				4|5|6)
+				5|6)
 					[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF"
 					ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")"
 					return
@@ -273,7 +270,7 @@ ruby_add_bdepend() {
 	local dependency=$(_ruby_atoms_samelib "$1")
 
 	case ${EAPI} in
-		4|5|6) DEPEND="${DEPEND} $dependency" ;;
+		5|6) DEPEND="${DEPEND} $dependency" ;;
 		*) BDEPEND="${BDEPEND} $dependency" ;;
 	esac
 	RDEPEND="${RDEPEND}"
@@ -286,7 +283,7 @@ ruby_add_bdepend() {
 # ruby_add_bdepend.
 ruby_add_depend() {
 	case ${EAPI} in
-		4|5|6) die "only available in EAPI 7 and newer" ;;
+		5|6) die "only available in EAPI 7 and newer" ;;
 		*) ;;
 	esac
 
@@ -354,7 +351,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
 	RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
 	REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
 	case ${EAPI} in
-		4|5|6) ;;
+		5|6) ;;
 		*) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;;
 	esac
 fi
@@ -458,7 +455,7 @@ ruby-ng_src_unpack() {
 
 _ruby_apply_patches() {
 	case ${EAPI} in
-		4|5)
+		5)
 			for patch in "${RUBY_PATCHES[@]}"; do
 				if [ -f "${patch}" ]; then
 					epatch "${patch}"
@@ -506,7 +503,7 @@ ruby-ng_src_prepare() {
 
 	# Handle PATCHES and user supplied patches via the default phase
 	case ${EAPI} in
-		4|5)
+		5)
 			;;
 		*)
 			_ruby_invoke_environment all default
diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index 0061353f4abc..d07fee03b446 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -39,7 +39,7 @@ S="${WORKDIR}"/${DICT_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gzip"
+IUSE="+zlib"
 
 DEPEND="
 	|| (
@@ -47,13 +47,13 @@ DEPEND="
 		app-text/sdcv
 		app-text/goldendict
 	)
-	gzip? (
+	zlib? (
 		app-arch/gzip
 		app-text/dictd
 	)"
 
 stardict_src_compile() {
-	if use gzip; then
+	if use zlib; then
 		for file in *.idx; do
 			[[ -f $file ]] && gzip ${file}
 		done
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 57a2c95dd10a..5bfa58e4a207 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -157,7 +157,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
 	tc_version_is_at_least 4.7 && IUSE+=" go"
 	# sanitizer support appeared in gcc-4.8, but <gcc-5 does not
 	# support modern glibc.
-	tc_version_is_at_least 5 && IUSE+=" +sanitize"
+	tc_version_is_at_least 5 && IUSE+=" +sanitize"  TC_FEATURES+=(sanitize)
 	# Note:
 	#   <gcc-4.8 supported graphite, it required forked ppl
 	#     versions which we dropped.  Since graphite was also experimental in
@@ -245,6 +245,13 @@ if tc_has_feature gcj ; then
 	"
 fi
 
+if tc_has_feature sanitize ; then
+	# libsanitizer relies on 'crypt.h' to be present
+	# on target. glibc user to provide it unconditionally.
+	# Nowadays it's a standalone library: #802648
+	DEPEND+=" sanitize? ( virtual/libcrypt )"
+fi
+
 if tc_has_feature systemtap ; then
 	# gcc needs sys/sdt.h headers on target
 	DEPEND+=" systemtap? ( dev-util/systemtap )"
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index 6b72d66111d3..50e727e98f4e 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -126,31 +126,31 @@ update_vim_afterscripts() {
 display_vim_plugin_help() {
 	local h
 
-	if ! has_version ${CATEGORY}/${PN} ; then
-		if [[ -n "${VIM_PLUGIN_HELPFILES}" ]] ; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ -n ${VIM_PLUGIN_HELPFILES} ]]; then
 			elog " "
 			elog "This plugin provides documentation via vim's help system. To"
 			elog "view it, use:"
-			for h in ${VIM_PLUGIN_HELPFILES} ; do
+			for h in ${VIM_PLUGIN_HELPFILES}; do
 				elog "    :help ${h}"
 			done
 			elog " "
 
-		elif [[ -n "${VIM_PLUGIN_HELPTEXT}" ]] ; then
+		elif [[ -n ${VIM_PLUGIN_HELPTEXT} ]]; then
 			elog " "
 			while read h ; do
 				elog "$h"
 			done <<<"${VIM_PLUGIN_HELPTEXT}"
 			elog " "
 
-		elif [[ -n "${VIM_PLUGIN_HELPURI}" ]] ; then
+		elif [[ -n ${VIM_PLUGIN_HELPURI} ]]; then
 			elog " "
 			elog "Documentation for this plugin is available online at:"
 			elog "    ${VIM_PLUGIN_HELPURI}"
 			elog " "
 		fi
 
-		if has "filetype" "${VIM_PLUGIN_MESSAGES}" ; then
+		if has filetype ${VIM_PLUGIN_MESSAGES}; then
 			elog "This plugin makes use of filetype settings. To enable these,"
 			elog "add lines like:"
 			elog "    filetype plugin on"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 806a4fd7c920..9a3975599916 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 7a4c7bc4250b..14ee747ea686 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,4 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
 DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
-EBUILD funnyboat-1.5_p11-r2.ebuild 1206 BLAKE2B 4336fa7e9d2b134cc3f82e4c22d3572af49f576a1c62bf40c651e9f7a15f9db6f6c060460644458ed1222b548b7b098f55120ee0d179e85146cc5a914c43997c SHA512 7443c5d068930b54a2f2ed21a2c9197334fdc38083a0d433bf602a201d09963ccdc156dfb869d8585fdaa83c7319b39b10fcf8a5c57718e02796be6c73f8339b
+EBUILD funnyboat-1.5_p11-r2.ebuild 1200 BLAKE2B 0f0d5fdf7448493f3153d2fe24463ce53bfbac908e19f01c6b1c0f3b9002b7b25533712601b1df0bd77203aaa5caa8e3f3ffb81046a7b612887c16072a0c2325 SHA512 d8f1b1d834032d332ccf7e08241e5daa98e1e85d9be4c4c912a1ba2d840f75ace72d64b2b0ec2d0ba5d4901ec66d938234df73b1e16aabc6cd3785f8b0d3c2e0
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
index 4f5dae983289..a0c6232d07c0 100644
--- a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-mixer[vorbis]"
 BDEPEND="
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 9060fca754e4..df4eb6bf7c8d 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,4 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
-DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
-EBUILD solarwolf-1.5-r2.ebuild 1085 BLAKE2B 4c6452ed6a4105fab33fcf176dc4bc38f7c056b0d556cd3706e3c4767bd5dac5aeaffb31bba36db1ae6cd3fd193fff379e05393ea87fff7b6c864737443858c6 SHA512 7bcf0bdf0047f2b0f3a320fe0682fc4d045702827da46f2aa1867c0208afda5a618afe663bc8a4bcbe4b45de487bf8f63e4b57288f724659a5d36f68e58ff456
+DIST solarwolf_1.5+dfsg1-3.debian.tar.xz 8944 BLAKE2B 7d83da34338e069d5076e7852f87f233043bfd3f3b2fe93a03fc3fcc631545ff666922d776d25689dec0723b077a373b30aed70ff713e27fad2c0f77bcf3b40e SHA512 e443c6096d7fae2ead3a4d6cacd21590dbdd89ae3293bbd3a219a5337647088b417d6712cef0839c394bc18570d0255d2c3af12a0fc1aae718955ddc64dced95
+EBUILD solarwolf-1.5_p3.ebuild 1434 BLAKE2B c84ceb67a5e48dd23abc088e8b97b578e31d19d940772addb4f18ab9538c28a8d24f5eb7cb615570628b8d84df6795327834cdfa67ea903d851d2fe931abc8ee SHA512 a4d6d0a00cd7a920f6f5929a30e66701daec848b4da097690e16f31a24cbf3221b61aba2402a9b351071453e5b12a5942068c23f7e666d23c31dbbd24af0e0d5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
deleted file mode 100644
index 2ec0e6da2f73..000000000000
--- a/games-arcade/solarwolf/solarwolf-1.5-r2.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,8,9} )
-inherit desktop python-r1 wrapper
-
-DESCRIPTION="Action/arcade recreation of SolarFox"
-HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
-SRC_URI="
-	http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+dfsg1-1.debian.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pygame-1.5.6[${PYTHON_USEDEP}]
-	media-libs/sdl-mixer[mod,vorbis]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
-
-	find . -name .xvpics -print0 | xargs -0 rm -fr || die
-	# bug #619948
-	gunzip dist/${PN}.6.gz || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data *py
-
-	make_wrapper ${PN} "python3 ./solarwolf.py" /usr/share/${PN}
-
-	newicon data/ship-big.png ${PN}.png
-	make_desktop_entry ${PN} SolarWolf
-
-	einstalldocs
-	doman dist/${PN}.6
-}
diff --git a/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
new file mode 100644
index 000000000000..93c392620e1a
--- /dev/null
+++ b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit desktop python-single-r1
+
+MY_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="Action/arcade recreation of SolarFox"
+HOMEPAGE="https://www.pygame.org/shredwheat/solarwolf/index.shtml"
+SRC_URI="
+	http://www.pygame.org/shredwheat/solarwolf/${MY_P}.tar.gz
+	mirror://debian/pool/main/s/solarwolf/${MY_P/-/_}+dfsg1-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
+	media-libs/sdl2-image[gif,png]
+	media-libs/sdl2-mixer[mod,vorbis]"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+
+	sed -e "/CODEDIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}/code\"|" \
+		-e "/DATADIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}\"|" \
+		-i ${PN}.py || die
+	python_fix_shebang ${PN}.py
+
+	# default to windowed given it forces resolution and menus can be invisible
+	sed -i '/^display = 1/s/1/0/' code/game.py || die
+
+	rm -r data/.xvpics || die
+	gzip -d dist/${PN}.6.gz || die
+}
+
+src_install() {
+	newbin ${PN}.py ${PN}
+	doman dist/${PN}.6
+
+	insinto /usr/share/${PN}
+	doins -r code data
+
+	dodoc readme.txt
+
+	newicon data/ship-big.png ${PN}.png
+	make_desktop_entry ${PN} SolarWolf
+}
diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest
index 11f7035f8c62..99e43df31d3e 100644
--- a/games-arcade/whichwayisup/Manifest
+++ b/games-arcade/whichwayisup/Manifest
@@ -1,7 +1,7 @@
 AUX whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch 582 BLAKE2B 6d5c35fe35fe08df884c69b54c8a0ca18bfa2f22706274cf7a8589391fc0f25d77ae7619c8ec44fe075e31020af19b0350bbac7f9e2866838629e24df6e7468f SHA512 506560bb48348b37034a6f7851e1d4ff4e56374df7fed9cc5ac405aadfd4e63cf947fdfa837f45b51eaa08f5bd0f5deeb805a02afb67eae9a03c8b24aff53c74
 AUX whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch 631 BLAKE2B 09c7b64e45ec239905043b1d1a8abf965d92a54405f98ee5db4f3c6e494dc509ca99ee00f42c2c125320975e8e8e7bd17436a05b1066218b70ba27c16af65643 SHA512 2fb39740ed5ee4814f496e799d27f4d9377771861799e907bab5d3454aca2b3d6d25616d254977f7bf3504b4874774bc9984ddcfca58660fd63cb5bc6938663d
 AUX whichwayisup-0.7.9-python3.patch 18559 BLAKE2B 96cb66f5092e1a0ee29e82b12ec5c6cdde3f92cdc3cb6a0db5b768e0eb51e6a8eaf5e4ca85889966d5155f9197fff8431408ac5a3a63b58cb65d38db15e04c64 SHA512 cefabb3deee25bf6fb008d648257dfd5fbe30a87e7aa9fc3cb0d80ce544db6e7c52193a3aad68761a8d7258b9474066eba6c5723b7da3ad1ac5c27f579184f28
-AUX whichwayisup-32.xpm 1694 BLAKE2B 079e9f6e3dde54c1d2bb7f576330663fa886bc112f3e20398c3e50521c19ccc4c68647b37e9d3ed4dc88a7f2c2ac60d11c171e3350e7ec84fee0b193e4eeb830 SHA512 e0329876d45aa575abe07024d7f154ff743f1899c4dbb58b8e317ae9173c2aadd63a511924e99115a9f56f42411507f542225e4980d9588e09f7765cf41bf95c
+DIST whichwayisup.png 6720 BLAKE2B 26514e025341ce7d5145d69295a24477ea3575afcfb0a11bbbddb1dd716feadef9a030ec9dc4171b75842fafc78670ed1fc7656dac8dbd6695b9592b73bb1383 SHA512 469b847955a745177c7629dd13f1975191766863bfe263e3818105356d71aaaeb66cbe34846d0bd908bf494e2d7d42b7f33499868da2fa346f96f8080bccc0b2
 DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809
-EBUILD whichwayisup-0.7.9-r3.ebuild 1370 BLAKE2B 351e7169dfd7edccced27db3f5f3193b08555017a66f5803cd7271a0670b7a92d2ed2646a8f76c96ebcce1b65f1038fd79750470118cc9ca1a43d7b7118e81ed SHA512 dc95b2776b8c533e7468afd9db8e4054052d78542833d8f64fe15d822faee0b5cbfc87cfa141998b06f931927e34e2357816c3da2dd17b7318dba75bd5fdc3f9
+EBUILD whichwayisup-0.7.9-r4.ebuild 1308 BLAKE2B 836ee81070c329f198af378100a0dfa628af0c44c1265dbb2dec45b160bccf0596ea941232a79cfdb2969b1ccf43c844f59161174ccc897d510a87e848370ad6 SHA512 1ac00033d22e0f3e51c785336c9b4898f01d38e55960d51f6ca27c3ece458722606e33c48139efa1bab0f79d8ed76003a510e7d936a112e391bc540985e34013
 MISC metadata.xml 491 BLAKE2B 7c632e2660757b2796dc732506e95b040890bc30941d152f4b650a2aad266e9aa3c013ce8054d02979c64610559ace6b4ac4b6d8ed9b5277a0dd9c92d9414b4c SHA512 a53511b1c0d5b69a34c5dfb0c302505cda98b9a54edb6b4f74868a48ee7870b1ec83dfedff7833e2997a97160182fb35f610a2f97c3577ca4b4cc297c98eeb1b
diff --git a/games-arcade/whichwayisup/files/whichwayisup-32.xpm b/games-arcade/whichwayisup/files/whichwayisup-32.xpm
deleted file mode 100644
index f5a6ff33c0dc..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-32.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * whichwayisup_32_xpm[] = {
-"32 32 32 1",
-" 	c None",
-".	c #03151B",
-"+	c #016C87",
-"@	c #225361",
-"#	c #363636",
-"$	c #387D9A",
-"%	c #0A2B35",
-"&	c #4E4F50",
-"*	c #ECEBEB",
-"=	c #9D866F",
-"-	c #E3D9D3",
-";	c #A8947C",
-">	c #CDCDCD",
-",	c #C5BDA7",
-"'	c #B2A38C",
-")	c #D0C9B4",
-"!	c #AEACAB",
-"~	c #FDFDFD",
-"{	c #020202",
-"]	c #856B5D",
-"^	c #262524",
-"/	c #6E6E6E",
-"(	c #888987",
-"_	c #121111",
-":	c #9E9D9D",
-"<	c #4F6871",
-"[	c #BCBDBD",
-"}	c #023B4A",
-"|	c #6E4C3B",
-"1	c #7D5945",
-"2	c #4F2C21",
-"3	c #401D14",
-"             .+@@#              ",
-"             ++++$              ",
-"           #%&@&@@@.            ",
-"           *=-;>,'-             ",
-"             )*=!~              ",
-"           {{#]]]#{{            ",
-"        {{^^%+@/(%_/#_          ",
-"      {{&:*>@+<&<<%[~[&{        ",
-"     _#:~~~~<+@/@&&(-~~/_       ",
-"    _#>~~[<^{}%%@{_&{<>~:{      ",
-"   _#-~>&{{  }}.+{   {^:~({     ",
-"   ^>~>_^(;>,:((((--,) {(~&     ",
-"  {(~*#{ ,),))))))),,;  _>[{    ",
-" #^*~({  ;',,,,,),,,=|  {&*#    ",
-" _/~~&{  ;;',)),)),=1]   ^*/{   ",
-" _(~*^_  =;;'),,))=|11   {>[_   ",
-" _!~*_{  ====',,,=|1|2   {:-^   ",
-" _:~*^{  ;;;';')=|]1##   {:*^   ",
-" {(~*^{  ;=;=;=]||12&2   {:~^   ",
-" _&~~&{  ==;==|321^:/^   {[~^   ",
-"  _>~/{  =';;13222&~#3  {#~>_   ",
-"  {/~!{  =;=|3333_[~^#  {:~(^   ",
-"  ^_>~^{ ''|3222_#~*^| {#~*^    ",
-"   {#~:{&'123232{/~*^^{_>~/{    ",
-"    {&*&^|323333{(~*&{#>~:{     ",
-"     {&!#       {(~~[!*~:{{     ",
-"      {^#_      {/~*~~~:{{      ",
-"        __{{    {#~~~~~:^{      ",
-"                 _>~~~~~-/_{    ",
-"                 {#([*~~~~[&_{  ",
-"                   {{^&(:[**!&{ ",
-"                        {{_^&&#{"};
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild
deleted file mode 100644
index 8c6d76376e9e..000000000000
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.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_{7,8,9} )
-
-inherit desktop python-r1
-
-MY_PV="${PV//./}"
-MY_P="${PN}_b${MY_PV}"
-
-DESCRIPTION="A traditional and challenging 2D platformer game with a slight rotational twist"
-HOMEPAGE="http://hectigo.net/puskutraktori/whichwayisup/"
-SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip"
-
-LICENSE="GPL-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	# Fixes from Fedora
-	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
-	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
-	"${FILESDIR}"/${P}-python3.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:libdir\ =\ .*:libdir\ =\ \"/usr/$(get_libdir)/${PN}\":" \
-		run_game.py || die
-	sed -i \
-		-e "s:data_dir\ =\ .*:data_dir\ =\ \"/usr/share/${PN}\":" \
-		lib/data.py || die
-	rm data/pictures/Thumbs.db || die
-}
-
-src_install() {
-	newbin run_game.py ${PN}
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	doins lib/*.py
-
-	einstalldocs
-
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-
-	newicon "${FILESDIR}"/${PN}-32.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Which Way Is Up?"
-}
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild
new file mode 100644
index 000000000000..f37eff3578bc
--- /dev/null
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit desktop python-single-r1
+
+DESCRIPTION="Traditional and challenging 2D platformer game with a slight rotational twist"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${PN}_b$(ver_rs 1- '').zip
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BitstreamVera CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
+	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "/libdir =/s|= .*|= \"${EPREFIX}/usr/share/${PN}/lib\"|" run_game.py || die
+	python_fix_shebang run_game.py
+
+	rm data/pictures/Thumbs.db || die
+}
+
+src_install() {
+	newbin run_game.py ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data lib
+
+	dodoc README.txt changelog.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Which Way Is Up?"
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 59f704b08df4..8a9b8ee44a19 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index f3e6a8e6b6bb..bdb1648ac7fe 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -4,5 +4,5 @@ AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6
 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
-EBUILD pysolfc-2.6.4-r1.ebuild 2195 BLAKE2B 97446fff310c52feb70bd60c7a9c0fe8cbe1714b01aa4fe60c8af9218e845e87a6e8d8b4a5ddbae53115b9c6fb5a2f57859113c15f9ffb1a6c5ab77133a0251a SHA512 2fa03f304e5cc1dac59e932ec253163c6116b6332df57d28537747e3c7ca704aad2a36832a52873f28ba0cf547798955fa36204f426740135f88509b48b47674
+EBUILD pysolfc-2.6.4-r1.ebuild 2169 BLAKE2B 581be072c6f3d141478a972dd15d4a81321abad8eb7d817dfbc8975f8e57c6570efcddeff45e56f4bbf13076be7ad360a92f0c567a905fbc39441af9d275c01d SHA512 afcbaa4a60df2d7b3cbb3bb32564383d05d1bd8a4064ca1ed3151cd5db822c3eedc42aad37dec8aaab825ccd94c1342033b5454830412f918f4863e8eebd5992
 MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
diff --git a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
index 60cde1298441..442a95d8a337 100644
--- a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
+++ b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_REQ_USE="tk"
 
@@ -30,14 +30,14 @@ S="${WORKDIR}/${MY_PN}-${P}"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/random2[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
 		!minimal? (
-			dev-python/pillow[tk,${PYTHON_MULTI_USEDEP}]
+			dev-python/pillow[tk,${PYTHON_USEDEP}]
 			dev-tcltk/tktable
 		)
 		sound? (
-			dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygame[${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 7e8283aafe2f..76e56efb9a25 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 42c45441ac19..1cea47a5abda 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,5 +1,5 @@
 DIST frotz-2.52.tar.bz2 289109 BLAKE2B d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774 SHA512 387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710
 DIST frotz-2.53.tar.bz2 375800 BLAKE2B a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1 SHA512 e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808
-EBUILD frotz-2.52.ebuild 1688 BLAKE2B 1428b453f2f43dc447a4982d510eda0f1f1e8fbdc124f32529c64cff46b7fb029667de95516f845ede99a0b5476b3f210f2e355914880a3816fec9e36037a114 SHA512 34b9d215752c7f299e9911de3b40b8cbc0e17a7455f3faa8caf31154bd8298d8b1002dbc84dc8b1811dd4335ec245dd42bce1136fa3632719351d9f2eb210132
-EBUILD frotz-2.53.ebuild 1688 BLAKE2B 8a2a441d32d0218b8597030979548810d0ad10062a8e01d7a1754a08dd22054deb95384a42a70ed3e3d3d2c9b7b9e297511a7394b120f1fa51727eacf0ef013b SHA512 8eba3345382085656525c24ed45554f34efc40c8d0be9d04631ec32628c5aef0d6a36645d286382b7680c71f07f2831ba205495b77899147f50da44aecd194f0
+EBUILD frotz-2.52-r1.ebuild 1690 BLAKE2B 2d95ac95b4541e5e887b0067dd58dc7ee6f5bb18d7bbcbb3f1c389032c5627fa8521570e808e25e7663f8e8a32c5835adde3f487cbdabb7f08f1dce23e23b95e SHA512 6290d59b3362aea687945c9f38664f6d927bd442878b5da2a23b8754a761f79542dd9087546e42fd5f88aab58e6f05cc878c09cabf0e26e173bd23d61ce2be4d
+EBUILD frotz-2.53-r1.ebuild 1690 BLAKE2B 2d95ac95b4541e5e887b0067dd58dc7ee6f5bb18d7bbcbb3f1c389032c5627fa8521570e808e25e7663f8e8a32c5835adde3f487cbdabb7f08f1dce23e23b95e SHA512 6290d59b3362aea687945c9f38664f6d927bd442878b5da2a23b8754a761f79542dd9087546e42fd5f88aab58e6f05cc878c09cabf0e26e173bd23d61ce2be4d
 MISC metadata.xml 337 BLAKE2B 58dbc1d02cdf6768759edb274b556b608135d088ab1b827abbe23726435e2595a9008a377bd27ebb1b4a517dc9e5ef74a9dcd2e08d829e0aacaa854fc258f830 SHA512 ace3f8702420d20cb543c88e0e22fae40cea97be5d86c40657107b9621c72ef462480a790f26735d212aec7fdffb27a1b00bd48f70d0e030f28efa53f51e0217
diff --git a/games-engines/frotz/frotz-2.52-r1.ebuild b/games-engines/frotz/frotz-2.52-r1.ebuild
new file mode 100644
index 000000000000..6be32d8e9c56
--- /dev/null
+++ b/games-engines/frotz/frotz-2.52-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/"
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		sound? (
+			media-libs/libao
+			media-libs/libmodplug
+			media-libs/libsamplerate
+			media-libs/libsndfile[-minimal]
+			media-libs/libvorbis
+		)
+	)
+	sdl? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		media-libs/libsdl2[sound,threads,video]
+		media-libs/sdl2-mixer[mod,vorbis,wav]
+		sys-libs/zlib
+		virtual/jpeg:0=
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	emake \
+		dumb \
+		$(use ncurses && echo ncurses) \
+		$(use sdl && echo sdl) \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CURSES=$(usex unicode ncursesw ncurses) \
+		USE_UTF8=$(usex unicode yes "") \
+		SOUND_TYPE=$(usex sound ao none) \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install() {
+	emake \
+		install_dumb \
+		$(use ncurses && echo install) \
+		$(use sdl && echo install_sdl) \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}"
+
+	dodoc \
+		AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+		doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+	echo
+	elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+	elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+	echo
+}
diff --git a/games-engines/frotz/frotz-2.52.ebuild b/games-engines/frotz/frotz-2.52.ebuild
deleted file mode 100644
index cab60c1ec299..000000000000
--- a/games-engines/frotz/frotz-2.52.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter for Z-code based text games"
-HOMEPAGE="https://661.org/proj/if/frotz/"
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ncurses sdl sound unicode"
-REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
-
-DEPEND="
-	ncurses? (
-		sys-libs/ncurses:0=[unicode?]
-		sound? (
-			media-libs/libao
-			media-libs/libmodplug
-			media-libs/libsamplerate
-			media-libs/libsndfile[-minimal]
-			media-libs/libvorbis
-		)
-	)
-	sdl? (
-		media-libs/freetype:2
-		media-libs/libpng:0=
-		media-libs/libsdl2[sound,threads,video]
-		media-libs/sdl2-mixer[mod,vorbis,wav]
-		sys-libs/zlib
-		virtual/jpeg:0=
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	emake \
-		dumb \
-		$(use ncurses && echo ncurses) \
-		$(use sdl && echo sdl) \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CURSES=$(usex unicode ncursesw ncurses) \
-		USE_UTF8=$(usex unicode yes "") \
-		SOUND_TYPE=$(usex sound ao none) \
-		PREFIX="${EPREFIX}/usr" \
-		SYSCONFDIR="${EPREFIX}/etc"
-}
-
-src_install() {
-	emake \
-		install_dumb \
-		$(use ncurses && echo install) \
-		$(use sdl && echo install_sdl) \
-		PREFIX="${EPREFIX}/usr" \
-		DESTDIR="${D}"
-
-	dodoc \
-		AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
-		doc/frotz.conf-{big,small}
-}
-
-pkg_postinst() {
-	echo
-	elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
-	elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
-	echo
-}
diff --git a/games-engines/frotz/frotz-2.53-r1.ebuild b/games-engines/frotz/frotz-2.53-r1.ebuild
new file mode 100644
index 000000000000..6be32d8e9c56
--- /dev/null
+++ b/games-engines/frotz/frotz-2.53-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/"
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		sound? (
+			media-libs/libao
+			media-libs/libmodplug
+			media-libs/libsamplerate
+			media-libs/libsndfile[-minimal]
+			media-libs/libvorbis
+		)
+	)
+	sdl? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		media-libs/libsdl2[sound,threads,video]
+		media-libs/sdl2-mixer[mod,vorbis,wav]
+		sys-libs/zlib
+		virtual/jpeg:0=
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	emake \
+		dumb \
+		$(use ncurses && echo ncurses) \
+		$(use sdl && echo sdl) \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CURSES=$(usex unicode ncursesw ncurses) \
+		USE_UTF8=$(usex unicode yes "") \
+		SOUND_TYPE=$(usex sound ao none) \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install() {
+	emake \
+		install_dumb \
+		$(use ncurses && echo install) \
+		$(use sdl && echo install_sdl) \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}"
+
+	dodoc \
+		AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+		doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+	echo
+	elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+	elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+	echo
+}
diff --git a/games-engines/frotz/frotz-2.53.ebuild b/games-engines/frotz/frotz-2.53.ebuild
deleted file mode 100644
index f03a3d070289..000000000000
--- a/games-engines/frotz/frotz-2.53.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter for Z-code based text games"
-HOMEPAGE="https://661.org/proj/if/frotz/"
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ncurses sdl sound unicode"
-REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
-
-DEPEND="
-	ncurses? (
-		sys-libs/ncurses:0=[unicode?]
-		sound? (
-			media-libs/libao
-			media-libs/libmodplug
-			media-libs/libsamplerate
-			media-libs/libsndfile[-minimal]
-			media-libs/libvorbis
-		)
-	)
-	sdl? (
-		media-libs/freetype:2
-		media-libs/libpng:0=
-		media-libs/libsdl2[sound,threads,video]
-		media-libs/sdl2-mixer[mod,vorbis,wav]
-		sys-libs/zlib
-		virtual/jpeg:0=
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	emake \
-		dumb \
-		$(use ncurses && echo ncurses) \
-		$(use sdl && echo sdl) \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CURSES=$(usex unicode ncursesw ncurses) \
-		USE_UTF8=$(usex unicode yes "") \
-		SOUND_TYPE=$(usex sound ao none) \
-		PREFIX="${EPREFIX}/usr" \
-		SYSCONFDIR="${EPREFIX}/etc"
-}
-
-src_install() {
-	emake \
-		install_dumb \
-		$(use ncurses && echo install) \
-		$(use sdl && echo install_sdl) \
-		PREFIX="${EPREFIX}/usr" \
-		DESTDIR="${D}"
-
-	dodoc \
-		AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
-		doc/frotz.conf-{big,small}
-}
-
-pkg_postinst() {
-	echo
-	elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
-	elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
-	echo
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 3c313a058810..6af12cd53498 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index d8dc3e3678b1..b3a0d873f9a2 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,5 +1,9 @@
 AUX quakeforge-0.7.2_p20210601-png-stub.patch 230 BLAKE2B fb1185bcbb377186bcacff8156dd4f5724882057b75af0cc42745471fa68fc30b672f589465d05603ded336b5370f9220aa6fb23546923317ca512056f5a0077 SHA512 cd5e88b23042a6462996d88034770211a59018e9ea81a498bbe4e5abd2aa4c01847c607bcd9670f6e1748bef1c4508668ed2b6f3b3b1690b392e9f9a9c93660e
 AUX quakeforge-0.7.2_p20210601-skipped-tests.patch 473 BLAKE2B a5ee046cd5b351741afe1953ddfc039df415d46d6d4f3085555466d052b0b61f58ce2684c8ea3b94817e754a12f5a423b0c98951daaa998970a89f89230a9952 SHA512 8d2f0b5f78b56e564fbf7b8602ded77f2403b0ce19d43c981e5f71d9fa7555529953447241effa209609480822e8a30e69a53b66b53618391887658435dd82aa
+AUX quakeforge-0.7.2_p20210722-skipped-tests.patch 491 BLAKE2B e9124ae690ee78825b921655f0ad297386a46b66151bcb7f0e9eff2bfc1a3f533b1b0beebdc863399519a104c098d4d2387fefa9a69d0dcfef7b442a7a5d73be SHA512 72e4a8f04cbc46f066fc3543a069a9d94a275c8f1a67028d90791c4c21d92ddd5e912b724c916ddee712b736fc098c747705f11619da2fc8162a8ad818c3b362
 DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
+DIST quakeforge-0.7.2_p20210722.tar.gz 3157720 BLAKE2B 9757ed10a5f78d9b5f09029c149c3fc121daf4bef2cc5a1687d00d2d85c36065663407318478c801a4ae62dee03713e35009c91f590d1686678756da1aab7824 SHA512 1c3778ff73cffbb5cadc33e0b544935f822a0f983ed67945dbbd7f6624752b68e3da46f1836f38f22cbae9a9ac191eeacc256ca5da540c5448dfc1fb56b68aa4
 EBUILD quakeforge-0.7.2_p20210601.ebuild 4879 BLAKE2B dd2ce56a125af5b069e16e159fb9d6a3c413263983d4ce1a730f6e2a53979d9247b5d1b8f953a53ddb7711e7c09853000632aefd121c74340f8ef03621c6ae8c SHA512 17da66fdac3ced92859908bc52878594661970e0fb03492ca720008c54f1a81e068f92a642b8b0b8749b65c76438799b92e6095102b4c6354784d1857da7bd59
-MISC metadata.xml 1814 BLAKE2B 88bcd7f96f83c035c1f84ec910895f7a197d5d29ac4d4c10b40baae21ecf37143a771c3f74deec60a906a6c36cf29ae2a2260362b6a891c216e1a2f40774e2d8 SHA512 c87273afde2a0776677b4c2b524eda78590311c70351101c0e6cc3c341fad95ad0c7636ac31822959722e55eb64d976c9bb777fc7a931ef946d31bf8a0826919
+EBUILD quakeforge-0.7.2_p20210722.ebuild 4386 BLAKE2B 268b9ede927ffd7d89b3d2cd6167e03a2666c33dd9def759bd537324cfc9dd462188a1df2c53ca3ed302b1e47c419153819a942bd554c6355bfe17d5814574b9 SHA512 f6808224222281798a853a83a455e77672185fd719c24ec680fc6ae5418db13ae693d2727ceea413bb5e62636c316708fbd4490b2135a9fab543196945548678
+EBUILD quakeforge-9999.ebuild 4363 BLAKE2B 239332acaa1be6a9d7424c905838594e7472415aee36b9b22f669ab7c8028e0fce6367f84f10a2eda1c7794cb91a5ee2ca92573a91ef113c473073a101f27a02 SHA512 8ce407d46a3a19e3a78be764b5c5bd98d3d018163a00eba5223a3a938ab7e9967cec054a00965b4bf1df225fe0a63141367464938a95e88be58cbe288d16e239
+MISC metadata.xml 1905 BLAKE2B 5c3af0de1b06ea4c5ff458d3859d10fc314361fca005e47da1f932e8aa9828dda8dff1fe3226a7ba7db03cc03b3da36854adff2eb9157a2014260fdeec46e4e0 SHA512 85ef7143bfb6fd8efaeb444cd66e561f6d2a4b787cc2d25fbae593cfdbc3ce7dcc899939bcd8489edd8506997f26023a87f8c128b66d2fb53f14082178dcd7c3
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210722-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210722-skipped-tests.patch
new file mode 100644
index 000000000000..df312bab7626
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210722-skipped-tests.patch
@@ -0,0 +1,16 @@
+These are only failing at high precision and
+should not affect normal usage.
+  quat/simd: may fail with -mavx
+      sebvf: random failure, usually pass, likely hardware related
+--- a/libs/util/test/Makemodule.am
++++ b/libs/util/test/Makemodule.am
+@@ -15,8 +15,5 @@
+ 	libs/util/test/test-qfs \
+-	libs/util/test/test-quat \
+ 	libs/util/test/test-seb \
+-	libs/util/test/test-sebvf \
+ 	libs/util/test/test-seg \
+-	libs/util/test/test-set \
+-	libs/util/test/test-simd
++	libs/util/test/test-set
+ 
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index a5c31dd9bfe4..c0d9251c3559 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -6,31 +6,32 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-QuakeForge is a 3D graphics game engine based on id Software's legendary 
-Quake and QuakeWorld game engine. Our purpose? To improve the state of 
-the game by improving the engine and making it accessable to the largest 
-number of players we can.
+		QuakeForge is a 3D graphics game engine based on id Software's legendary
+		Quake and QuakeWorld game engine. Our purpose? To improve the state of
+		the game by improving the engine and making it accessable to the largest
+		number of players we can.
 
-Arguably the single most important issue on the minds of players today 
-is the rampant cheating which is currently happening on many of the 
-larger servers. It's a serious problem and it really makes a good game 
-hard to find. We're working hard to fix these problems at the engine 
-level.
+		Arguably the single most important issue on the minds of players today
+		is the rampant cheating which is currently happening on many of the
+		larger servers. It's a serious problem and it really makes a good game
+		hard to find. We're working hard to fix these problems at the engine
+		level.
 
-But what good is that if you have to have a copy of our client and the 
-server has to run our server? There are other projects out there and 
-some of them have very unique qualities. QuakeForge is cooperating with 
-QSG, a group comprised of representatives from nearly every known Quake 
-source project to ensure that our clients and servers run with other 
-clients and servers just fine. We have all agreed to implement any 
-effective cheat prevention methods.
+		But what good is that if you have to have a copy of our client and the
+		server has to run our server? There are other projects out there and
+		some of them have very unique qualities. QuakeForge is cooperating with
+		QSG, a group comprised of representatives from nearly every known Quake
+		source project to ensure that our clients and servers run with other
+		clients and servers just fine. We have all agreed to implement any
+		effective cheat prevention methods.
 
-Other things we're doing include merging the two code trees, adding 
-features, and improving the OpenGL renderer. And QuakeForge is still the 
-most portable source tree based on the id Software code.
-</longdescription>
+		Other things we're doing include merging the two code trees, adding
+		features, and improving the OpenGL renderer. And QuakeForge is still the
+		most portable source tree based on the id Software code.
+	</longdescription>
 	<use>
 		<flag name="client">Build Normal and QuakeWorld clients alongside the servers</flag>
+		<flag name="vulkan">Enable vulkan renderer (experimental)</flag>
 		<flag name="wildmidi">Use <pkg>media-sound/wildmidi</pkg> for midi support</flag>
 	</use>
 	<upstream>
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
new file mode 100644
index 000000000000..1a58d8f86151
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
+else
+	MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8"
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib"
+
+RDEPEND="
+	client? (
+		media-libs/libsamplerate
+		net-misc/curl
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		alsa? ( media-libs/alsa-lib )
+		flac? ( media-libs/flac )
+		jack? ( virtual/jack )
+		sdl? ( media-libs/libsdl[sound] )
+		vorbis? ( media-libs/libvorbis )
+		vulkan? ( media-libs/vulkan-loader )
+		wildmidi? ( media-sound/wildmidi )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	client? (
+		x11-base/xorg-proto
+		vulkan? ( dev-util/vulkan-headers )
+	)"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/transfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-skipped-tests.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > .tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	qf_client() {
+		echo $(usex client $(use_enable ${1}) --disable-${1})
+	}
+
+	local econfargs=(
+		$(qf_client alsa)
+		$(qf_client flac)
+		$(qf_client jack)
+		$(qf_client oss)
+		$(qf_client sdl)
+		$(qf_client vorbis)
+		$(qf_client vulkan)
+		$(qf_client wildmidi)
+		$(use_enable client sound)
+		$(use_enable client vidmode)
+		$(use_enable debug)
+		$(use_enable ncurses curses)
+		$(use_enable png)
+		$(use_enable zlib)
+		$(use_with client x)
+		--disable-Werror
+		--disable-dga
+		--enable-xdg
+		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+		--with-clients=$(usev client x11)
+		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
+		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
+		--with-sharepath="${EPREFIX}"/usr/share/quake1
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doxygen/html/. )
+
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
+at one of these locations with lowercase filenames:
+	- '~/.local/share/${PN}/id1/pak0.pak'
+	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
+
+You can add them yourself or use either of:
+	- games-fps/quake1-data: install from a Quake CD-ROM
+	- games-fps/quake1-demodata: pak0.pak only (limited demo)
+
+Key binds notes:
+	Defaults ('imt_mod' table) expect you to set key binds manually in:
+	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
+	For the in-game bind menu to be usable ('imt_0' table), bring up the
+	console with backtick \`, and run 'imt imt_0' (only needed once).
+	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
+
+Audio/Video notes:
+	Can add settings in:
+	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
+	Examples:
+	- set vid_width 800
+	- set vid_height 600
+	- set snd_output sdl (or alsa, jack, oss -- sdl can do pulseaudio)
+	- setrom vid_render gl (or vulkan, sw for software rendering)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+		elog "Migration may be needed for ${PN}'s home paths, now using:"
+		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
+		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+	fi
+
+	if use vulkan; then
+		ewarn "You've enabled the new vulkan support that is still experimental and yet"
+		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
+		ewarn "line option to revert to GL."
+	fi
+}
diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
new file mode 100644
index 000000000000..03d46dcf580a
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
+else
+	MY_COMMIT=""
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib"
+
+RDEPEND="
+	client? (
+		media-libs/libsamplerate
+		net-misc/curl
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		alsa? ( media-libs/alsa-lib )
+		flac? ( media-libs/flac )
+		jack? ( virtual/jack )
+		sdl? ( media-libs/libsdl[sound] )
+		vorbis? ( media-libs/libvorbis )
+		vulkan? ( media-libs/vulkan-loader )
+		wildmidi? ( media-sound/wildmidi )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	client? (
+		x11-base/xorg-proto
+		vulkan? ( dev-util/vulkan-headers )
+	)"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/transfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.2_p20210722-skipped-tests.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > .tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	qf_client() {
+		echo $(usex client $(use_enable ${1}) --disable-${1})
+	}
+
+	local econfargs=(
+		$(qf_client alsa)
+		$(qf_client flac)
+		$(qf_client jack)
+		$(qf_client oss)
+		$(qf_client sdl)
+		$(qf_client vorbis)
+		$(qf_client vulkan)
+		$(qf_client wildmidi)
+		$(use_enable client sound)
+		$(use_enable client vidmode)
+		$(use_enable debug)
+		$(use_enable ncurses curses)
+		$(use_enable png)
+		$(use_enable zlib)
+		$(use_with client x)
+		--disable-Werror
+		--disable-dga
+		--enable-xdg
+		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+		--with-clients=$(usev client x11)
+		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
+		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
+		--with-sharepath="${EPREFIX}"/usr/share/quake1
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doxygen/html/. )
+
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
+at one of these locations with lowercase filenames:
+	- '~/.local/share/${PN}/id1/pak0.pak'
+	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
+
+You can add them yourself or use either of:
+	- games-fps/quake1-data: install from a Quake CD-ROM
+	- games-fps/quake1-demodata: pak0.pak only (limited demo)
+
+Key binds notes:
+	Defaults ('imt_mod' table) expect you to set key binds manually in:
+	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
+	For the in-game bind menu to be usable ('imt_0' table), bring up the
+	console with backtick \`, and run 'imt imt_0' (only needed once).
+	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
+
+Audio/Video notes:
+	Can add settings in:
+	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
+	Examples:
+	- set vid_width 800
+	- set vid_height 600
+	- set snd_output sdl (or alsa, jack, oss -- sdl can do pulseaudio)
+	- setrom vid_render gl (or vulkan, sw for software rendering)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+		elog "Migration may be needed for ${PN}'s home paths, now using:"
+		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
+		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+	fi
+
+	if use vulkan; then
+		ewarn "You've enabled the new vulkan support that is still experimental and yet"
+		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
+		ewarn "line option to revert to GL."
+	fi
+}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index a7f2b852f3de..ef362b09ba18 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index c1b2e7965e13..028e9e66d398 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,4 +1,4 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
 DIST angrydd_1.0.1-13.debian.tar.xz 11940 BLAKE2B d64ae1f878f3dfe4eee9f236ce6869f7ce3d77021a09593240a84860157781ecd776be7a06edbb48d1e340c654c50f4463b76b42049076e9c02b6397988ca9df SHA512 123d593ac7ceff8f6fe5d70442b92e6564f4e6ee668450cb623bbdeb4633cad6e04cf896d93cacc5e11bda08cb61b7c92ce0b99072e6e12b21e023620d12b360
-EBUILD angrydd-1.0.1_p13-r1.ebuild 1212 BLAKE2B 99a2f0117f39182180dadef3ccd0cf8727f5c425d2a9444aeda0c147e8a89254cfb7bb9c2c1b2db503b80b6b78ab2449b26c7a83f128e528649ab179a8545dc2 SHA512 a4d60cea200734be0c2c938b453beb519f81426699ce9ca4fe7aa9f8510b61999cd80fa4485cb21238d24399cfbb8cf3c717dcc9d349c6a4a6e228cbdb310df2
+EBUILD angrydd-1.0.1_p13-r1.ebuild 1204 BLAKE2B 58763f857a85ccabfaeb86bb40b21de4317c1240aa1500d63fe26314113ca2370cae522d7ef1bdb9ba862f01bf4c77a72107e663e1ecfeb2c1e2cabf710319ff SHA512 5a0402b5779ad00466978e3e24ebbfb8e7d56c00fa4aa21ac0a83975eb17f19313e12944c057d7dd893aa01788a4a6f918cb733c827697b7efb221e17ea17645
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
index e4bdd9f36a81..d1ad454c75cd 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit desktop python-single-r1
 
@@ -22,7 +22,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 47058ebe4bf0..0fab76824e19 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-sudoku-40.1.tar.xz 358076 BLAKE2B 03a53827956a40a7ce54eef3dfa2d27c455d716cdd7f395c8c1e6b0e1f4e07cccad766b9a5cb23de81ef384b56296dfb117867672ade87fa5efffca740add1ef SHA512 29f97a0f9c7b990cffe66fe99c909822c1050c3c01c703e7967f9aa214824f153b6fba619e2c084dfa66aa66a3d3fd034659a8f0995ae69a9d2a85435e0e38d6
+DIST gnome-sudoku-40.2.tar.xz 358260 BLAKE2B cf48bedee61ee808820a6e7ac3a368f215d6f0370edc83f06d62a3a28c79fb6c024411f9acace3db547a246f721e47c8c8c4ef63c7b07517c587f2b3b1de114b SHA512 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa
 EBUILD gnome-sudoku-40.1.ebuild 973 BLAKE2B 69cc10fae2b368c06fccccb3666294a035e8964da74d6dfdddce713ecfb77d1469c33d63ce7d97a22455cec702d1964c0d2519054085f1b2d7f85da6c3ee13e2 SHA512 3f841ee10a879e13579959292f85fe8fd4f0973556f3eb0012a7bcf896dbb202185cdd925404151134a14f672873751026337ecf7653381ff9f5fddd90b0e0b1
+EBUILD gnome-sudoku-40.2.ebuild 976 BLAKE2B 1be0b7e21ba555fab318a54be15a74b0103dd520b13cf838a51d15227404a5ec6cbdda249fbe98b46ef1f0fc55d119a2601fef4f6361b6ba915594ec971c5371 SHA512 7b20cdbd72e7b1f5ceed7717dfb32768ed107972c5c817d6bce5412160a382deebcb0cd8ef495587cda06f90f33b687ea76c5cfa2cf337711fdfd75f2b769f59
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
new file mode 100644
index 000000000000..b284e4ecdf62
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8=[introspection]
+	>=x11-libs/gtk+-3.24.0:3[introspection]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.3.4
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index a51af6f425e6..4eaa2a34a492 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index ae27b1b90fba..afbc405f6c1e 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,4 @@
 DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1 SHA512 f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
 DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc SHA512 07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
-EBUILD angband-4.2.2.ebuild 2207 BLAKE2B dbb9e7ae1ec5237a3a1da044e2c78e0509b758ab113f6483a8f3688da804ab9d5576e5838c7800d610632069718121aabb654c3ec59746af088ed0d94c55fa71 SHA512 53095f279ee117123d2025f305b5dcb63a077ca71d9e84d37775f53775fdc5958aa3f9aff0991f15cf52667e3034cb06d72814b1c0989f4e572188cfed2fd8d8
+EBUILD angband-4.2.2-r1.ebuild 2209 BLAKE2B 160b14c783ce56ab14d9b20d22d9f794297f99a5a3e8c774051d68677a1e6aa13ded57c4a9ddaa74d2345971c88a4a5763aa1e521ed22485a3c064b003a78607 SHA512 b45c70fb6e802e67f533ac3ca2e1021a739e8e35919ffb7b211f401200d2ea31008d48867cb2139e2300b6561b5448659fc1b8b191f7c2b5954c8d1b6d873cd2
 MISC metadata.xml 430 BLAKE2B 7245504be968d4ce51d4a782520dd8e8b1acda9c16aeeea78674b350df8a15f88a6338ad8fe3852c5f8290c1198af0b32372fce2f3e13f7dac8063d0816f5431 SHA512 4cb61f2b253a390e59abb74f1d67171f73ec30cf38a3d05bdd23f36faf2b4a639f8dd117ec87b69a19faed0e7d117060c4aabae543aef988348591dd4c01a0f6
diff --git a/games-roguelike/angband/angband-4.2.2-r1.ebuild b/games-roguelike/angband/angband-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..4ae0884350c8
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.2-r1.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 desktop xdg-utils
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="https://rephial.org/"
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+	|| ( X ncurses )"
+
+RDEPEND="X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+	)
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	sdl? (
+		media-libs/libsdl2[video,X]
+		media-libs/sdl2-image
+		media-libs/sdl2-ttf
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[mp3]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+
+	if use !sound ; then
+		sed -i -e 's/sounds//' lib/Makefile || die
+	fi
+
+	# Game constant files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	{
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
+	} > "${T}"/99${PN} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-private-dirs
+		$(use_enable X x11)
+		$(use_enable ncurses curses)
+	)
+	if use sdl; then
+		myconf+=(
+			--enable-sdl2
+			$(use_enable sound sdl2-mixer)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc changes.txt README.md
+	doman "${WORKDIR}"/${PN}.1
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl; then
+		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}"
+
+		local s
+		for s in 16 32 128 256 512; do
+			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+		done
+		newicon -s scalable lib/icons/att.svg "${PN}.svg"
+	fi
+}
+
+pkg_postinst() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/games-roguelike/angband/angband-4.2.2.ebuild b/games-roguelike/angband/angband-4.2.2.ebuild
deleted file mode 100644
index e4bebd7a3816..000000000000
--- a/games-roguelike/angband/angband-4.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
-HOMEPAGE="https://rephial.org/"
-SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses sdl sound +X"
-
-REQUIRED_USE="sound? ( sdl )
-	|| ( X ncurses )"
-
-RDEPEND="X? (
-		media-fonts/font-misc-misc
-		x11-libs/libX11
-	)
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	sdl? (
-		media-libs/libsdl2[video,X]
-		media-libs/sdl2-image
-		media-libs/sdl2-ttf
-		sound? (
-			media-libs/libsdl2[sound]
-			media-libs/sdl2-mixer[mp3]
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-
-	if use !sound ; then
-		sed -i -e 's/sounds//' lib/Makefile || die
-	fi
-
-	# Game constant files are now system config files in Angband, but
-	# users will be hidden from applying updates by default
-	{
-		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
-		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
-	} > "${T}"/99${PN} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--bindir="${EPREFIX}"/usr/bin
-		--with-private-dirs
-		$(use_enable X x11)
-		$(use_enable ncurses curses)
-	)
-	if use sdl; then
-		myconf+=(
-			--enable-sdl2
-			$(use_enable sound sdl2-mixer)
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc changes.txt README.md
-	doman "${WORKDIR}"/${PN}.1
-	doenvd "${T}"/99${PN}
-
-	if use X || use sdl; then
-		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
-		use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}"
-
-		local s
-		for s in 16 32 128 256 512; do
-			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-		done
-		newicon -s scalable lib/icons/att.svg "${PN}.svg"
-	fi
-}
-
-pkg_postinst() {
-	if use X || use sdl; then
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use X || use sdl; then
-		xdg_icon_cache_update
-	fi
-}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index d6a83bfa3b96..6ba91ef6d665 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest
index 439eefa10167..44e96db3b710 100644
--- a/games-rpg/avadon/Manifest
+++ b/games-rpg/avadon/Manifest
@@ -1,3 +1,3 @@
 DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7
-EBUILD avadon-1.0.4_p1331768904.ebuild 1237 BLAKE2B 9b10a153d3e102359b91971cfbb4696ca89f10d867c746154c92ca02e28afb4e550fb3c66cc714e0423cf9ab67fa9e301043408dee520e2e337327221bdaa216 SHA512 a43fd6f3b37e3decf7c510e160b2a6fbe43f9a74bc0abe3bc04f808530a7f962d890ae64263e6196c528f3c99875a53e9168c555ab3b6c2aaa37531ea54ff2c7
+EBUILD avadon-1.0.4_p1331768904.ebuild 1081 BLAKE2B eb75eee4ec365a8965913b5b1ba01f07b2c72c61d07d7a56b899a80394f27aac2866d1fe79e348a41132e73787877bb5d8016e88b66792cdca94441827777a43 SHA512 59f01b184165c4340aed7eb71284a217323ff3e4620dc668b9a7a5a27fe29f5bf28ace8a8f1de1d2f148563987ec7ccc790828035f179207e8e2c394a45ff7f0
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
index 4a9ff4f3cecd..794827ce5ff1 100644
--- a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
+++ b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils unpacker
+inherit desktop unpacker
 
 DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
 HOMEPAGE="https://www.spiderwebsoftware.com/avadon"
 SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends.
+S="${WORKDIR}/data"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist"
+RESTRICT="bindist fetch"
 
 QA_PREBUILT="opt/${PN}/Avadon"
 
-RDEPEND="media-libs/libsdl[opengl,video]
+RDEPEND="
+	media-libs/libsdl[opengl,video]
 	media-libs/openal"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/data"
+BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
@@ -35,19 +35,15 @@ src_unpack() {
 src_install() {
 	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r "avadon files" icon.bmp
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	newexe Avadon-$(usex amd64 amd64 x86) Avadon
-	dosym "../..${dir}"/Avadon /usr/bin/${PN}
+	dosym ../..${dir}/Avadon /usr/bin/${PN}
 
-	newicon -s 512 Avadon.png ${PN}.png
+	newicon Avadon.png ${PN}.png
 	make_desktop_entry ${PN} "Avadon: The Black Fortress"
 
 	dodoc README-linux.txt
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
index 5aa0f14a475c..928fbe422486 100644
--- a/games-rpg/dear-esther/Manifest
+++ b/games-rpg/dear-esther/Manifest
@@ -1,3 +1,3 @@
 DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
-EBUILD dear-esther-20130608-r1.ebuild 1476 BLAKE2B 41902cb17858901ae611cc83d0762cb04fbd5a245eaf9cafdba644cc99528e2fafa4849c84077602104f9f6fdf846be41a13be995e2bc65c8ebb3590340677e4 SHA512 d5a5520fb54bce5a1525d7e95a4f2db47aeaa87eeffe444491bc3005b52e9a003ec44b1ff8c128e67f2e80408995ce96c00feb1534caf761255e917ce02c13f1
+EBUILD dear-esther-20130608-r1.ebuild 1232 BLAKE2B 1cc35b890ec1e3869f5f6ef8fbc8b1511f33a57bdf326e7e2df85dd636fa01e7bb497929dcadd9621e4eaba3b4de92b333d7e19c1efd4ca994ca1914a7348436 SHA512 d256edb9c4f3b922bf36ee937dd388caeea6447946b712744a640525b7057e96c4267e45e99a08852679d02818c5c9db7951a86eff98ff3ba9543ca2756ae80c
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
index b2a07780a454..34dd1adabcdb 100644
--- a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
@@ -3,41 +3,37 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper xdg
+
+MY_TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 DESCRIPTION="Ghost story, told using first-person gaming technologies"
 HOMEPAGE="http://dear-esther.com/"
-SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
-S="${WORKDIR}"/data
+SRC_URI="dearesther-linux-${MY_TIMESTAMP}-bin"
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*
-"
+	opt/${PN}/dearesther_linux
+	opt/${PN}/bin/*.so*"
 
 # TODO: unbundle libSDL2
 RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
+	media-libs/freetype[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
-"
+	x11-libs/libX11[abi_x86_32(-)]"
 BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "and move it to your DISTDIR directory."
-	einfo
 }
 
 src_unpack() {
@@ -45,26 +41,14 @@ src_unpack() {
 }
 
 src_install() {
-	insinto ${MYGAMEDIR}
+	insinto /opt/${PN}
 	doins -r bin dearesther platform dearesther_linux
 
-	doicon -s 256 dearesther.png
-	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
-
-	dodoc README-linux.txt
-
-	fperms +x ${MYGAMEDIR}/dearesther_linux
-}
+	fperms +x /opt/${PN}/dearesther_linux
+	make_wrapper ${PN} "./dearesther_linux -game dearesther" /opt/${PN}{,/bin}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	newicon dearesther.png ${PN}.png
+	make_desktop_entry ${PN} "Dear Esther"
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	dodoc README-linux.txt
 }
diff --git a/games-rpg/grimrock/Manifest b/games-rpg/grimrock/Manifest
index f98afb3eae90..95d67585f760 100644
--- a/games-rpg/grimrock/Manifest
+++ b/games-rpg/grimrock/Manifest
@@ -1,3 +1,3 @@
 DIST Grimrock-Linux-2015-07-07.sh 316846242 BLAKE2B 5d8123b3e2dedf4d6b2ae6f43c9ebe5427e63205b7ff53dc0fba26b0b3a8a1f164b79a3a10776c751aa0fbe29c7ef715412bff826476894eec6aa545da4adec3 SHA512 c90203a747564223281fb61ffcc7ac90f772990f33bb8345aff68c65fbc371f0f1a611645e952a75bd9dbca9e760398c0411eb9adade9c58e525a5b1c4e186db
-EBUILD grimrock-20150707.ebuild 1555 BLAKE2B 11b0bc03dd1b01614dd3899b1d6b615fc34d32b02162b7e750a37da21b12e3b49cd9fce9a155f2c85e9edaba9d19841755bd4afa2acdf29118a69d5837b83a2f SHA512 d46f2401d3daac6767a535175fde51167c8bbf946c4e8ba4608cbad2b6d4da0b3f076c3ff1e9594cb1b802bcd30ea18072ddf252f29f36b35e9946ca2d5992e4
+EBUILD grimrock-20150707.ebuild 1374 BLAKE2B 3ef091ddd158ec02a9555ec0ec6d32f37c8c60e3a2a7538d5de599eb3d62482e93132cd117cb5879c38330a818ead9060fe28a4e78f906929f2c3fe1b1d0655a SHA512 ddada99446e943c33c29eaf06c0950d0c720e3518cf277ccb4739a61e93d37ea07e330aeb5d725c4217d85c03189d995cae27338bef853a8e252b9c0eb59468a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/grimrock/grimrock-20150707.ebuild b/games-rpg/grimrock/grimrock-20150707.ebuild
index 03275c50c9a5..e0950dd5bc09 100644
--- a/games-rpg/grimrock/grimrock-20150707.ebuild
+++ b/games-rpg/grimrock/grimrock-20150707.ebuild
@@ -1,36 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils unpacker
+inherit desktop unpacker xdg
 
-TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 MY_PN="Grimrock"
+MY_TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
 DESCRIPTION="Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine"
 HOMEPAGE="http://www.grimrock.net/"
-SRC_URI="Grimrock-Linux-${TIMESTAMP}.sh"
+SRC_URI="Grimrock-Linux-${MY_TIMESTAMP}.sh"
+S="${WORKDIR}"
 
-SLOT="0"
 LICENSE="all-rights-reserved"
+SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist splitdebug"
+RESTRICT="bindist fetch"
 
-QA_PREBUILT="/opt/${PN}/${MY_PN}.bin"
+QA_PREBUILT="opt/${PN}/${MY_PN}.bin"
 
-RDEPEND="media-libs/freeimage
+RDEPEND="
+	media-libs/freeimage
 	media-libs/freetype:2
-	media-libs/openal
 	media-libs/libsdl2[opengl,sound,video]
 	media-libs/libvorbis
+	media-libs/openal
 	sys-libs/zlib[minizip]
 	virtual/opengl
 	x11-libs/libX11"
 
-DEPEND="app-arch/xz-utils"
-
-S="${WORKDIR}"
-
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
@@ -38,25 +37,26 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	myarch=$(usex amd64 x86_64 x86)
+	MY_ARCH=$(usex amd64 x86_64 x86)
+
 	unpack_makeself
 
 	local i
-	for i in subarch instarchive_all instarchive_linux_${myarch}; do
-		ln -snf "${i}" "${i}.tar.xz" || die
-		unpack ./"${i}.tar.xz"
+	for i in subarch instarchive_all instarchive_linux_${MY_ARCH}; do
+		ln -snf ${i} ${i}.tar.xz || die
+		unpack ./${i}.tar.xz
 	done
 }
 
 src_install() {
 	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins ${PN}.{dat,png}
 
-	exeinto "${dir}"
-	newexe ${MY_PN}.bin{.${myarch},}
-	dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN}
+	exeinto ${dir}
+	newexe ${MY_PN}.bin{.${MY_ARCH},}
+	dosym ../..${dir}/${MY_PN}.bin /usr/bin/${PN}
 
 	doicon -s 256 ${PN}.png
 	newicon -s 64 ${MY_PN}.png ${PN}.png
@@ -64,7 +64,3 @@ src_install() {
 
 	dodoc README.linux
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index 920a954af436..60573f340107 100644
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -2,6 +2,8 @@ AUX 0.98-gladpack.c.patch 511 BLAKE2B 57434e5edd25f0757e18f2c2c73198236fa069eb09
 AUX openglad-0.98-gcc43.patch 205 BLAKE2B 05dac9336eac12434d51ebe1322387ec1c32d77bda52f654312075260f1add0a24d4d5834e2d72d6c8208851f583b245147595a8df2e9a9b6e72bf72dcc1421c SHA512 c7f6b4602234f7119dea119a6fd7c2edd07af856dd711195a942d291063912c46a202f446db8183eb62cc0a2aea3586bb3a2b8e1140d4d915be1fd6e166eb4d1
 AUX openglad-0.98-ovfl.patch 381 BLAKE2B 28a7d1dabbacaf665f01f1b238c904855706921b9ae33e09802104734c3456889aa409cdc38bc12e076d609df0909f6ecab7a02be15933d90c4ec8fba11abb00 SHA512 00ac89d9cf223ac8db111b30ce7838b892f318ac8c8a93522afa719a98887c386eb95c788a912c4bfce99ef804a8395b3c2260b9ec22454651e6f2539d1833e8
 DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
+DIST openglad-0.98_p20200907.tar.gz 2060013 BLAKE2B 5ea16c0ab13e45f1723ceb0b4167fcbf5863d040e1fc54cd27fa59df14200f84e0e22c0cba87f9ad3294a90850d5b36199cba8e78804d1994fb2dea6ea493fff SHA512 b3bf582a780d90408fc585b28418f462602ec35434c018d6315fb8b119b34cb0dceabcd6b5a6450ba6beb2ab5dc931d6e21ecf46e76853c7f5051c9b3be9014c
 DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb
 EBUILD openglad-0.98-r1.ebuild 868 BLAKE2B 70f20201f2cbf7f82701e2d4d6058213121bd8d2c05fcfe3c1f0230410901feea5c82954933c3dfc30c5d852d574facccada3157571a4b07f36151f1ad052f4a SHA512 20fc6585c53de645d5a0b12858819cd28a2174a4f67518f245d33a8c6a8647ef69ccee4954df15365966ffa613a7c3bc3fe92b1e16b7cd5789c9af0e9bb7555e
-MISC metadata.xml 332 BLAKE2B 29e8535bbe3b4ccd5225fdee9e19b41afba42751a9926226375f47e320cb743944b4fb81eb1b665ea9782df581eba22db602e4515b2cd723ca319ef90bfa86ff SHA512 b751058cb6393309c0635329d5fd5236b013d2e07d5e2e2a7fdffcb50ee8dd60e8b0157d161ba498e01140106f91f3b2052a43737be12214f7f065ebd9f6d07d
+EBUILD openglad-0.98_p20200907.ebuild 1880 BLAKE2B 7cf82e365fa92ca87848cac9e312907af5594041c3637ce2078f1d32edcd1a657606a143d6b8bc340c4b7bc03019ff7e26f563fede65a229c93431f194a80fb9 SHA512 05c385eac139939a8229b1ebbcaa82d1bb7b337b0094c73161d2bf4a75e904811277eaa2d55aa29349fbec5f0f6cde54666bc4694a61f9ad0ff919ded19e00a0
+MISC metadata.xml 389 BLAKE2B 114b39daa76f110c2769567433582e1dfb984f3040ec53c0ce184ec621b6676c0697912b2e46f7cba0ebac1335caeb78312f23b16ad3892b3dec577c3ef54cbc SHA512 ccf5c251e70ae23dff515ae55b21e6f5ea03339e1477ae46e6da81b50666bcb0a201b0046c0d43e4fcb8f460ca0f2aea607f7b73e47cc3cd7c9d2dd83a329730
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
index b093b0fee1ec..7be52b700c61 100644
--- a/games-rpg/openglad/metadata.xml
+++ b/games-rpg/openglad/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">openglad/openglad</remote-id>
 		<remote-id type="sourceforge">snowstorm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
new file mode 100644
index 000000000000..132a5ea39795
--- /dev/null
+++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+MY_COMMIT="80e33b15cfa6d7d288b4b3db4dcca0349f13691f"
+
+DESCRIPTION="SDL clone of Gladiator, a classic RPG game"
+HOMEPAGE="http://snowstorm.sourceforge.net/"
+SRC_URI="
+	https://github.com/openglad/openglad/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Boost-1.0 GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libyaml
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
+	media-libs/sdl2-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/premake:4
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# game uses the binary's location for assets even with a wrapper
+	sed -e '/^std::string get_asset_path/!b;n' \
+		-e "a\\return \"${EPREFIX}/usr/share/${PN}/\";" \
+		-i src/io.cpp || die
+
+	# unbundle (delete + add to pkg-config below is enough)
+	# physfs: need missing physfsrwops.h matching system's to unbundle
+	rm -r src/external/{libyaml,libzip} || die
+
+	# cleanup not to install
+	rm sound/Makefile.am || die
+}
+
+src_configure() {
+	# premake4.lua assumes a lot (e.g. no SDL2 include path), check ourselves
+	local pkgs=( SDL2_mixer libpng libzip sdl2 yaml-0.1 )
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die)
+	append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die)
+
+	premake4 gmake || die
+}
+
+src_compile() {
+	emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r builtin cfg extra_campaigns pix sound
+	# note: extra_campaigns not directly used, but users may want them
+
+	dodoc {cheats,classes,scen}.txt
+	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry openglad Openglad
+}
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
index 43f0a9c26a3e..2ab58b69d727 100644
--- a/games-rpg/pcgen/Manifest
+++ b/games-rpg/pcgen/Manifest
@@ -1,3 +1,5 @@
 DIST pcgen-6.04.01-full.zip 68679438 BLAKE2B e9afa6b9937804988425d8d18cfed7728197ecc303f586ed899491e4d500eb0e6ddc0ae92aef1d4bfef7ff3fb987cca34af95246c83ebe71e089e3e5e91aa9dd SHA512 37e76e9bca3defe803459f898d3c51015cb4c4f69905c4179b78b1b26977b7d720ef413b3f5b2ef4252aa98f732075b9567c4f4822c61d169a5a0a6e2c78c0d4
+DIST pcgen-6.06.01-full.zip 73423642 BLAKE2B 54dbebb3e73188435ce6ed6d38387e194fff156f39d9238b55f0e7d990f785eb79f562a41c60a4861f637514615802ef5103f886e0f96624f7f53b197adcd5a3 SHA512 9af94aa434229ce00f08385759b4efc22f16ad32be81be4177c44eec94f1bedcec0742b494bbed3c95c1bcf9b2c51e2649330ee0a54f7ca4b0042966099851eb
 EBUILD pcgen-6.04.01-r1.ebuild 847 BLAKE2B 9baec67066489b94514db1ebdf575c4d05285d776ae8e48abf9d11271ec64bd3d6855ba8fa1984f6113110f934bc65505948d43a2ec65f233a50a0051d30ba4b SHA512 23bd92b3f73583776594e150906d499c077ffaa8d13d41923fa971755bb5acd7ef9c7a6c0da0a3aa67805bd2fa5304bc1c51d586ccf7fb5f3d443811904c9f70
-MISC metadata.xml 328 BLAKE2B 45ace1f30157cc4450f9dc90a24a7a6112a09fe61c1a17dca06b87d32fdbce9c7f704b36bb217da0371f71a8ff9b2ecdccbb63ad7b981587f61c33a3c4ef6adb SHA512 cd3e9ca2c51782031b89444cc5c3eda37537c04467753e9a6bd5c2e5357d5ba3077ed6aee0adeac6dd91c829c7fded3077fb8d39ab8e80d87e3dc62af5605cb7
+EBUILD pcgen-6.06.01.ebuild 795 BLAKE2B 627fa16921af9aee9395609eda4f99dbe72427f9a3cd6a593d4d4014b0cccc12a4a9a7695b513c580e2ad757b57c60e2389a6472a190858dbdbeb35d2ccd8d43 SHA512 69aa805a6caf28a7b2cccdc44b2799087ac21fb05fe3703c05189cdf84730571cc8de9491bfa088a669b11b075a7e4aa935047a948cb01d435858d4b6046baf1
+MISC metadata.xml 379 BLAKE2B 8915ccbc5046286453c4e21b9d60dfcaa6d3f83e5d4c8351f0ba126ca4ecbf5f47f22f5c3cb12f938204b9f4c2155f3c9c3d84e508f29a335be646fbe14d915e SHA512 67cf9fe30f4628f8126f1fe5dc90d697f7aa62e4ca2bb5d7514e3d45163db37d6a2929414ee3643f58ef1f67fedfe2f387a5d3642530add4979a7d99b64786c3
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
index e2b2929d7fb9..2602eda62716 100644
--- a/games-rpg/pcgen/metadata.xml
+++ b/games-rpg/pcgen/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">PCGen/pcgen</remote-id>
 		<remote-id type="sourceforge">pcgen</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/pcgen/pcgen-6.06.01.ebuild b/games-rpg/pcgen/pcgen-6.06.01.ebuild
new file mode 100644
index 000000000000..6bf03db1d130
--- /dev/null
+++ b/games-rpg/pcgen/pcgen-6.06.01.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop edos2unix
+
+DESCRIPTION="D&D character generator"
+HOMEPAGE="http://pcgen.org/"
+SRC_URI="https://github.com/PCGen/pcgen/releases/download/${PV}/${P}-full.zip"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-2.1 OGL-1.0a"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	edos2unix ${PN}.sh
+	sed "/^cd /c\\cd \"${EPREFIX}/opt/${PN}\" || exit 1" ${PN}.sh > "${T}"/${PN} || die
+
+	rm -r LICENSE docs/{doc_tools,pngcrush_logs.txt} ${PN}.{exe,sh} || die
+}
+
+src_install() {
+	dobin "${T}"/${PN}
+
+	insinto /opt/${PN}
+	doins -r .
+
+	newicon system/sponsors/pcgen/pcgen_128x128.png ${PN}.png
+	make_desktop_entry ${PN} PCGen
+}
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
index c15d236e7cf1..39e8975f694d 100644
--- a/games-rpg/to-the-moon/Manifest
+++ b/games-rpg/to-the-moon/Manifest
@@ -1,3 +1,3 @@
 DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
-EBUILD to-the-moon-0-r1.ebuild 2423 BLAKE2B d9f921cfa744e4ad10134811a20b134aaead701367ba3747cdf2b50fe4010634ddef498271b1ef13343a4711080d34c668ba7e0f1393b382700d5b2245946e50 SHA512 5e5446a9abbbb7d2ee04f44f731bf4442e6d3d28d0ba6e6e126178e1ceb2fae36eb25362d1a4c0e313337676596a852ecd9eb892fcb6e6369f0439802c5b4849
+EBUILD to-the-moon-0-r1.ebuild 2084 BLAKE2B 3f054999698d3b4cbeb53bae17aeef92824bb90ece8085c3f8235602ca0a6d0729437284d78957f9834160ebac0827ea08ce3f144fbbbecf583695f5442c2dff SHA512 986e1b2b4c57fd65a7d71d3264f5c1a0e6346776fc48960c12a5fea3ce1eee8adf50ce66e8df460b72f6bf373676bbbd7ef981b5fe26570c6a09af0e5d4269ee
 MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
index 619cdd026667..a5cc9e2b6f8b 100644
--- a/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
+++ b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
@@ -3,27 +3,25 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper
+
+MY_PN="ToTheMoon"
 
-MY_PN=ToTheMoon
 DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
 HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
 SRC_URI="${MY_PN}_linux_1389114090.sh"
-S="${WORKDIR}"/data
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="opt/${PN}/${MY_PN}.bin*"
-if [[ ${ARCH} == "amd64" ]] ; then
-	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib64/*"
-else
-	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib/*"
-fi
+QA_PREBUILT="
+	opt/${PN}/${MY_PN}.bin*
+	opt/${PN}/lib/*
+	opt/${PN}/lib64/*"
 
 # TODO: unbundling sdl-sound breaks the game
 RDEPEND="
@@ -37,17 +35,11 @@ RDEPEND="
 		media-libs/sdl2-ttf
 	)
 "
-DEPEND="
-	sys-apps/coreutils
-	sys-apps/grep
-"
 
 pkg_nofetch() {
-	einfo
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "and move/link it to your DISTDIR directory."
-	einfo
 }
 
 src_unpack() {
@@ -64,35 +56,24 @@ src_unpack() {
 
 src_install() {
 	local dir=/opt/${PN}
-	local libsuffix=$(usex amd64 "64" "")
-	local arch=$(usex amd64 "x86_64" "x86")
+	local libsuffix=$(usex amd64 64 '')
+	local arch=$(usex amd64 x86_64 x86)
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r noarch/{Audio,Data,Fonts,Graphics,Game.ini,mkxp.conf,ToTheMoon.png}
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe ${arch}/${MY_PN}.bin.${arch}
 
-	exeinto "${dir}/lib${libsuffix}"
+	exeinto ${dir}/lib${libsuffix}
 	if use bundled-libs ; then
 		doexe ${arch}/lib${libsuffix}/*
 	else
 		doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1
 	fi
 
-	make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
-	make_desktop_entry ${PN} "To the Moon"
-	newicon -s 32 noarch/${MY_PN}.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	make_wrapper ${PN} ./${MY_PN}.bin.${arch} ${dir}{,/lib${libsuffix}}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	newicon noarch/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} "To the Moon"
 }
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index 40a6e2e1bfce..aecc042af6c4 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1,3 +1,3 @@
 DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
-EBUILD wasteland2-1.9.0.13-r1.ebuild 1945 BLAKE2B 19714595fe7c1280a3bada785989138e50b6eb45a389b3078688730c2460dba1892a1fbcc384a08e56e747781ed87d5c8b6faf4718ad9bcc60c04b2b63d59fd8 SHA512 f0fca084083d7d1d43ce4611f5216ec1128093b7f226fdf63a700fad169d0014817130f237fa92f4c1848e65835f681c67c460a791ec82285f3be953ec417e3f
+EBUILD wasteland2-1.9.0.13-r2.ebuild 1657 BLAKE2B 26fdcab72a0a33fb4f4ecd2f51ef5fe8b810e007b4458f929fd392975f35dfef584e9a9780af1386139cd404d76a15504f3c457eba1a5408c01acb5d7756ce78 SHA512 670d9aa0aaf7a8ed816488c5946ceacad64d51c1bc646411191fb78394da5349ebd9c0943b6e94c017b33b69d70175fd2b4ec27324b3849be47e28707e9bc3d8
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild
deleted file mode 100644
index 2dffd54fb060..000000000000
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="22000M"
-CHECKREQS_DISK_USR="21600M"
-inherit check-reqs desktop gnome2-utils wrapper
-
-DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
-HOMEPAGE="https://wasteland.inxile-entertainment.com/"
-SRC_URI="gog_wasteland_2_${PV}.tar.gz"
-S="${WORKDIR}/Wasteland 2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist fetch mirror"
-
-QA_PREBUILT="opt/${PN}/*"
-
-RDEPEND="
-	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
-	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
-	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
-	>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
-	>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
-	>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
-	>=x11-libs/pango-1.36.5[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	virtual/opengl
-"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy Wasteland 2"
-	einfo "from https://www.gog.com/ and"
-	einfo "download ${SRC_URI}"
-	einfo "and move it to your DISTDIR directory."
-	einfo
-	einfo "This ebuild was tested with the CLASSICAL edition."
-	einfo "If it works with the deluxe edition too, please"
-	einfo "open a bug report. If not, open a bug report too."
-	einfo
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	# over 20GB of data
-	dodir ${dir}
-	mv game/WL2_Data "${ED}/${dir}"/ || die
-	exeinto ${dir}
-	doexe game/WL2
-
-	make_wrapper ${PN} ./WL2 "${dir}"
-	newicon -s 256 support/gog-wasteland-2.png ${PN}.png
-	make_desktop_entry ${PN} "Wasteland 2"
-
-	dodoc docs/*.pdf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13-r2.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13-r2.ebuild
new file mode 100644
index 000000000000..42082b1444ca
--- /dev/null
+++ b/games-rpg/wasteland2/wasteland2-1.9.0.13-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="22000M"
+CHECKREQS_DISK_USR="21600M"
+inherit check-reqs desktop wrapper
+
+DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
+HOMEPAGE="https://wasteland.inxile-entertainment.com/"
+SRC_URI="gog_wasteland_2_${PV}.tar.gz"
+S="${WORKDIR}/Wasteland 2"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist fetch"
+
+QA_PREBUILT="opt/${PN}/*"
+
+RDEPEND="
+	dev-libs/atk[abi_x86_32(-)]
+	dev-libs/glib:2[abi_x86_32(-)]
+	media-libs/fontconfig:1.0[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/cairo[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/pango[abi_x86_32(-)]"
+
+pkg_nofetch() {
+	einfo "Please buy Wasteland 2"
+	einfo "from https://www.gog.com/ and"
+	einfo "download ${SRC_URI}"
+	einfo "and move it to your DISTDIR directory."
+	einfo
+	einfo "This ebuild was tested with the CLASSICAL edition."
+	einfo "If it works with the deluxe edition too, please"
+	einfo "open a bug report. If not, open a bug report too."
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	# over 20GB of data
+	dodir ${dir}
+	mv game/WL2_Data "${ED}"/${dir}/ || die
+
+	exeinto ${dir}
+	doexe game/WL2
+
+	make_wrapper ${PN} ./WL2 ${dir}
+
+	newicon support/gog-wasteland-2.png ${PN}.png
+	make_desktop_entry ${PN} "Wasteland 2"
+
+	dodoc docs/*.pdf
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index f63f7ff538cd..bc61af29e3d5 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crashtest/Manifest b/games-simulation/crashtest/Manifest
index f688984c9769..4c7da92dd7c6 100644
--- a/games-simulation/crashtest/Manifest
+++ b/games-simulation/crashtest/Manifest
@@ -1,4 +1,4 @@
-AUX crashtest-1.1-gentoo.patch 2907 BLAKE2B 5d99f7943f568877d31a1d3cadcbb670487db8923275d44384d9e4a2897320b7c963c59163cb7076ff995617f11d8b1c3482a0cca4b02cc28a5ff5b4ce7e7f9f SHA512 6b657329db9eba28de9dcbf33bfd46002e89e0a5a348a9109742cfa6b0ab6a431a8c5edd880201b40ab0dcc4cc5b27be16dc5e38e16621596ec62ea07676c716
+AUX crashtest-1.1-gentoo.patch 2682 BLAKE2B 8350921502fbd7242fa9a6282c9392a19beaed85a21c1b312d1d63371848d632889108e3888fb8b1324e96e967cc0d28fb5d5c0920b0e0bd1c7168d984260fa3 SHA512 4fb5b594fd65c3cbe5c458d96041d52b591898fed4193c252d2e1dfcba3e205031a469627291e341069c07498e0036bd85a842bcb4322e0a602d87e26c7a37f1
 DIST crashtest-1.1.tar.gz 134769 BLAKE2B 16c7be2723d705bbcfc4457a0d7bb545ddaacfb9009cc184c849c59a1c356c67d0151bd7bbb0d1909efb89d24e18657038fe0dd66e218e0c7ed24c67ba82089b SHA512 f361b5f202cdcdca871357eb2a2158af2958f4058b6754c63dc5a20c3e08e2ef532e984596d0daac073f2321b2db02e3f8c2a0a4998450fc953c1661d712d59c
-EBUILD crashtest-1.1-r1.ebuild 831 BLAKE2B b57fac9716e9a510d5971ad00a16493c3594ceb018e180fbcc62090cb75ca4187587ce7863ecbbe06a17ce91354b26656f62d0c0c08e7eec9a9de5861f9eb6f6 SHA512 312efd5ef21b25f35c8f78e1088d909afdf8ec56beb7dc2c3c043c5db18c3d68b726ca9590fd4e484299fe508c7b9e6f0eb6c898becd8c49cc2f7be607346112
+EBUILD crashtest-1.1-r2.ebuild 820 BLAKE2B fc6085f60a0e57378f18ebec3000d1804b65cc6eea0359e6c07d5e3ef7ea277016dc200e6ce3d4a6872df84e89d4d3a882d38dfdc99c297ce35ef39b4d325e9a SHA512 03fd1c50d5f2c8871c201982511b6d3d43a8774f578f4874d51ad2742ee3aa92f8658effc2132df9421e826f1129f95d4e6cb82144ab574e2271c890d303fe84
 MISC metadata.xml 562 BLAKE2B ae31c43ea940ab17bf1295a254c715d4c3a9460a38617deeb7e41e075b04cc20ad2c7710fa66ffc124c9441d00787902ca423537a494c4eaed57c933abf23cb2 SHA512 94005d1dd7a8f13dc37e0c81290486eb34dfda05a2808eb9b4908b5ba7ba722e0435acdde3d2da082e61a70e60eb2e6df70cd0d59589ccb913a6e6e87b81bc55
diff --git a/games-simulation/crashtest/crashtest-1.1-r1.ebuild b/games-simulation/crashtest/crashtest-1.1-r1.ebuild
deleted file mode 100644
index 1faed8379238..000000000000
--- a/games-simulation/crashtest/crashtest-1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Educational car crash simulator"
-HOMEPAGE="http://www.stolk.org/crashtest/"
-SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/ode
-	media-libs/alsa-lib
-	media-libs/freeglut
-	x11-libs/fltk:1[opengl]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.4"
-
-S=${WORKDIR}/${P}/src-${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}"-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-		Makefile ${PN}.cxx || die
-	append-cppflags -DHAVE_ISNANF
-}
-
-src_install() {
-	default
-	make_desktop_entry ${PN} Crashtest
-}
diff --git a/games-simulation/crashtest/crashtest-1.1-r2.ebuild b/games-simulation/crashtest/crashtest-1.1-r2.ebuild
new file mode 100644
index 000000000000..ff27796a7f4c
--- /dev/null
+++ b/games-simulation/crashtest/crashtest-1.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Educational car crash simulator"
+HOMEPAGE="http://www.stolk.org/crashtest/"
+SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
+S="${WORKDIR}/${P}/src-${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-games/ode:=
+	media-libs/freeglut
+	media-libs/plib
+	virtual/glu
+	virtual/opengl
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" \
+		-e "s|@GENTOO_BINDIR@|${EPREFIX}/usr/bin|" \
+		-i Makefile ${PN}.cxx || die
+
+	tc-export CXX
+}
+
+src_install() {
+	default
+
+	make_desktop_entry ${PN} Crashtest applications-games
+}
diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
index b384c87278c2..8e8a7d9aff61 100644
--- a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
+++ b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru a/Makefile b/Makefile
---- a/Makefile	2009-02-15 17:11:31.000000000 -0500
-+++ b/Makefile	2009-10-14 01:00:13.900627555 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -1,34 +1,12 @@
 -# EDIT THESE SETTINGS
 -
@@ -29,7 +28,7 @@ diff -ru a/Makefile b/Makefile
  
 -LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
 -
-+LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
++LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags` -lglut
  
  all: crashtest
  
@@ -69,9 +68,8 @@ diff -ru a/Makefile b/Makefile
  	# Models
  	install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
  	install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
-diff -ru a/crashtest.cxx b/crashtest.cxx
---- a/crashtest.cxx	2009-02-15 17:08:24.000000000 -0500
-+++ b/crashtest.cxx	2009-10-14 01:01:25.822753522 -0400
+--- a/crashtest.cxx
++++ b/crashtest.cxx
 @@ -615,13 +615,7 @@
  
  int main(int argc, char *argv[]) 
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 5c1ff575230e..55b0deb58a05 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -1,6 +1,4 @@
-AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c8244c14f6a2701d8a8e80679723aeac11882d7801aaba3f4433036fa078c3f199d7c4fc01a6e8ce2363db37519cb205386aa SHA512 9b28fe63ea4bd3d21559306bd110eaa2c518dc933a572a93dc21182464ee4f95bf7d8bc3f21ebe78addbcc2e432fcd2992587925f97d633270ce9d47ff2e228b
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
-AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13-r1.ebuild 1098 BLAKE2B 2f04ce44cc351b46bb9c1ed361022f3a509227dddc15ebee2e08896d27ab23261f31d28ca4f48416975d61f85b85b3ee51a6679e2b37bf75c0930b69249dd391 SHA512 54f24caa030be0df48e80f964940767f5d3ff969e968bc57cdd038aa16780411da6f7d62bccb3055643ae5fdd47479b940775f8677598c4d46fb5deb3634ca99
+EBUILD crrcsim-0.9.13-r2.ebuild 846 BLAKE2B 6873b4de3092315aada2e3578a5558156c6d470ca2b505e10aaa6da26b5f5d81d1c911576feacab6d329b0b63ed98dfd27f136ff4b5b8769716521d5135d09aa SHA512 dd0928a8e76f8ef6a3fdc9151c6b3c55a77a28a448008f29d45351589cfd3964701ae3c014d142438ebbb0b8a763ad548b4f17ba32cdc18fac464743ebea5497
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild
deleted file mode 100644
index cf65eba9ef26..000000000000
--- a/games-simulation/crrcsim/crrcsim-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="model-airplane flight simulation program"
-HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
-
-RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/plib
-	sci-mathematics/cgal[shared(+)]
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buildsystem.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version "sci-mathematics/cgal[gmp(+)]" ; then
-		eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with portaudio)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS HISTORY NEWS README
-	doicon -s 32 packages/icons/${PN}.png
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
new file mode 100644
index 000000000000..f32c81a4c523
--- /dev/null
+++ b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Model-airplane flight simulation program"
+HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="
+	dev-libs/gmp:=
+	media-libs/libsdl[X,sound,joystick,opengl,video]
+	media-libs/plib
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	portaudio? ( media-libs/portaudio )"
+DEPEND="
+	${RDEPEND}
+	sci-mathematics/cgal"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+DOCS=( AUTHORS HISTORY )
+
+src_configure() {
+	econf ac_cv_header_portaudio_h=$(usex portaudio)
+}
+
+src_compile() {
+	emake CGAL_LIBS=
+}
+
+src_install() {
+	default
+
+	doicon packages/icons/${PN}.png
+	make_desktop_entry ${PN} CRRCSim
+}
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
deleted file mode 100644
index 396fd573ec90..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -79,8 +79,12 @@
- dnl Default is: no portaudio present
- portaudio=0
- 
-+AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
-+
-+AS_IF([test "x$with_portaudio" != "xno"], [
- dnl Check for the Portaudio header file
- AC_CHECK_HEADER([portaudio.h])
-+])
- 
- if  (test "x$ac_cv_header_portaudio_h" = "xyes"); then 
-   dnl Check for Portaudio 18
---- crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-+++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-@@ -113,8 +113,8 @@
-   // $USERPROFILE/.crrcsim                (WIN32)
-   // $HOME/.crrcsim                       (LINUX)
-   // CRRC_DATA_PATH                       (LINUX)
--  // /usr/local/share/games/crrcsim       (LINUX)
--  // /usr/share/games/crrcsim             (LINUX)
-+  // /usr/local/share/crrcsim             (LINUX)
-+  // /usr/share/crrcsim                   (LINUX)
- 
-   // cwd
-   if (dirname != "")
-@@ -154,13 +154,13 @@
-     s.append(dirname);
-     pathlist.push_back(s);
-     #endif
--    s = "/usr/local/share/games/" + appname + "/";
-+    s = "/usr/local/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-       pathlist.push_back(s);
-     }
--    s = "/usr/share/games/" + appname + "/";
-+    s = "/usr/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-@@ -172,13 +172,13 @@
-     #ifdef CRRC_DATA_PATH
-     pathlist.push_back(data_path);
-     #endif
--    if (data_path != "/usr/local/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/local/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/local/share/games/" + appname);
-+      pathlist.push_back("/usr/local/share/" + appname);
-     }
--    if (data_path != "/usr/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/share/games/" + appname);
-+      pathlist.push_back("/usr/share/" + appname);
-     }
-   }
-   #endif
diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
deleted file mode 100644
index 10d6bff6b769..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -229,7 +229,7 @@
-       has_CGAL="yes  (found CGAL v3)"
-     fi   
-     CGAL_CFLAGS=-frounding-math
--    CGAL_LIBS=-lCGAL
-+    CGAL_LIBS="-lCGAL -lgmp"
-     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
- else
-     has_CGAL="no   (CGAL not found)"
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index d1603f50d04d..ced1f4574d6b 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,11 +3,11 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.3.3.tar.gz 14107179 BLAKE2B 9c19bf8f88ef7aa33c345ec46c3dc70ae1221fcad075880a86bd3a577835640002126018d2a5251e063d6259cdd3cd4bde58097feb9095b793538b363b827c5d SHA512 de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
+DIST openrct2-0.3.4.tar.gz 14186428 BLAKE2B f30ee821e0993fc30cbb19f72ffefc47006582c79832a6041d93382278c1a5e8d366a0fba2bf8d81c1b58ce720f680e947885eb11322329bd63edd7f2bafa4d6 SHA512 13014f4e43b04ee34af713cdddf6b5fdcb8b928f9ff0d54bd7c4476074113a5b48ebb9942b5da6b1712a8f9033919c426948d771907b9a725821778e080413bc
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-replays-0.0.31.zip 1783829 BLAKE2B 70ef5a5ad89b531baefecfa4c673a4d41e18c4ef5586f045a2174bf39d61bc59ebd5deee23abbba138bd9b943f056134845c8710397b84fc388a5e268025b7d2 SHA512 cb26543ad44a9d2c5d4a22e666c9efce605b0de34ac7cc8f42853792f50b8eda9eb551d2e6d0724fc4d282c83043718fa074cdd5081a9f12aebdc62efd2c082c
-DIST openrct2-replays-0.0.38.zip 1765056 BLAKE2B b42fcca434c353e2d5a58e81bfc867221e23e357d334474f5c71d82b6046b7c8fee7e2b41f8c1e3180169125ba897c49af954e3074ca17499dec778e4c7be0ae SHA512 625249b1708bc5530699c1e9b7afee409d42691c0b6214c6a8f8acb2bcdcd3cf28468496d5b56e3ae1620af8e865d314bbdc65209ed1392a84ad62ea0ffd8900
+DIST openrct2-objects-1.2.1.zip 3381089 BLAKE2B d7b26e45dad74e5c2b30669bb9bfa96e6a9c8e0cf9dfc9b6205f0cd9f24075555267585d2132472eaf412ffc95eea668dfb0c6297ad17a52d02e998dfdee7cd8 SHA512 86d44325037184adcb59397f4d68c5248b0efbfaf1ac9416155fa46886a4784c2a1bf1ab4922fa75a3c6182f1025d1d41314ebafa8ae878b8a8d85670d16d3c9
+DIST openrct2-replays-0.0.43.zip 1669525 BLAKE2B 41b9b1accd877b98c7e244abfe799233e0bf75c14fa7e83e8c1fe996406303dec009c396345ec554a5ca1549172b1497e3adb5d038179c42ae1e719c9707567a SHA512 bed91fdfb7c67449f46effc7102ecfb46f3f5b43130cdbfc1343067a95a046714a0d2e9444b8059845c48bec5d0d4d8560ae7e3a3b6ec7182e7eff5bf40a5131
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.3.ebuild 3907 BLAKE2B a0acf5515aa1587141e6a7e7d2bc2157bceb5c7f80dba7f12c1f5ba71a7cfd568a4aac543c0f2976889d4ca9a8e2cb44102259056115cacd79e223f3fd05128b SHA512 55758f576c2533185f57ae7fb602647474d98762dff85bd55f3d3cf6315ba7dfa1f157809201aca03f584fef5a23b07c1d6d45ca29ad69d8d9f5a0bba76b3dbe
-EBUILD openrct2-9999.ebuild 3864 BLAKE2B c8af3ad568badb86477afa8f442fd37ef57330070e88cd46de39abfbd8427a6995ebc4f252bd09c631039fc6933abf92566fa5e4c8d6fdc272cb0bbb35852357 SHA512 82db558dc9dda97426d70b260899cca4cac4288b7d2bf860e7e023362211d15bc4f408b1b41e2ea5cc2462fd16b2eb47dda13a10100d7381628a283851a8c2ae
+EBUILD openrct2-0.3.4.ebuild 3907 BLAKE2B afb084d11dc302a5bbcd012829a3eee84d235ccc10a6286ecdfa2b0ba3d69347d2b76e7414518dc94c71013b6fd27a34033d28a983199e72cbe48da2097737ef SHA512 33cd727418f2b5b5b02dfdeb571093665292dd326fb468fed9c5c99e082f5bb1420161eb9fee265b24246afacade9711ac6c10d54d62a350069adbf6f620b399
+EBUILD openrct2-9999.ebuild 3863 BLAKE2B a364f3af76b329b9b3837c74e9f06dc126ec6016b9aa60e025f80a5741db3171b821760dd6d526ebdfdb0ca3380a0a05aec1aa9c51c5cba441f6e8db53559661 SHA512 96d67e3a94cc4a14663666d764bebbb4215e32522d654955484c2d0e850a2cc12449b9bb318c012d424e6d7ba5de8d98610c735ce96a76bbcc6ee857484605ab
 MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.3.ebuild b/games-simulation/openrct2/openrct2-0.3.3.ebuild
deleted file mode 100644
index 3ac1aa7a40a2..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.31"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +lightfx +opengl scripting test +truetype"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.3.4.ebuild b/games-simulation/openrct2/openrct2-0.3.4.ebuild
new file mode 100644
index 000000000000..b734ade37c73
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.0.21"
+MY_PV_RPL="0.0.43"
+MY_PV_TS="0.1.2c"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson
+	dev-libs/libzip:=
+	media-libs/libpng:0=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		opengl? ( virtual/opengl )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		$(usex test "-DSYSTEM_GTEST=ON" "")
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 0c3df5377959..44980d09b40e 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -12,8 +12,8 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.38"
+MY_PV_OBJ="1.2.1"
+MY_PV_RPL="0.0.43"
 MY_PV_TS="0.1.2c"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 8a43ffd62464..5bced2cb2ee9 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 0e8e983a6d66..dccda253cf90 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,7 +1,7 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256
 DIST freeorion-0.4.10.1_p20200629.tar.gz 142041599 BLAKE2B a9c14409f31f5ad4d8db95fa33e8f1adb35f7b2a74ea7f173365c7d09979b9a3aa7981ee9deec0427c64844da14ecc323ee54e3331217e2978b49eb86a7a18fb SHA512 b2d4f52e968852569d549c03eca2545b7adac560e5716a21da612dc363b23d790c4481fbd5762f1f1f8da9a8e04894e247ce19363cd96cc2001728912e027d9a
-EBUILD freeorion-0.4.10.1-r3.ebuild 1604 BLAKE2B 5cee95702f0c2ce2c1e9c74ba9e9904bb69c2d6be9a086395f1b24819e3da0779f4fed7712c856c4ab13dbbf727b1787d6798f03ff9516a883d1640471a6d849 SHA512 894b2151ec04c45469a970e94dfd0821680b13ffa239b43d75b2f5cde54af42ce9943821d6fe09ced3691b23cc712fea4515f15940cf819de7a6e68ef266bb05
-EBUILD freeorion-0.4.10.1_p20200629.ebuild 1644 BLAKE2B ef9b112a19a381eaf1124214fc00f28b4e1b3549c73ec12f61175ac376f1feddea3e44797fc603b47d8dbc5ed9b50e1de48336ed37894324c0be74b71e88f05b SHA512 23278ded785944883105ba67d97c1a328ab4d5e1e1d95e492e434f635731911487234e361a9085733c745b64f176bae4b9a2ee47d97eb1c9b54afe04c03926a8
-EBUILD freeorion-9999.ebuild 1604 BLAKE2B 0f6789c4d4affbfa6fc24c70144f68d33e78f5eb4f9b0a0db4ceed078d09d91178ce6f24e4525de20b477ebfbeebeebc5ac20fac7c85e45e27567b67e93b3dfd SHA512 86ff1c82607f47522af8fec002daa6ac18567f041fbbc7dfee73c215ce5dc9ba01ef85bb0d3c8eae438270720110504a0897cea9ee32c0602a47bba37496e940
+EBUILD freeorion-0.4.10.1-r3.ebuild 1594 BLAKE2B 34fd78d2c505ccf80a8b7bc4873f6fcd99ddb1c4ccbba52c3ac205d8129c5b7efa3c85b5f37c1be6a0d8bd3eb9d24090dd3ed0d80693aa80a51c75f68194ab66 SHA512 684c49ce0cdfbeef1442cd84e916ea0183e478d377a48e3af6e7d0f0af7f4aa29f1473249be38b9409b748a5b11cdee7691c0aa4d5b8f4bb2548d8bab7510700
+EBUILD freeorion-0.4.10.1_p20200629.ebuild 1634 BLAKE2B b6e07e04ac314e80b458df46da95e865b027904dd4c0d6a1b1df50521af576789f7d1f06234dd6645baff4dad30b339067229ad1192b48274e6f70eaa62ef1c1 SHA512 2bb509e552355f52290b728bd248234e1d7f33e8a09ce2d85c81c3f1276eb5629087ef6532750e0a4ce47ddff8955a79cbd01d0a284b65935948462f94e74c63
+EBUILD freeorion-9999.ebuild 1594 BLAKE2B d2c0148504ce2855c0da99e74cc5b3539d5a3427992a28aa03b507ecda8848b1d7670623f8ca71d2ec79eb309ef607a6d69d12d175c95fb6cf44e4d21ee3606a SHA512 ff9412d58ff52e19d771ee84b8088a5d95b1eb0dbb0b2f180e509c7bb8b45b810503d742a418dafa2afc25d658da05da110c38ff76555bdb62baed9c8f335e81
 MISC metadata.xml 684 BLAKE2B a35a60f214e503d3338a2207ba7657734fe1dfdfb31b66af255148f0ac8ad83e4a2c70c5e8bed10f8e7cef22456d05b3def6ba1b48621cd0bdf2ab05faba68a2 SHA512 c672ca681068ddb098a09c2cdeea572b207cf7612008c909914b224c613e9152b2741533bf25d87c0d3fd0dc2fcb4817dea20bd132075f23b0482ec77f0bf18c
diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
index 7dc53ff3da60..80259c6eddb7 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
diff --git a/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
index 62d5f6b9836a..eac7dfb3feb3 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 063ff13d1aea..46bf4ce29f60 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index bd3aac819c44..b2772fd37e7e 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,7 @@
 AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.14.tar.gz 513004602 BLAKE2B 04d0ec57a2b0627f778d1a82e592d11f360bf80b445b1faae7e3d708599b22e272be85848942edd9f2c1393bbe1979aaf3a249996ce9ae682c34de24b5c88c29 SHA512 09f803c34452d20aade2a8373c15be2f595d2ae8633885e321870aac742250430f376b753090fc6f03f19307f650972ba8477a2cc255e0fbafb2d7270d9610d2
+DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee SHA512 7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
 EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27
-EBUILD wesnoth-1.15.14.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6
+EBUILD wesnoth-1.15.15.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.15.14.ebuild b/games-strategy/wesnoth/wesnoth-1.15.15.ebuild
index c9a69554f398..c9a69554f398 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.15.ebuild
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 4399358e38f8..fb9319e3e72a 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 0958e5217806..5ba4ef5baaa8 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,9 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.32.0.tar.gz 28170873 BLAKE2B 92839a83067f3699dfcf85a6e479c16a80e18f375f402654dd2b1207497bfba639e717d3ff205cc682a8cbf3cefd37990c7d6dccf46e9dbf23bfd416c58eba81 SHA512 998a1055a5d68cdf61603ecac503db24a8ea344cd388acc7f1f04aafe54b22db059461619c1a1d93b807dc64c779a158b6b2d5066412d6ffc3df0a858de83b0e
 DIST pyfa-2.33.0.tar.gz 28872031 BLAKE2B fe7fad57e43a8efc78f828d0ff81788147fa64ef02a20a71d6fef8ab0130d39b5ebffc18d58a774a61d805b8d0e570cbedb0b8fa536c8c71e61102fb6d093998 SHA512 bfa4e41b387e9f23aeae41a4884a0492316cc6e51841243ef56dc733edab10e6c9609ca7918d4de9fcd052b4da8f8048ce7578d164ad98237b53cb05f7c168d8
-EBUILD pyfa-2.32.0.ebuild 2703 BLAKE2B 21f2952ac68a5eaf0456fb58462bc383ebe3c32ad5c5ba3431085b1c3ce96b1a9cef6ef74f72bf563d00618d652cc0ad9f9813b02d278841b1884cf09e025e4e SHA512 7d2ab8c09e753860aec8212f772dcae96f7dc83ae394b588191cf070ae6a46d5492f8d83761e0ac8a4b7c9cbaa1160d5d2dc277a707ec18d0c66e1d9610f475e
-EBUILD pyfa-2.33.0.ebuild 2704 BLAKE2B 2dac7b4d62e191a9b5692385a176beaac6cf6fe16bf3704d9b7064ca71d805a9a518494e6cedb23f263a3e8d167caff0aae94e42f401a32e12caa27e93b63099 SHA512 594a15773e4aba915a94e1271b85c454340e1b4975b44b92a03c97d970987fada17eb7d80a51d4bf7bd8866ae9558c3e1d29bd9591ffca22e5f9296a103b5227
-EBUILD pyfa-9999.ebuild 2704 BLAKE2B 2dac7b4d62e191a9b5692385a176beaac6cf6fe16bf3704d9b7064ca71d805a9a518494e6cedb23f263a3e8d167caff0aae94e42f401a32e12caa27e93b63099 SHA512 594a15773e4aba915a94e1271b85c454340e1b4975b44b92a03c97d970987fada17eb7d80a51d4bf7bd8866ae9558c3e1d29bd9591ffca22e5f9296a103b5227
+DIST pyfa-2.37.0.tar.gz 29991827 BLAKE2B d2dd51becc037176ef0e4394799d6d35ea5025b4b9aba7a1e2a12d908b1d8d9a436d2e2b2e9d06b3592ea2276b3dfe24c639d02cd77fe25a6ea673d9f048a238 SHA512 e3ccee3ee3b74644f208afdf719bf1e3dc29335041e3cdd19b5742f51e1fbb0fcab2376c26fc789e7992d1f35215c128bf6480860a0eea75eeb69c9b466ba1cf
+EBUILD pyfa-2.33.0.ebuild 2626 BLAKE2B e3de401116f10d06370a104995446d7e51495402ee4a3c7dca0fe322ba360f0599c1b2693d153a21ee1d5b05c70ff991a39aea1f263e3de9f7d84b397ca80e3b SHA512 11e469339790547150752836c950edbcdcaffd728ecc0aea3e943158fa52095e9ffaeb52a2551cd144cf4fa88d3afc794931ba4c9f7823adc37bd40cacbd3408
+EBUILD pyfa-2.37.0.ebuild 2626 BLAKE2B c500862a8acadc751f117361e9f8995dcb8804a2d1f1d93bce7602985ce743ba47b01ed651a4a594741b9eafbc1ffa1e80bf344c2043b36cae10fd3361cd481d SHA512 b56257b154b6c5973f547dedbedba6442779e5c976b5ef3fa2dd68220efa71e997c0e31780e273ea15d931946e48344ebb8c4de8fe895c7a496ba2df93268428
+EBUILD pyfa-9999.ebuild 2626 BLAKE2B e3de401116f10d06370a104995446d7e51495402ee4a3c7dca0fe322ba360f0599c1b2693d153a21ee1d5b05c70ff991a39aea1f263e3de9f7d84b397ca80e3b SHA512 11e469339790547150752836c950edbcdcaffd728ecc0aea3e943158fa52095e9ffaeb52a2551cd144cf4fa88d3afc794931ba4c9f7823adc37bd40cacbd3408
 MISC metadata.xml 774 BLAKE2B feee5ef3ecce1f83f9d9503111c31e0bf92d9d4dff8b93d44016424c105e93d29d5f610a0c3fbb18a8ff738971989d7e59d83410c00f860cdda4e428f6d93494 SHA512 8c55d22f82558fe2d4f1cfcc63ae19aa4df60eb0fcf3c087250b041e5f1025e933bc87aa22bab4220e2c02f8915f5e4486e43842349fac0ee3f01ac6278b85f6
diff --git a/games-util/pyfa/pyfa-2.32.0.ebuild b/games-util/pyfa/pyfa-2.32.0.ebuild
deleted file mode 100644
index 615f61631bfa..000000000000
--- a/games-util/pyfa/pyfa-2.32.0.ebuild
+++ /dev/null
@@ -1,93 +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="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	${EPYTHON} ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/games-util/pyfa/pyfa-2.33.0.ebuild b/games-util/pyfa/pyfa-2.33.0.ebuild
index a30888fe1578..91c42fe4412e 100644
--- a/games-util/pyfa/pyfa-2.33.0.ebuild
+++ b/games-util/pyfa/pyfa-2.33.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit desktop edos2unix python-single-r1 xdg
@@ -27,23 +27,23 @@ RESTRICT="mirror bindist"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_USEDEP}]
 	')"
 BDEPEND="app-arch/zip"
 
diff --git a/games-util/pyfa/pyfa-2.37.0.ebuild b/games-util/pyfa/pyfa-2.37.0.ebuild
new file mode 100644
index 000000000000..7f760faeb791
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.37.0.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_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit desktop edos2unix python-single-r1 xdg
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/Pyfa-${PV}"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.2.2[wxwidgets,${PYTHON_USEDEP}]
+	')"
+BDEPEND="app-arch/zip"
+
+PATCHES=(
+	# fix import path in the main script for systemwide installation
+	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
+)
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
+
+	default
+
+	# make python recognize pyfa as a package
+	touch __init__.py || die
+
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		-e "s:%%EPREFIX%%:${EPREFIX}:" \
+		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		pyfa.py > pyfa || die
+}
+
+src_install() {
+	python_moduleinto ${PN}
+	python_domodule eos gui service utils graphs
+	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
+	python_doscript pyfa
+
+	insinto /usr/share/${PN}
+
+	einfo "Creating database ..."
+	${EPYTHON} ./db_update.py || die
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index a30888fe1578..91c42fe4412e 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit desktop edos2unix python-single-r1 xdg
@@ -27,23 +27,23 @@ RESTRICT="mirror bindist"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_USEDEP}]
 	')"
 BDEPEND="app-arch/zip"
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8f3e6df8dd2e..3b0ccec0e2bd 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d6907fd2f3b3..dc79f798910e 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -5,7 +5,9 @@ AUX gdm-40.0-meson-Fix-libwrap-detection.patch 772 BLAKE2B 7910f76af46d7541da954
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
+DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-40.0-r1.ebuild 5898 BLAKE2B 2364babcdb6cb3d09f77cf377531cacbc8e58c84505b16393d51daeb59809ce0943d3e4fab9726b20bd91d212191717de0e617cb860394c409593198cd5ef827 SHA512 f107afc617e3776ee79e1790210a9def6c4832367f3aeb0e23f53663fb5123e1d1826cba07b0eef29980183e28570772b8ae78ed3254b66c8d80fd989211101c
 EBUILD gdm-40.0.ebuild 5890 BLAKE2B 73e44b3e931b81c11c955d21fa4d3412e749d2ffebbbd982cf85e132b5dbed79107050b96f362630f46094a2a89ec4a36a881db006a77ed9d3639ff560d0fc3c SHA512 3e72f56a5073b205f488a5692429508f73375d370021ce7b3bc5b0ef384f17c3dddf70977b6c97c58b3d1817c969ac0a4e60e0d2253d76289465616a3c8891da
+EBUILD gdm-40.1.ebuild 5852 BLAKE2B d1a717b28c09fc9eae9d5d53936bd9b97f81ffddde390ec4ea958276477f8461898d992ebde5e3f1d4f4600228f464503bbf446aed56341308e72b1f1640d4ca SHA512 8110d1917c889d55091f53cbbf3ce1e0b8a8438685ab8af8015f10b7581c24c76440f484a20624e9f864a6c4599b2b04bb744015f63c1c16dc9dceb7bd64a091
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-40.1.ebuild b/gnome-base/gdm/gdm-40.1.ebuild
new file mode 100644
index 000000000000..591f372b4963
--- /dev/null
+++ b/gnome-base/gdm/gdm-40.1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+
+SRC_URI="${SRC_URI}
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-BY-SA-4.0 )
+"
+
+SLOT="0"
+
+IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
+# dbus-run-session used at runtime
+COMMON_DEPEND="
+	virtual/udev
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-2.91.1:3
+	>=media-libs/libcanberra-0.4[gtk3]
+	>=sys-apps/accountsservice-0.6.35
+	x11-libs/libxcb
+	sys-apps/keyutils:=
+	selinux? ( sys-libs/libselinux )
+
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-base/xorg-server[-minimal]
+	x11-libs/libXdmcp
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+
+	systemd? ( >=sys-apps/systemd-186:0=[pam] )
+	elogind? ( >=sys-auth/elogind-239.3[pam] )
+
+	plymouth? ( sys-boot/plymouth )
+	audit? ( sys-process/audit )
+
+	sys-libs/pam
+	sys-auth/pambase[elogind?,systemd?]
+
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/dbus
+
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	>=dev-libs/gobject-introspection-0.9.12:=
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+RDEPEND="${COMMON_DEPEND}
+	acct-group/gdm
+	acct-user/gdm
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	x11-apps/xhost
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		gnome-extra/mousetweaks
+	)
+	fprint? ( sys-auth/fprintd[pam] )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=gnome-base/dconf-0.20
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=dev-libs/check-0.9.4 )
+	app-text/yelp-tools
+"
+
+DOC_CONTENTS="
+	To make GDM start at boot with systemd, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
+	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
+	# rc-update add xdm
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.\n
+	\n
+	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
+	for smartcard support
+"
+
+PATCHES=(
+	# Gentoo does not have a fingerprint-auth pam stack
+	"${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Add elogind support
+	"${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
+
+	# Support pam_elogind.so in gdm-launch-environment.pam
+	"${FILESDIR}/pam-elogind.patch"
+)
+
+src_prepare() {
+	default
+
+	# Show logo when branding is enabled
+	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
+}
+
+src_configure() {
+	# --with-initial-vt=7 conflicts with plymouth, bug #453392
+	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
+	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
+	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
+	# so lets try always having it in VT1 and see if that is an issue for people before
+	# hacking up workarounds for the initial start case.
+	local emesonargs=(
+		--localstatedir /var
+
+		-Ddefault-pam-config=exherbo
+		-Dgdm-xsession=true
+		-Dgroup=gdm
+		$(meson_use ipv6)
+		$(meson_feature audit libaudit)
+		-Dlogind-provider=$(usex systemd systemd elogind)
+		-Dpam-mod-dir=$(getpam_mod_dir)
+		$(meson_feature plymouth)
+		-Drun-dir=/run/gdm
+		$(meson_feature selinux)
+		$(meson_use systemd systemd-journal)
+		$(meson_use tcpd tcp-wrappers)
+		-Dudev-dir=$(get_udevdir)/rules.d
+		-Duser=gdm
+		-Duser-display-server=true
+		$(meson_use wayland wayland-support)
+		-Dxdmcp=enabled
+	)
+
+	if use elogind; then
+		emesonargs+=(
+			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
+			-Dsystemdsystemunitdir=no
+			-Dsystemduserunitdir=no
+		)
+	else
+		emesonargs+=(
+			-Dinitial-vt=1
+			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	if ! use bluetooth-sound ; then
+		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
+		# bug #679526
+		insinto /var/lib/gdm/.config/pulse
+		doins "${FILESDIR}"/default.pa
+	fi
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local d ret
+
+	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
+	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
+		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	systemd_reenable gdm.service
+	readme.gentoo_print_elog
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 6193c930e18e..76b89b03cf84 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 DIST gnome-desktop-40.1.tar.xz 721416 BLAKE2B de1432a9ee61fa0545ce09c1228a133555d732ea58b9550a1f218726342d4c4e1c9d30f402b62a6a370cd281302c47f820f8bccbd69f8b8651f77e4b0e8d4f66 SHA512 ff9da5d0c805a7d42339a9174b907dd0cc4845c8eeb5a004a13f001dbe449f28a6360ed9dc1951376be4a48271908990052ca0e8d6e4339214cafcb80d204b57
 DIST gnome-desktop-40.2.tar.xz 721852 BLAKE2B a7258d0465b17c5c9c78a066acd72571c002054f196d847e07b10055b1d72900d6efc80ac623f118ff11a87a4d5042ac9902f7f3f9d5a181ad3d80429cf9f904 SHA512 2fd3ba5eb0263aecc43978d84070619c16af4de998b344bc2aaac16aa0e734d93235aa218c2684ad993b471136434b97dffae52f183798daaa4ec47574cc51b3
+DIST gnome-desktop-40.3.tar.xz 721788 BLAKE2B bfdb77995d8cb392805a9d4a7a1276608aa53ea7c73604b12817c1660176c4e0274ba6954523cd0bec067230520c2736ed77885726696e463c97d09992186243 SHA512 96f2069ec3eb1bd1f6c2056c73d268eed5521398818cc05c22cdedfd1c09805fe5abc7f450abc7752690e809f3bdca502dfc107564236bbb03e262531418804f
 EBUILD gnome-desktop-40.1.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
 EBUILD gnome-desktop-40.2.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
+EBUILD gnome-desktop-40.3.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild
new file mode 100644
index 000000000000..b42b6b81c1b1
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.3.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 gnome2-utils meson xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/19" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	x11-libs/libxkbcommon
+	app-text/iso-codes
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index e3728e38cf6f..d49543fa317c 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4
-EBUILD gnome-menus-3.36.0.ebuild 891 BLAKE2B 5dfe02262354e59ef667b46a32f64d685ab91764b2a3514eccbc35b736a60dac1a92f206d43fa9b68b86f79417c15834cee6c4c1932260a5ad7c80256d1b6f96 SHA512 7fd9e5ac0057132e5d8900b26fdf4aa70c392a63068f5c4076ad84924c645f976240269b2e3b1765fc33f06cb2599aaeb274cde6fd7d2f4392d21cb97a1d7f39
+EBUILD gnome-menus-3.36.0.ebuild 898 BLAKE2B 7b225f817e6ee7e97e27d492a515a4cac7b12a4e4f33fbc3bfc8203da2ff3360be9adcd17c0a37e5e88475f561b21765d1a3977bf4bf419a9e123fef5ff48542 SHA512 2a3a8645c838422860bc6bbf40a45eb44dfda12d3aec93864ec71f1e0a531f29014521153f186c6c0491f4669f6ef7b8a3e8d25527311562479b9c9b87d72ce8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
index 7f174aad752c..c6e06f47930e 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 4d953eaa3a0c..677edf856f0b 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -8,9 +8,9 @@ DIST gnome-shell-40.1-r1-patchset.tar.xz 4328 BLAKE2B f26eec7cb7ab5e30b574a77cb3
 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
+EBUILD gnome-shell-3.36.7.ebuild 6657 BLAKE2B 47a8e56bca7600591d6d175f46bce02891f9cd913ca6705a57c0f9a55d837c9effd4a793419ebf1ee4c8bb6445a26787cbb8e8a60e18c0a893569a6420b0f661 SHA512 94f5e8b02d055a0c3bf95018a1c66e6d4dc22015169c35c5aaa2492ca21ed01b9623d74565add12080fd0b149a0963855865450b5b9a2823075cfdc2f6befb7f
+EBUILD gnome-shell-40.1-r1.ebuild 6454 BLAKE2B 3226c13ab09fb7e90780f1d000747206ae31b34848b550fdda5add1a0a816e7d94d83fc6169b63b94bf202fd20aadd366b5521ad3c805c2deb4e9865a3eae84c SHA512 580202be3f3b5050cac826f43f32ba8f7166e30ac68c80692027eab333b85d1a4ecab66d7b58f6cd6989ed0ba13e4ebd72a1174617dfce34d26e9f2eabfcd384
+EBUILD gnome-shell-40.1.ebuild 6359 BLAKE2B d4f2d72dacd2c4a67eb6ce37ff199ac890e097e807f3a2c921b664f8d76c22c55ae4dc73b9b7461ac38ae818fe034941de3e208fac15a95210b0254dcde95aff SHA512 aba29d2394572b63f55c9e9e694483de3c8a413114ee8d6bd2c1080e9086fea4297f268e572bbccf84c07896ec242397520414c58a67175cd73c0517d8379dc1
+EBUILD gnome-shell-40.2.ebuild 6359 BLAKE2B d4f2d72dacd2c4a67eb6ce37ff199ac890e097e807f3a2c921b664f8d76c22c55ae4dc73b9b7461ac38ae818fe034941de3e208fac15a95210b0254dcde95aff SHA512 aba29d2394572b63f55c9e9e694483de3c8a413114ee8d6bd2c1080e9086fea4297f268e572bbccf84c07896ec242397520414c58a67175cd73c0517d8379dc1
+EBUILD gnome-shell-40.3.ebuild 6362 BLAKE2B 1523c3a69e54f9c92dcb2e7a4e4db7278afaabc749c7908083663dcf89c4fee435381783f2c5c31268c2e856840bf135c4322027651fd701d64c436ff6206358 SHA512 2515a1107b2427e93de6a36df228a158b472bb7410c52542deab90a6aec1572626c872249bbc40e1985aa67cddc6c97142e357a59062e33db257325a536887a9
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
index 4ed0027e0380..40a104d89586 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -60,7 +60,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	media-libs/mesa[X(+)]
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
index 75c7f4c0b748..459ff2cf4df8 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -64,7 +64,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	media-libs/mesa[X(+)]
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-40.1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
index c16d80cc4f55..dfb141f86a4f 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -63,7 +63,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	media-libs/mesa[X(+)]
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-40.2.ebuild b/gnome-base/gnome-shell/gnome-shell-40.2.ebuild
index c16d80cc4f55..dfb141f86a4f 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -63,7 +63,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	media-libs/mesa[X(+)]
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
index 96fa03cf83f6..7a13c2596f16 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -63,7 +63,7 @@ DEPEND="
 
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	media-libs/mesa[X(+)]
 "
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 27772ea7f4b7..33e9c900604f 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -6,5 +6,5 @@ DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
 EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
 EBUILD librsvg-2.50.6.ebuild 2577 BLAKE2B d1f7f58b9d597ec468632c9317dd98d049f25828f701322a97ff7da5d48b29010543291c95b69d28cbbbf5dd5abf74faef01ed99cbcf7b038806e6db358be7ab SHA512 a2f73a752c007ee1e29f75b8dff78c0526ed3a724cb6be025dccf72d4dadb65680e7c8fca97f496c9676e2e03719529bacb37a0580412804ed77d0618e6103c6
-EBUILD librsvg-2.50.7.ebuild 2578 BLAKE2B fa83c90fb3a2dac88cddc4834e54a7dd8ab4f43adb2c4cbd08496dfecab280d7f3073731a5cdd7b99373742ae396015c5e31a13ea1bb1f5f811c85a101b50bca SHA512 5b7f4418de48797e70a9e7b26e4136ff58e5d47a792fbf0723406d6213a9a9aee4dcc576576a15ef547263014466183bff315bf9a4b95c8efab41d734ac3fb57
+EBUILD librsvg-2.50.7.ebuild 2585 BLAKE2B 0f84955408dab36e5ee976f87dfa6e96452b6aaf1eeef05a01e8b592688c08341c700978779379331d59e6b210fc53b25d663e94f4e57c8ae0f2dd7d8b9355d7 SHA512 5cdb07d70fc66118a91780fe18e0378d4b3574ffd4f1be27266b2bb1b5570c113a2396184095d632eeb133054754ecd319099bd7bbf2a77d58fc6480286301f6
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.50.7.ebuild
index 546a5d59d911..2e17a1ddd2bb 100644
--- a/gnome-base/librsvg/librsvg-2.50.7.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 06524c109043..05c4a7ed42b4 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 208476b1ca41..fdf5669d4235 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r4.ebuild 1431 BLAKE2B 17ae1a8ed0849172f4cb90d3a8f889a0c4962a7456a5937fbbdb1c217ecdaf66dfc882aa73f503e22b20ecf46198850d22ee8df3fd9bed998d74843eebb1488e SHA512 9dcd0b4f09e07d8ef366411af1e5e7728bfc50e5b66c6f7e942791d182bcbe3a919ce585216d5814a56e33f6939b9254950ba75b87700becd8bcb27b7f26e894
+EBUILD chrome-gnome-shell-10-r4.ebuild 1417 BLAKE2B 208ef492ca6d94dd0fc6e2266e591ac72bd73289287f75969fe6649c1ee128500773e3941b81250e41349f44b85bd574f2881f2383f04eeca797343c2fd9ba87 SHA512 882a55531e8a71ff709aee74112b346b4c6b7b0098235392e806d2e9353fc9cf93576d6db564ffb4118196324fc90c7aa336be5a89220dd1ace299d0cac9d37a
 MISC metadata.xml 568 BLAKE2B 2627bf6f826c898bcc4e42086b4f5804130f5bfca3bbabb3ab6b1a981ba1e3020e2dc3b03ca024276d432a496d82d8cdacc478364482a1424f7228b3ace35ce9 SHA512 a5f1ef966622d4b1bb6afa50b10ca2cf5cb4b5903cd39f2ee6319e3afafc9a2a86bbf76e4f96b4830b7cd911b16e0486cba7ab15ec172b4fbeca2fcc51b90b5b
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
index 50f322f7a5c0..d8e3cc5328de 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake-utils python-single-r1
 
@@ -24,8 +24,8 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-shell
 "
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 8af594fa5c48..7706e685ab88 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
 DIST evolution-data-server-3.40.2.tar.xz 4625240 BLAKE2B f7c966e0e092ce46157e55d1a096e5ce69ae5103c0d777f262b62cac4185bec88c4cf84b9da4927cd8e008310f09bedcc017cb4ec39e4c90b3a36c1444b3507c SHA512 495e264cc92b31e6bb76b205641f4c030e82a010f0cf58f712d5c05b5a06f0a60c5b83b31f95ececf9e553f2e816bb9bab2df54cd9982a81eb2bb7f936016639
+DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
 EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
 EBUILD evolution-data-server-3.40.2.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
+EBUILD evolution-data-server-3.40.3.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
new file mode 100644
index 000000000000..02f51c3698ce
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]"
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index cf08e4637337..fb612f763ce7 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
 DIST evolution-ews-3.40.2.tar.xz 673592 BLAKE2B 0b11b77c729102ecc0602abde323817782b9d56939a708bf9a506f2dc2d9d0edb43f7607e0a970db3144965aa669691d2041d99841d70ac604feece721e11979 SHA512 a42f8ee092aa1fdfff07729bb1c3d0f80a25f6073f07135f0fecb8f431cd5273c2afd292752457515b0be71f106025d413948a97f2a4d3d43b049989dc296175
+DIST evolution-ews-3.40.3.tar.xz 673800 BLAKE2B 4d8cbce33552a40551db08f25bb784ec1b54df0672bab95cd278de6a761a0ed05d5d21754107043fcfde1b533edfbce6a25b2d7fc3c6e885bc7618efd8c89763 SHA512 c35da74f1c52dabf1d3373654a70a7fa005cbc8ebb30a64c3315cffae222221a049918eb9821773020a7178c64caac0b9360ea562eda748b1e26911fcb4fcb90
 EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 EBUILD evolution-ews-3.40.2.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
+EBUILD evolution-ews-3.40.3.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 0433aeb5d219..5fb4d46af20f 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-40.0.ebuild 1352 BLAKE2B 443d4bda82c501ffc17da0b8bd7d03d2ec1352a1552da2cdb19233783d809d490e21df5aeafaf50755471bb23e3bab3305b77fd2bf2a93c8c20dbe76c90bc57a SHA512 4ac05156ba3accd58e98197aa21e0f49cf7999404dd5e90c80bc947e3e43b368970af52c6817482770adf3fc876aa369b1cdefa9d2e057fa1a6c2ba287385bc1
+EBUILD gnome-tweaks-40.0.ebuild 1346 BLAKE2B 894dd852902211c4f2052cbc627e8da4591496ba623cc1934f2d3a59d5b27ebfb08bebe476580026590ab3444810a3cc5d20e321c87a55cc5ad95f3e0dff11a7 SHA512 f7aa67c45b538ec3cb9c8a2aa21cfbdbdc2ef2e7f92a7fbb858c784dafe857af4b347b238be2e6196150a467f0c473d8b09626293c1c8fa3a9692988551922be
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 9b3b4d59ea7a..ee0cf7fb6a6b 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -20,7 +20,7 @@ DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/gnome-settings-daemon-3
 	x11-themes/sound-theme-freedesktop
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index d1b4ebbf8535..a28a0b86b659 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,6 +1,6 @@
 AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
 DIST nautilus-dropbox-2019.02.14.tar.bz2 381416 BLAKE2B 0765196974d88caa477d962311efe05941cd2d25e35fa028720c8abed5120fea5abede74f39e00cb2ac9eb08d6d4bbdf1d1fe6db8d604c1803570209e654d55a SHA512 c5758d97fa40af1b27388c23289e5d1d98ef1c6db04ed7fb5cfee387723f72c34f3583fb6e0158a39f30d5ff649cb2de6d92fc4ad6e976e301dc239bda9d554b
 DIST nautilus-dropbox-2020.03.04.tar.bz2 387351 BLAKE2B ff25716ef10759e014cffec8a7e9b1a40931686d6de3c69e9060c77cbf3aee65ffeed91ba809ba8cffc372f284180c74a8cb5b0ca4b342aa137d9e574a2a1abf SHA512 8f26165a48d1767b3bccb34f95f19357e8fd209f383270ac2d40f773df139d640c3fb33db28cf1fa7e2d7063a7a37b15ed7f4f22f85019e05885c097cea39a48
-EBUILD nautilus-dropbox-2019.02.14.ebuild 1348 BLAKE2B 47bad42c76c9dc763e2ff956b74c58ce37d9adfcfd53ec39299fc157aabf46677dc8ad3f309dff84223a51e28a54388bbfde391c0987a833ce3aaed70b2d887a SHA512 bc706d9ba742f574f105364922bfa96645aaa701e2891d037236d2f3ca649719776d8b6680a9f771745a589e972fd1d65e8c591f103d635ba96489a4e222f761
-EBUILD nautilus-dropbox-2020.03.04.ebuild 1393 BLAKE2B a80af45d8842c6968845d99cb5960b280778e279742592ce347bc54333efee605efcb58a2d59823c694e575fb80e6a684483a7fd3fcefb6a2d712e570b4bdb1c SHA512 576ec079ec212a6ba01c326fc2d20f77187ebf71cbd7a2fc9c0bd8d244a9249ad6b8a36a16a61e54ac91f88615bd51bfaca5d9d159feee9557bcfe9e98e99a57
+EBUILD nautilus-dropbox-2019.02.14.ebuild 1338 BLAKE2B 3b2e205cdd6c28489a02f45e859713388597c66a30493d8b72977d46e596a96471c171182e391561cda8d757d36eea3b9b797f15c6c327215533649c78ab76b7 SHA512 9ae4eb6d7c9534ec48d25ef4c85728459992f6b393ca81b87cbfecfa3c9d98e2025a2049c0c5305e260d5b9edd39592d67ce26d52fb55c16b90629f1b19bad7a
+EBUILD nautilus-dropbox-2020.03.04.ebuild 1379 BLAKE2B 69127a6a87c06b0fb446116df5367f8ec0bd95ba4c193db097df15f4e1a375efd0457a32ae223900f5daf39bddf0b7f96bc55de3c7207ab74624dd9c86539f9b SHA512 57fec409e6f60acf2b8048e0abece035072be3d85d1aefe383af0d7bed5165052650c0f7a54054ff21d7b683f91ded69416cb527bddf66f9ecccd828adb3393b
 MISC metadata.xml 582 BLAKE2B eb358f22a425af53f12ca27a47f82d8eae8b3bd0529f36492e70d1335337a1bd0c7f430494d2431e19ea3305f8e29decfd7c056ab5d9fe8069fbff00e567b38c SHA512 24032cabaf2db87514114e49410d67eda72e5365486941bd76507ae7a4645142b493ec88fdf47952603e36d84d5089606fa0bcc5f1d9a6cdd8831e457f15688e
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
index 0e5c5cb2b921..bd8415d16fba 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -22,7 +22,7 @@ RDEPEND="${PYTHON_DEPS}
 	gnome-base/nautilus
 	net-misc/dropbox
 	>=dev-libs/glib-2.14
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )"
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
index e882654d4eb2..76ae97342d8f 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -19,7 +19,7 @@ IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	dev-libs/glib:2
 	gnome-base/nautilus
 	net-misc/dropbox"
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 BDEPEND="
-	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_MULTI_USEDEP}]' )
+	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
 	virtual/pkgconfig"
 
 # use system rst2man
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index de84553e5886..b8e0cf819291 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,8 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
 DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
+DIST yelp-40.3.tar.xz 1506144 BLAKE2B e9cb9f2e1390fca1c3cf144a1c0278e6ad8506f6177b84c6966fa4a1088ba316afc3eec2e5292e49878c45bacedeb06c1980e4f16d7ec1c8bd22d8fb10ba07fe SHA512 d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28
 EBUILD yelp-40.0.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
 EBUILD yelp-40.2.ebuild 1206 BLAKE2B a2ae94a13c94fc2efae9792aaa3f0ee50060a0beebb2fb4dc46175c66af89d59621b59fa8e989e536e16c5c1050797cffb88373c2dd8aaa87d94b26bf90633df SHA512 b2e09bce0909db5a998c88f5d28e89e59dcebc43bc71b342263c83808cc7b5f1591249b551f29a3576c8391c0f75006a744b6f337db2eb6b4ce42aad63c9db83
+EBUILD yelp-40.3.ebuild 1208 BLAKE2B 4161f42721caf7f10f9f98af2b8f4021c57723b66b9a92f62171c6fbd37be9e98e962210498342f5642f7a9beb6029fbcef7a0f0f113affc2633a0953ae38eea SHA512 749383ebd2412a9adc0bca4e562a2e4c3a678f6a73ad5da823c9b9acbb0b39c1ccf560696f1cdac8f45094f521a76d672ea1679c0524a4bb4ae086e73363d60d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-40.3.ebuild b/gnome-extra/yelp/yelp-40.3.ebuild
new file mode 100644
index 000000000000..ddb5e4d5603f
--- /dev/null
+++ b/gnome-extra/yelp/yelp-40.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index e5cd5a5c7c25..b3ea54967c2d 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
index 8ebc2b157b12..7c3824cfe480 100644
--- a/gui-apps/swaybg/Manifest
+++ b/gui-apps/swaybg/Manifest
@@ -1,4 +1,4 @@
 DIST swaybg-1.0.tar.gz 15851 BLAKE2B 820edbce4161f2d109bc8e842fb2bef101a5793d1da90f4258e5771fe85ab089e184c063a0a7073adbe218c59307946f86bd02c4d62b0585aeb3f9cd5c7963f8 SHA512 67d0e0109b906ece51800729182940374cc59fa07d0866b57cf876d12191fe12e796b84350a849dc85183fa58a3b2d196191e48dcc03dcc3708a980ed4a8cff0
-EBUILD swaybg-1.0.ebuild 810 BLAKE2B cb309017732cb5e64b5137f6ebc2ad0425247be2fdb3144fb724a1c077b70efa82c77b6fa6351c79dff5811b58366c56e1069c027703317dcb384b04dedbd52f SHA512 d63bc6facc43dee7b5c4ae58c340512e1f17aa462f41eb88866b58cad196e32f50f60c365d08b412cd9e76564c843aeca2f04bd14b959b29962f1f988de4d802
+EBUILD swaybg-1.0.ebuild 817 BLAKE2B 50bab38da4f28d6beaf0208a5f35a98971885fdcb9c60199baee5930389c29b559bf3484982f0bc897749e8e7dc78d51a699074b219418db310d813da6778421 SHA512 751b1c83c41f155e93ebc979b17d12da630d3d70f04e13a290e163ed21ff64b0edbf5c8a1b7e36fdb886266dafb3f698b9db9a9ead61eff21a985d8b8af0b70b
 EBUILD swaybg-9999.ebuild 813 BLAKE2B 749ea546ac884d7684006708287a703527df983e0890478842a1775e4e57debe0fb1afb5187ac360fc17c3a0ca1e584a319f80cbab0b4f104c70dd703cc55a75 SHA512 9dc55b737dfb5ac36ec2630e9aaa38f5c0bdf560d5a81bfed0825b7f5401b22216bd2bdca07cb4133a3c86027b9fcb2f9292b9876c50aefca202ccc5cfc8e336
 MISC metadata.xml 888 BLAKE2B 9f83faa022a8a9977c4378ce146fa179e080f83ecfd136824a835eee83979d45f137d4de917fb9bcabf619b437023467063a53114782cc72e2dac40bf59c2c3f SHA512 eed11b5ffbca4411ef634e7c47f432e614614761b4058efb9c3427f6309db782777c51a3c4255f743bccd274888a6d2097f1e0476cdff837790fb8171bec514e
diff --git a/gui-apps/swaybg/swaybg-1.0.ebuild b/gui-apps/swaybg/swaybg-1.0.ebuild
index ba300c663030..37ec67bd1e63 100644
--- a/gui-apps/swaybg/swaybg-1.0.ebuild
+++ b/gui-apps/swaybg/swaybg-1.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
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index 0cd1544eb856..c8e329bc518d 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,4 +1,4 @@
 DIST swayidle-1.6.tar.gz 10131 BLAKE2B c0391d288c780c61b72b7a5ac612efc18c359cc7d622faa308e22b1e4359c064bc2824e7cb8fc14143ddde54fc6980bdc5d449d1f16a867b54aef9dfbaa4ff17 SHA512 c82b0d2aee06f87fd71e9e2208e917c0dc7afe80ab0b782c3165127519445021d8cf363292eee99f939165eb813909f2a4ee74153e776557c6d06672de2c1c82
-EBUILD swayidle-1.6.ebuild 1270 BLAKE2B 33a20397213c4db45d15d959de74132ea1f3bdc92ea2013c46de2a2a5258d9cd4327cb9aa01fee22f1ad587e0d1395dd99171a06ea4e4077da321875ab65c955 SHA512 65fed72886c9aa943cc8b14029751e4c43f73b69878e8a9c66904baaf23c422f096bf14b05b3f46c5cbfa2ebe9168ca80ee2bdd3bf7f48350e45c5af3913f1b7
+EBUILD swayidle-1.6.ebuild 1277 BLAKE2B 5725397b5300749830242d38c57f1242cab9aeb10ad69099a6658d7c00f55a349c52f7eabae5f29cae8e6f6f477d5f9e00f85ee717399f1e0e2d78b9fb63cf0f SHA512 02a9ecfae6a008e7e4bac1e89161199f1ef9b246979f13594779bc63aa151b2ba1b81c1bed391de03eabf7e91ae6ff77808a655193b1dbd6303240467ee532e9
 EBUILD swayidle-9999.ebuild 1273 BLAKE2B bbff1eb0b6121c74c1eb7404138ad81b2f060895a7eb71eda9a87e9eda79e6be0ae5477b070a6b4091220b78b9aa38783a52e5681cd01cf820eca9d663f577e0 SHA512 24ad9f33d30eec175a831a6503a47d446b8d7642e3e9827d47105b60d6099965f57094848372c2ca7b68dc1437bcf96efe450c6a9f305ee50bfd1bc022b54590
 MISC metadata.xml 1027 BLAKE2B 90746eaa42889e71c20b38dd9d656524f65ce511d2c9f988fdbebdd19504ba2f3c1ba49a4108889bb5973bd3a65cdb6879a2cdcbccd02d853678ad657fb22118 SHA512 220b8549757e9682dbcda6ff84774cab67036ba689ea818f912bf59ae2e1acb0ddbc133955d1b6d354943597f1293549da48ff9780cb3e91bd447d5068731cf6
diff --git a/gui-apps/swayidle/swayidle-1.6.ebuild b/gui-apps/swayidle/swayidle-1.6.ebuild
index 447bf1644a1f..ae2ed9985b48 100644
--- a/gui-apps/swayidle/swayidle-1.6.ebuild
+++ b/gui-apps/swayidle/swayidle-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 892aed364ca6..0ca44740ea52 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede66c6124986c3395575a4e2c22d59a837a09033d1632b61628e45b18b3ee5ca198bafe4fbd8f429cb0401eda SHA512 16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67
 EBUILD swaylock-1.3.ebuild 1299 BLAKE2B ef276cf73b8296a58bfdbb559beb789b6b30f5de0352752313ab135af7d5d9e3f3ef22b67c8834923fe465eb86f45c85a1f999427cc5f964476a9d4de5e62307 SHA512 5c1d8b253ae607e332163cdc9fc8a7a53dcca202fdc512ef59b2d8c423818e3b7dabda42453c7fda36e8847075556472249d9433dd84be6fdee887ca965db972
-EBUILD swaylock-1.5.ebuild 1265 BLAKE2B 91273004b19254fec334126cc2327ff7954169e9a153d321fd90a539efaf7048fdb4fed6a6f0e72dabae6f0e398f37866baffb3437e10c45580e4fcb247a9290 SHA512 e6d6bbcdbc090995a2ee270317095112641688f012f9a753d950daeccee636e972258a725d904acbe0d01e2ee98aeb058835ecf37284a82ffb41904d88b386f9
+EBUILD swaylock-1.5.ebuild 1272 BLAKE2B 804a0bdafa6d96d1e7c038b42dfe5cb463afc2c0601e284c1c9e3a4d791b2f39308ff25d55feabaf5da153e4b5e19b1eafd61207c2e9a5483ed98bf34dee884a SHA512 513be1bec49a65d6027acd213a5808cc0203efe4f4d502091b4a13b728eadf06e35a10dc17031f17fc5f24aac8fee03a4f908e084ff6af585c47d32a68eb4c01
 EBUILD swaylock-9999.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
 MISC metadata.xml 1250 BLAKE2B 0fedd8edef50f471c7a4cde72b417d2b625e87cdb873149e2714879b81634f21e4ad18cd2b078bdf63c8b198955abe7812823e2101ec176a9de07c9db56b2e39 SHA512 166fc66a1bf3cd3e80461e74c7022ef2fda4ff21c49d6aa2fc4feb8ea961501022861ff17bd8850422199c09c98718b9f8b73534b9ffadb9a44bf5656ec8cd00
diff --git a/gui-apps/swaylock/swaylock-1.5.ebuild b/gui-apps/swaylock/swaylock-1.5.ebuild
index 846a5eb4b23e..d37597d6dedb 100644
--- a/gui-apps/swaylock/swaylock-1.5.ebuild
+++ b/gui-apps/swaylock/swaylock-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/tuigreet/Manifest b/gui-apps/tuigreet/Manifest
index 11d644d1868b..2efe525bb8d1 100644
--- a/gui-apps/tuigreet/Manifest
+++ b/gui-apps/tuigreet/Manifest
@@ -1,69 +1,167 @@
+DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
+DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
 DIST cc-1.0.55.crate 52090 BLAKE2B 1ace1ad556b030d3d81dd9af06767acf6e31d00f3eabf5d72a41a537e4e984defdac4ab0d802cbf83dee3f726a9aefd9c87ed702fec08a0cc9ed1e1410544b40 SHA512 a20aa18cfba9ee0d9fa0bbf3117be6d37c4420ef45e1b01f5505b138ffb2b2052c9464f964c5c2881f93fd4c903cb3b78b4c15ed14ea27585351313f189d1725
 DIST cc-1.0.59.crate 53238 BLAKE2B 11bca8147d0a3b90223049d7b84c2ec27c2f6fe7a287a0585cc5445a49de7872a9870420877f51925be57fb365a949ee25351daeb3496f954f241513be3cb0de SHA512 1cc46d8e13af525ede88a6ea9c6ba20b5061c6038a5f5ae5e1fabbdac66086b8d14bf665cbebbdc0a7141fa8b5a667530ecdd59f512ab31d6b923d8def2b7e87
+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.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST chrono-0.4.15.crate 150581 BLAKE2B 89f1fb1840e7d25e226f4ca1100d85a8d02e0e386a5820bc68c8b5fca8eb94eafa01d90ad895a8b3e2c237f79593056f48a4a0954b6bee1a6eebb5d6f53e7cde SHA512 64ec4c7fad26ce7dd107e3e1b176507cd8f4b10c3ff47940c45ccec0b882858dc35d5cebed36b64e2bd1b611ad8b48dfaa7cfe4a7b687887b4f0a8be1de24dbc
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST dashmap-4.0.2.crate 21066 BLAKE2B 61c8cd1d52188ff071aae0c323b67e2f16b2282791c696a3f9c3d876d21efcccbad62f80bed85fc1b6a8223708c30ff5d5513b7f4a980f29980f2a6a1f8ab787 SHA512 1658183be619b781c5d9e33a2c709805053ab81187145517eb4bd22e12acb42426fef841a91618e889f4e7da792b88437bbf26e3899144222562c54575107d0e
 DIST dlv-list-0.2.2.crate 12359 BLAKE2B 366b729f265433be58dc4ff97d516f73a4305a5b8fca418e41d43624204aba854bc5aa8a62ea2e68f17c8bdbaaa945427680ec21e71e65f9b23f2e754c4083ef SHA512 c61212f328b1d9fec63605e66ce0391d64fd7499dcdf6540f3285f19769942a9266838f58d5396928d7506df619805a8793650fb1eca330a4665068e4f6ca779
+DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST find-crate-0.6.3.crate 12092 BLAKE2B 5434dd8ba17e54ddc3d68e0fbfdb0e0a2026c0c62ed76e5b64b19d8da1963e693e43f385c41d0b7d480369705291ac67abff9aab8f2b7a84b57abd7b4732cfa4 SHA512 f7866a4f917df064277630570f987898e465dce98be548ff7535201ada88b5db71c755f00013fcfed45ffdf29fd667c90ff19999a1fb7cb183a7007bd011f899
+DIST fluent-0.15.0.crate 8372 BLAKE2B b662d9eab9aed1217634f716ebcb0c3d22146b7a2869d61633da43effe672651b9582b9020dbeb824ee936d01f4fb0ee15fd9fa0b61fd300e999f2b82a47ed03 SHA512 652236123ded538807448edd56d93bd6f590da4d85569aba7ec5aa513f5ca6176ffd933566604b86f48c48a2a5918257da514c37be44291ad6a339d6ab9ba259
+DIST fluent-bundle-0.15.1.crate 32744 BLAKE2B b552d382b9fe1ebcaa78498c07e6354ae29cb4bab65b7d8a3ce0ea1a7009f60fcdb2ed5480c268e17ca7fa13886abbdd74722c4610fa8a5a7cda00c4ff90e6d6 SHA512 8ce9939a34a6771dc213d190660848be029930a4bfe9d95c69f51b02b936950c35eba4920ee8d15993d5f89783c356288fb13c1f1ef380f531222e95e385db72
+DIST fluent-langneg-0.13.0.crate 11723 BLAKE2B bfa4ec1a3a11360d28b5291e8eed2628ca6007b8afca726ded87d630394773835b3c8aaf818376a93a60de10feab25d7784c8d2b1e34e63b660d581a37d9626d SHA512 397d0a4f3508c7f58105dbb9ef7a32c5c4ebe4a73d80d2a19930479bee325839485c8002b49fb8c55d686ec9f3ed1d26493b56825b65d60ef7fba78a1442f9d5
+DIST fluent-syntax-0.11.0.crate 28524 BLAKE2B ff5762a9feb333aadac587296401d6386c327f93525a9b2243df34f7dc4532cd37a66d865660c7a6b0e775a6cc0e5454ec92808ca7236bf0265314a5be151989 SHA512 cd6157ed27735fe319b115e555760832ee29d5887d8a1a9932a47e880c97f927304320c7ced54b30984c65acfd5ce1b9dc659a8e27b4976330cb803d07f64289
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST greetd_ipc-0.6.0.crate 4082 BLAKE2B db8db55c73fa2d2a7e280424a7019072b7e323377acf6c0123909643ef9a0447e6f82dd66a9fe22e7f232047f7be1a0afcc5089981ed6f787e5c4ab461f851e8 SHA512 4d3f6db9d36053fb0e7620889a32ebf098051bc29295b193e840f4feebacd63a358d03c44bbb7c01e49f40421e93f61389633725aa45e377eb20673f38b4ed76
 DIST hashbrown-0.7.2.crate 70480 BLAKE2B bf9bb2c4190da90bf19342ee6222ba603ccf70c31838e2024e7fba7e71e9b4a401e1e7d9f7d352248ffbf9afe8bf7408a3d1677395e332cff194bef4c5eb8721 SHA512 3fa701ad9743383e7ab0b4d483badda1a499442adc12f371db335316e3580e55f693d155d355f4ace84159c39a762e615ebe1cfa6fda1c93bf01d297b53826a9
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST i18n-config-0.4.2.crate 7570 BLAKE2B f3608b74bb5978c251d15a77973aa98e290b8216607026844582e2f74d3adc3ae96ecf4118e3d290c0a4ff42ef6896c84e0d1cbb14e6c800bf8088ded9e6b796 SHA512 98b3fabfdc26f486a873f4187c05f0b17c839d5279b049978eb12ba216221f8fcdee9732dd309c5810259b73289c2ba6d35304be6afd54bdc8d52923e6e69045
+DIST i18n-embed-0.12.1.crate 21188 BLAKE2B 8fbdf96134ea8ba02b1c0cad57f8ca88778813ddb15614627f5965f39c73428b226498ac6225a084180c89e3a08dc434d120355cd1a5a11a20905ddd5f164b1e SHA512 692cf589a6fbb1c27b01bb0915ac81003af87c0cd8e43b0f4163cecb953b1708114d1be6602973cca1eaf2fee402632ffcba4980f60bc8e7d31a7e235775cff1
+DIST i18n-embed-fl-0.5.0.crate 8694 BLAKE2B a51bfcc1bfa50f8b3d7a53f310d8105a4bb69530b7232181742c2b5821ca1552ee91f12f46edbcfb79a6a25e4253b10dcb7afceb349acb3a6396eea0dfaaad89 SHA512 cc472cd0331e95daf591ea46e8cd28b2d7e6ab40a789115bf20f1cd03fee703b8cd0c3070d117d3153d77e4d9dcc449d82f2a1b7fbbaeb19bc98a5f7addbc6a9
+DIST i18n-embed-impl-0.7.0.crate 2210 BLAKE2B fb339999fee37df7420ce9f60b04883cafefe9cceccc241698d38290ca87b97e7e11e87b4c0a8de59d8c667278fb755b18fd0079adfd71d1c62eafb4681c5e0e SHA512 402f02928a484b954b34972288a9aa065a193876aec3608ed1bfb0b6d72afb6cf4ce2393e20cba7362b9d61e42635793fb975aa2387181296bee5daaedee6b94
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
+DIST intl-memoizer-0.5.1.crate 8292 BLAKE2B 32b42caed088028a254c8eca21aab5b44c7e4348255c09009a9e97f205cdb92743c9355f7eabf132bad1a22c4c30335708f1da13b3658a4f0eaa7f77f2721b14 SHA512 3f505dff396039da10ed45c1b99904601dd4784900c0b9f1d0c73d99df656998c56c7644c8d3608d08cf23516b9e35018acdb810e8add48b8435da8e03098a7b
+DIST intl_pluralrules-7.0.1.crate 9263 BLAKE2B 421226320aedc0c2919448b9d349887d3abe078d5bf4ea1f82995c972ad206931d361c9dad03c3be7c29aa485198e940e4270fb70a71af32907e6fce26db177f SHA512 1cc58a806691f100d4d22c804289e9ebc04f5f6693109d6ad4d91c6e9164cbd690aeaaab8c2e86ffffffcc07618b6c40eedd5b4b7e88082dc72683023896790c
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST libc-0.2.74.crate 503397 BLAKE2B b38c932a29de204e9cdbae39fcdbd1a054256e8c0f37227ba71bffbc133d80bb68d34f4011fc83db7300254c381fe0855e1df19db2dd75234a5ee029f1ea9e63 SHA512 6aa984cd325bfa37736d3afe4518093468927607daf7b12bd8a5a396d2ec3740876504ab4a2a622c5e7caa9872f31263a42ce53f10c15f61f9e45891eaf41df1
+DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
+DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
+DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
+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 numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
+DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
+DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
+DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST ordered-multimap-0.2.4.crate 19365 BLAKE2B e8ccbb8b4e49a8848a9ee7433ebf4614ce198908b6b9adcdd3455e0db7607f3c8bb301bd0a919efacd4f6295c4dd23f86aa2ce76c620bd390bf067dff7c7d688 SHA512 46616c3889b3a9d3d294aa858567e38aa736f7e5b8edc55b53401ebba758a5f74c9a2c498b74773a2c7ac52471988a3e6ab954300f753b1633aa8c32c4e67660
+DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
+DIST ouroboros-0.9.5.crate 6402 BLAKE2B 61095988578683f70f6e4e07a49a00514fab62cfc19ff6d85e9ce0ce824a8d1ab7f338cd37803322e493b12a003b08f5115659fdafc13768669a1651b102757b SHA512 8154205a91112c7d2a888a9dbe32e4d8bf25ba58890e06f500ba199141ea3ec00d59dac9a083889061e7575244b3ae16de0fa94d24e70e3f0062d740a95bf3ff
+DIST ouroboros_macro-0.9.5.crate 13515 BLAKE2B 8ea011d7ce20b5ffc7615f13868a5f140eacc88f657440b6bf5cd7527d6b93238f44c18b6381df1753b31db98e5a0de56c3fa1e93844020331bd44dec33de412 SHA512 2f7c0e2043cfe3470321c4c7a0d424e378f88b8ae17f10d01bdcc02d8bda2b72aecbe8e7882368f5009f3f42de4d1e91da5952c54b3e6aa47dd7b741d991f0c4
+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 ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+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-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
 DIST proc-macro2-1.0.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST pure-rust-locales-0.5.6.crate 159349 BLAKE2B ff198ed3266e7bc7b6b4d26343a07b9ca85cf1eabbd1119e568dc8794da58de2c6f9639b01dadeb145d79ba6467bac0fc19594886cfe679a58b8baf7a3d39af6 SHA512 cb7855f243dfaee0c2f2dc70fd4eba77881f7a7309dabb60d40eea14ed2eec620385129c9bab3abd363d6ee915afc22a849533a833feb885862cf2f0e7b06a76
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST rust-embed-5.9.0.crate 894464 BLAKE2B 5be40fd9c6bbd394fff8fc53dca7e38b91e081f9adbf2288de6e6ccfe6a9212bd19bdb8ae0fa5d962be24c37a917969630344dd13d949ed568258afbdba5c53b SHA512 2cdaf6b622f81e4e1126fe7809a8dc97bf6936b179aff38419ce24171be92eb7f703b04ecd3ed35a93a2af89a06dd2fbe42a80591fc51e699dcbd753f076a6bd
+DIST rust-embed-impl-5.9.0.crate 3963 BLAKE2B 8225a379f4c46ef82c4fde0bab34dde56667aeffd7c6cebc97e21bd3a669d67e986e5ae70eab6485b48926a90d1223943b2b244bbaad7b4a43e92a8e052877fe SHA512 dfd2c3ec82872c3e48afa3466215cd075cf59beee08c267f5c5f36b87cd14e674616eed0838f40530a257a7961acb999beeeb939f00d39f093b2a3d0ca25ac67
+DIST rust-embed-utils-5.1.0.crate 2092 BLAKE2B a6118f9a10f6b4ad7fa8e2871f6c6eb61aeec2df40466d24e08598079b3ceb7258a528353b11b7643effc35b1fe91a9f599e8f6a605edb3c91836da47871d4a1 SHA512 8859374e21480133564a98d8dbdf43f5c04f0af205c4568e200eb1c87d437df4c5d73d65b82b5e0af65f02016f82db403140105346f597b3c0b48aae7b34dab3
 DIST rust-ini-0.15.3.crate 16555 BLAKE2B 9a2901118ecc824dd249444f54fae771be84c5f9fd837bb5ecf54cc07124383660a9556aa19954db91f55e5d246a6d857a326ba3f11fe38a6ad3e1765da60dae SHA512 45a252bcfc7c035aefc28ecf2c0da6d5ceb0ed0dedbb279b968fb51bb1ffc5ed872f907f6014965aca55a8179c949281e7eaab6ff25515e1ebea9c38f8f56145
+DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 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 serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde-1.0.115.crate 74425 BLAKE2B a05b1c4841bea27d7d7b27684e864feb992d70c51e200ad6b660f038db92f8e92c878bedab71c8bb6681755f0dc91bcc0d5059b57d28bf6b6871144ffbbbba1f SHA512 42b6aa8dd49bf0ee85d2ce4e76ec6267c2bf4ec95e110f3fa47d8a420fbe333e9999b28c3f51fd961646c9e17ece7670289803244a046d5ba9c9b9ab96c38058
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
 DIST serde_derive-1.0.115.crate 50701 BLAKE2B a3e8ed4baa4a6b4aff26a4a81b845066f9835f07d2dc6507e6f9526db15504627c82b8927a79ec90c4fb65b73d7253afabb70fa174fe9a19307f6a521329ba30 SHA512 a43881a01a934750c4be35ebc4707279f2c9f8eb54116e67898f525463f6ec6d4c79e391547532fc3fe0c20da3da356c8903a0fee7aedd13b00d0c7a92cab354
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
 DIST serde_json-1.0.57.crate 114723 BLAKE2B f6097bd4541b369d1d4c1f1d50c787489918bcb71f3786084d0b5e139358f0c66ecc8ed4ca9bd3474fdb44726d0e5d9a099900cec31392968eba80180715c5d1 SHA512 0ca0ed1cf47c87f907b241e696d6aa23b49bec876d3b9e0e011c20d145b797769631ff8ce8d57487633d1d8a8657e601884bc10b5670ce17c136b9579fd921de
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST smart-default-0.6.0.crate 8169 BLAKE2B d4b19bf0a96d9eddb05b7530545a5b138464c8a23448abe60ad21a2dc6d1f335bfbd97b76a48b1f801d078e9bf84879c736b64b9d8d932478fa93e57d77590d3 SHA512 66ecfadb3c7a7a8c6ee48b62146a058595e87efc18f4962a7bcf04120067440a83fcb4489c7831986eba06450279546b019c111e2a2a01e7f2d52fb82e98914d
+DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.33.crate 204845 BLAKE2B acde40a1eb59a78ef17afd46fbc5dd3710db4a1fab1d2ca6159bfb1ab3e3ee4182818284ed6a78f6babb539312dfd46eb43dc62842063db953cedc65cd307ba6 SHA512 82408aea39c376825b977d54ea339661cf54664358637e5caaf8efaa7d08e03385b160b3317060c27662a621ab5752bd761cbc416165d1c2cccf28985d73db51
 DIST syn-1.0.38.crate 206263 BLAKE2B bb9a4f111f95190b9d1e61f5bdcac5e940112d5c6958a5d0edd852869e07f4de8c47cc4e069e0899c3a973e6aa2e858133d20eac897c1f5adbe80ff2748d2f31 SHA512 67e1d94e0efbf305d9bc2c5f42c57a17896f98a888ff7565912f7234cb2bd6f699b630c8687546d28569baa87442acff070eb0059314f5380b183469784aab12
+DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST system_shutdown-3.0.0.crate 8645 BLAKE2B 8bf27c1ca02939cf0280a6cbe33f3323a1d6f744ffe77f815cca987856e960ecd0d17645f1692e7065183d3497098fbbecb106e08078bf03291ea267d3023fae SHA512 00a3ae6ac1d6be11a5e83fe6130bbaf69d3eeaf850977ba9ba8c6d124a7eecd972c78fb191a5c78693f37ac7704bca8c9e5b2982fd70fdccac64008f52e09887
 DIST termion-1.5.5.crate 22783 BLAKE2B d383a648f2a32b1115a69a1d74fb4948e30b29ea7a7599ff49bb423c7a39f9f2321817817dbd4488256efe45dba7865285f4d21a23492aac02e662cd8b9cbf84 SHA512 4362678cba8cce41f8435d8184c80f94a0bb24055a7b7a922b15ba162f6dbe4143c37d6b9adb1ce226d160a96610f2827e5cba4a41c141f32b2c91265a1a25ad
+DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
 DIST textwrap-0.12.0.crate 23480 BLAKE2B 8bcf6944b7805e15af048901875c03cf5fb9894038ce9a85d3cc10aa4c666372698679026655a48f02de884ccc4f8a5701c789ba7c41e27c1238a65c1d33863e SHA512 ebd7c3e7872f7def369dbaf86ac36de6ddfedc6d367d3b869da2e89a51cf70429fa7f5d2d0906b4cc059359417a936a18d4a0fc90aeedfe9a3e94c3252e58822
 DIST textwrap-0.12.1.crate 23964 BLAKE2B 4024e84d2e72c7116aa3fc10c64be75da4bd082c8d769f4c0d75db60c988b8f3aba4f9f0ac5010a7fc7747e6ec21acfb280886fb14fc6f57a2a0e880257708c1 SHA512 6076afc86110e978d55cdfde41e05eb847c50da21237d88eec73873547d601ec6cedcc23dad738ccee9ec96e0488dc26ba4d0bf039110698a875541d79db25c2
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
 DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST tinystr-0.3.4.crate 19341 BLAKE2B cfd7208ca63194e802859857b4accf0788b742689809a3654d3e798eb3f09dc1c407779308499e74669091f5c8e096ed6c3c5febcee53b0da4541bbfba976788 SHA512 d7e303d2c77243c53b7d20b9f17e14a42ea995cdf00374fc9e1c51fba471ae4b408ae0c489cefa6bb4e258c87b2478ec9a61403f68608c4b90cc19fdcd31d807
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tui-0.10.0.crate 130922 BLAKE2B 26288fcb7033d07a420d800e2c9c53882b086f2e35c01f0672bd00a46bcfb8c22069c70b2f4b92be3f947126c3849cf9d2955962a91fa1bd614e87fb4e4a2e1b SHA512 fbc79de541fcd50ad09b3fbc703db63520227f58f38d35e4599b4ed147bc3a6ef596f8394aaf1c42208c60e32e24dc0d90ed2ecf57f0406bcb259d5d1576f01f
+DIST tui-0.15.0.crate 139975 BLAKE2B 889ea1a56c797e862cd2af85dc6d3f85e253b02d40fe5ea29008b2083f63c5d078dc614401d98461d7c9daa3367283c3a91274a023a3f220361ee6cd73b06277 SHA512 2df5234f369d0ebb9724d63399a8c88a26dff878e7b618bd7697cc1e60a61098119c7f8845ed469486156c25998d8211d93fab8d9b5c10292cb637604adfd3b6
 DIST tui-0.9.5.crate 123889 BLAKE2B 15da9b5289d61da6eb14cca7cba6873c6896bd0f963a6de1dd355270d6dccad5611b7d1b230be09a151453171eae433767225d86f9d6f055866c528ce29c0c65 SHA512 b71ff85a56e4d6a7f3611bfc5b042fa377703db23a9f6eebc169fc08bf7cb0c41d74ddb02cf65ebacd5d86ae2b1ebad1fefa44fdd914210cf88a2ba031a24b81
 DIST tuigreet-0.1.1.tar.gz 38572 BLAKE2B a8d2a388672d467504ded731c38f995376c6fec629e8be08956b83b08cd82932763812180bf762ed8f30de456f8e7f7c1cbb48215487424610d4cfeddf3d9c8e SHA512 e299e8640c022253ead66d116c4750320c5ca5741cdf3d5cc244cead01a9bfc8f9a623a9a065e8bc4ab7992fe8308da9323d38d38868535bad75057cfd6743ab
 DIST tuigreet-0.2.0.tar.gz 38826 BLAKE2B da067b73eb3beca5fb6c58a6ceca0c749d6e67771de4d4a451dbdc13016dce7823ee455b0f50b9b019fe3eb599d855d0047c06ddec98b6131f59b12334919af0 SHA512 bca6fa2397f4fd6d6449015379b7d5b9bbc89d498b42d76859aa05b878733203ff36df9a7d2d84079c525727f2579a46a47e414c1bf1319e0bfafcc0d8ba0204
+DIST tuigreet-0.6.1.tar.gz 49829 BLAKE2B f6344c625b538b97e3155110380ebede2c01aba7a6987127e77761fbb8beed240bbc04ecb782e5d5e8430132f319cb6be6fafef0bbc479d531967fd7595e4037 SHA512 de6ac444551a94fc3be0d1dceb4b31ecd31e674eb7ed2f5735ea8e571da1c2819c3483e8a06e5757ddfe695fb0cd8c0db066947bc0b638c30210a353b91cba6b
+DIST type-map-0.4.0.crate 3177 BLAKE2B 6c56ab2600e36679f37319040a529029bf8432959026c95c98490a5f137c64ae30b889dac7e4bab2b4edc656adc22d2a01c6c7a688f8ac46db1505f5c7ff5642 SHA512 c3e81d6dd94d5d8266bf409efb9e9ce6fb5d5889d672422b1f85f406ab62c58e27af5b6031ba5699af9d70c90bd8fca913c7ae0fb75f64358e3b7989f3d32099
+DIST unic-langid-0.9.0.crate 3899 BLAKE2B d246e91e24a13f37d19109d6774d1e50d9c42bec70158917b5b40b0d34d3819d494182a5d08de4bc58acf540a10c08fd0bad55ae73c965ffddb93746ee64eb16 SHA512 8e296396f1ed48ce680211947d5268b543abe4b450780b8bcd2ab44ae01f9a2d1f4fad6c421f4166033e1f2cfc90987d7689864679f2ef6727ff602185e7073a
+DIST unic-langid-impl-0.9.0.crate 33921 BLAKE2B 071da37eed84db516f5b42c92f7af3c06b4acba3f0702ddee86be0e05dbb4daa1610dc465d1902f03f1ce8f7fa50c6911d4279e5638b63aee6da33628090493a SHA512 97a5989b05f204ea30973b11211ea2fafdefdd6580055ebb08c40f33ff4e89a564d85345b9eb78d220c41f77d15ec9ded03063d275ceadc29ef4cfd5da82dd8d
+DIST unicode-linebreak-0.1.1.crate 65230 BLAKE2B f22a5e75dd53f26c87ab66c15e9198035203b3fbbe7deae24ac2c064d9d552128abf61e22771b29a0d827d2c2996085ff4ff710516871151a655df0625d85e48 SHA512 fe46428b27622eaf4763e1499b9f15f447ed60053b114d4f4d9cd2f952c62a8313be9f161625b6829b1d91ee1451016c2084c5854e64e32b6c1385857c60a970
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-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 zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
+DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
 EBUILD tuigreet-0.1.1.ebuild 1335 BLAKE2B 143f3f92f0394d9fde8f5c94fc9c0d049d9d0b117d5838bf79bfedc38774fa419c720653a1cc10753d23c9b25ae352aae2119c7ef8d3a1ce6695a4f8c49b04d4 SHA512 90b7bdd7b4432a53784ffbf5cd5f5e08733da93db0dc9fe360abe57b710dfb4720251de64b30ae0519192e5f54a73382c53e45845d22520489f2fc779b51b901
 EBUILD tuigreet-0.2.0.ebuild 1296 BLAKE2B 9b28466f2307b576840aee8c341a50499c0108753f34431495f49fa1c75df8af493cec0abe8474770fe31a80d6cec968b414511c2f9de3a3b1508d962eb309d4 SHA512 0bc6c3494b0b2e5b1e3f2446e587238d5ac85de710ca44ec3efe7d39614bcc8f3a5e55b7d51784e24afbb8d09bc65d90b378f7bae7c13d6b4632a25f982cd80f
+EBUILD tuigreet-0.6.1.ebuild 2343 BLAKE2B 3f6c32a8c24a49b4a7735358dbe97bfc4c8f0adc4423a8d0b5c8ff4c9fc882648ba14ea45b03a5dd62db7fb4e7a0beefb6216bb8247f9de8c95dc23d6ce9149c SHA512 e79ea483482240c592c3df98557646e277ea2096b7f9e7e0d37be24934995a691899a33e95daa2d005ffc921ee28c86566c33bdf9060023581bb26af2f5606dd
 MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/gui-apps/tuigreet/tuigreet-0.6.1.ebuild b/gui-apps/tuigreet/tuigreet-0.6.1.ebuild
new file mode 100644
index 000000000000..d7ef086dc182
--- /dev/null
+++ b/gui-apps/tuigreet/tuigreet-0.6.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+Inflector-0.11.4
+ahash-0.4.7
+aho-corasick-0.7.18
+autocfg-1.0.1
+bitflags-1.2.1
+block-0.1.6
+cassowary-0.3.0
+cc-1.0.68
+cfg-if-1.0.0
+chrono-0.4.19
+dashmap-4.0.2
+dlv-list-0.2.3
+find-crate-0.6.3
+fluent-0.15.0
+fluent-bundle-0.15.1
+fluent-langneg-0.13.0
+fluent-syntax-0.11.0
+getopts-0.2.21
+getrandom-0.2.3
+greetd_ipc-0.6.0
+hashbrown-0.9.1
+hermit-abi-0.1.19
+i18n-config-0.4.2
+i18n-embed-0.12.1
+i18n-embed-fl-0.5.0
+i18n-embed-impl-0.7.0
+instant-0.1.9
+intl-memoizer-0.5.1
+intl_pluralrules-7.0.1
+itoa-0.4.7
+lazy_static-1.4.0
+libc-0.2.97
+locale_config-0.3.0
+lock_api-0.4.4
+log-0.4.14
+malloc_buf-0.0.6
+memchr-2.4.0
+memoffset-0.6.4
+nix-0.21.0
+num-integer-0.1.44
+num-traits-0.2.14
+num_cpus-1.13.0
+numtoa-0.1.0
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+ordered-multimap-0.3.1
+ouroboros-0.9.5
+ouroboros_macro-0.9.5
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.27
+pure-rust-locales-0.5.6
+quote-1.0.9
+rand-0.8.4
+rand_chacha-0.3.1
+rand_core-0.6.3
+rand_hc-0.3.1
+redox_syscall-0.2.9
+redox_termios-0.1.2
+regex-1.5.4
+regex-syntax-0.6.25
+rust-embed-5.9.0
+rust-embed-impl-5.9.0
+rust-embed-utils-5.1.0
+rust-ini-0.17.0
+rustc-hash-1.1.0
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+smallvec-1.6.1
+smart-default-0.6.0
+smawk-0.3.1
+stable_deref_trait-1.2.0
+strsim-0.10.0
+syn-1.0.73
+system_shutdown-3.0.0
+termion-1.5.6
+textwrap-0.14.2
+thiserror-1.0.25
+thiserror-impl-1.0.25
+time-0.1.44
+tinystr-0.3.4
+toml-0.5.8
+tui-0.15.0
+type-map-0.4.0
+unic-langid-0.9.0
+unic-langid-impl-0.9.0
+unicode-linebreak-0.1.1
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.10.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
+zeroize-1.3.0
+"
+
+inherit cargo
+
+DESCRIPTION="TUI greeter for greetd login manager"
+HOMEPAGE="https://github.com/apognu/tuigreet"
+
+SRC_URI="https://github.com/apognu/tuigreet/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+QA_FLAGS_IGNORED="usr/bin/tuigreet"
+
+LICENSE="Apache-2.0 Boost-1.0 GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="gui-libs/greetd"
diff --git a/gui-apps/wayvnc/Manifest b/gui-apps/wayvnc/Manifest
index d8177329ef44..eee86fd8ac0a 100644
--- a/gui-apps/wayvnc/Manifest
+++ b/gui-apps/wayvnc/Manifest
@@ -1,4 +1,4 @@
 DIST wayvnc-0.4.0.tar.gz 52157 BLAKE2B 7c8456d5136ef361ca7dd72ffa7501514eeb7a61ae1777a02391fb7fceea6b020d68951300ab76254f2afd5e2610fe66ce0f461d18dc38522706691438f4620e SHA512 b8f1af24213077dc6126ae1f613b9cdeed8f365f9d1989a5b053563f0eb4bc49921e746e0f1026fe0e02bfeea23b912798678a5a337a052d977aa04496a75570
-EBUILD wayvnc-0.4.0.ebuild 884 BLAKE2B 12217ad95e53efd84149ce8d3140bb1552b41a425740e448f1d59f98d8ebf8a32b6401dac5b92895ac6dcd453af531d0940f3c74324d8714e6b0b49a3ae93293 SHA512 d13a811372db890cd7d3e894e2190852e3b6806cbeef91d11cf1fa9d7a035b219b8cc9065f498864ff943b1f57a69c52443e39db223e46e8060dd3f1c81f4bd3
+EBUILD wayvnc-0.4.0.ebuild 891 BLAKE2B aa14a0bf2201a032482ce32d938d7d5d3ea8454ddfd5b5ba1b257f73c2c79232e975dc9e53fcc20661bbe430657a55064a7cf1d5a295e4c4362ce6dcddaf51b7 SHA512 b8ad1e34d2cb432c129ad948042aa9cbca835fa9fe2af56f750470b5b79adeffc999d3490b78ac547c76f069bfa25729ff97e7106fe8e279c4074908e00c1a59
 EBUILD wayvnc-9999.ebuild 884 BLAKE2B 12217ad95e53efd84149ce8d3140bb1552b41a425740e448f1d59f98d8ebf8a32b6401dac5b92895ac6dcd453af531d0940f3c74324d8714e6b0b49a3ae93293 SHA512 d13a811372db890cd7d3e894e2190852e3b6806cbeef91d11cf1fa9d7a035b219b8cc9065f498864ff943b1f57a69c52443e39db223e46e8060dd3f1c81f4bd3
 MISC metadata.xml 966 BLAKE2B 8f0d787a99e307ee38e0af773ebd1b59a2b5ffb385fc23c869613d15140d385d2f2686931ff016cd8f0c7591b5ea52d1f8d6b02f18f5cac1a615b096b15c1ce5 SHA512 cd20b9a926fa9ed2c3d94bc718b9a0ab29f62ffe059b041dd988cbdcee33223b24e4d75ecb679e6fd898a6abff2d6e6a6f96c11832f08d358159a5b5566ba1e9
diff --git a/gui-apps/wayvnc/wayvnc-0.4.0.ebuild b/gui-apps/wayvnc/wayvnc-0.4.0.ebuild
index 369ff2e67cac..2185a19e3ead 100644
--- a/gui-apps/wayvnc/wayvnc-0.4.0.ebuild
+++ b/gui-apps/wayvnc/wayvnc-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-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/any1/wayvnc.git"
 else
 	SRC_URI="https://github.com/any1/wayvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index f4d945ea59b6..fd38f0b2e162 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 0f174043b754..b92cd0245501 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,5 +1,5 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
-EBUILD egl-wayland-1.1.7.ebuild 1667 BLAKE2B dd908d257236ced3909795e2cb2b37d08c92aa61ba49ca5ff3180f6079b0f2e5bd4f194b527dc4e3527b2d13914fcb7102c05c80296cd0ed7d885c29c819def3 SHA512 eecdaf683a786a819d76d5726eaf52c46daf27d8a988619426dc12f59f89fc54232b67b44524c21f8dbd1e3fec9ca4837e5a36f2db41b3aaa153ba16e671cbbc
+EBUILD egl-wayland-1.1.7-r1.ebuild 1132 BLAKE2B 8e4b03714a6ca4b8b46713becd2aa60863712bceff60078ebbef97d1c5ffcbcc7fd7cb6e1d16f44830310b731fc5d068df9debeaf2f26cd1052f4183f5be6a44 SHA512 01dece299473c23b5f0b4f7982a8fd413a327284bce7254f22d5753878f2d10b2fb6a3bdf3d40f565fabb781cba0a24392befae9056d78ef84331b2d60146522
 MISC metadata.xml 328 BLAKE2B 0967a32e5ffc7a996fe48c6cc822e1e2e6efdd7093876ef28256bdc35c292b5216191a786b5592dce818b9aaeaef3f0992f68a369bf36d4ba835d56a6cd786cb SHA512 f06489d4abad797233a1fe8183d3248a4b31c08549c57d59374bceb844566767e0bdddffa88e008e043543f28fd52de3a3dff2692dcde060d8a441e271917aa6
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..088724525cf1
--- /dev/null
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson
+
+DESCRIPTION="EGLStream-based Wayland external platform"
+HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="
+	dev-libs/wayland
+	!<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]"
+DEPEND="
+	${RDEPEND}
+	gui-libs/eglexternalplatform
+	media-libs/libglvnd"
+BDEPEND="dev-util/wayland-scanner"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
+)
+
+src_configure() {
+	# EGLStream is not intended for X11, always build without (bug #777558)
+	append-cppflags -DEGL_NO_X11
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/10_nvidia_wayland.json
+}
+
+pkg_postinst() {
+	if has_version "<x11-drivers/nvidia-drivers-391"; then
+		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
+		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
+	fi
+}
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
deleted file mode 100644
index dc19e9bcb8c5..000000000000
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson
-
-DESCRIPTION="EGLStream-based Wayland external platform (for NVIDIA)"
-HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/wayland
-	!x11-drivers/nvidia-drivers[wayland(-)]"
-DEPEND="
-	${RDEPEND}
-	gui-libs/eglexternalplatform
-	media-libs/libglvnd"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
-)
-
-src_configure() {
-	# EGLStream is not intended for X11, always build without (bug #777558)
-	append-cppflags -DEGL_NO_X11
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/10_nvidia_wayland.json
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To use EGLStream with x11-drivers/nvidia-drivers, it is necessary to"
-		elog "load the nvidia-drm module with experimental nvidia-drm.modeset=1."
-		elog
-		elog "Can be accomplished by:"
-		elog "  echo 'options nvidia-drm modeset=1' > ${EROOT}/etc/modprobe.d/nvidia-drm.conf"
-		elog "...then reloading the module."
-		elog
-		elog "Note that EGLStream requires support from the wayland compositor and"
-		elog "is not currently supported by many popular options such as gui-wm/sway."
-	fi
-
-	if has_version "<x11-drivers/nvidia-drivers-391"; then
-		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
-		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
-	fi
-}
diff --git a/gui-libs/neatvnc/Manifest b/gui-libs/neatvnc/Manifest
index 25092291c7e4..f3223d218fdb 100644
--- a/gui-libs/neatvnc/Manifest
+++ b/gui-libs/neatvnc/Manifest
@@ -1,4 +1,4 @@
 DIST neatvnc-0.4.0.tar.gz 555438 BLAKE2B d6676521c3bceb43055589406419c12aca8139b561dc2f9de1ac3abae3e3c84e7ce133fb18a6206941ee9a00306a3c5c4dbebf2c36b15e57a11bd950a20f69a6 SHA512 cfbba3e81e1319b3c0f87644c7fb92e2a72d993c107722d6cb2e23674e1c4bfe9c281442a508a14d3e16964529d0646d1b9726d8f081157fb902454637346a7d
-EBUILD neatvnc-0.4.0.ebuild 908 BLAKE2B f00578ef6188cdd9fc4ac9beab68cc80049440c2958c12e6bb5867dc9ad598695c405a6d048be17527c885f8b91d0231efe88c60ae9b778e753659fdb00088a7 SHA512 285c3bad698f9e6688b86119fa888914c853493cd6dd008b2efc9c0d5f1bcf993950138b9e93b7e1368381c605cb4414daf8e90cc82b612a91166ce112cd08f6
+EBUILD neatvnc-0.4.0.ebuild 920 BLAKE2B ccb19c4221688f21d60327a82af31fa38d773160889dade00202bd6f77688642a5b337ebbbf3a8036adb660ae5a95e283a60e4dcfe57ccac218558d0d36fbdc3 SHA512 7cef18ac8328ab8d0e4767864170b2e7d1410b64a2a06dcc933aee1def819a058ebca4e79bcf3e1c8f098d592cc01b177d77c49ff4024ae5cc5113308ad1ab01
 EBUILD neatvnc-9999.ebuild 908 BLAKE2B f00578ef6188cdd9fc4ac9beab68cc80049440c2958c12e6bb5867dc9ad598695c405a6d048be17527c885f8b91d0231efe88c60ae9b778e753659fdb00088a7 SHA512 285c3bad698f9e6688b86119fa888914c853493cd6dd008b2efc9c0d5f1bcf993950138b9e93b7e1368381c605cb4414daf8e90cc82b612a91166ce112cd08f6
 MISC metadata.xml 571 BLAKE2B 702805cda0e58010431105d07031714cb57bf9e62c2e41849643a17938cb56c1e5fbe3c764d96e04a9776f256ab2552168713cfb634bc9447ca4a01ad15375aa SHA512 175b832fd67f53b98e3cc31e3bfd76af84536c47a6b55153a50bf122628486b648e02ee1d8cf07b3edcb74b944389239928954561f8ff2f01016891c9e5af675
diff --git a/gui-libs/neatvnc/neatvnc-0.4.0.ebuild b/gui-libs/neatvnc/neatvnc-0.4.0.ebuild
index 0e82ff2aa460..e4b7ec2f9fb9 100644
--- a/gui-libs/neatvnc/neatvnc-0.4.0.ebuild
+++ b/gui-libs/neatvnc/neatvnc-0.4.0.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 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/neatvnc.git"
 else
 	SRC_URI="https://github.com/any1/neatvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index b899bcbef100..943ab93c4fb6 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,6 @@
 DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 EBUILD wlroots-0.13.0.ebuild 1950 BLAKE2B 680b6a39783806291c950dae086800ead41f337ed611b6d86655bf342bb80e13b63f97a32f11f58c8875e4ee14b7f53e1d122fe69fbb67c91f998baab57da70a SHA512 8497307be27fe7884384986cea09a5cead3fa25a205ec13eec37026ebf5bbbf89aab1d9384970b4a1b4798589c3c30205567979d0accd50b5b61efd17a4f5e82
-EBUILD wlroots-0.14.0.ebuild 1502 BLAKE2B cc3fe493692c7063ceb2d505603b3d508cc88807e4608d653afbc19e94d80261b7279ca1d44fda8ad41afcb4f29ac20f7a13607b5d5aa1a6d3685e76e8536745 SHA512 577162e7a4f5181b196f7cf8cd209fa0099b45ef8b6bcfdb32841f17ae4748ebd139107d5667de1c2799876d522a7f31a681cfca85af9dd79e7ccd2cf6c11e05
+EBUILD wlroots-0.14.0.ebuild 1509 BLAKE2B e4bbc42e2260f3804bd2f0118b2bd2663c3615cb103a3a87dc1e858fce0d62a5e587c3717fb1a68b79197196ee17fe86a168fcb95f7e1ea0a6f971257f2c56ba SHA512 3857996c0ea44b645d53ddf86f164e5bf863b1f6876adf1bccd9ea599b4dd018816204432c6820914419316daf6ceb1ea88ff62827deb65cffe9ccbf5a5d1cbd
 EBUILD wlroots-9999.ebuild 1502 BLAKE2B 5d51d77f6c908a0d12d322e420ee4e259d8907ab70468dc33d501285650b9869ffc5689c83e5c42540671d93becfbf581eafb23af7bcf24c7f0e1aa363ff321c SHA512 1f5f2ddf111d0cd85760613b8bd386e5cce9fbd55a56de97d76ac2d19e5331453f73d6d66b416afc7d723a04dff7904d9cbfcc393b7192ae052fd8fd61432285
 MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/wlroots-0.14.0.ebuild b/gui-libs/wlroots/wlroots-0.14.0.ebuild
index cb80b4e42fd5..34a1612b0eda 100644
--- a/gui-libs/wlroots/wlroots-0.14.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.14.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	SLOT="0/14"
 fi
 
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index f543f50b2a89..b9df5026c86b 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 937228afb340..6e00dd24abe0 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,6 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
-EBUILD sway-1.6.1.ebuild 2418 BLAKE2B 5c67dab5bec00b8db60bb3827d9bdd6fe0c2c16afde3c5b99f4cef3557c6b8f8567c4c67eec4bb09f8b58173e6af3b2d79d0b2768f124130b9ac8acd718a8d92 SHA512 c22c6bb6a0c91ced2f8b1bbd18c0440937a57c01be4fe10e6694cf0a262ee28947dc592e6723f05f4297750a211f481b7b2b567963296fc297ca2418d274ac17
+EBUILD sway-1.6.1.ebuild 2425 BLAKE2B 30488976b3f1838258bcbf3fbd2f75a2ab64c82cb660540bb32aacdbf276d0c58624af1921744bd3a29d346481879b0a290d1d53aad6eb956ecb774822ac8fe8 SHA512 887f6e51f1565afb39d60da491f1a644228a453bddcdb7ed6f034b12057d8775d98eff443b1cfb6339ad70c47b98868b37c08bf3ab7e3c9392eaf901d6b3c712
 EBUILD sway-1.6.ebuild 3076 BLAKE2B 2d4a7a7ae42afcad33ba479954b2efc239f968590041c02e9106688ec0fa5cca1f37438694ba85858afeda9bfdcfc33e43166711414193eb996e8657d07ac5c9 SHA512 dc67030cb488cb4fbbd9af52a51cb7149a5aaaf9e3861704aa305af9a84d9a4dca20de0a25cf4002c89a46259e2a312096cb555c7e0d26cb21bb78f8f0e8fe22
 EBUILD sway-9999.ebuild 2418 BLAKE2B 5c67dab5bec00b8db60bb3827d9bdd6fe0c2c16afde3c5b99f4cef3557c6b8f8567c4c67eec4bb09f8b58173e6af3b2d79d0b2768f124130b9ac8acd718a8d92 SHA512 c22c6bb6a0c91ced2f8b1bbd18c0440937a57c01be4fe10e6694cf0a262ee28947dc592e6723f05f4297750a211f481b7b2b567963296fc297ca2418d274ac17
 MISC metadata.xml 2428 BLAKE2B 6dbfafb29a5e926b761a60d6d12658dfc59ed75c16e01907c6842c14ae97eaf7d3ceebc805f19a9c783a393b33360eb81b7ad3564d5cb2b0270425ce43616123 SHA512 e49f4e6514b8fd171423ded89c516e3c706141da132b28a2419f9b145627706b6cac9066a51f46ecfc3c1df15bd749bdf40168a3841d3789d13550894b184f7a
diff --git a/gui-wm/sway/sway-1.6.1.ebuild b/gui-wm/sway/sway-1.6.1.ebuild
index c6a53ff0d87b..c803967beb39 100644
--- a/gui-wm/sway/sway-1.6.1.ebuild
+++ b/gui-wm/sway/sway-1.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index cac835c5f637..aefa18970ce8 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index fd0810089391..e086f9a7f462 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-20.12.3.tar.xz 4471984 BLAKE2B 0101613bada0322e27640135fe103980b5436c34593d2214093adeb8426fbc95a1b7258f027229488daf378a84f44f232ea8ebfb54f39b97b397b06093a85a53 SHA512 6821c06c1eb7aa9f55872234289de9ffe503dbe6183bb208aee104769fe8fa1af4cc2e34448f5902046c576e0823c1724f215a0bc9a3f60ef25b59b81d85ffa6
 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.3.ebuild 1022 BLAKE2B ee9bbabb985d7206e232e86b4127a1c40fb07cb6aea6b2f8c4e688677a9616515193320fa71aeeb8da46174d48c5430970c1bed90542d2661938ecf7d59d42c5 SHA512 20b8c92566a5b3351d36e29a45180ea20f0fc814effcbc7a4e28a90108382dd467a6dbc0f7843fe2cea22dcb7d7576a51d108b1288635eb480d53bb925a560cd
+EBUILD kajongg-20.12.3.ebuild 1007 BLAKE2B 24f6127f14a2e165441ab17d6acbea6a6f03ef8c653decedebc9447d7bfb5a261f026a840fb9b7c79f3aaca5dc9c39bcc86868912bf62c05fdcd763fc02fcfe9 SHA512 3bd6a7f00b3e494d26695c538804ca00c8a26e92202c223e6928a1d8f1c22c1f5e3273c9a370bd8bb910394d755ba8ccbb7e7be9fee679f105c06ab5a01bc3c4
+EBUILD kajongg-21.04.3.ebuild 1010 BLAKE2B 6de22787ccab4f220527bbc00e97c129ca81f4135d5bbcd0f5e3449582c1526c74bcd8cbdbff630addac8e5fcee1d7808ff14116450ebdf75b3f9c93c3094328 SHA512 7f0c47153d413fc84c90ae55b0e6f60768de7982b36342140b595f578a0f5ebff97b80effdab8f9afc500295aa88b59a858aa4d842eb2e5dd7790be2b4c564af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-20.12.3.ebuild b/kde-apps/kajongg/kajongg-20.12.3.ebuild
index 154e4037c4ba..537f695b5420 100644
--- a/kde-apps/kajongg/kajongg-20.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-20.12.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
 QTMIN=5.15.2
@@ -29,8 +29,8 @@ DEPEND="${PYTHON_DEPS}
 	>=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}]
+		dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
diff --git a/kde-apps/kajongg/kajongg-21.04.3.ebuild b/kde-apps/kajongg/kajongg-21.04.3.ebuild
index 22ff850f7c9e..cbbb34ac5e00 100644
--- a/kde-apps/kajongg/kajongg-21.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.04.3.ebuild
@@ -29,8 +29,8 @@ DEPEND="${PYTHON_DEPS}
 	>=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}]
+		dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index c1a0d4ade0f7..19c74398e596 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +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.3.tar.xz 3166572 BLAKE2B bbd64b51cc768de9baeebb3b66906d8e0d8ff133a63ddfe19a9e360e34d6c10b9e08a55ca8aca88c7e723a7af29d5882d214e72db1c7292364631817e6ccc399 SHA512 f82695722fb66a707abaf120b56e0f0977a63065a21849e72f178ee0eb653b73bd5ceb651a92085a34ad7d1c98da08611138a7d52b491c7caa9cbca47b7ff19e
-EBUILD kig-20.12.3.ebuild 1746 BLAKE2B a1862baf444f373d3152ca47bb4889d325f2fd980af516a7c7f39106b51e7d7b2519af8d7ea866e57a058ffb27a1930e9374e23eb4a0ef8420c384eb379ea105 SHA512 a87a49e4b976699cb75a09f7a85dd85306232cf0a61198fce03a37e7ab1dbd6e112f828f42f3ade135bd99c1405d43f53eb39d394383bff7c60f55baede2d395
-EBUILD kig-21.04.3.ebuild 1747 BLAKE2B b1198b2b9c05a1ef6f91039d719eb20aa39b218a4df1e64e3584c54d7c02e67759230addc4db63fe9d1371295da5a051e39ef6d9c3aa0611051cb678e337f9d2 SHA512 8d6ef43f079f92f06d3cded5eecfd4c26c63a262393a363289399a4146a30a0ebb1f8935293a0f9f79043f647d25c486b8624a9bec75114490fdaa354a02fcaf
+EBUILD kig-20.12.3.ebuild 1738 BLAKE2B 17f0b7460ec6acf8e16d76f7923abf1df90199be072ea2b0fc746fab80c732ad233ffae753abe736985462d95ad49c7ad058ddb8a991ad27a6aed4a33daafe52 SHA512 2dc3941882c28f6aa77ee35174fb000c117c35414f86d0cdedc1abbd7d89d52b02fe4de017ae36f3e850f8f1bbfaab071a4e3585618adfb92beb2a5abff22625
+EBUILD kig-21.04.3.ebuild 1741 BLAKE2B a603a8b2574f206aff340c6dd7cc240f999b51c04c1b11a7e24f61d5349ea5cea65dfe1cebf7df9f2aac78bd2b5d2ba193dd65c037bc7fca4b01c5fc62c314d7 SHA512 ebe8501aa5764be374ce004d79ff4e4468a05cba78002354afbd1f7b7af5f43a02993f98c7e6d5f0dd66bab3fedf649abdedde337dc3c2c681a76bc65b67a6f2
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/kig-20.12.3.ebuild b/kde-apps/kig/kig-20.12.3.ebuild
index fc825ec4096a..1fe03246e600 100644
--- a/kde-apps/kig/kig-20.12.3.ebuild
+++ b/kde-apps/kig/kig-20.12.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 KFMIN=5.75.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
@@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS}
 	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
 	scripting? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/kde-apps/kig/kig-21.04.3.ebuild b/kde-apps/kig/kig-21.04.3.ebuild
index aacbcbcbad8b..370c5bf8fb7a 100644
--- a/kde-apps/kig/kig-21.04.3.ebuild
+++ b/kde-apps/kig/kig-21.04.3.ebuild
@@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS}
 	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
 	scripting? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 989c8cb2fb9a..0e4faabb6fc5 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,5 +2,5 @@ AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
 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.3-r1.ebuild 2705 BLAKE2B 42513cbd2258384d256b28afb844962c656a72684bd8a8713e663df87d3bdaded01e61c3bb6f5c3047382e00707816382f7988e6142a99f6b7f6c0186ecc5a8c SHA512 714c8e1cd5b2ca53d1c57f1a66d875456390590aca8937411caa6815766ff8f26fea5c40967178501ee07800a6fbd366057f3f4dc3daceb11d23784cb8d3085b
+EBUILD kio-extras-21.04.3-r2.ebuild 2705 BLAKE2B f26a7fd787830c185aaf23ef523d5e0bfb5a188ec04e60463cbd836a7dab44e7d8d60b0773b59f57e80a886957e964e5f2609858b2394483c719b3c987319f97 SHA512 986b78edf2025b5bf04de89bd651aaa75686d57cc296e65c0c4e1e633c32a543edb5ae478cc2ad3756442932886f53ac9be1089464bdb00eb4847a0ceb760f0e
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
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
deleted file mode 100644
index b91c9b44d8a4..000000000000
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-r2.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild
new file mode 100644
index 000000000000..cef7b17a3b27
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r2.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/lokalize/Manifest b/kde-apps/lokalize/Manifest
index a8e12676562f..430cd4e9e856 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,6 +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.3.tar.xz 2023364 BLAKE2B 8b8790e72e1b4a6e7389adf9577ed1d392693ec14072d314d8c3d0e269a6d40c11acf22537bc328831de9a8e28a6b948fc02ac4956a325b887172e78fa56f9bd SHA512 b336fe464c123b60e4de4ba8bda0f34e2ba5eaf7708879179b9671bc33d8b031f81d595d089c24b4275ea56032e9867653cd98bf21c3d0c3db125564c057e21d
-EBUILD lokalize-20.12.3.ebuild 1973 BLAKE2B 5ae0cbdab456cb1bfb50d5ac3ef3c88d0dcd6d4662fc2a8671f92fd4aa7b4f96c2cab5a016c9548be652da76e38678409830c9a82e898ab8ff272c3ea13d34a8 SHA512 dc59c0bc4fa7f01c2996fd1f907a92afcf8f32dd4d6b5dd55cd6f328f1088f658321798e35ef5403a7b188fcc00c242f96c73f7228ae0b4b2e2351c28d3ea146
-EBUILD lokalize-21.04.3-r1.ebuild 1993 BLAKE2B 7005ed74730cbe5e4e56247a576d62d111141fdacd0df4c428fcc1128ec009165c6ec8864c46fc3b9603cb266db27064a2263372e85770e33e9207b11525b9a6 SHA512 7fb06b76982bb4dfec2f1c96e582ebea82a350d3e47c79fec9b40446cf8782f5cc162021616fa7513b0bd362b11c97c7c11de9ff6aa8afea9172590a41341b25
+EBUILD lokalize-20.12.3.ebuild 1965 BLAKE2B aa9b32239be3b55fd1e52d77e93394eae8f536fa8eb5b0a55f2f480e6fced9212954e2ec482b43b31b453dd37aeb41918cc1d2d5b77d74594b5a0d8d143e057c SHA512 f49f9b9973d3ffa64a8feca59ce5ac1b0c991fbd83e395f135de458118f3de4aa00ad994b76d6864e6ec25a06f380df54324d434c4efb0abf8311d6a066dee57
+EBUILD lokalize-21.04.3-r1.ebuild 1987 BLAKE2B 6c63a3c8e87cc62da92ddb2378fea0741c0687b337f0514a167d71f6fef6786a75d0aa710d5bd6b5aaf2bfca2b842e269c58606e9f20251ae4e27192fa4dc3bf SHA512 125ee2a33555a0e80b398e7f0eaae18fe1dfabaa1bc0fff7b7c135d30a1d1b3c25c29799a95998c1ee5d186f80a90f1e8ca19a887fe9c77c8482410d12406979
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-20.12.3.ebuild b/kde-apps/lokalize/lokalize-20.12.3.ebuild
index f8b0991c6559..60913ba468ee 100644
--- a/kde-apps/lokalize/lokalize-20.12.3.ebuild
+++ b/kde-apps/lokalize/lokalize-20.12.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 KFMIN=5.75.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org optfeature
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+		dev-python/translate-toolkit[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
index a93b5b86e594..f2f3f4ac0158 100644
--- a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
+++ b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+		dev-python/translate-toolkit[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 5ac7645f137d..24fd24010e56 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index fbe7f8574713..3850f34b1997 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
 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.84.0.ebuild 593 BLAKE2B 02119cfeb83c7567bc799571a4729a50ff7bca06a4ccd0f64cda6df5dcac58838bb2c258a49998d6fb8be54544c7c48b50d47dfcbb47a377022db3f64f29843c SHA512 d13f0572a93abdebb511b6ef96637ea69669eb88a9dfa5b987380d7b2d12aeae980bcf3cc4be41c45b8beeb9c7f733340fc28c5d1b0160a710f801ff81e62d64
+EBUILD kapidox-5.82.0.ebuild 578 BLAKE2B 49f227140227f8bd0a7815849098058bc0c1b9da7b4a974f01cbfbb5eb57b5c07109573df4c484317b7d077e7be5cf5ba124ffd2758dcbb5a9e1ba8b1ac56065 SHA512 7eb931c1a5e12b2bfdd34ee8bdecb53947be8d644e9cd70688bcb856c5b74695b09b5c919d0429a87798f27826090caa90e9ed68bcf2b2560bdd7d41443f5b68
+EBUILD kapidox-5.84.0.ebuild 581 BLAKE2B 994bea85c967425bf08dc45b6606db04d0c5a6f29fdbbfacc759ba6f85244e2f7fcee791255fdf5bc76ccd6f1a5c369ec70607a2bc5aada0d64491bb91926121 SHA512 590dced773e680936c2d11f2185de3ea266287fe3c970826109b039c83d5458363d906236071458ea2459f4a13f34af8de54584b06c3b514c7a9754c30a4d0a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild b/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
index 60c324d932a0..2ccf963f84e2 100644
--- a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
@@ -16,8 +16,8 @@ IUSE=""
 RDEPEND="
 	app-doc/doxygen
 	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
 	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/kde-frameworks/kapidox/kapidox-5.84.0.ebuild b/kde-frameworks/kapidox/kapidox-5.84.0.ebuild
index 0461561a8f53..727d5203cf84 100644
--- a/kde-frameworks/kapidox/kapidox-5.84.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.84.0.ebuild
@@ -16,8 +16,8 @@ IUSE=""
 RDEPEND="
 	app-doc/doxygen
 	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
 	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 61d3d7b1602a..f3b804122a8d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
 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.84.0.ebuild 938 BLAKE2B 7df746cbb85e119c1128a6a967328c055323cdbd616c87775d36298099f38e1eda8fce8f734c350f7fb92153258539b6e801889d99d05d766ed8bcd90c77594f SHA512 7e8ec30bc0688fc8db618dcb6cf7247628b91718cbc28be7e8679f16e1fcbb090b421c77e48d9843b72301e14c10d32b9550d2976ce22194533dcff660574ff1
+EBUILD kimageformats-5.84.0-r1.ebuild 1022 BLAKE2B de78382df932482f4cd5cd50c1e909f6026517188fe6e83d6f9d6e801ca305a4463f987bbf642fc0f4a2496482719ab82af4115ab675dd8438f485814d02dd7d SHA512 29ab0b31904c2b86c6d31ed4fbb44fde1c5549862113d4d276744b93d4af2207528f35cffee3918f54853851d9b7044c7e383a82e256256cf82118cd780f47b6
 MISC metadata.xml 445 BLAKE2B 9e064019f9686ca2c961e427717c51f741a60cf1d470fa582ce9f1b9fb10146c2e4a5491b6c57de0b23d892ac8a2b0799a1afc5b9a5230d6b1722f3c4b41bd9a SHA512 18cd0bceb33980ba86628488b78b2dfab4a55f2bb05b2b7108b39339b4d9b144c2c5420cef06ec10df245cc71987b178ef72eedf32ef6fbb19013d0dbc341203
diff --git a/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild
new file mode 100644
index 000000000000..d289229e7c20
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild
@@ -0,0 +1,49 @@
+# 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:0
+			<media-libs/openexr-3.0.0:0
+			)
+			(
+			dev-libs/imath:3
+			media-libs/openexr:3
+			)
+		)
+	)
+"
+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/kimageformats/kimageformats-5.84.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.84.0.ebuild
deleted file mode 100644
index 1e0b558caa85..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.84.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-misc/Manifest.gz b/kde-misc/Manifest.gz
index ad93428b6d15..82677707b94a 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 7b7c6aa1e89d..a5bb4e149b12 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,3 +1,3 @@
 DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
-EBUILD skanlite-2.2.0.ebuild 939 BLAKE2B 97dec5bdad028eba2668042b1680980bdb6d1c120a5c2586ff2a6d5376a50165f1b2612f36dbaf992262490f2f3adad850ef1f931f5d6981b5661beb8d3b91a3 SHA512 5389652b83c5e752ddbb8a9855b759f0ab313e6e107edeccd38700e718929de912a00847349ba6f777e55ac8ebb31ca5cb7a0de7cf9d7a70cf0051515f822354
+EBUILD skanlite-2.2.0.ebuild 946 BLAKE2B f2663dfe40d41447eb6c2014b1025f45aacaab2ba40e007fdbe3c7944d8bba562bc75cdcf78baee3bd473b1b5c1a2ec10d6fe64aa8408bdf9757f1e662d1a00b SHA512 bfcb3d483cd0e3aa4675c4b9b2e2be9dba9f29593058b8238af724b46b467f580e802a23ff42a208f4fdafc8600a173bb407d40b2f2ec585ba901b971b248238
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/skanlite-2.2.0.ebuild b/kde-misc/skanlite/skanlite-2.2.0.ebuild
index 14f66b6b3af2..bde95a63a244 100644
--- a/kde-misc/skanlite/skanlite-2.2.0.ebuild
+++ b/kde-misc/skanlite/skanlite-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/2.2/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 6d714de224f1..5a0869462166 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/Sun-BSD-no-nuclear-2005 b/licenses/Sun-BSD-no-nuclear-2005
new file mode 100644
index 000000000000..88e09e0d51ca
--- /dev/null
+++ b/licenses/Sun-BSD-no-nuclear-2005
@@ -0,0 +1,39 @@
+Copyright (c) 2005 Sun Microsystems, Inc. 
+Copyright © 2010-2014 University of Manchester
+Copyright © 2010-2015 Stian Soiland-Reyes
+Copyright © 2015 Peter Hull
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met: 
+
+- Redistribution of source code must retain the above copyright 
+  notice, this list of conditions and the following disclaimer.
+
+- Redistribution in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in 
+  the documentation and/or other materials provided with the
+  distribution.
+
+Neither the name of Sun Microsystems, Inc. or the names of 
+contributors may be used to endorse or promote products derived 
+from this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any 
+kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. 
+
+You acknowledge that this software is not designed or intended for 
+use in the design, construction, operation or maintenance of any 
+nuclear facility. 
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index f74e4dcb8f97..24edd1220217 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxappearance-obconf/Manifest b/lxde-base/lxappearance-obconf/Manifest
index 088298adf904..b164bd88a5bb 100644
--- a/lxde-base/lxappearance-obconf/Manifest
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -1,3 +1,3 @@
 DIST lxappearance-obconf-0.2.3.tar.xz 290204 BLAKE2B 3f222419e147232eb805e8b86a29993fefbf80008cc3cd98d048a0b3b2799fb3672571f87666917136ad17c1b4b6bd649194599d684bb14a574ae40d0d127d99 SHA512 cec56238b2b8ea86ab310fdf3d9d43ef665aac7762018a296803ef7caccb6a5a7854c4b17e0028152b379a373602ede30edb02811a9a370ba369b62bb3caee09
-EBUILD lxappearance-obconf-0.2.3-r1.ebuild 880 BLAKE2B 9d8603bfd7a64e6cab88aba080e4eeeb4580816ff3b7475ec4b0522b648274c8636d07c212ca1829dc0e18439394e28e15a6f3bba122e11b88bf56d022e8a7cb SHA512 6fb944a854ad2a9bee6fb7d9531b01c810a03e56afdc6035285bc1c95c2216fc62b94454177f81d0754a7a5a27bc463885272534dcbdfa835765ad41f9492a15
+EBUILD lxappearance-obconf-0.2.3-r1.ebuild 887 BLAKE2B 818c958fc8cb491d06313fc488400f82f1c094eae7d3522c3b362f96a0664685012a63c714ebf75f3565414dd622938cd1b0f83be09efe46d980c1b17a8645f5 SHA512 7ca0b73f5d11b71de1fb3035b80af55771773f2d0304e247e6ed98834efc99c2bbf1be07371cf3ae872f50958ed9a4ca1001d6631778800f15bda403b4c93314
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
index ab03ab7ac90f..96b2c49bd9a0 100644
--- a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
index b56140d9ca86..a7ffd48c12e3 100644
--- a/lxde-base/lxappearance/Manifest
+++ b/lxde-base/lxappearance/Manifest
@@ -1,3 +1,3 @@
 DIST lxappearance-0.6.3.tar.xz 165656 BLAKE2B d76d3d9b270e18e46cad44d204d1d5e4faf20bd6c292bf8dd17c2d570fa0276f183489c39f115c189b525643dbd03d0a1b1681f7fa0f61171bc822d8250ef513 SHA512 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c
-EBUILD lxappearance-0.6.3-r2.ebuild 646 BLAKE2B 00e63cb1790851a5823ae278ea7c621c45ff95406c15c23e6a73b0e4625b83458682dabe645585cc95a050004e5c612ffbaf4fea90fec6ba3be2a2a7eb60e111 SHA512 2f818d703347d4255d596afc9a0d854b604d62b2a95931235c96668d2521d01c2ed37e2b8effe36640c3a5bad8f6c2b01e89eec6472f336268f7b462a7d37a22
+EBUILD lxappearance-0.6.3-r2.ebuild 653 BLAKE2B 4d66addb3da2947b16ad2359393aa45a3c4a65f622f10772789b53095a1efcf3b503bae2d3fb85d3ba373d1973a15c6713239ff73f138e5d953fadced432214d SHA512 25c2183ab5ba4505c9230c75310a8b9f3b2f2e4b338ac87619506be85bd7a05be6de8cc505b404ee9baae296963cdf48a1f6941ffb1c070341a11ff5867a1f32
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
index 7871a1c7b61b..6dc2be262c73 100644
--- a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
+++ b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus"
 
 RDEPEND="
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 59efc07711a5..399e7acbc5b5 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -1,4 +1,4 @@
 AUX lxde 1989 BLAKE2B 80163b00c1de0dbe9ea02692c93bf041fef792d75d976a086ce7d66fe29cacf6cb583f481a51f14847db8fab912937f6a72073559b89057802f93a88afee250a SHA512 43eaaef1a5997f07281fc771d3b4a6cb3ba3515964b3e477679c28b06f21bb7dccac9fb2249dcb8ff6f08b21407fb26238f6cf66ea0a1d312a9566b5ca9d730c
 DIST lxde-common-0.99.2.tar.xz 889948 BLAKE2B c01b3af5499ed4efe3004c922563c752999921cadab36a7fd5fec56762334c93d22ca7a28e9a8e8ce3462e128bea493740d5aa9931c4bf26cdf8a8dcd1bfb9e6 SHA512 9eb939ad411ed15c6bae880541b5c021ce5f3dd66df8662865e2f7219159110d8bf6059a707e55863d04617b17a15ea517317c44f88982344369aa85b7128b6e
-EBUILD lxde-common-0.99.2-r1.ebuild 658 BLAKE2B b8969991e2c09a6c6063f30316ad8aa7cb0b494b8c8a1ab59e8374fabd99b56ee8c14a538998fa09bdcb97fc9e439e6c9e4aa18a941b9aac6ff4d143f665273d SHA512 640854b2cd21b882974c003a3aa0d101eb4815c9a78211fa43616b89fb00e0565f6c83dedf722fe621e198926483846329d2776a93dedbb93d47b32a190d4c98
+EBUILD lxde-common-0.99.2-r1.ebuild 665 BLAKE2B ef5fde1fb4b10c398aaa09b1c84171ae01571f6ae4313570afe9b7cd44e9c79fc2a5dccd46b329508ff33f8c558f314fb7d439b834225c200f3523d054eb4fc3 SHA512 f32a3e6a109d4bf860f05ad6bbc8682f8434c9552cb2441d0dcafed5765a734874b1ef65f62fce3c36f2651ace9135f84d04f6d0c5f0d9885c31ef486275ab51
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
index 764cf19a11d1..210221c9cd35 100644
--- a/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
+++ b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
index 4086ed65ffba..98d27e663cd5 100644
--- a/lxde-base/lxde-icon-theme/Manifest
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST lxde-icon-theme-0.5.1.tar.xz 4469552 BLAKE2B 0c2b6cb3c60fc5260c2813db84977167b56898f1388bc034180c2efd6b7d3fe5baea6a18f9cadbf984d3680100bf2c5ebbc8f1130491c41b1223efff889ff4a8 SHA512 4ae0e7efd610bc68c4fec2fa00e83b4cc61a313fa4207c213d592f7c8f40bda79117e45dfe7df537baddc8834a55f8ab8864918655136d938a7201c7520597b5
-EBUILD lxde-icon-theme-0.5.1-r1.ebuild 402 BLAKE2B cef96c6bd7483bcd9355a2984a0ec3e0efa7c9ec02a99a23c58e9f742acb5d64b7a7390986576677001e821504990182c591dd35d92fb8be14f3935030cf5859 SHA512 de132271c8bc0b2a35770a64babbbe3954975ef30b6911d883f4fcef5b55ed7c8b7e6f9878181e240bb4ffbc5639838ba53019d634450f484776e9d94c7482b4
+EBUILD lxde-icon-theme-0.5.1-r1.ebuild 409 BLAKE2B 2e47f31506434d3e649548d0290c95c28cbe4d4cbf3ef70804abb0709c52c61c85bbdb5708946e564c3578ccc1d8c4c9532fd750b8b190b87dc082de0120ae50 SHA512 f6d98c226f98b9fd989648d198285193e2e4108b42e57972749595fec78fb750b8a4369ac4ca032ab435aeb9acc0a79addeeec4af976b4ec8f2f7a3557965340
 MISC metadata.xml 241 BLAKE2B 98bfae51c09ce98581df5fe14356401f4bd8dc35ea5589a8c4665239d63d5576d97de1786790c399c5d5c0df7c705e3817078cd231951f912653d536296572d9 SHA512 5ff3ff6f88249ad29e84c55fd91cdff0999f9c6c9d9cce1f5ce52d7ca0214668ebe6d9111640f5666e6688c6126d52d62dcd69c0a4949593926c2073f428eef7
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
index 911b666ab3da..969e1aed4b00 100644
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 4b4aec6e8ab7..97ee7e150857 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxde-meta-0.5.5-r7.ebuild 985 BLAKE2B fc9c360f4a7385eb2e50361133dced87839f215eca52074ba8400a90ce01f42e1bd2d28be6349e43f278e9684763ae208a3258f4d9f90170a3a0ecd9798d4aeb SHA512 b16410ffb6bb813784f3e73191fa9c15f27213792c0b82c97fb6cec3fae834dd7442309e90e80de698d63b7691bbe7d80eb0b884435c6ea5869f0415e247adb4
+EBUILD lxde-meta-0.5.5-r7.ebuild 992 BLAKE2B 97d388d6d62d43b4153fc35496a7943f12e811ed6eb32603340ea5ca62467ea763c36d9a39315ae91f79e8797797806f7ad80a8c7ddcb911382d276243113a36 SHA512 8b1314ff853ec8879001545348b4ded1a3e0191e4975e20239f49002cf988b6bc8ab0ef9e27315ac9dc1f496843c2a9ba0b482cfb2c3071777eee113842ab043
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
index be2acbb50c58..be98dd2e4c6c 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.lxde.org/en/Status_of_LXDE_components"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 3a52cc89ad3b..96fee7cfbf84 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -2,5 +2,5 @@ AUX Xsession 1974 BLAKE2B 229ba66250e025cb207d9e22a50aab356bfa185cbc65ea87d62a2e
 AUX lxdm-0.5.3-pam.patch 470 BLAKE2B cf386ca0237f7bd4362867083e5c395cdd3e9187ab2c5bfbbcd4e9e405e7f9c9e2ed9e47e1c6ff8ce7cc6d9b04a19e7f03920892e97fa9b7f91b7f76cae2b890 SHA512 b64caec5b27f92ef2c2dc5fbaa0c067d6450bbaa23c057599c741b1f930bcbe47c07ff68f8ea6b35a610edff820aea7071bdde5edbecd47851a2d80f833f8ed2
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
-EBUILD lxdm-0.5.3-r2.ebuild 1700 BLAKE2B b4d5c134195f0e2b81ab7b71b4a58e9c3e4b1950037fdd6ba5deb58332831abad51fc897d710eb0670e98317c3b43cc6ad205c78bbc16d0ebd1da7de620fbe8e SHA512 8b1f319948778b0628babe88e4dffbeeff29c0512bfff4b562b74c06177d55c6f20d3d69cd6968a774d1fd8c0e0aa4a7c819abd1595fbb10abd8e7b31ac2709e
+EBUILD lxdm-0.5.3-r2.ebuild 1707 BLAKE2B 88d6acdd1f11f83c1a6cd489e5ec9919f1642a7799b5043491115a2f5425a7dd7e17af3dbcbeccb7c4e84b8a61992c0f209f981e042518228bbb439eb4149cdc SHA512 c9b0eed16aabfe77671a98c3e5ba7fd0bab10882001331287f04000ff83455f996016d0deef613ea06836956a1e68b679dd51cc10eac949bdb8aadd9d3fd19bb
 MISC metadata.xml 320 BLAKE2B a8062bdfacafdfde6dea3070d5bca886cd63ba90b8bff178b82b1f00d297aa9a002b160e13673bd09ededd08ef6f140ec5167970bab6a520c0ec83597ac6b52f SHA512 96357b205f52d95923b471320e623e06ff35e5054eac0ce1e0da7b35181e59d181d8f62d46563a82b22f8e2219f52f337bd600293f5d4f729e7c21e56a4417f2
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index f3111c85cbfa..c2e5d6be8cbd 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86"
 
 IUSE="debug elogind nls pam systemd"
 
diff --git a/lxde-base/lxinput/Manifest b/lxde-base/lxinput/Manifest
index c241383518cf..ab5ded283780 100644
--- a/lxde-base/lxinput/Manifest
+++ b/lxde-base/lxinput/Manifest
@@ -1,3 +1,3 @@
 DIST lxinput-0.3.5.tar.xz 145356 BLAKE2B e3c96a1232329afa5030adffc17af4adf9afc3eb1049f860fe6ed115eb35d580c24a69a21a9a858790b9213b7d4dc716ab9e30becf42b4f9645f2ec642de538c SHA512 d5233f03c4314ac16fb548db56ae2d17651b29d8a59bfef3e6e6805f6b9bc8100b0711bbc72e31a6bc458eccc6fe1b4a38cf097dbf6a1b04f600bba58ff03f35
-EBUILD lxinput-0.3.5-r2.ebuild 547 BLAKE2B 016c724d0f442739bd5ad0a5c34fe3fc87176f4f0963309a5c135c84c02f55a2f1a00666ee5caa214cb3226fcbba264ee60ccd0edbb0fe6b0354ad353d5bbb61 SHA512 53603aed96375b121d2575090c5d4cce4af6b58c3f1b93e6362a7fc124480086b2408f7f9adf60c1f4ac264a5b2c8c71479144ec7d3e681000b30e3f02112453
+EBUILD lxinput-0.3.5-r2.ebuild 554 BLAKE2B ac17ad21251cf0dbde4b18c5cbd3d799109cfc641545cc147081b059cad0e95ccd47d156ebda7966d0fedec1b30815d61bfbcbb32c2ceb3c119a171c69f03a57 SHA512 fcdc83992bb2275edc9341e615861a7e7428a6f3e04a2df1b0f5ed1fedbef11cd456fc5a329d734746355e411ff6098e6712fed69c6fc381e14e49034e8187ed
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
index 414ef3254f96..9be7292833d1 100644
--- a/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
+++ b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index e8ca810cf985..665abf6a4d1e 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,3 +1,3 @@
 DIST lxlauncher-0.2.5.tar.xz 131428 BLAKE2B fa12b7d49d0a95b6aa782c2bb338dc26677edf585b2b532e6d457771e450a8fba458c8c5638fd101edf079a3872a322418c44f01b4ccf6118c8a1377c6dd7a8a SHA512 3f57755ad6feeeb1daa61c29f142b997f8175ff0863d1749b3e28b83744d03e06a7f0bb373fdcd48364e307840dd05cd23b92109c75523e32d3eae8e183ed6cf
-EBUILD lxlauncher-0.2.5-r1.ebuild 760 BLAKE2B 7b121e6a7d0e44a53383eb86387873d9402cc8e02308b402807dd4369cfa85a749ce1ab5ec5a5d1a1255c05714de0617a9c21464783a25f038f43288b5f68e7f SHA512 70a08d74367db6e12413bf9f2dd1e981887871b5c0dc047654a342c45d8c601713e763bfe9c21bbc7956d09af9f4394d6db1c27e2f423745495f880180fc6878
+EBUILD lxlauncher-0.2.5-r1.ebuild 767 BLAKE2B 5e6dc61877836ad51a54ae4f23cfb0bb82ca025c7b6c2cd312ce6bc8011a06d6abe86c1f648eba5ae2552c9ae136e85c5c0f0443a6632a27b1b935fd1faa1d43 SHA512 b8c9d8b24d2ee71704560449733372ab5e485631715dc400a879d7c775f48739a7814fc4578fb45675ca962041320d6f5c1b35c2b8f5271faad2328c80a78837
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
index e472c53f384c..9924d37b65fa 100644
--- a/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxmenu-data/Manifest b/lxde-base/lxmenu-data/Manifest
index 6dfdbf12f562..381fc4112648 100644
--- a/lxde-base/lxmenu-data/Manifest
+++ b/lxde-base/lxmenu-data/Manifest
@@ -1,3 +1,3 @@
 DIST lxmenu-data-0.1.5.tar.xz 199192 BLAKE2B 2aeec1e350a06c0fbdc74136590ce132944503f5e411df2c22a0db61cf9ccd02303b28326dde9d0b0ad5098327e9cc35c4a9abccb9ccec0c05370128e68d12ba SHA512 ea1a1ad511d9e56c7692a8d96feb52c53aa7bd7595f2312d4f41fc15a12a056551c70d6a2c55a30f849e2ac2fd1a06436751573472ae70e0158e069736578b40
-EBUILD lxmenu-data-0.1.5.ebuild 510 BLAKE2B 5a290a085beef9fab34cce8cc9aac8bf8bb4e71907cce41d524f8a942984016b432774eae9534baa63301bdad1781f6a7b2643d36f058ad1fa6c07b3ac152bc4 SHA512 9f6d9d6b979c91480d50020173dd0f3a8575cc5079e1cec1c4974e5117826545dbf63ddcab996af8f2f05c176e41afb6395af5c34fc9bb352557f5a6e9643f75
+EBUILD lxmenu-data-0.1.5.ebuild 517 BLAKE2B e467b62315922c434c7eb783fcc4ebdf3a380daec2167cc1800c8799adefe6e5dc26ea9d7152756aca8076f25a966018db6a1b9e19b066d8e9dde9b4fc88e83f SHA512 21f294f488d8b81caab22e4c360bb39944d47ec137da4efc50f06659ac60fd8b398534878122873da92e1b75b4e57bfadf42e5c8657fd0d6ab6124d9d2ca697b
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
index d6ecc4fb38fe..22d69034e0df 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index b1369a7ecb60..c53af322903a 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,4 +1,4 @@
 AUX lxpanel-0.10.1-fix-pager-panel-width.patch 1123 BLAKE2B cc4e0063e92b0cad0a9477635dff3f013aee4e71626b61c5f5a1e45d5c1bc374c47eb5448cf69086215b8c1a1a901cd78629acdd5d2b1a065ca3cb8853a7e792 SHA512 ffd529b5facb9394cc5ab6501688aa20e32a74da198e6e7004325dd9fa6ca0ee01697d17913ba1115aa7a4267cfcaac855deb8b7a8e98a6de5b330e39efaeabf
 DIST lxpanel-0.10.1.tar.xz 1548276 BLAKE2B 2ea8628c9c4c7a77d65e58cae0b5656209db63b455299fcda00fe79aae1b139860ed8993ade7db68bbc65f61b8911f40879f1ef9993dc12f15f7480d3ea72cfa SHA512 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef
-EBUILD lxpanel-0.10.1.ebuild 1634 BLAKE2B 4ca15ec4e011e39cd496e7d8d3c70e933ef8dc157a18ff997807e42b1a971a5f2cb7424d797b49799872480c7a6a91a6d4a85bfe3bab57efe491885ae7e4fddd SHA512 92e6e2c2d1d247d22c3ac3d3e1a190c107b2ed0c0fcc25f9a06bcb947a0417a344d96d57d74b9bbebcce14de05c3adf5e749ca148a64a911dfd63a9ba184b55e
+EBUILD lxpanel-0.10.1.ebuild 1641 BLAKE2B 1226a84bd27e8a1872b7c1970a5238b57f840aa05b3b8ce674fcd9120664393e07194a2326823d30116624cbd58c51abc8a761fc486e1fd27fbc5b08222cb86c SHA512 89d4121ddd9c1df8cbbc47e6f97ea03f63517c6bf0d408e01b746c59c64189b26d037edb5555915bc9e1ccf711dcd151d9aebd0bbfa0acb5defc612f592cd477
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
index f8edfb798dc0..07a5a63d4cf2 100644
--- a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+alsa wifi"
 
 RDEPEND="
diff --git a/lxde-base/lxrandr/Manifest b/lxde-base/lxrandr/Manifest
index f4f113a1990f..1cb70f692e5f 100644
--- a/lxde-base/lxrandr/Manifest
+++ b/lxde-base/lxrandr/Manifest
@@ -1,3 +1,3 @@
 DIST lxrandr-0.3.2.tar.xz 134072 BLAKE2B 8c8e7985b20c4b90d610b51ffbb7c6f02096f9b2550ea69f16bd0ae8840456a605d646d83cb2a70550a84aaca87deb6496b811fe79990cf36994b2b66aee7915 SHA512 9f00f885e4af3544d9bf8a7581d5b9e3049c1fac174c119dda8c85f2f94aa7be241b6e06e5fe86596a0fb65a38bfe1983ced91c064339a60b19f506ed337ee4f
-EBUILD lxrandr-0.3.2-r1.ebuild 599 BLAKE2B e0c40758cdb9d1b71172e7a4e083bd10ac021e1253a6bf7088593036c318c8769734265497a28c52c01affc0f5ed309019f339e51c04a49d2d97e08b44f11ebd SHA512 2d361e3ace772fd7d4c4d70bf654312969c6f7e36520cab6833efa023f1d326ebddb8884d3de06ef38e178335b972c047c6803dcb3db829ec9345c2745fdf918
+EBUILD lxrandr-0.3.2-r1.ebuild 606 BLAKE2B 32f3cbe7c592f8159995bd5f8b5ddc2fb0fa0873c16eb347820e31665146e0eed9a6ee34b6a925562653d2c2e9d0055f38fbd1f46a3046d1b4ffbeb68349ab63 SHA512 0ad48dda97cb8097983a743b7838a4eca2d797266df8a6222f30d8176ce95a136399add7186a346cf34adf09a2586d50bc1645947f63b98937e9101bcc8bc67c
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
index dad80fd04fd8..40d124b78798 100644
--- a/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
+++ b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 3b6185ea74c7..5e4ccb80d417 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,5 +1,5 @@
 AUX lxsession-0.5.2-notify-daemon-default.patch 709 BLAKE2B 7f2c75ce81e70abbe0c9621d6d5605a87925f2231d86644dadf93235349a90fa733b75b9a371833c4b8b482b43c644c617f041ac1f29df1d94550cc0d7abd7c8 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c
 AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75e264fd45b1861b05ece4085a3fc48be94ccc60011e496eba605410cf1d7f08289b49e1a62e6b7b562b0edeef1bff50 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1
 DIST lxsession-0.5.5.tar.xz 422564 BLAKE2B 27910f84ecd8df8af06649235d33604eb83e8203f6a485a7450a91887de691d161acf8f51d8c1786f8d073966ba88d20296275adc131b9fa1c670c0f9e3ecdef SHA512 12e25214485cf855b380a5aa91eb536f31536c98f5a50a1115cb4bf8ff884c7cdcd40c69a1502eeb9f4d3e6169e0607d6488ef3152ee184662fee39fe7a04d54
-EBUILD lxsession-0.5.5.ebuild 1154 BLAKE2B 9f07d02afb7cffe7338a7c30a9105de2ad094458d5bd20f96b2a02bec4790eaa197961cdb9e00ec70d35612457757b032eaf124f252243efd024ae90e87fc81a SHA512 5b6466bfad977d23d09aad2b3a447b944460ba27cc203835c34483306e86c840e68182f8e72db5a86e577ed15b434c8e59ae254d6d94a66592bcc8372f3d54d2
+EBUILD lxsession-0.5.5.ebuild 1161 BLAKE2B c6c779edd35bfaa58a33d1580fe8d935100b4fdd97a34d10f8a6ec607940aa5ce2d06dcb4c6e0817525286904cc4882a484b618535c1f2b966b4d0fc83d5580f SHA512 744f48ada310fcaaa9ee03420b8b6666f18c198f47d324dfe216f0cdff1b33445aab75c420a3f2f23dd3d8e3967939aa69f08250a3d62235ff6dd1196663bf2d
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxsession/lxsession-0.5.5.ebuild b/lxde-base/lxsession/lxsession-0.5.5.ebuild
index d932ca86b560..a80ed0e5896e 100644
--- a/lxde-base/lxsession/lxsession-0.5.5.ebuild
+++ b/lxde-base/lxsession/lxsession-0.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE="nls upower"
 
 COMMON_DEPEND="
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index 31b14a228b93..7e8885ac86b1 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,3 +1,3 @@
 DIST lxtask-0.1.10.tar.xz 138116 BLAKE2B 38fc7e4192a04a3748d14148d7defe71e766f802b869468c25aca971d58072824377da374b72116c924310a5a001f65680d878a6bc0afd59609ede63a590fc49 SHA512 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a
-EBUILD lxtask-0.1.10.ebuild 519 BLAKE2B 27abb40d47aba76ad5d6e69bac75e7043e2ccafbf4f93e5296e372db06ad4097b73998869d62012fa272fa1b782ed2762b63df870a0e884a830549287e8dfe87 SHA512 bcb4b0bbcea1f96dcecba98ab472be8938c79336c9828962837c0716540d04cfa8221c48e8b5f91cd9d23ec0a9915aa6887c5953d7e86818d9cd3c9d3b5f308b
+EBUILD lxtask-0.1.10.ebuild 526 BLAKE2B 94b5d464d9d90b39122610151306caacaf9a51b4edaf5fa23515a3195d09f3b0ec68866a212bd1f48acbd13383b6126cacf3468e62456fbcd04757e8c9d91718 SHA512 301eda12c2f7b1b6bf291aafbdb56dd587428cb93099c9877cff2f100f07a889faddefd7930fc34b4ec3938bb7ab741a43fb19dac068fb110c0c3d08373a198c
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxtask/lxtask-0.1.10.ebuild b/lxde-base/lxtask/lxtask-0.1.10.ebuild
index ea0221a2b864..e1c1a329c2bb 100644
--- a/lxde-base/lxtask/lxtask-0.1.10.ebuild
+++ b/lxde-base/lxtask/lxtask-0.1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index 4242e23af4fa..6d65ab6bc373 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,3 +1,3 @@
 DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
-EBUILD lxterminal-0.4.0.ebuild 735 BLAKE2B 089490e8a7da688bd2ab339ed7ff8556a092ac4e42fc2a77e735392f8a097b621aca1f8b2273d84858be577d1c55965afbb47eb7eed308537768fb8a3df649f1 SHA512 db3ba508e985adca466eae401d0473931a7a1aa334179a3721bb35f6d003dbaf20b715e354b27a4d9f6f6258b96b49667fa810c45d5442e9fb691cb4c13fc31d
+EBUILD lxterminal-0.4.0.ebuild 742 BLAKE2B ecf93d341510e1284bbb05a956932ec6a9ab633f238196b7aa6876599e3c3d35351eb0ec78f48ccbbd8b5df205c64d5a085c8ea5612fd87cc899b0e9bc531974 SHA512 a0893681df6c940ce31d7a48ff645cda7e5c181006b988277048d5fbd6fe143f2aff9172d22b30fa93d48ea616be4c2e771662ad6d4c32ef30dd14b124cebce7
 MISC metadata.xml 240 BLAKE2B 4ddbab8646b091795d596898ca5d6d13137c83c2a7fb889c33404340cc44e950df16574bdfce21ccb67f190b864c55103f31fa2996b9adb383db7a530b48d2de SHA512 a4bd8a67ce4ac3071173b23e2400e057bcbf9fb458bbb4a18d31b67216d4d66e6b8e540f003feb386a487f2a64eee066a0a83d0aa2629c5b99d5498d4289ec97
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
index 50c4a08d1e48..ac2acb53b0ea 100644
--- a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 643bff37c0cf..6128101023bc 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,5 +1,5 @@
 AUX menu-cache-1.1.0-fno-common.diff 2591 BLAKE2B 3e48e23596e1b633cd195700828848754ec1ea498099e3489614642110768d4805af0e53fdbc9c128376dec7f8b366b206fb0fc54656914684b824c245a44933 SHA512 cc740568441296da46cc3382f4e29ab50d677c3900127e4d13652491f6dc1f3473e945f2d05afe756ac0308e26d469c7bdb519040ad886b5bc467e6883f995f1
 AUX menu-cache-1.1.0-memleak.patch 1185 BLAKE2B af0ca2b3ece0bb765192295b561778d883a91500f74bbd6721fc2346a194bc4832e7120983a292879c493afb8822d219bbb22f96ed6f0912e4f631240999b89e SHA512 7c65382ac0c90e4eab452d8cf04967abec2da6a8fcceb34d77540d24ad3d70ff5c523210c2336b34c157faa44de90c5b4311b4b956759dca68dba2615d93e753
 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
-EBUILD menu-cache-1.1.0-r1.ebuild 781 BLAKE2B 2bcb201a6bdbf5171afea67e31e8cb2b5e418d1c3104a70f322d3b88a24c41d5afa7a00dcf9955c723c3cff3089ca3a27a6fe31f1654082ef3ea1502432d4d16 SHA512 6ae50c16c8d917d1499a1e540f58b19401ed9bc802559f4eb29e3ef3ab35d125fb79cb8937440430d84f623f7b133c451c306a676ff004c591054134dd5f4445
+EBUILD menu-cache-1.1.0-r1.ebuild 788 BLAKE2B 5a599b495124cd2fc41e85773c2bd35768bd10e3186feeb37f5f7cb4962030878fbae9c9b7cc2467351898f3f40f0b91b80eca8e6e0d40b78ec294ef883dd83f SHA512 1bf9ebbe418f57359d31c865f6e5491a7bc23132c5fa7635b7ab21a9e3b554a9b2aa9dcdd1ddd7433e5abc2c64579c04b83f062d8a39d41500343fe8d274f38e
 MISC metadata.xml 320 BLAKE2B ff914db078fa5bfac7bc5184362f6a8c211945f0c1e0286fb3d7ba4da205c108678206272559fe5f5217380ed867a309c8e920c0d4a0cd5773e0b4d8ff9466c5 SHA512 b5a290c4ae3492e59e38159a1ad9aaae97abaad29ae07936db417f85b5a002f6d325d2b769a9222880b3235ed2bec0e3f59f930a9e2ea49fe4c2094549e84060
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
index 1958455b3b12..93c38c1430b1 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # ABI is v2. See Makefile.am
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 48aa61a82d3b..d31448bda57d 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index ed305e79aaae..afedf75b3849 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-3.40.1.tar.xz 12223944 BLAKE2B 00e37d45c5139e77ab9461948185467c9d2fadd3b315bdc65b6a55fe78e605a1eb65479ced304fc0d5a2bd2acf813164fc567254ad8e692701823420195c810a SHA512 acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00
 DIST evolution-3.40.2.tar.xz 12215356 BLAKE2B df1bc738ea058c2e624e7d56b69bb13e059ceb25fc4fa26d00823677fee61ccb9adc16ee70f5f702163b59f3fcf760a116eb2eabe2350edcad693614d6c0b68e SHA512 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08
+DIST evolution-3.40.3.tar.xz 12216768 BLAKE2B 7b146ee09abff566a5a0cbbda9dda6ce5cd26c076462fd511cbc02fa35352d1ab776c67c5c99990278963a6f96c2ea8410588925cce1c05300e34ad5252de618 SHA512 08fcfdafd78ee323a57355dec1c8755525eefb599b70e6fb60ed0e9963a538a4b3f172b78f03aecbd245741fad08363b01ada46c2e349a9ccdc080d28c286452
 EBUILD evolution-3.40.1.ebuild 4174 BLAKE2B 934f54e05123d518ebc4d8b2df4e545da85a50d8d23d1e20b9d59f4489fc741a68e98fa79cf0abfb288038e0e8adfe4d26296279c59d90f4f585fad9da776821 SHA512 b0fbe1e12c1fbb7b047a81f3f99ef6e6fcc360e6f319f7d6e751f38e2134bce15d6d381964a5d30c541493a356a1ba4b119ace6c9f200bfdfccfea597657036c
 EBUILD evolution-3.40.2.ebuild 4174 BLAKE2B 934f54e05123d518ebc4d8b2df4e545da85a50d8d23d1e20b9d59f4489fc741a68e98fa79cf0abfb288038e0e8adfe4d26296279c59d90f4f585fad9da776821 SHA512 b0fbe1e12c1fbb7b047a81f3f99ef6e6fcc360e6f319f7d6e751f38e2134bce15d6d381964a5d30c541493a356a1ba4b119ace6c9f200bfdfccfea597657036c
+EBUILD evolution-3.40.3.ebuild 4176 BLAKE2B 0ca9c2838cd05916d7d79f3b39c751298bd52803494ed195d6dcf5acce89b53504701f9b9e364787e722b51bee0740bcbd09c5f80586d0adb8ecc8f1bfb002d0 SHA512 38663f3563dcee27f007be6d67c22ad9f35f9acd96dfd86eca51329b16ba266a34b21a51689ad5f99c7c5da587e7961b0f4a225833aa72e7926c3c21baf0f2e5
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.40.3.ebuild b/mail-client/evolution/evolution-3.40.3.ebuild
new file mode 100644
index 000000000000..9e0a1d3f5578
--- /dev/null
+++ b/mail-client/evolution/evolution-3.40.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.56:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 777e327a8c67..6f3835b8e749 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -2,5 +2,5 @@ AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20180807.ebuild 1292 BLAKE2B f558391789ed0468b4e5481668c359e10d2846cba9d7df4dba352c9ff57e21234e1d3f9809cce195ea2d86511dbb7d2f669c0db65ca8f837a944ff8c07508222 SHA512 8f3c58bd37f2bf33b6e8451397f33ce426fb53593b82362210a2977edcfd377ec4f035de3837b30f30f5a851477102edb496fa2af018f1ab0ed971526032cba1
+EBUILD mailx-8.1.2.20180807.ebuild 1299 BLAKE2B 013ea84f20c322fc45bbe61b176cad49904541e7afc745158285d3562f2f84f985c32332694907a63c04a7fded219a3a5e81c0d57410f90184192fe94718cfa0 SHA512 7e0b2127dc0db040a1076c63e01f43bbe0432965fcbc7f50f345fcebcecce467dabc9ed061dec565b8297dbaa03e6edfff38dea48eed49afbe38f9170ae81eec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index 0dc175ca042d..a85a025cc1fb 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-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"
 
 DEPEND=">=net-libs/liblockfile-1.03
 	dev-libs/libbsd
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index f2b421befeb8..a6ffe72a11eb 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,71 +4,71 @@ AUX icon/thunderbird-bin-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f5
 AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
 AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
 AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
-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
-DIST thunderbird-78.11.0-be.xpi 666676 BLAKE2B 81877cd6f49e61d462d22510ed82b3a6e31ce34d2d11f253ee6ce31e7569dd6f3f5e4fd0ff41a7404c3b374fe01b6495af064a722f445c4ac23d7941e546b9ab SHA512 11243c238d1fff8519e58d5f138b3830f398c5f561a968d448dbe3703d81ab98056ff65dd80ae3c268ddc14583437a1b4988323ae20c235652619c887e89a137
-DIST thunderbird-78.11.0-bg.xpi 672416 BLAKE2B 625560636cbd8522d9425e395ce28829644d86700c365987ba31e92c9d8fb8ea5d132f62ff12b6386c41dd995d3b95d49e55c84c5be7d68e687228f2f510b0be SHA512 1c16a3ba03579a462ed1f36eadb409c81cfa6185f6112a674aea9cbf445529d66c51e844ea7ec6c9c89ed8bdf593223a80116f976dd242078487c18a20f7abe4
-DIST thunderbird-78.11.0-br.xpi 604529 BLAKE2B b2e9f794d23b4a78209ffa355db99ce06ce573bfc9c3ee69a0cf82ebfca1e06c06b3e6ba869dfed72abe2d6ef84a87224fe713febe2c00828770a0a13e0a70e4 SHA512 f4a67b79ba899c29f6a0ee5ee2677a75898ecd417a5460af52e1dd72a99b985db9f00fe682a2249cf76ec7576316a52d24995b39e5e5ecac5fffc7b3abfb1126
-DIST thunderbird-78.11.0-ca.xpi 620448 BLAKE2B 9b88bbb31a16934ca112f806db6b8a7225ce7969073b297b03f71522c5f5f069958fce80608da0e30cfd7edac5b1c5f9c161078b7210affa48e103e3e5aa7185 SHA512 5abf0bb7f9b9ffb784ce89bbc74deebdfd042ca465b14cd7560bc6e8d774fac8d1998dd1afe3bab31a2347bddb4b64621bce39429ee49c17302a0cd7c85987cb
-DIST thunderbird-78.11.0-cak.xpi 635650 BLAKE2B 2d127cd4601de8b7aa114a3a96ec21e35dc7e0fc2da0df3a8a075ef2abfd044c797059cfce2167b839398c0762ca8378b7878c7208f0cfecf5ed4ebcb0c54883 SHA512 d74ab66d99895b6ba97e2e2ea8d3a285d0ba87f242f5f5ebcd155a15155b23db3eafd19599eae4d4f759efbbffa10b70ecfe899751c2f0e7c31fe7e51e47f99a
-DIST thunderbird-78.11.0-cs.xpi 635344 BLAKE2B 9ca8d944d2be138d90a8da9e93d3e7a2ef5306dc3bad3fe874bb62347359f58472d38794210de3898774c2b1ede57b5a4cca10d210b63dd2aaa44e936d41ee7d SHA512 b967644424cfc8132a76ba82dbca88b6c712bf1c37f46d57f0f17cbb493de4e3468c9ed6b20ef030c087316c263cc081fa7fb796c5f9cdaf3e34212f211ddfb4
-DIST thunderbird-78.11.0-cy.xpi 646232 BLAKE2B 0f180f548f4bbca346b877092b940889ebdd8b2e97819052744a0b0ba2bdddc413d335e13b3392b0e02a7c347616d12cf266bae8d19f5365779eca449119599e SHA512 b9bdd207ab9165e383a51f094d8ffa07ac20bf9d15f0f6832ccccc3342244ab7ba3344e20d3ac4c3ade70fbfab7c5598e9051907427a4553aa63022ac23fcef3
-DIST thunderbird-78.11.0-da.xpi 620991 BLAKE2B db619e56d9140b547055ed21d13590ffae23ca6528603cb40a68c7b5b46ae0a70bb267f79fd6b450cc106541491cb95072e8d34e1f22ccde3ae7138c809cde7a SHA512 7417e454e1621e47df72b749da146faa0d9c88955c85655fb3edbe4a8e550788e9f6c53565a78cfe82e9ce0ab3524052cbfa0fdff5a71d2291284299a4ee4c33
-DIST thunderbird-78.11.0-de.xpi 665194 BLAKE2B af74caf1d4a6ae13ee3e6c59a3dd562333588c4b855b1f2cebcdf1f36a02fe2645bf6f402ca22cc69c7e38febabbf2cd63858eca31a1450224c7a5f7b68e8432 SHA512 ee3163c6b9e3c1583c0c3b5d33112f5e9f37b336e3ec52980dee7bab02f016a4b6a7f6f82851932c4d72f7c85428e24e308e798fe34c41b8cec3cb226b3c150f
-DIST thunderbird-78.11.0-dsb.xpi 666778 BLAKE2B 26a14ff3711b6789b62cfab66b5e125bb4b1d41489b32a939602d37571503539022e7a72503417eb4f8d6d8f12c1d0ed8097e6d3e4cdef6b3c3b609d8209d279 SHA512 d8781e76172b29f68943f5f3bcf922b40937495a189ef709dcae19e2977cea27caebdb6b17989fd594bf707fdb0a288982d7ee4bbc916af987add20cf55b55d5
-DIST thunderbird-78.11.0-el.xpi 774458 BLAKE2B 5ca290b9df4e7a7d7cb109bf1f026f88b47941d0e224de56ffe2fb1a8b4df8818584f163cb48657d022e553821349e1f2fb8f27a102de0986912402b9dd519cd SHA512 06d1dcc0b17604cdd68bf8c0b0dc6a014ae6f70c05b4a1c5b2768a45eef8099686b307ce3e0b13a1d294ef45f1707cc7252c0c85d6b0bcf204cacf189f63bedd
-DIST thunderbird-78.11.0-en-CA.xpi 611764 BLAKE2B 3c7df065c37712eeeb4d383eb42673ec31e8ba9d3d80a042728de1c276619ed19dc509762ec90f13b13a48b73991d2b9aee33df101039f18a4096ef0640f5e59 SHA512 843582f12e6d32c4eb27a0e984a96a406fa39b1adcd253c372e05c826e623e8059ccc704f7438cd4a14216b4251ceaa8c5b8b48dd8d34cc9f12336a3fb1ffe89
-DIST thunderbird-78.11.0-en-GB.xpi 611188 BLAKE2B 9702b2e97c951589974f5b7f80636838261da021c4736e08416f15b0a7d30bc0885c6570fdc1f127111ce1f68e2251f181bc19b9bec887b7b1034becfc166fa4 SHA512 f0ecae7a6d3272cc779c35859647a86ec2f857499b47634006db528373a43aac79329e9ffeee304eb0a95195915f7aeb1170ef74240bb67e560d4305f960b21c
-DIST thunderbird-78.11.0-es-AR.xpi 657793 BLAKE2B 895e2b21661c7c82475d3c93695e011f15f44d63cb49eab3b4b0c6a6d7d062eeb4282b1e16843d9202dc172e146406ed21851197e5eaff52dbbd81de0ea4f441 SHA512 570adcfa7416d1d3b2dbf6923927580c1334efd16ad024ab10df0a9c20558aaf4c14fb67245fe7d72b1d14454b759b38e3545fb62e9f9eb3feb881773dfcb6bc
-DIST thunderbird-78.11.0-es-ES.xpi 569808 BLAKE2B fd1edf9defcb06a2be32a065c72a479b43d66122636a5024d415d91358296a516730942aaf486fd18b391cc66a3282d8ac81263df261b5a98e3ec8a23cde3a18 SHA512 64fa4b4eb00c95dc8ccdc369cfc3c50a06bda3fc95a4d5625d677e27354f116d33b3e7de1697dfd16fa6429dcfbcbc2c7b8e4cdc9d6598ac08487d12b3d898ca
-DIST thunderbird-78.11.0-et.xpi 597738 BLAKE2B 449b1057f9647f36e725368933b56125bf22377be1551c5c1a2c2b2dd4627114ec8257dc7b6960a2d31465c3026ce2f29c91d1c86fe7aa3741b9a92f425a9f51 SHA512 9f36639ddcc96851585a1cd5d36fcacbc4bbb6c1155cab5da1376f40b0a2a096c0d923ee00db32ff3a40c6543b957ae75472b1a052310be7cb0539cb3a826619
-DIST thunderbird-78.11.0-eu.xpi 632960 BLAKE2B 7953b03d89922c61a4b2b4fd1328cc9f39b0095d071738c08531883ce4636a50669f62d26b87750c573638e0db48fb67aba18df70106636789306ac1ffe690b9 SHA512 e590ac6762c92b95e7c820f86f1484f72acf878489356c74b346073a39417b1db5a99a233d2466bf4f350516dab0279753e5724588bc0edca5965831c96a0e13
-DIST thunderbird-78.11.0-fa.xpi 639752 BLAKE2B 9762634fb297c77110d6d45a64ccfc298510c838aaba9203a1e07b640e6aa72fa3083f722a070864927e0f687a6b764aa0cd51df79c50a1d9c71b289c0f13ade SHA512 de2725034fd0373ea8955905079f4eabfe1d2baba44fbdcd614fd85ea33a8b8eabf4371f19e6f046929cbd56e4bf70e862693f1fbd97050c3411c83de8317234
-DIST thunderbird-78.11.0-fi.xpi 642456 BLAKE2B 5af89a5311f7a373cd07a6350ef5bbc865be21d53cc33e5aa7a0ccf6d2963a25cbfb3cdac7c805f66feb084d807fed3a72aa3dd561c3d03ca647faaa6b3daa19 SHA512 0a22233c37b279b344862c0d156f938c588921aefc4852f3d4631a459b5a177cb74495ed61bbb90329aeb781f909cd9a330d2153114b8ebd64f53eb37bfa7965
-DIST thunderbird-78.11.0-fr.xpi 669492 BLAKE2B def525cee10efa0978d778ddb0ccd9672eb51ab5d7eb5a4a09b64773b410b5d2b3d17b93445cd324431cdec0ac8da8e72bab5534d60c694f2a50172280156174 SHA512 18b4aa4cf6684f0510b8e3cf990c79bb5b3c61ae37012dda0bc14febfa9ecb53f4cc86f21c40deca972972b1e89a9f15231a7498c3578ab22d1753b3dc397dff
-DIST thunderbird-78.11.0-fy-NL.xpi 653078 BLAKE2B 043b2ecc0f54e0ba9b6f75ed1a0e8502ff4e5788e41d8c54a4895a107fd044fcb1aa4237a1e593f1cdcb8782e25226b6ba996df830aa1ab5b005410a7988c558 SHA512 e3b295fdb187715bda511105be726bddbbcd8ca3446bb8199937bcf98d16caa5ff7df52c9ef6170b85b8b0a0369179744e5a02283908c5fd1a3fede244d3ad77
-DIST thunderbird-78.11.0-ga-IE.xpi 600708 BLAKE2B 9bb307d36ce5b9178985b818b75f417a4f44b29e748b847427598cd34a1202a15a5b2fbad00060bb98dd2ac0e1881845dbf23544f4defb16932c228fbe7eac22 SHA512 52a330bb02aac06ab2588537316a6241332bec6e2d616a3c5bba44fba1d50d4bc25ed3ca91372c74979ea6c92eadf484170e033bb0f2a12e22b54da0ac88fe4b
-DIST thunderbird-78.11.0-gd.xpi 609380 BLAKE2B 8e33f096bc758e7d13c67b46f7508941c14dc8936678df293edb8782dc625c0b93ecb3b3d6df2b060e318430b9ced5c79c884b3fd495156e052e3edbf045d217 SHA512 e41728ba4d570995fcc382d372c7f1bf83ec1b554371748580b48d7f119047075439de662bc17bfeb60e20134f1f29ff3855c6e8a6e09498db606194c651dd05
-DIST thunderbird-78.11.0-gl.xpi 615733 BLAKE2B 2b5364a9d4c03540091a60195f9a3d7b18cee3857693613c8d121731f1ff370209134ddffc6190e4e95b8ac5c32a7fbc8df81497e6dfaba680f91dc8f46feb2f SHA512 c7b2aee95fdf67a65a9ffcb48ce8da2c720b6a6674a945012289f53d30e855c0602fc5df8b7186aadacb993fc2b1494bb79427d095db1daffd724e6fdec5a8db
-DIST thunderbird-78.11.0-he.xpi 640490 BLAKE2B f79910c79f9ba9d5ccbf72b5104b71837a77d53dcf92627f264b7a9f8717dc08ade847d717fac74b72ba102e204daa5af673a9438a52a4353890148456ebfa1c SHA512 54122ab286ae100a38d0e9172d447d85df2692ea47baf57bb4632204c689ea6db83546610db1f0a93795eb7316bdee7db8b7adba8975bc51729b368df1bdc546
-DIST thunderbird-78.11.0-hr.xpi 629032 BLAKE2B 137a179f6d3b774e177fd8d1b7035c5a872a998a2f22b5507007e7655e3b70d07414c9dd97c793276a892115c031afbb37e81a61f48ea830419e597b01fa9fc0 SHA512 2714cc3c735c227e7da7c61d078648814c1533f18ad18f90edc66a3e35af924b0728e335d3381c211333297aeb7cae5122f3803554ab825fbce54c55f0bc5087
-DIST thunderbird-78.11.0-hsb.xpi 668608 BLAKE2B 61dccd236d7fa6d0e0df69727650f0f2710f14f6733b71e99b3f349f9446d551de861d5b44a3b8096a3a36503cdda7313d3459c974adabd19d8bb66f6bdd1df3 SHA512 d9461ec874a3c4a14ea8450868ec4193ed160df3e43fb083b1bc0cd3c9e208a9698f5b84cb4088e02fcfcad83e88a98406a8782672c57f3caf609917443620ce
-DIST thunderbird-78.11.0-hu.xpi 679836 BLAKE2B e58d2bfe5c6919fc46ab323a325dcd3ea6b2069763da16f8cdeb79a50dd7a1812f01e42a89abaa61d1bee4dab608c15e898f3563fe2b5eb2d2dfd61cd4e08d48 SHA512 b27bc91598df5b47453593c0ca75217f59143db756a496386907992bc9d7d259655985459c6cacf9736b5d12f8ebd92d7419c478892e22a2c6747a05bbdd3c64
-DIST thunderbird-78.11.0-hy-AM.xpi 713327 BLAKE2B 25269f40b57361629a7212bfd1a5e8525e78d388a88e3648eea9316e7a181ecb79ca1657b1699103780fbecdb77ae939d2db29b424dcc00abb3bc8a65cf95b1c SHA512 389a018f3185b24d5141a235f12d8a450aa86d3a17d4af03049453c607bedab9f953dba3f4e0b6c6512eb56bd9276a13871b56c386dc0e1433c819fddc95a03e
-DIST thunderbird-78.11.0-id.xpi 620681 BLAKE2B 614ef09d3bafdceb05809efc973a38f23b7647561c80365d8b9dadeba0eb871b44af847ddecc0ee14a9ff8fe70c3facca2e1ba2a072ff3bed648c556cacab461 SHA512 2761954d55dda11609a20ce67868b9d83d3bc2608ecdc2a2d5bd8ffed628e80e62696f10b44026f53600becb0c0cadadf486f50e64f8ccffa7948cf1273fa910
-DIST thunderbird-78.11.0-is.xpi 581637 BLAKE2B 2462fcd02e4affe409def825e5e220e1c4a3a0b0ec9e6666c1641dda1aeab472c088688e971ad149d3462eb1d11521c4076142da37e22c52756a2442585a0ea8 SHA512 52b11675f5333e3519e4972030d48f158ad1a266774a387a34012839227607ffc70662d6d94c06e3212825c187261339f112bc3b3181aa89b9c66c2f0e480bdf
-DIST thunderbird-78.11.0-it.xpi 572964 BLAKE2B c272e3f7203dc8494f83075f8121971e9fbee227e99cb84e33db32df61e0504b3a30ccafbeee42757cb437382d98a3251b019522077f1c4bc5012a0487275f52 SHA512 c09e348a4cdc1a682b30358a9c2a8a49342f07de5fe746e17079a11c480a5046cae348b0d8cdf56df3af3a77020feb6d1248bc22ded14c0d2f1f6d3c5b74053a
-DIST thunderbird-78.11.0-ja.xpi 722453 BLAKE2B eac59b6fa660fa3d80f4c968c444b495017b44cb73e9ec28840fd135dea439b5fa481ef10fa57333e2cbbc4d6a68634ce2b1705cbacbfa7be74aff14e41f718e SHA512 c141ca2158307241f8b47fbca516944b81740c7a198f969e502bd774ac868037e9680024d910a737b34b026c465471bc2f493de4a6d6adf5e16c4aec66102cdb
-DIST thunderbird-78.11.0-ka.xpi 717016 BLAKE2B fba12a3dcff7cfe1421bc1d8ea130dff1c3c474e8aeb202463dc1bfcd681ea60e0076a6323ffd270e448dfb01a511ff93e13c906e0ab8f23d0da1c741848e988 SHA512 546d7863ac06da5334a89f8b3e590d596e58cadd3e7fb32420afad64d63ca31e4e8697e59e8f064a1dd1291c9fe6cb8993acac292f968494dde044e10bd71118
-DIST thunderbird-78.11.0-kab.xpi 651922 BLAKE2B 3b94ce7c69c7ed81361e4366c28de31e4e2e6f7e646e587ecf0bd410f3f52c3f284ca61805fe0ee0d86bc7d6763aee8a6071f53fb99d4638ab631451303ccb8e SHA512 60761ebf5d8fb8ff639e9178e5788fdcd9728cef6f69ba4dd9553eacf61b3e0a1ed3aa0489c277bd618745dc64da7587de8ee0f3f8d5f7ae3f93957f5456dec6
-DIST thunderbird-78.11.0-kk.xpi 720464 BLAKE2B bd741e0567c243303ae7287f9f12dfb7c59f286b8638285ea2b44e0bdb911dfc40434438fe7640f0a3a36a0863307ffccdfaac83d3c023cafb14d953f05a753e SHA512 d92a7e142e6e8d01853d55ba0fba3b94df2847a7bfc8c7086d3ab06646c6bc55d3ecf9c63e4dcf1e42b883f297f55fd9ca94e19df12d54d33a406f9b985f1218
-DIST thunderbird-78.11.0-ko.xpi 688207 BLAKE2B 1cc5547c1bd57daaa84557de95f708c9f44f66091b82749622e59030e91a1c1a6e7a503c692b1097f35cb1376634d1e9aef2c1d3ecdb82f02f3b8d7ac8d02ddf SHA512 111c022dfae9705ca43bec679e84345415626e29b6320ce1001e8a00c5b34948ed7dad0548b864ef367d4f8db91b4e56554f2ba7ec490efcea69207184776404
-DIST thunderbird-78.11.0-lt.xpi 660298 BLAKE2B d494291f5c7f5010128da76a704c8b6a780e1b37c6e89b5b4f275c4c3bba69d0e2bb7b7b2e27ee8922085570d5b7f43d65b3d9fad4f7589dcf32d7db965b135d SHA512 02ceeaf31b2d42494d5d1b8351912e4f4df5925e3b1111c0bb59ec84187ae83fd241a99f4f5660a8d7a0bf636b9c53c74fc61640065829735859c633f4f79758
-DIST thunderbird-78.11.0-ms.xpi 572177 BLAKE2B 9ac91c920b272754c6f97c1f0018b7bad5d78b017705f4a2d8d8ae2e54bcaca373d64ebce37cb76a4d99ab4dd17cfa275fc24bf1b6e1c60f062cea43242e9c11 SHA512 5e31a0eb2e34aa45f75ee932150131e5618984d2e7d04acf5cdb4a72c5fec53131ea1bd36e407b98266d9a497219745c2aba9b501ca813a133abd7cab81fa9ac
-DIST thunderbird-78.11.0-nb-NO.xpi 637236 BLAKE2B 86d94e683a3bddd0a344b8c3313dca82ec588a6957e6731734f1368a99e82acbb329f676bd516c43f7a54ad2ce18ee1d839283d132eb15300364477f13807abc SHA512 9953462a1ed7b3ec2cfc979d4379b711ba065d9c519677abe10f0c13196e36830dd6bb549d199b681042200ac64668152b6855e4f23ada38815cf63e3df4e95b
-DIST thunderbird-78.11.0-nl.xpi 644361 BLAKE2B 27a5a7a210ddf4f6c5e880f5234d938d61f513911db6b4954fc3cf97de257f253f089c2e4380294863bc08d8358ab9d3b79b786a0397076565d331ede5d94c66 SHA512 b4ba64c3bfdd3f4f5c52272802e927e2ad0bcd78b7553e7a65a16ecac715e5f9940f4d202097fc05e9b694e56e1ca9ddd99f1fb7f16b749e58a1f84835cadc4f
-DIST thunderbird-78.11.0-nn-NO.xpi 640698 BLAKE2B 64a382fdeb55933aed0f12e4e01c5cb4e858885213cb48c4f95030d61bd8bb50e7bad4ab27bffa85f0a741cd77bcdf9ac962f854cf665a0717f863ab70d30334 SHA512 2cd14aef1333764eab9635b9a676e9412843ca76bad49f68a75ff888a2c8159a6d8790db482c879b620754ee7102656fca3dac78d4ca37c4eb65ca9afc1b17e8
-DIST thunderbird-78.11.0-pa-IN.xpi 633218 BLAKE2B 782271f2f4c3858f3f7e4e9594210f2420f1116c28c2e28d7086194768c611c4f8cef2d26d6afa16a3449617eedef6395f54a1ad96136dde5763da5509744e20 SHA512 a0e5cceaa1b3a4278384c3653f463b9ba7829e24739cb6986b9e2bace54c4724e0747d72c7c8e7de4a0b06523e8722ccc21af3e2467580f2d8e375a62eb859d7
-DIST thunderbird-78.11.0-pl.xpi 637127 BLAKE2B 15bd3782cd937d32665e078bf064b3d359625a546bf160e53ca19e3cb6d0628b68ba5bc2237cc2668e5812ff0fcda98271e5cdf848d5bea59588d23c6355c9e3 SHA512 e6f552fe5cfb51cd1b8fbaa5f5e59606ac032bc4316b694429da2357cc20f466bd2fb93b53e4e8c8397dcb0b688912f838acfea9312ea4c6f78d5874e1350a6b
-DIST thunderbird-78.11.0-pt-BR.xpi 649418 BLAKE2B 5f12a096e4e8f4a1784c5de3042995f40e7bc389d935aabb2dfa6c90aaacfb4899d23ebe177b094fdc601303812096d4972fde661d34c407168c86300e43064a SHA512 8c31c917ef14f6b9ad1064d268bb5c32ac8cda2e43586abbd4dd2e898dbd6699e0c7babd2f0e4607b2ae2ddbb099acda46deda11ef329bad7ed46162bda85454
-DIST thunderbird-78.11.0-pt-PT.xpi 655488 BLAKE2B 34101f209071fbf439ed15b0ce1af5f16f5d07d9adcd84e15e64f2939177bcd192591ec3bcc962df3c6467d55b743867f4bcbecd330af667a758167b2129ac1b SHA512 81db3d1f452b06e08e81f7c40d0fd5ee6887e8c1e618b676dba10a9deee720da318db8b52c9632ae1b727b75e7c3577a355779fe233319f53881ea4b393f5da3
-DIST thunderbird-78.11.0-rm.xpi 646533 BLAKE2B 6ed3823c693a13accdf5293c55e61302f8747b43ded4b36dab0d28b31430174579cc6b8a37605a0ca3ebaf901ad00a15eb9e6fbe22822e17e9569b7d15b2597b SHA512 e0831ee2236dadf6554021c7f4b80329532a39233fa94109d304993f72a9be6436e0ed2f3aeeff928342de1798d4aa225200cd42d517185f8bcb8dc7ee813cf8
-DIST thunderbird-78.11.0-ro.xpi 662634 BLAKE2B d0d396b81621aed365b580dc802f3fd8d70da2814190f87d0007620110f03fcd45cb501a6be7b5fe8f616a2b25c7a312512f51e936d1894300b919fde21b412d SHA512 ac89bbe12cb3db1ab4afdb768ca7681a8620b8fd0ea13753806f8841e5f42b8e069cf8864b5b273e347068e30644c8cdfc748ef8aaecd16eac9e0d9d69b7f426
-DIST thunderbird-78.11.0-ru.xpi 756179 BLAKE2B 97ae08626e6d3cb79549a922cc77d407087b089099bdb313748b35105018cb7dfe20c180ce33590988dea28763801a5883c73384234dacb04a258cbb5045c22d SHA512 218d371689587addb7f58bf77800418e71865655a6b8a741a856ecd19664e714c5a706c28325871a455e14802d2ad19570e4dcc2ec36bb541030d1427a4e07c2
-DIST thunderbird-78.11.0-si.xpi 651107 BLAKE2B 023dd3bfb33421ad40838de454d26c3273edc18f8c37a0a138ef9b31e360639d5fe4c7ecac13d045ef484c95255ac7c8560f7a89de6d3acacb3bd62ae1d718d8 SHA512 b4407aeb29a7dbb11ddb1af9b819b26d02c0cbc0b9f8479d8186d63ad2919ed1f93c3e1f4cdc1033944ac4611623bb9e4cd41e5695873bd0c16f466f0a200ff6
-DIST thunderbird-78.11.0-sk.xpi 643226 BLAKE2B 4538fab12007f8bff1e398d91f4cd8a4ab5daec2a7a02f699fadd9352bf563de37984a2317cfa55979451b8e3ab139d0e9bff6b212895e35dfc47802323d96b8 SHA512 4c097c03a9c5f67d6c315f8d097760260986cf8cc299cbbe8e73c21cb1adccd9f27c91b420f6fd8dff07dfa1d9ef08ce8964dacc4ee2f27353fc6789c000ef5e
-DIST thunderbird-78.11.0-sl.xpi 632387 BLAKE2B 0447e0295494f468d339f716a64155ae7bd06ffe1bfd85d123498b8f7f08946280cd24f07249128cff90677a4bdb38a93dc1494d091d99f193ee35e2c2e0b29c SHA512 88a0188d61f53888221a62cd107c3cd140bea943e9ab04667a84d1fc4cb960e6e7a65b0415db77e5e16ff37edc80a0e4cbf2d1ec4f7cfd51aad4ac04d9715bff
-DIST thunderbird-78.11.0-sq.xpi 657820 BLAKE2B 05dac5425b86dfccdaf9e6851173e57783b9dc542b04b94bc38ac1c26d85e0de2bb5f458a99cbf6e2c1e03e87b4066ef7a0029a75aac072adca1376441737417 SHA512 271b0e279809375bdc32017bee724483de054f8afd29ea467fad49e6ae867447fd63a4ab29997a2f2b50d3cd0b1a68367363e2c1f352729ab0d288fbb6451b84
-DIST thunderbird-78.11.0-sr.xpi 683118 BLAKE2B d3994161023a5e6d678cc32d8e192e3ee3e127b1b4cc0e2d060a3b126757f835f9c5ed2c5bcea1834bd779a412f7b38a02030b818f9dc11128dc4fcd4d892d45 SHA512 f9aba1f45d313d9c6eb6cb2177e218e21c1a6e9e7908675462893dae3354eda896e6ff8a00d3f634883165e01dea5a7550c752e348745489937d7179e3407049
-DIST thunderbird-78.11.0-sv-SE.xpi 648871 BLAKE2B c42ae9287630439a52b77d2ddf4dd00ee83ae7b85a9a7bd184e69b2d7ccbd11352098dfaa1164a1ee6ad3d8df72bd7a16a4991a6c1da4db6d00fd41ac0603d70 SHA512 708950a9bd38375e469f8e0006c4c63f867828f7324e847bc9116f2cdc59c73c4b8a0bfa65568c28d71163cd2cd13f73749590578145d809ee6306a627c17bc1
-DIST thunderbird-78.11.0-th.xpi 712040 BLAKE2B 7d45cc692e84122fbb8abf265d000fddeea685059f93ae862fb0f49f9a6ee46af5f8c40cc06efc849b5704356c7ad2925addd087468216b715399bed14933638 SHA512 739f265f30e43ee707ac8b3f422b3665640133a5303a07ffcbc5c0f503bcc27236fdd43fa8650c18432ad7888d96ebcd1c6d7043d75be27c76723e02bd816671
-DIST thunderbird-78.11.0-tr.xpi 649072 BLAKE2B f2e78a3c0098b4b13d6f0c21a091843a77151785f3c054fead3a42c0a8524af9d3db4ea1fa67f8394dc7e713d4c67b15baef37be1c6fd8f7a8f31adddce7b42a SHA512 d7c2015420542ce94419b3edd6a77fff5ce48206d8705ed83845725ef7f76b7e64d39c033bb419d61bc74fd0aae9472fd5be7670f186b0f778a61fb6d757a65a
-DIST thunderbird-78.11.0-uz.xpi 586597 BLAKE2B 8b064a4ddadf316854546ed33c65aac119376f09091d42c22f47dd8f40ac210d12f5f1a8101b03f9113ed0e5c09e9ea3c21c95525c4a2a0bc2eaac195924c831 SHA512 72be001755d84ec39c00cf2d9a83d787d1716620da0c1a99b8f5ce793c89af89a8f49361a32ec4335c7a900da7ca718e3e38ddc80f81ae22786f158ff7c7ae07
-DIST thunderbird-78.11.0-vi.xpi 674611 BLAKE2B 67834c7860979a438ed61056080b32c7be4416aebf87325172a15ff48f915a0d61c6a45e5cfc84c4aa74cd0f3776e5dc1476e187f7c07c5378abc010ac2af5ae SHA512 336075fc449df3ac1a05d041d7fab80ca7c418cb43bbdb45df50b1a206dc95e0750f1b4b61da6d5473346e183f0c7525ef41de76dab9ff60ff8923b030a67486
-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-bin_i686-78.11.0.tar.bz2 68286013 BLAKE2B 949e86083a46fbea1a7e663ec263fb3e6030bf7779ada6439737af9f871087a2a154f9bcbaf1092ab38e8acc4c7ef78c84dd5b967b01b2fc1d49eee4f3680696 SHA512 519245cc8c28187e7778f2b7a8bcd828c11fd52f57d4ce9549b223dc45b9348414b5a67d7d5ed3fbaa9e3ca6e9064f1ebfb99d5156806532d22e533c9ed9019a
-DIST thunderbird-bin_x86_64-78.11.0.tar.bz2 65289371 BLAKE2B ea4e8f2bf49e3674bdc1375490ce403d69062468b3e75b8ca8293e1d3be89ec7a70b1603f075ad73090d6898eeaad438fa480832c607b72b90499cf4d01fa218 SHA512 a3b633efe617261873ef0a509d182e9024ce028869ae877d8772fc5dd375fde3e67ee6889be1d56c24dab175db22ce9c3610bc215e32b46a3081ac9326ca3fc5
-EBUILD thunderbird-bin-78.11.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
+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-bin_i686-78.12.0.tar.bz2 68301501 BLAKE2B d77c3876c422bbd2646cb336f4a257ff75dfd054cdfd1f3c69c3fe256b9834a4a77a8760721979371af0f6a2e46bad8f661aa7ceac5e4ad65c4a272ea9ea5f51 SHA512 922be4dda848f5023b8e68a9374945a31c4c8dfe00fb4f15aa38a328551bbb7b591069f7255c6cc38474564eacc63f1e609fd7d8fb2bc096ebba9ea79a699aff
+DIST thunderbird-bin_x86_64-78.12.0.tar.bz2 65386721 BLAKE2B 1d726ac903a4615c79ceab7738f202931143e54c6cc40b7fcded80ef0f33edab3e812d6e3275bfb059f20fabbe9f30a963494116a80d6c2c84457ef3bbe9cbf5 SHA512 b67afedf1db46e39ba09f9fa2860af2444ccd6c6b66c70fdae25eabff9aaaf4e6102d7b994e0ac2458c88de3010bfc8dfd857da108a08a5ac61783b6ece542a5
+EBUILD thunderbird-bin-78.12.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.12.0.ebuild
index 908f3ef026b2..908f3ef026b2 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.12.0.ebuild
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 803b5a288a3b..969d858b061a 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,73 +6,7 @@ AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de8
 AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71ffe40b2aa7179d8a5622fe9b837f9430f93371cc83582118682fbb95d8ed5f66b4019924cf9b023e67cb696c SHA512 41a680a7d615bbfceabb49c9753feac5efb1276ad0e709164ee16fb4a0655886da29ac60bf1fc6886e1d4c00b84b3889cb85f42f1ebbc72a52bce80817a4ead0
 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
-DIST thunderbird-78.11.0-be.xpi 666676 BLAKE2B 81877cd6f49e61d462d22510ed82b3a6e31ce34d2d11f253ee6ce31e7569dd6f3f5e4fd0ff41a7404c3b374fe01b6495af064a722f445c4ac23d7941e546b9ab SHA512 11243c238d1fff8519e58d5f138b3830f398c5f561a968d448dbe3703d81ab98056ff65dd80ae3c268ddc14583437a1b4988323ae20c235652619c887e89a137
-DIST thunderbird-78.11.0-bg.xpi 672416 BLAKE2B 625560636cbd8522d9425e395ce28829644d86700c365987ba31e92c9d8fb8ea5d132f62ff12b6386c41dd995d3b95d49e55c84c5be7d68e687228f2f510b0be SHA512 1c16a3ba03579a462ed1f36eadb409c81cfa6185f6112a674aea9cbf445529d66c51e844ea7ec6c9c89ed8bdf593223a80116f976dd242078487c18a20f7abe4
-DIST thunderbird-78.11.0-br.xpi 604529 BLAKE2B b2e9f794d23b4a78209ffa355db99ce06ce573bfc9c3ee69a0cf82ebfca1e06c06b3e6ba869dfed72abe2d6ef84a87224fe713febe2c00828770a0a13e0a70e4 SHA512 f4a67b79ba899c29f6a0ee5ee2677a75898ecd417a5460af52e1dd72a99b985db9f00fe682a2249cf76ec7576316a52d24995b39e5e5ecac5fffc7b3abfb1126
-DIST thunderbird-78.11.0-ca.xpi 620448 BLAKE2B 9b88bbb31a16934ca112f806db6b8a7225ce7969073b297b03f71522c5f5f069958fce80608da0e30cfd7edac5b1c5f9c161078b7210affa48e103e3e5aa7185 SHA512 5abf0bb7f9b9ffb784ce89bbc74deebdfd042ca465b14cd7560bc6e8d774fac8d1998dd1afe3bab31a2347bddb4b64621bce39429ee49c17302a0cd7c85987cb
-DIST thunderbird-78.11.0-cak.xpi 635650 BLAKE2B 2d127cd4601de8b7aa114a3a96ec21e35dc7e0fc2da0df3a8a075ef2abfd044c797059cfce2167b839398c0762ca8378b7878c7208f0cfecf5ed4ebcb0c54883 SHA512 d74ab66d99895b6ba97e2e2ea8d3a285d0ba87f242f5f5ebcd155a15155b23db3eafd19599eae4d4f759efbbffa10b70ecfe899751c2f0e7c31fe7e51e47f99a
-DIST thunderbird-78.11.0-cs.xpi 635344 BLAKE2B 9ca8d944d2be138d90a8da9e93d3e7a2ef5306dc3bad3fe874bb62347359f58472d38794210de3898774c2b1ede57b5a4cca10d210b63dd2aaa44e936d41ee7d SHA512 b967644424cfc8132a76ba82dbca88b6c712bf1c37f46d57f0f17cbb493de4e3468c9ed6b20ef030c087316c263cc081fa7fb796c5f9cdaf3e34212f211ddfb4
-DIST thunderbird-78.11.0-cy.xpi 646232 BLAKE2B 0f180f548f4bbca346b877092b940889ebdd8b2e97819052744a0b0ba2bdddc413d335e13b3392b0e02a7c347616d12cf266bae8d19f5365779eca449119599e SHA512 b9bdd207ab9165e383a51f094d8ffa07ac20bf9d15f0f6832ccccc3342244ab7ba3344e20d3ac4c3ade70fbfab7c5598e9051907427a4553aa63022ac23fcef3
-DIST thunderbird-78.11.0-da.xpi 620991 BLAKE2B db619e56d9140b547055ed21d13590ffae23ca6528603cb40a68c7b5b46ae0a70bb267f79fd6b450cc106541491cb95072e8d34e1f22ccde3ae7138c809cde7a SHA512 7417e454e1621e47df72b749da146faa0d9c88955c85655fb3edbe4a8e550788e9f6c53565a78cfe82e9ce0ab3524052cbfa0fdff5a71d2291284299a4ee4c33
-DIST thunderbird-78.11.0-de.xpi 665194 BLAKE2B af74caf1d4a6ae13ee3e6c59a3dd562333588c4b855b1f2cebcdf1f36a02fe2645bf6f402ca22cc69c7e38febabbf2cd63858eca31a1450224c7a5f7b68e8432 SHA512 ee3163c6b9e3c1583c0c3b5d33112f5e9f37b336e3ec52980dee7bab02f016a4b6a7f6f82851932c4d72f7c85428e24e308e798fe34c41b8cec3cb226b3c150f
-DIST thunderbird-78.11.0-dsb.xpi 666778 BLAKE2B 26a14ff3711b6789b62cfab66b5e125bb4b1d41489b32a939602d37571503539022e7a72503417eb4f8d6d8f12c1d0ed8097e6d3e4cdef6b3c3b609d8209d279 SHA512 d8781e76172b29f68943f5f3bcf922b40937495a189ef709dcae19e2977cea27caebdb6b17989fd594bf707fdb0a288982d7ee4bbc916af987add20cf55b55d5
-DIST thunderbird-78.11.0-el.xpi 774458 BLAKE2B 5ca290b9df4e7a7d7cb109bf1f026f88b47941d0e224de56ffe2fb1a8b4df8818584f163cb48657d022e553821349e1f2fb8f27a102de0986912402b9dd519cd SHA512 06d1dcc0b17604cdd68bf8c0b0dc6a014ae6f70c05b4a1c5b2768a45eef8099686b307ce3e0b13a1d294ef45f1707cc7252c0c85d6b0bcf204cacf189f63bedd
-DIST thunderbird-78.11.0-en-CA.xpi 611764 BLAKE2B 3c7df065c37712eeeb4d383eb42673ec31e8ba9d3d80a042728de1c276619ed19dc509762ec90f13b13a48b73991d2b9aee33df101039f18a4096ef0640f5e59 SHA512 843582f12e6d32c4eb27a0e984a96a406fa39b1adcd253c372e05c826e623e8059ccc704f7438cd4a14216b4251ceaa8c5b8b48dd8d34cc9f12336a3fb1ffe89
-DIST thunderbird-78.11.0-en-GB.xpi 611188 BLAKE2B 9702b2e97c951589974f5b7f80636838261da021c4736e08416f15b0a7d30bc0885c6570fdc1f127111ce1f68e2251f181bc19b9bec887b7b1034becfc166fa4 SHA512 f0ecae7a6d3272cc779c35859647a86ec2f857499b47634006db528373a43aac79329e9ffeee304eb0a95195915f7aeb1170ef74240bb67e560d4305f960b21c
-DIST thunderbird-78.11.0-es-AR.xpi 657793 BLAKE2B 895e2b21661c7c82475d3c93695e011f15f44d63cb49eab3b4b0c6a6d7d062eeb4282b1e16843d9202dc172e146406ed21851197e5eaff52dbbd81de0ea4f441 SHA512 570adcfa7416d1d3b2dbf6923927580c1334efd16ad024ab10df0a9c20558aaf4c14fb67245fe7d72b1d14454b759b38e3545fb62e9f9eb3feb881773dfcb6bc
-DIST thunderbird-78.11.0-es-ES.xpi 569808 BLAKE2B fd1edf9defcb06a2be32a065c72a479b43d66122636a5024d415d91358296a516730942aaf486fd18b391cc66a3282d8ac81263df261b5a98e3ec8a23cde3a18 SHA512 64fa4b4eb00c95dc8ccdc369cfc3c50a06bda3fc95a4d5625d677e27354f116d33b3e7de1697dfd16fa6429dcfbcbc2c7b8e4cdc9d6598ac08487d12b3d898ca
-DIST thunderbird-78.11.0-et.xpi 597738 BLAKE2B 449b1057f9647f36e725368933b56125bf22377be1551c5c1a2c2b2dd4627114ec8257dc7b6960a2d31465c3026ce2f29c91d1c86fe7aa3741b9a92f425a9f51 SHA512 9f36639ddcc96851585a1cd5d36fcacbc4bbb6c1155cab5da1376f40b0a2a096c0d923ee00db32ff3a40c6543b957ae75472b1a052310be7cb0539cb3a826619
-DIST thunderbird-78.11.0-eu.xpi 632960 BLAKE2B 7953b03d89922c61a4b2b4fd1328cc9f39b0095d071738c08531883ce4636a50669f62d26b87750c573638e0db48fb67aba18df70106636789306ac1ffe690b9 SHA512 e590ac6762c92b95e7c820f86f1484f72acf878489356c74b346073a39417b1db5a99a233d2466bf4f350516dab0279753e5724588bc0edca5965831c96a0e13
-DIST thunderbird-78.11.0-fa.xpi 639752 BLAKE2B 9762634fb297c77110d6d45a64ccfc298510c838aaba9203a1e07b640e6aa72fa3083f722a070864927e0f687a6b764aa0cd51df79c50a1d9c71b289c0f13ade SHA512 de2725034fd0373ea8955905079f4eabfe1d2baba44fbdcd614fd85ea33a8b8eabf4371f19e6f046929cbd56e4bf70e862693f1fbd97050c3411c83de8317234
-DIST thunderbird-78.11.0-fi.xpi 642456 BLAKE2B 5af89a5311f7a373cd07a6350ef5bbc865be21d53cc33e5aa7a0ccf6d2963a25cbfb3cdac7c805f66feb084d807fed3a72aa3dd561c3d03ca647faaa6b3daa19 SHA512 0a22233c37b279b344862c0d156f938c588921aefc4852f3d4631a459b5a177cb74495ed61bbb90329aeb781f909cd9a330d2153114b8ebd64f53eb37bfa7965
-DIST thunderbird-78.11.0-fr.xpi 669492 BLAKE2B def525cee10efa0978d778ddb0ccd9672eb51ab5d7eb5a4a09b64773b410b5d2b3d17b93445cd324431cdec0ac8da8e72bab5534d60c694f2a50172280156174 SHA512 18b4aa4cf6684f0510b8e3cf990c79bb5b3c61ae37012dda0bc14febfa9ecb53f4cc86f21c40deca972972b1e89a9f15231a7498c3578ab22d1753b3dc397dff
-DIST thunderbird-78.11.0-fy-NL.xpi 653078 BLAKE2B 043b2ecc0f54e0ba9b6f75ed1a0e8502ff4e5788e41d8c54a4895a107fd044fcb1aa4237a1e593f1cdcb8782e25226b6ba996df830aa1ab5b005410a7988c558 SHA512 e3b295fdb187715bda511105be726bddbbcd8ca3446bb8199937bcf98d16caa5ff7df52c9ef6170b85b8b0a0369179744e5a02283908c5fd1a3fede244d3ad77
-DIST thunderbird-78.11.0-ga-IE.xpi 600708 BLAKE2B 9bb307d36ce5b9178985b818b75f417a4f44b29e748b847427598cd34a1202a15a5b2fbad00060bb98dd2ac0e1881845dbf23544f4defb16932c228fbe7eac22 SHA512 52a330bb02aac06ab2588537316a6241332bec6e2d616a3c5bba44fba1d50d4bc25ed3ca91372c74979ea6c92eadf484170e033bb0f2a12e22b54da0ac88fe4b
-DIST thunderbird-78.11.0-gd.xpi 609380 BLAKE2B 8e33f096bc758e7d13c67b46f7508941c14dc8936678df293edb8782dc625c0b93ecb3b3d6df2b060e318430b9ced5c79c884b3fd495156e052e3edbf045d217 SHA512 e41728ba4d570995fcc382d372c7f1bf83ec1b554371748580b48d7f119047075439de662bc17bfeb60e20134f1f29ff3855c6e8a6e09498db606194c651dd05
-DIST thunderbird-78.11.0-gl.xpi 615733 BLAKE2B 2b5364a9d4c03540091a60195f9a3d7b18cee3857693613c8d121731f1ff370209134ddffc6190e4e95b8ac5c32a7fbc8df81497e6dfaba680f91dc8f46feb2f SHA512 c7b2aee95fdf67a65a9ffcb48ce8da2c720b6a6674a945012289f53d30e855c0602fc5df8b7186aadacb993fc2b1494bb79427d095db1daffd724e6fdec5a8db
-DIST thunderbird-78.11.0-he.xpi 640490 BLAKE2B f79910c79f9ba9d5ccbf72b5104b71837a77d53dcf92627f264b7a9f8717dc08ade847d717fac74b72ba102e204daa5af673a9438a52a4353890148456ebfa1c SHA512 54122ab286ae100a38d0e9172d447d85df2692ea47baf57bb4632204c689ea6db83546610db1f0a93795eb7316bdee7db8b7adba8975bc51729b368df1bdc546
-DIST thunderbird-78.11.0-hr.xpi 629032 BLAKE2B 137a179f6d3b774e177fd8d1b7035c5a872a998a2f22b5507007e7655e3b70d07414c9dd97c793276a892115c031afbb37e81a61f48ea830419e597b01fa9fc0 SHA512 2714cc3c735c227e7da7c61d078648814c1533f18ad18f90edc66a3e35af924b0728e335d3381c211333297aeb7cae5122f3803554ab825fbce54c55f0bc5087
-DIST thunderbird-78.11.0-hsb.xpi 668608 BLAKE2B 61dccd236d7fa6d0e0df69727650f0f2710f14f6733b71e99b3f349f9446d551de861d5b44a3b8096a3a36503cdda7313d3459c974adabd19d8bb66f6bdd1df3 SHA512 d9461ec874a3c4a14ea8450868ec4193ed160df3e43fb083b1bc0cd3c9e208a9698f5b84cb4088e02fcfcad83e88a98406a8782672c57f3caf609917443620ce
-DIST thunderbird-78.11.0-hu.xpi 679836 BLAKE2B e58d2bfe5c6919fc46ab323a325dcd3ea6b2069763da16f8cdeb79a50dd7a1812f01e42a89abaa61d1bee4dab608c15e898f3563fe2b5eb2d2dfd61cd4e08d48 SHA512 b27bc91598df5b47453593c0ca75217f59143db756a496386907992bc9d7d259655985459c6cacf9736b5d12f8ebd92d7419c478892e22a2c6747a05bbdd3c64
-DIST thunderbird-78.11.0-hy-AM.xpi 713327 BLAKE2B 25269f40b57361629a7212bfd1a5e8525e78d388a88e3648eea9316e7a181ecb79ca1657b1699103780fbecdb77ae939d2db29b424dcc00abb3bc8a65cf95b1c SHA512 389a018f3185b24d5141a235f12d8a450aa86d3a17d4af03049453c607bedab9f953dba3f4e0b6c6512eb56bd9276a13871b56c386dc0e1433c819fddc95a03e
-DIST thunderbird-78.11.0-id.xpi 620681 BLAKE2B 614ef09d3bafdceb05809efc973a38f23b7647561c80365d8b9dadeba0eb871b44af847ddecc0ee14a9ff8fe70c3facca2e1ba2a072ff3bed648c556cacab461 SHA512 2761954d55dda11609a20ce67868b9d83d3bc2608ecdc2a2d5bd8ffed628e80e62696f10b44026f53600becb0c0cadadf486f50e64f8ccffa7948cf1273fa910
-DIST thunderbird-78.11.0-is.xpi 581637 BLAKE2B 2462fcd02e4affe409def825e5e220e1c4a3a0b0ec9e6666c1641dda1aeab472c088688e971ad149d3462eb1d11521c4076142da37e22c52756a2442585a0ea8 SHA512 52b11675f5333e3519e4972030d48f158ad1a266774a387a34012839227607ffc70662d6d94c06e3212825c187261339f112bc3b3181aa89b9c66c2f0e480bdf
-DIST thunderbird-78.11.0-it.xpi 572964 BLAKE2B c272e3f7203dc8494f83075f8121971e9fbee227e99cb84e33db32df61e0504b3a30ccafbeee42757cb437382d98a3251b019522077f1c4bc5012a0487275f52 SHA512 c09e348a4cdc1a682b30358a9c2a8a49342f07de5fe746e17079a11c480a5046cae348b0d8cdf56df3af3a77020feb6d1248bc22ded14c0d2f1f6d3c5b74053a
-DIST thunderbird-78.11.0-ja.xpi 722453 BLAKE2B eac59b6fa660fa3d80f4c968c444b495017b44cb73e9ec28840fd135dea439b5fa481ef10fa57333e2cbbc4d6a68634ce2b1705cbacbfa7be74aff14e41f718e SHA512 c141ca2158307241f8b47fbca516944b81740c7a198f969e502bd774ac868037e9680024d910a737b34b026c465471bc2f493de4a6d6adf5e16c4aec66102cdb
-DIST thunderbird-78.11.0-ka.xpi 717016 BLAKE2B fba12a3dcff7cfe1421bc1d8ea130dff1c3c474e8aeb202463dc1bfcd681ea60e0076a6323ffd270e448dfb01a511ff93e13c906e0ab8f23d0da1c741848e988 SHA512 546d7863ac06da5334a89f8b3e590d596e58cadd3e7fb32420afad64d63ca31e4e8697e59e8f064a1dd1291c9fe6cb8993acac292f968494dde044e10bd71118
-DIST thunderbird-78.11.0-kab.xpi 651922 BLAKE2B 3b94ce7c69c7ed81361e4366c28de31e4e2e6f7e646e587ecf0bd410f3f52c3f284ca61805fe0ee0d86bc7d6763aee8a6071f53fb99d4638ab631451303ccb8e SHA512 60761ebf5d8fb8ff639e9178e5788fdcd9728cef6f69ba4dd9553eacf61b3e0a1ed3aa0489c277bd618745dc64da7587de8ee0f3f8d5f7ae3f93957f5456dec6
-DIST thunderbird-78.11.0-kk.xpi 720464 BLAKE2B bd741e0567c243303ae7287f9f12dfb7c59f286b8638285ea2b44e0bdb911dfc40434438fe7640f0a3a36a0863307ffccdfaac83d3c023cafb14d953f05a753e SHA512 d92a7e142e6e8d01853d55ba0fba3b94df2847a7bfc8c7086d3ab06646c6bc55d3ecf9c63e4dcf1e42b883f297f55fd9ca94e19df12d54d33a406f9b985f1218
-DIST thunderbird-78.11.0-ko.xpi 688207 BLAKE2B 1cc5547c1bd57daaa84557de95f708c9f44f66091b82749622e59030e91a1c1a6e7a503c692b1097f35cb1376634d1e9aef2c1d3ecdb82f02f3b8d7ac8d02ddf SHA512 111c022dfae9705ca43bec679e84345415626e29b6320ce1001e8a00c5b34948ed7dad0548b864ef367d4f8db91b4e56554f2ba7ec490efcea69207184776404
-DIST thunderbird-78.11.0-lt.xpi 660298 BLAKE2B d494291f5c7f5010128da76a704c8b6a780e1b37c6e89b5b4f275c4c3bba69d0e2bb7b7b2e27ee8922085570d5b7f43d65b3d9fad4f7589dcf32d7db965b135d SHA512 02ceeaf31b2d42494d5d1b8351912e4f4df5925e3b1111c0bb59ec84187ae83fd241a99f4f5660a8d7a0bf636b9c53c74fc61640065829735859c633f4f79758
-DIST thunderbird-78.11.0-ms.xpi 572177 BLAKE2B 9ac91c920b272754c6f97c1f0018b7bad5d78b017705f4a2d8d8ae2e54bcaca373d64ebce37cb76a4d99ab4dd17cfa275fc24bf1b6e1c60f062cea43242e9c11 SHA512 5e31a0eb2e34aa45f75ee932150131e5618984d2e7d04acf5cdb4a72c5fec53131ea1bd36e407b98266d9a497219745c2aba9b501ca813a133abd7cab81fa9ac
-DIST thunderbird-78.11.0-nb-NO.xpi 637236 BLAKE2B 86d94e683a3bddd0a344b8c3313dca82ec588a6957e6731734f1368a99e82acbb329f676bd516c43f7a54ad2ce18ee1d839283d132eb15300364477f13807abc SHA512 9953462a1ed7b3ec2cfc979d4379b711ba065d9c519677abe10f0c13196e36830dd6bb549d199b681042200ac64668152b6855e4f23ada38815cf63e3df4e95b
-DIST thunderbird-78.11.0-nl.xpi 644361 BLAKE2B 27a5a7a210ddf4f6c5e880f5234d938d61f513911db6b4954fc3cf97de257f253f089c2e4380294863bc08d8358ab9d3b79b786a0397076565d331ede5d94c66 SHA512 b4ba64c3bfdd3f4f5c52272802e927e2ad0bcd78b7553e7a65a16ecac715e5f9940f4d202097fc05e9b694e56e1ca9ddd99f1fb7f16b749e58a1f84835cadc4f
-DIST thunderbird-78.11.0-nn-NO.xpi 640698 BLAKE2B 64a382fdeb55933aed0f12e4e01c5cb4e858885213cb48c4f95030d61bd8bb50e7bad4ab27bffa85f0a741cd77bcdf9ac962f854cf665a0717f863ab70d30334 SHA512 2cd14aef1333764eab9635b9a676e9412843ca76bad49f68a75ff888a2c8159a6d8790db482c879b620754ee7102656fca3dac78d4ca37c4eb65ca9afc1b17e8
-DIST thunderbird-78.11.0-pa-IN.xpi 633218 BLAKE2B 782271f2f4c3858f3f7e4e9594210f2420f1116c28c2e28d7086194768c611c4f8cef2d26d6afa16a3449617eedef6395f54a1ad96136dde5763da5509744e20 SHA512 a0e5cceaa1b3a4278384c3653f463b9ba7829e24739cb6986b9e2bace54c4724e0747d72c7c8e7de4a0b06523e8722ccc21af3e2467580f2d8e375a62eb859d7
-DIST thunderbird-78.11.0-pl.xpi 637127 BLAKE2B 15bd3782cd937d32665e078bf064b3d359625a546bf160e53ca19e3cb6d0628b68ba5bc2237cc2668e5812ff0fcda98271e5cdf848d5bea59588d23c6355c9e3 SHA512 e6f552fe5cfb51cd1b8fbaa5f5e59606ac032bc4316b694429da2357cc20f466bd2fb93b53e4e8c8397dcb0b688912f838acfea9312ea4c6f78d5874e1350a6b
-DIST thunderbird-78.11.0-pt-BR.xpi 649418 BLAKE2B 5f12a096e4e8f4a1784c5de3042995f40e7bc389d935aabb2dfa6c90aaacfb4899d23ebe177b094fdc601303812096d4972fde661d34c407168c86300e43064a SHA512 8c31c917ef14f6b9ad1064d268bb5c32ac8cda2e43586abbd4dd2e898dbd6699e0c7babd2f0e4607b2ae2ddbb099acda46deda11ef329bad7ed46162bda85454
-DIST thunderbird-78.11.0-pt-PT.xpi 655488 BLAKE2B 34101f209071fbf439ed15b0ce1af5f16f5d07d9adcd84e15e64f2939177bcd192591ec3bcc962df3c6467d55b743867f4bcbecd330af667a758167b2129ac1b SHA512 81db3d1f452b06e08e81f7c40d0fd5ee6887e8c1e618b676dba10a9deee720da318db8b52c9632ae1b727b75e7c3577a355779fe233319f53881ea4b393f5da3
-DIST thunderbird-78.11.0-rm.xpi 646533 BLAKE2B 6ed3823c693a13accdf5293c55e61302f8747b43ded4b36dab0d28b31430174579cc6b8a37605a0ca3ebaf901ad00a15eb9e6fbe22822e17e9569b7d15b2597b SHA512 e0831ee2236dadf6554021c7f4b80329532a39233fa94109d304993f72a9be6436e0ed2f3aeeff928342de1798d4aa225200cd42d517185f8bcb8dc7ee813cf8
-DIST thunderbird-78.11.0-ro.xpi 662634 BLAKE2B d0d396b81621aed365b580dc802f3fd8d70da2814190f87d0007620110f03fcd45cb501a6be7b5fe8f616a2b25c7a312512f51e936d1894300b919fde21b412d SHA512 ac89bbe12cb3db1ab4afdb768ca7681a8620b8fd0ea13753806f8841e5f42b8e069cf8864b5b273e347068e30644c8cdfc748ef8aaecd16eac9e0d9d69b7f426
-DIST thunderbird-78.11.0-ru.xpi 756179 BLAKE2B 97ae08626e6d3cb79549a922cc77d407087b089099bdb313748b35105018cb7dfe20c180ce33590988dea28763801a5883c73384234dacb04a258cbb5045c22d SHA512 218d371689587addb7f58bf77800418e71865655a6b8a741a856ecd19664e714c5a706c28325871a455e14802d2ad19570e4dcc2ec36bb541030d1427a4e07c2
-DIST thunderbird-78.11.0-si.xpi 651107 BLAKE2B 023dd3bfb33421ad40838de454d26c3273edc18f8c37a0a138ef9b31e360639d5fe4c7ecac13d045ef484c95255ac7c8560f7a89de6d3acacb3bd62ae1d718d8 SHA512 b4407aeb29a7dbb11ddb1af9b819b26d02c0cbc0b9f8479d8186d63ad2919ed1f93c3e1f4cdc1033944ac4611623bb9e4cd41e5695873bd0c16f466f0a200ff6
-DIST thunderbird-78.11.0-sk.xpi 643226 BLAKE2B 4538fab12007f8bff1e398d91f4cd8a4ab5daec2a7a02f699fadd9352bf563de37984a2317cfa55979451b8e3ab139d0e9bff6b212895e35dfc47802323d96b8 SHA512 4c097c03a9c5f67d6c315f8d097760260986cf8cc299cbbe8e73c21cb1adccd9f27c91b420f6fd8dff07dfa1d9ef08ce8964dacc4ee2f27353fc6789c000ef5e
-DIST thunderbird-78.11.0-sl.xpi 632387 BLAKE2B 0447e0295494f468d339f716a64155ae7bd06ffe1bfd85d123498b8f7f08946280cd24f07249128cff90677a4bdb38a93dc1494d091d99f193ee35e2c2e0b29c SHA512 88a0188d61f53888221a62cd107c3cd140bea943e9ab04667a84d1fc4cb960e6e7a65b0415db77e5e16ff37edc80a0e4cbf2d1ec4f7cfd51aad4ac04d9715bff
-DIST thunderbird-78.11.0-sq.xpi 657820 BLAKE2B 05dac5425b86dfccdaf9e6851173e57783b9dc542b04b94bc38ac1c26d85e0de2bb5f458a99cbf6e2c1e03e87b4066ef7a0029a75aac072adca1376441737417 SHA512 271b0e279809375bdc32017bee724483de054f8afd29ea467fad49e6ae867447fd63a4ab29997a2f2b50d3cd0b1a68367363e2c1f352729ab0d288fbb6451b84
-DIST thunderbird-78.11.0-sr.xpi 683118 BLAKE2B d3994161023a5e6d678cc32d8e192e3ee3e127b1b4cc0e2d060a3b126757f835f9c5ed2c5bcea1834bd779a412f7b38a02030b818f9dc11128dc4fcd4d892d45 SHA512 f9aba1f45d313d9c6eb6cb2177e218e21c1a6e9e7908675462893dae3354eda896e6ff8a00d3f634883165e01dea5a7550c752e348745489937d7179e3407049
-DIST thunderbird-78.11.0-sv-SE.xpi 648871 BLAKE2B c42ae9287630439a52b77d2ddf4dd00ee83ae7b85a9a7bd184e69b2d7ccbd11352098dfaa1164a1ee6ad3d8df72bd7a16a4991a6c1da4db6d00fd41ac0603d70 SHA512 708950a9bd38375e469f8e0006c4c63f867828f7324e847bc9116f2cdc59c73c4b8a0bfa65568c28d71163cd2cd13f73749590578145d809ee6306a627c17bc1
-DIST thunderbird-78.11.0-th.xpi 712040 BLAKE2B 7d45cc692e84122fbb8abf265d000fddeea685059f93ae862fb0f49f9a6ee46af5f8c40cc06efc849b5704356c7ad2925addd087468216b715399bed14933638 SHA512 739f265f30e43ee707ac8b3f422b3665640133a5303a07ffcbc5c0f503bcc27236fdd43fa8650c18432ad7888d96ebcd1c6d7043d75be27c76723e02bd816671
-DIST thunderbird-78.11.0-tr.xpi 649072 BLAKE2B f2e78a3c0098b4b13d6f0c21a091843a77151785f3c054fead3a42c0a8524af9d3db4ea1fa67f8394dc7e713d4c67b15baef37be1c6fd8f7a8f31adddce7b42a SHA512 d7c2015420542ce94419b3edd6a77fff5ce48206d8705ed83845725ef7f76b7e64d39c033bb419d61bc74fd0aae9472fd5be7670f186b0f778a61fb6d757a65a
-DIST thunderbird-78.11.0-uz.xpi 586597 BLAKE2B 8b064a4ddadf316854546ed33c65aac119376f09091d42c22f47dd8f40ac210d12f5f1a8101b03f9113ed0e5c09e9ea3c21c95525c4a2a0bc2eaac195924c831 SHA512 72be001755d84ec39c00cf2d9a83d787d1716620da0c1a99b8f5ce793c89af89a8f49361a32ec4335c7a900da7ca718e3e38ddc80f81ae22786f158ff7c7ae07
-DIST thunderbird-78.11.0-vi.xpi 674611 BLAKE2B 67834c7860979a438ed61056080b32c7be4416aebf87325172a15ff48f915a0d61c6a45e5cfc84c4aa74cd0f3776e5dc1476e187f7c07c5378abc010ac2af5ae SHA512 336075fc449df3ac1a05d041d7fab80ca7c418cb43bbdb45df50b1a206dc95e0750f1b4b61da6d5473346e183f0c7525ef41de76dab9ff60ff8923b030a67486
-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
@@ -138,6 +72,5 @@ DIST thunderbird-78.12.0-vi.xpi 674606 BLAKE2B b325878404c5de61418ada8c67495bbed
 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
+EBUILD thunderbird-78.12.0.ebuild 31630 BLAKE2B 981b56156c083733ce81fdf101d987299dd3ede95f26cfec28509e1a0830fd403377f0a4e5fd2c5bd8915abc395a04987e955c01d3f3868e2282fd5d6e3f4ca1 SHA512 c14d3002b04855045b482674e51410eda99552c2e44c067afa85d9dd6bb32b5deb50ef8f02c3c7d9b27da453cffa8b90c46f1692da202e4d46e3b26525b35267
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.11.0.ebuild b/mail-client/thunderbird/thunderbird-78.11.0.ebuild
deleted file mode 100644
index 878962ef03e1..000000000000
--- a/mail-client/thunderbird/thunderbird-78.11.0.ebuild
+++ /dev/null
@@ -1,1108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-14.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
-		ewarn "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
-			ewarn "=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
-				ewarn "=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-client/thunderbird/thunderbird-78.12.0.ebuild b/mail-client/thunderbird/thunderbird-78.12.0.ebuild
index d5a0e95087de..9823bae0f4ad 100644
--- a/mail-client/thunderbird/thunderbird-78.12.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-78.12.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0/$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 31ea5d4a4ccd..c5a1af839f34 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index b6ff95c36f18..30648627093d 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,6 +1,6 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 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 3734 BLAKE2B 897b4d4874e65eac748c691ff8e33f3d06dc7c2863131b097b063ccfe8ee5a2ef482ac13e0f48b2ec8b967a37dad331c956df0851bc184fd18626253e5697e1f SHA512 67d63de48374fb1b125208ea6b5ac6a29d2223b273b9467e0ff4a9e86a5287e7853e84c145695dccb1b3a298d69ba1749c3ac3e6904487b715f960e4c52814ea
-MISC metadata.xml 831 BLAKE2B 29a5717658b796c2cccd8314136429ea280806d9577f7f9be49fd2f52da21f77b8dc9c079a4d57a49c2a9447abd239c686574dfe299b3a3aed34357dba37456a SHA512 639441fd16521622e2ca72fa6c44560ee9a237395c4bc25e1013a4404d05d9d64e828a50ce7293ebb85f9dcf231fcbb57769a0260592d801cdff3af6debab4c7
+EBUILD bogofilter-1.2.4-r4.ebuild 3776 BLAKE2B ca33d99ba26303b43236143b6039f640e2fd2a85ef37c3e5efd8a06d92d941e201cb25d9e7b30e3c9dd876aeba69cafe9ac9bab20f14a17984a331f173d7c628 SHA512 57925f55342e5c6adcbd62d59523f5b9082f80843e66eef83e1f5e720dee7c20b5ed7bbff9d26185a27aa991a803ae2e25589dc35a5801f68c6fc375982cbab1
+EBUILD bogofilter-1.2.5-r1.ebuild 3735 BLAKE2B 4ec21b0d88008c9c1e4103b7d2e8601f30eec94196139be2430435051b2260f657fcc5efcf95e778d9e8749b37d6bd394c00402fadb285e148cb0f508bbfd167 SHA512 6cca07e3972056a32f47feb5334d5368209068d85d1c7094f7ca102668e50e291bfe0bbabba709bc078b2fce0fbb4fdfc261d2b7b56c6e320ee7f15eb933836f
+MISC metadata.xml 603 BLAKE2B fcd011f6d9229b71b37139e18d232297f138d56901b4bd61a9a4b5b6d8a7de6ace1d020e73b5bfc4e6a72876a1380f472c1d359136991f76530ea7493b10698a SHA512 43d591e4893f97a8be8527d1de553e6a835a45439489ba9196b9cea2eb71008baa0bc5d5e525ddf7e7f885212144af69207b2fc22c6f70b71dd9f73223fade94
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
deleted file mode 100644
index 833ba677f9bf..000000000000
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="berkdb sqlite tokyocabinet"
-
-# pax needed for bf_tar
-DEPEND="
-	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:* )
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-test-env.patch" )
-
-pkg_setup() {
-	has_version mail-filter/bogofilter || return 0
-	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
-			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
-			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
-		) ; then
-		ewarn
-		ewarn "If you want to switch the database backend, you must dump the wordlist"
-		ewarn "with the current version (old use flags) and load it with the new version!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 445918
-	sed -i -e 's/ -ggdb//' configure.ac || die
-
-	# bug 421747
-	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} || die
-
-	# bug 654990
-	sed -i -e 's/t.bulkmode//' \
-		-e 's/t.dump.load//' \
-		-e 's/t.nonascii.replace//' \
-		src/tests/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="" berkdb=true
-	myconf="--without-included-gsl"
-
-	# determine backend: berkdb *is* default
-	if use berkdb && use sqlite ; then
-		elog "Both useflags berkdb and sqlite are in USE:"
-		elog "Using berkdb as database backend."
-	elif use berkdb && use tokyocabinet ; then
-		elog "Both useflags berkdb and tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	elif use sqlite && use tokyocabinet ; then
-		elog "Both useflags sqlite and tokyocabinet are in USE:"
-		elog "Using sqlite as database backend."
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use tokyocabinet ; then
-		myconf="${myconf} --with-database=tokyocabinet"
-		berkdb=false
-	elif ! use berkdb ; then
-		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	fi
-
-	# Include the right berkdb headers for FreeBSD
-	if ${berkdb} ; then
-		append-cppflags "-I$(db_includedir)"
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	emake -C src/ check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
-		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
-		contrib/{spamitarium,stripsearch}.pl
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
-		contrib/vm-bogofilter.el \
-		contrib/{trainbogo,scramble}.sh
-
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
-		doc/integrating-with-* doc/README.{db,sqlite}
-
-	dodoc -r doc/*.html
-
-	dodir /usr/share/doc/${PF}/samples
-	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
-	rmdir "${D}"/etc || die
-}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r4.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r4.ebuild
new file mode 100644
index 000000000000..f7de05ae32a1
--- /dev/null
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="berkdb +sqlite tokyocabinet"
+
+# pax needed for bf_tar
+DEPEND="
+	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:* )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-test-env.patch" )
+
+pkg_setup() {
+	has_version mail-filter/bogofilter || return 0
+	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
+			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
+			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
+		) ; then
+		ewarn
+		ewarn "If you want to switch the database backend, you must dump the wordlist"
+		ewarn "with the current version (old use flags) and load it with the new version!"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 445918
+	sed -i -e 's/ -ggdb//' configure.ac || die
+
+	# bug 421747
+	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} || die
+
+	# bug 654990
+	sed -i -e 's/t.bulkmode//' \
+		-e 's/t.dump.load//' \
+		-e 's/t.nonascii.replace//' \
+		src/tests/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="" berkdb=true
+	myconf="--without-included-gsl"
+
+	# determine backend: berkdb *is* default
+	if use berkdb && use sqlite ; then
+		elog "Both useflags berkdb and sqlite are in USE:"
+		elog "Using berkdb as database backend."
+	elif use berkdb && use tokyocabinet ; then
+		elog "Both useflags berkdb and tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	elif use sqlite && use tokyocabinet ; then
+		elog "Both useflags sqlite and tokyocabinet are in USE:"
+		elog "Using sqlite as database backend."
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use sqlite ; then
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use tokyocabinet ; then
+		myconf="${myconf} --with-database=tokyocabinet"
+		berkdb=false
+	elif ! use berkdb ; then
+		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	fi
+
+	# Include the right berkdb headers for FreeBSD
+	if ${berkdb} ; then
+		append-cppflags "-I$(db_includedir)"
+	fi
+
+	econf ${myconf}
+}
+
+src_test() {
+	emake -C src/ check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	exeinto /usr/share/${PN}/contrib
+	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
+		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
+		contrib/{spamitarium,stripsearch}.pl
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/{README.*,dot-qmail-bogofilter-default} \
+		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
+		contrib/vm-bogofilter.el \
+		contrib/{trainbogo,scramble}.sh
+
+	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
+		doc/integrating-with-* doc/README.{db,sqlite}
+
+	dodoc -r doc/*.html
+
+	dodir /usr/share/doc/${PF}/samples
+	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
+	rmdir "${D}"/etc || die
+}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..91ec80334468
--- /dev/null
+++ b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb +sqlite tokyocabinet"
+
+# pax needed for bf_tar
+DEPEND="
+	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:* )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	has_version mail-filter/bogofilter || return 0
+	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
+			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
+			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
+		) ; then
+		ewarn
+		ewarn "If you want to switch the database backend, you must dump the wordlist"
+		ewarn "with the current version (old use flags) and load it with the new version!"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 445918
+	sed -i -e 's/ -ggdb//' configure.ac || die
+
+	# bug 421747
+	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} || die
+
+	# bug 654990
+	sed -i -e 's/t.bulkmode//' \
+		-e 's/t.dump.load//' \
+		-e 's/t.nonascii.replace//' \
+		src/tests/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="" berkdb=true
+	myconf="--without-included-gsl"
+
+	# determine backend: berkdb *is* default
+	if use berkdb && use sqlite ; then
+		elog "Both useflags berkdb and sqlite are in USE:"
+		elog "Using berkdb as database backend."
+	elif use berkdb && use tokyocabinet ; then
+		elog "Both useflags berkdb and tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	elif use sqlite && use tokyocabinet ; then
+		elog "Both useflags sqlite and tokyocabinet are in USE:"
+		elog "Using sqlite as database backend."
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use sqlite ; then
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use tokyocabinet ; then
+		myconf="${myconf} --with-database=tokyocabinet"
+		berkdb=false
+	elif ! use berkdb ; then
+		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	fi
+
+	# Include the right berkdb headers for FreeBSD
+	if ${berkdb} ; then
+		append-cppflags "-I$(db_includedir)"
+	fi
+
+	econf ${myconf}
+}
+
+src_test() {
+	emake -C src/ check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	exeinto /usr/share/${PN}/contrib
+	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
+		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
+		contrib/{spamitarium,stripsearch}.pl
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/{README.*,dot-qmail-bogofilter-default} \
+		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
+		contrib/vm-bogofilter.el \
+		contrib/{trainbogo,scramble}.sh
+
+	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
+		doc/integrating-with-* doc/README.{db,sqlite}
+
+	dodoc -r doc/*.html
+
+	dodir /usr/share/doc/${PF}/samples
+	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
+	rmdir "${D}"/etc || die
+}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
deleted file mode 100644
index f6824cef0e84..000000000000
--- a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb sqlite tokyocabinet"
-
-# pax needed for bf_tar
-DEPEND="
-	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:* )
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_version mail-filter/bogofilter || return 0
-	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
-			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
-			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
-		) ; then
-		ewarn
-		ewarn "If you want to switch the database backend, you must dump the wordlist"
-		ewarn "with the current version (old use flags) and load it with the new version!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 445918
-	sed -i -e 's/ -ggdb//' configure.ac || die
-
-	# bug 421747
-	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} || die
-
-	# bug 654990
-	sed -i -e 's/t.bulkmode//' \
-		-e 's/t.dump.load//' \
-		-e 's/t.nonascii.replace//' \
-		src/tests/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="" berkdb=true
-	myconf="--without-included-gsl"
-
-	# determine backend: berkdb *is* default
-	if use berkdb && use sqlite ; then
-		elog "Both useflags berkdb and sqlite are in USE:"
-		elog "Using berkdb as database backend."
-	elif use berkdb && use tokyocabinet ; then
-		elog "Both useflags berkdb and tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	elif use sqlite && use tokyocabinet ; then
-		elog "Both useflags sqlite and tokyocabinet are in USE:"
-		elog "Using sqlite as database backend."
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use tokyocabinet ; then
-		myconf="${myconf} --with-database=tokyocabinet"
-		berkdb=false
-	elif ! use berkdb ; then
-		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	fi
-
-	# Include the right berkdb headers for FreeBSD
-	if ${berkdb} ; then
-		append-cppflags "-I$(db_includedir)"
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	emake -C src/ check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
-		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
-		contrib/{spamitarium,stripsearch}.pl
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
-		contrib/vm-bogofilter.el \
-		contrib/{trainbogo,scramble}.sh
-
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
-		doc/integrating-with-* doc/README.{db,sqlite}
-
-	dodoc -r doc/*.html
-
-	dodir /usr/share/doc/${PF}/samples
-	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
-	rmdir "${D}"/etc || die
-}
diff --git a/mail-filter/bogofilter/metadata.xml b/mail-filter/bogofilter/metadata.xml
index 3de4cce96436..65b8ce194286 100644
--- a/mail-filter/bogofilter/metadata.xml
+++ b/mail-filter/bogofilter/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Bogofilter is a mail filter that classifies mail as spam or ham (non-spam)
 		by a statistical analysis of the message's header and content (body). The
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 157e65eedcbd..51676606ae6d 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -10,6 +10,6 @@ DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fc
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
-EBUILD libmilter-1.0.2_p1-r2.ebuild 2275 BLAKE2B 5d22054cb7cc6af8596ddefcb61f19a01d1f52ed092ac2728b1f586606fc24dbe6b225d50433d60bfb2e739f510c9c2f82b40ed0e669d25b2c7ff933b58677ef SHA512 d5664b12dc006abcafd7a26b41ee80fa4355441f68e0b3a219ec36c85590cb1f5b4216469f0c538e3befe0e289ec5196cdeb4f15f7a47d2b29649d1029b0ce0d
+EBUILD libmilter-1.0.2_p1-r2.ebuild 2222 BLAKE2B f2ac06a33e4ad53c4c8e503d2801ae6401731e24c820f9933a89bbd74b6e7f14303be5e10b34eb224a38b8dca104b925b1eda5fd0ebea09e4dedb2088d217554 SHA512 394e15dca1bb8a8ad09b3cdd454588eeb5f40cc9b34fcad600bc171578678adc10d81bda70d7afe9f40b8e10a571f55c1da1700367ce913f3750d38d91b7bbe2
 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
index 6c2477f4e76b..924c4295b379 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
@@ -20,8 +20,7 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
 
 LICENSE="Sendmail"
 SLOT="0/${PV}"
-# TODO: restore keywords soon for bug 730890 after testing
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="ipv6 poll"
 
 RDEPEND="!<mail-mta/sendmail-8.16.1"
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index a1da635d87f5..685a60e900e3 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r15.ebuild 3603 BLAKE2B 55e2d4cc38a60066b08eae0be054a24ad9587946d692c0c5e0851aced7f066c6f857969359f18065229022972e2926978ed2fb091e4a1e211e603aa5cf551cdf SHA512 677e5441cf4d530715f23bd1c6ddc7ef7c3923c1c18afe3e258712ac55567dabcab3b99a6b34c9c690825a6e02273205d3d82779b96e30740761b8126dc1e210
+EBUILD procmail-3.22-r15.ebuild 3610 BLAKE2B 642a7efe3a502bf2f812104029bac0b91619b78cd2119fa36debf7011c253d775154ad1943115ab2013906b5a88fef2c0bef82dae8bb36117091e6513cc84ce0 SHA512 0e1a49e558dc85dd13e432661ab4b373b2f0cf1dcad99d2f756b851348ce57b8a7d0ccc640f5d73904ae09298c782e847da835d317bba14157ea933ea3a06765
 MISC metadata.xml 265 BLAKE2B a79a9f0aec856d7f6890b8adf1dbb728c1218426404e815e308bef910ff6b80a97dc487084ea81f93823fcd3a909f3eca5bec488c252cb886c46c55544f370f2 SHA512 82df2df703946d60d4906f91f64fb4158cd88219b613221005996ff953451c0a659d761d1ced61971be2d6be6f968bc8471c26e001353f6dee6033a2012c265a
diff --git a/mail-filter/procmail/procmail-3.22-r15.ebuild b/mail-filter/procmail/procmail-3.22-r15.ebuild
index c02cde9cd8c1..cbdc4d089194 100644
--- a/mail-filter/procmail/procmail-3.22-r15.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="acct-group/mail
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index e5c1558a3b28..96453becb4db 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -8,6 +8,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules-r1.cron 1555 BLAKE2B 3c83a1d3f951c5a7004c6ca838aba6ae76502de9e3dad0104537c819ea02652a920e5f549e4ef5c6fa4a36b9cf32e5ef9cd31d421dece002fc99d3e6227ea578 SHA512 5ea9aeff563589991fecde6e4530da36953c55d462d00882a5aa164936c71c947edf6bbb533fc4a2858a29cb3ac08388dac15d37aeb4d090889385c8b431676d
 DIST Mail-SpamAssassin-3.4.5.tar.bz2 6167088 BLAKE2B d99c9e40f6735328b5300f010f248d35a8a8dcd3a3692a8db909234b8de3a5e432d004cf09f7ddb8b2ae82144525ce1ab25d89df92b621d8e119e2128e59cce6 SHA512 46096019ef3d2b6dadb7af0d076c22526786cccb669cd4bed131b64fa935863630ca9f3e78277bebba0ed75099be9fbce97a30a6478ed84093896a1ad3d8387a
 DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
-EBUILD spamassassin-3.4.5.ebuild 9791 BLAKE2B 93a079f7325ce4e08a0628a2ee1922140fabdd0d435b5b44d15b7ad1a05801be6eeafa173a75cc732ade69190ebc9ebba81851ac160efc97e1a9b81f63514856 SHA512 4836602107901a744adcce03a8f4c47ba0397940ff2dd78696b4387ef51de51786db948fb57163d50833866fbc2b193193c33cabedced6f93478934f3088c57a
-EBUILD spamassassin-3.4.6.ebuild 9798 BLAKE2B b83f70d5cf4d0e8756a5faf4a77fded1623ecf81eaae565a687e274ec9c4b91f777bddf02f30b41e186d598f07f67269a429c41a34b653a51a205ed963689b4d SHA512 f0c68aa2ede16ee1ae3dfd8a65d1262b54d5f6078028b13bd94f95396e06df41a16301d490a70d301e9674fe6d836c7d4e325368da3d612c15be55e8a5fbb273
+EBUILD spamassassin-3.4.5-r1.ebuild 9787 BLAKE2B eeb5a6103dc393e1777a49c02babddf04009b683781c665d342beb7113bbaf44941fa82c5a601d3b37a6a95109013ff58e77a2bf7bdbc0ea9f51df8ff0425d20 SHA512 1422439239de80d0b24f38806044798c0e9428da64843eecffbcc082ef728cfd482bd07fcd3a287450f16a66e0d2978af72d3571009552df7a53c8e7d9b29913
+EBUILD spamassassin-3.4.6-r1.ebuild 9794 BLAKE2B e493f48584957b7f2225aaebf63593fe8bc8b301cc04958c5f8e4bd4a30e000974649bb47f27a0bed169d394ffae4d204c14b3b74e9a8b72c338bfc5573d848b SHA512 f1b65419729883a010e6da0631bbfcf078cfe29f7aefb97a2e538fd86c270693421e2d4911458b4b499956447dcb601150c4aacdf3f3967fd3c765191099dde8
 MISC metadata.xml 609 BLAKE2B 81b169e5c10732a699a07de2aa6327aed5a0c1c8ef44eb6934bd7c37bfa5c80f2f433ade2998a3cd57da68c1b773229ed8aeb7b64c1ed2d58c7ab529d2649b72 SHA512 e0ad537ae894ca5ab2585d0b5dd20357325c409a4497fba096c6b6cbc88cd99fb937af1085c59e164d510a5d5033c6fa511fadc4ab77b1fa2a5bb6b2c514061d
diff --git a/mail-filter/spamassassin/spamassassin-3.4.5-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5-r1.ebuild
new file mode 100644
index 000000000000..fb0dd65e00c3
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.5-r1.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-functions systemd toolchain-funcs
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="acct-user/spamd
+	acct-group/spamd
+	dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Archive-Tar
+	virtual/perl-Digest-SHA
+	virtual/perl-IO-Zlib
+	virtual/perl-Time-HiRes
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	|| ( dev-perl/GeoIP2 dev-perl/Geo-IP )
+	dev-perl/HTTP-Date
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-CIDR-Lite
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	dev-perl/Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
+)
+
+# There are a few renames and use-dependent ones in src_istall as well.
+DOCS=(
+	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
+	sql/README.awl procmailrc.example sample-nonspam.txt
+	sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
+	spamd-apache2/README.apache
+)
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t
+
+	# Some tests need extra dependencies
+	# e.g. t/sql_based_whitelist.t needs DBD
+	# This is kinder than REQUIRED_USE for tests which hurts automation
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		perl_rm_files t/sql_based_whitelist.t
+	fi
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"rules/init.pre" \
+		|| die "failed to disable plugins by default"
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	default
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+		"${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+	use qmail && dodoc spamc/README.qmail
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	insinto /etc/mail/spamassassin/
+	doins "${FILESDIR}"/geoip.cf
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+
+	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "The acct-user/spamd package should have relocated it for you,"
+		elog "but may have failed because your spamd daemon was running."
+		elog
+		elog "To fix this:"
+		elog " - Stop your spamd daemon"
+		elog " - emerge -1 acct-user/spamd"
+		elog " - Restart your spamd daemon"
+		elog " - Remove the old home folder if you want"
+		elog "     rm -rf \"${ROOT}/home/spamd\""
+	fi
+	if [[ -e "${ROOT}/home/spamd" ]] ; then
+		ewarn
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "  Old Home: ${ROOT}/home/spamd"
+		elog "  New Home: ${ROOT}/var/lib/spamd"
+		elog
+		elog "You may wish to migrate your data to the new location:"
+		elog " - Stop your spamd daemon"
+		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
+		elog "   updated to the new location, now that the daemon isn't running:"
+		elog "     # emerge -1 acct-user/spamd"
+		elog "     # echo ~spamd"
+		elog " - Migrate the contents from the old location to the new home"
+		elog "   For example:"
+		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
+		elog " - Remove the old home folder"
+		elog "     # rm -rf \"${ROOT}/home/spamd\""
+		elog " - Restart your spamd daemon"
+		elog
+		elog "If you do not wish to migrate data, you should remove the old"
+		elog "home folder from your system as it is not used."
+	fi
+}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
deleted file mode 100644
index f8162b0b210a..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-functions systemd toolchain-funcs
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="acct-user/spamd
-	acct-group/spamd
-	dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/BSD-Resource
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	|| ( dev-perl/GeoIP2 dev-perl/Geo-IP )
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-)
-
-# There are a few renames and use-dependent ones in src_istall as well.
-DOCS=(
-	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
-	sql/README.awl procmailrc.example sample-nonspam.txt
-	sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
-	spamd-apache2/README.apache
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t
-
-	# Some tests need extra dependencies
-	# e.g. t/sql_based_whitelist.t needs DBD
-	# This is kinder than REQUIRED_USE for tests which hurts automation
-	if ! use mysql && ! use postgres && ! use sqlite ; then
-		perl_rm_files t/sql_based_whitelist.t
-	fi
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"rules/init.pre" \
-		|| die "failed to disable plugins by default"
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	default
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-		"${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-	use qmail && dodoc spamc/README.qmail
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	insinto /etc/mail/spamassassin/
-	doins "${FILESDIR}"/geoip.cf
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	if use mysql || use postgres ; then
-		local _awlwarn=0
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				_awlwarn=1
-				break
-			fi
-		done
-		if [[ ${_awlwarn} == 1 ]] ; then
-			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-			ewarn 'You will need to manually ALTER your tables for them to'
-			ewarn 'continue working.  See the UPGRADE documentation for'
-			ewarn 'details.'
-			ewarn
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	if use mysql || use postgres ; then
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				ewarn
-				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-				ewarn 'You will need to manually ALTER your tables for them to'
-				ewarn 'continue working.  See the UPGRADE documentation for'
-				ewarn 'details.'
-				ewarn
-
-				# show this only once
-				break
-			fi
-		done
-	fi
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-
-	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "The acct-user/spamd package should have relocated it for you,"
-		elog "but may have failed because your spamd daemon was running."
-		elog
-		elog "To fix this:"
-		elog " - Stop your spamd daemon"
-		elog " - emerge -1 acct-user/spamd"
-		elog " - Restart your spamd daemon"
-		elog " - Remove the old home folder if you want"
-		elog "     rm -rf \"${ROOT}/home/spamd\""
-	fi
-	if [[ -e "${ROOT}/home/spamd" ]] ; then
-		ewarn
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "  Old Home: ${ROOT}/home/spamd"
-		elog "  New Home: ${ROOT}/var/lib/spamd"
-		elog
-		elog "You may wish to migrate your data to the new location:"
-		elog " - Stop your spamd daemon"
-		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
-		elog "   updated to the new location, now that the daemon isn't running:"
-		elog "     # emerge -1 acct-user/spamd"
-		elog "     # echo ~spamd"
-		elog " - Migrate the contents from the old location to the new home"
-		elog "   For example:"
-		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
-		elog " - Remove the old home folder"
-		elog "     # rm -rf \"${ROOT}/home/spamd\""
-		elog " - Restart your spamd daemon"
-		elog
-		elog "If you do not wish to migrate data, you should remove the old"
-		elog "home folder from your system as it is not used."
-	fi
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild
new file mode 100644
index 000000000000..d13f67500af6
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-functions systemd toolchain-funcs
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="acct-user/spamd
+	acct-group/spamd
+	dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Archive-Tar
+	virtual/perl-Digest-SHA
+	virtual/perl-IO-Zlib
+	virtual/perl-Time-HiRes
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	|| ( dev-perl/GeoIP2 dev-perl/Geo-IP )
+	dev-perl/HTTP-Date
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-CIDR-Lite
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	dev-perl/Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
+)
+
+# There are a few renames and use-dependent ones in src_istall as well.
+DOCS=(
+	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
+	sql/README.awl procmailrc.example sample-nonspam.txt
+	sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
+	spamd-apache2/README.apache
+)
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t
+
+	# Some tests need extra dependencies
+	# e.g. t/sql_based_whitelist.t needs DBD
+	# This is kinder than REQUIRED_USE for tests which hurts automation
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		perl_rm_files t/sql_based_whitelist.t
+	fi
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"rules/init.pre" \
+		|| die "failed to disable plugins by default"
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	default
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+		"${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+	use qmail && dodoc spamc/README.qmail
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	insinto /etc/mail/spamassassin/
+	doins "${FILESDIR}"/geoip.cf
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+
+	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "The acct-user/spamd package should have relocated it for you,"
+		elog "but may have failed because your spamd daemon was running."
+		elog
+		elog "To fix this:"
+		elog " - Stop your spamd daemon"
+		elog " - emerge -1 acct-user/spamd"
+		elog " - Restart your spamd daemon"
+		elog " - Remove the old home folder if you want"
+		elog "     rm -rf \"${ROOT}/home/spamd\""
+	fi
+	if [[ -e "${ROOT}/home/spamd" ]] ; then
+		ewarn
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "  Old Home: ${ROOT}/home/spamd"
+		elog "  New Home: ${ROOT}/var/lib/spamd"
+		elog
+		elog "You may wish to migrate your data to the new location:"
+		elog " - Stop your spamd daemon"
+		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
+		elog "   updated to the new location, now that the daemon isn't running:"
+		elog "     # emerge -1 acct-user/spamd"
+		elog "     # echo ~spamd"
+		elog " - Migrate the contents from the old location to the new home"
+		elog "   For example:"
+		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
+		elog " - Remove the old home folder"
+		elog "     # rm -rf \"${ROOT}/home/spamd\""
+		elog " - Restart your spamd daemon"
+		elog
+		elog "If you do not wish to migrate data, you should remove the old"
+		elog "home folder from your system as it is not used."
+	fi
+}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
deleted file mode 100644
index f052cccd1aea..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-functions systemd toolchain-funcs
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="acct-user/spamd
-	acct-group/spamd
-	dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/BSD-Resource
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	|| ( dev-perl/GeoIP2 dev-perl/Geo-IP )
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-)
-
-# There are a few renames and use-dependent ones in src_istall as well.
-DOCS=(
-	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
-	sql/README.awl procmailrc.example sample-nonspam.txt
-	sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
-	spamd-apache2/README.apache
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t
-
-	# Some tests need extra dependencies
-	# e.g. t/sql_based_whitelist.t needs DBD
-	# This is kinder than REQUIRED_USE for tests which hurts automation
-	if ! use mysql && ! use postgres && ! use sqlite ; then
-		perl_rm_files t/sql_based_whitelist.t
-	fi
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"rules/init.pre" \
-		|| die "failed to disable plugins by default"
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	default
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-		"${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-	use qmail && dodoc spamc/README.qmail
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	insinto /etc/mail/spamassassin/
-	doins "${FILESDIR}"/geoip.cf
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	if use mysql || use postgres ; then
-		local _awlwarn=0
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				_awlwarn=1
-				break
-			fi
-		done
-		if [[ ${_awlwarn} == 1 ]] ; then
-			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-			ewarn 'You will need to manually ALTER your tables for them to'
-			ewarn 'continue working.  See the UPGRADE documentation for'
-			ewarn 'details.'
-			ewarn
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	if use mysql || use postgres ; then
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				ewarn
-				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-				ewarn 'You will need to manually ALTER your tables for them to'
-				ewarn 'continue working.  See the UPGRADE documentation for'
-				ewarn 'details.'
-				ewarn
-
-				# show this only once
-				break
-			fi
-		done
-	fi
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-
-	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "The acct-user/spamd package should have relocated it for you,"
-		elog "but may have failed because your spamd daemon was running."
-		elog
-		elog "To fix this:"
-		elog " - Stop your spamd daemon"
-		elog " - emerge -1 acct-user/spamd"
-		elog " - Restart your spamd daemon"
-		elog " - Remove the old home folder if you want"
-		elog "     rm -rf \"${ROOT}/home/spamd\""
-	fi
-	if [[ -e "${ROOT}/home/spamd" ]] ; then
-		ewarn
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "  Old Home: ${ROOT}/home/spamd"
-		elog "  New Home: ${ROOT}/var/lib/spamd"
-		elog
-		elog "You may wish to migrate your data to the new location:"
-		elog " - Stop your spamd daemon"
-		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
-		elog "   updated to the new location, now that the daemon isn't running:"
-		elog "     # emerge -1 acct-user/spamd"
-		elog "     # echo ~spamd"
-		elog " - Migrate the contents from the old location to the new home"
-		elog "   For example:"
-		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
-		elog " - Remove the old home folder"
-		elog "     # rm -rf \"${ROOT}/home/spamd\""
-		elog " - Restart your spamd daemon"
-		elog
-		elog "If you do not wish to migrate data, you should remove the old"
-		elog "home folder from your system as it is not used."
-	fi
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 3132e5a9cd14..ac7b9d7d640e 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 8de0c7e802b7..db7922c130f3 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -7,5 +7,5 @@ DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce584
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 EBUILD notqmail-1.08-r3.ebuild 4411 BLAKE2B eb096ec4d942d90120615c1d8385c9149f7409815696f574487e7bc0225000483db4e5170e3f578a8e28d2a272de0e27357292c9106520a2770661ec7a1b1498 SHA512 64dfbec09a2b8c9bae743641b75c689431ad10e756633067b2398767580de801cabd7dd4ec164b0665eca9233e581992ee9cf64231ac747defbb6999a78ab437
-EBUILD notqmail-9999.ebuild 4380 BLAKE2B 6d50a59eb3c3576fcc1acadeecc73ecba3f35f2b54fc226fa16e4f187eb8476d8da27cbac32ddf8d3c6462cc70bb18a0c9e90f6db8a15b037a3132fe53f311c8 SHA512 390901fa08ca3e0694fd053e8edf4373876460e62a868f1352d692c40d44bde7e8ddcd5694f05f135f32ffa3d299c2cdda0539c66c0ece2f968b523fdbc7f0d4
+EBUILD notqmail-9999.ebuild 4266 BLAKE2B fbbba305aff99486f322e1ff9944a05a07c8e07dd97204d770c5b7e531484c34080c2db6f28213d09c0e7a7d381341533b7394b9693c46c6372e89007ebb2ea7 SHA512 447e96d61e77c3c684483988d3aad1846e3dc818790a8715d127cc4a4fbcc119495eb52ecd5cc3cda34230b4fc2f9b6806b818b625aa1c44ea1ae1753d424ece
 MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index d19ad72c59fc..9c68b334dbf5 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -11,8 +11,6 @@ QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
 
 QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
-QMAIL_LARGE_DNS="qmail-103.patch"
-
 inherit qmail systemd
 
 if [[ ${PV} == "9999" ]] ; then
@@ -31,7 +29,6 @@ HOMEPAGE="
 "
 SRC_URI="${SRC_URI}
 	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
 	!vanilla? (
 		highvolume? (
 			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
@@ -104,11 +101,9 @@ src_unpack() {
 	[[ ${PV} != "9999" ]] && default
 }
 
-PATCHES=(
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-)
-
 src_prepare() {
+	PATCHES=()
+
 	if ! use vanilla; then
 		if use qmail-spp; then
 			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 734cd34b50ba..ed10e854dabe 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -3,5 +3,5 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
-EBUILD opensmtpd-6.8.0_p2-r1.ebuild 1930 BLAKE2B 8e5d22354c6a43440a580a5dbe9af39292a7eabe9246a938215e68717ed2a955b8c0743bd486695f831c4c4da15b14bc66dfbfbf22b2b53b36995b22a45c5b4d SHA512 2fc08751dbd68706742492c58701a459c8531b349496fc2d7673ec92f5ddda1c7ae2f38078dfcccf931d948dc88442532fa4372bbd8250d8fb5790373f792ca3
+EBUILD opensmtpd-6.8.0_p2-r1.ebuild 1937 BLAKE2B dd60263e3caa42fb1311dae93a2327b98463cb3e2639b5fd02fb8e9133711c3e261556fced08cef07ca6a068398e95ba16c844e95678c39ed891ae7264c124c3 SHA512 870b990798fb50704cd7d3eb987f9a6423666315e065e928ef96fae31ce2ddf7110f8860ab6768ce6d9c46a5b52f7903eae6d07802defe795f3121ecd2c3487e
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r1.ebuild
index 570076441144..083ae24c1cd3 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 IUSE="berkdb +mta pam split-usr"
 
 DEPEND="
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index f5a486d11653..8f659a47621b 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -14,6 +14,6 @@ EBUILD postfix-3.5.11.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a
 EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
 EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.6.1.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
+EBUILD postfix-3.6.1.ebuild 7982 BLAKE2B 91b9bb31c7ebfbfd43579e3d241caf3abd8dc03123e708310d6281ee4c274638e2cfb941a721de0e7f4bae27797234eeee393e31667f3df4e9990d9f7b1a8959 SHA512 a4d278581262197b430782d84a9dc496162e603496872414db148db42f26096d92267c2dee9181d288c55e3fbffd8037c2b84d75e0e321fd42c6ad4036a4cb2e
 EBUILD postfix-3.7_pre20210707.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1.ebuild
index 96598ffacec1..c6b40e6b353d 100644
--- a/mail-mta/postfix/postfix-3.6.1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index e2a42488492d..2cfd5af867f6 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -14,5 +14,5 @@ AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 EBUILD sendmail-8.15.2-r2.ebuild 7199 BLAKE2B 801a30a6d9d71d3aa34ddf3910c9bb4658d687905b3df1e17052b9bbab692db74d2e703906cff948ba173684e08668f44274afb2fd9d269f51607dd2318a8d46 SHA512 9a8e3c5118e64bad84082d34b9593aec4b3bbf7bee23aea056a32b1d5bdae797086d4a0e342f217cd91bec9dc112cd387b7c02401eb800ac7f613fd5eecbcbb2
-EBUILD sendmail-8.16.1-r1.ebuild 6217 BLAKE2B 0a6a986ddd360009711f62adbed2e7d3f468561a78b299b5c72d2d0053657b1b096a2d0864f783b065a08f345d40ba4ce30c8ecf724886570831303764ef2abd SHA512 458d3414662545a99d4994b3cc701956404b8759ac6a91c7faac6916d081c4b363de3bb10c5a89a447b35a090fdc7d9b7cd12c9deb2588c0560b0a1cde7a31af
+EBUILD sendmail-8.16.1-r1.ebuild 6152 BLAKE2B bef102ab5a1c63b6e55ad7b170a43d55147a98fccabf0715fddc51b94e71421801ffb33babc1f22ae35e1d3f91b72e0afac9c80f8400034471f052e7a590b789 SHA512 c2b27b940a3ab8fa675f7460cce64cd6b0ae97eadacfec3253fc6eababe267f3b59bf9ee30b9729d3e78a60554c72c9934c0573fd6450fcdb4c9c4639a2f8654
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
index 8b5b4f3cdc07..95ef65582be0 100644
--- a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
@@ -13,14 +13,15 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
 SLOT="0"
-# TODO: restore keywords soon for bug 730890 after testing
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
 
 BDEPEND="
 	sys-devel/m4
 	virtual/pkgconfig"
 DEPEND="
+	acct-group/smmsp
+	>=acct-user/smmsp-0-r2
 	net-mail/mailbase
 	>=sys-libs/db-3.2:=
 	ldap? ( net-nds/openldap )
@@ -30,8 +31,6 @@ DEPEND="
 	tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="
 	${DEPEND}
-	acct-group/smmsp
-	>=acct-user/smmsp-0-r2
 	>=mail-filter/libmilter-1.0.2_p1-r1
 	!mail-mta/courier
 	!mail-mta/esmtp
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 870f1ce5d938..10e44a897a14 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 9a6095750dd2..311618639e30 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,3 @@
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
-EBUILD caja-dropbox-1.24.0-r1.ebuild 1844 BLAKE2B a36103595c1714285ed92d915ad0f039406a107ebab3540d1f8938c62377e2bdc77c1e43e790761e0a32cc1c9b983fc32665c8beb0417054f7dc916b1a96568e SHA512 adea7ca28572e2a5d2862106eab105ecbedb1cfef3e3e2a5cf00acde5f73ef5ae5bd4253ed00f19ac657c3056100d61fd8024a9b640f25834d5c15c38f398ac7
+EBUILD caja-dropbox-1.24.0-r1.ebuild 1834 BLAKE2B db46ed147558ee4c38a659e9d9d1262bcb3409798cbfcc5ff6262f07734126b0d00f4106d1a066c0e6c696cc11de9e3791a6c5eff032b165ea3a90d12040658c SHA512 ea6eba4ffb27b99c09e28cb299e58e723a9db2b262cac3f2211537ec7e3d3edfbf73194cbc4ac7ae0136d825c45b0d42da76d80a709c2be8220c355e356c5bf4
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
index 8a9816574a28..a6f1b5507d59 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-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=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 MATE_LA_PUNT="yes"
 
 inherit eapi7-ver mate python-single-r1 linux-info
@@ -23,7 +23,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=mate-base/caja-1.19.1
 	mate-extra/caja-extensions
diff --git a/mate-extra/caja-hide/Manifest b/mate-extra/caja-hide/Manifest
index 2d10564ab518..5fc820164131 100644
--- a/mate-extra/caja-hide/Manifest
+++ b/mate-extra/caja-hide/Manifest
@@ -1,4 +1,4 @@
 AUX caja-hide-0.9.0-py3-support.patch 684 BLAKE2B d0288daa9870a00b2d77a865f54567c51809548314c4d9659c270698563f59c4378734ee7f2386e9bd643fe0a7fe0226f5e8693e0d84e19c1c03e72da09a2cad SHA512 eb78fb5495d34b1e5ccf22d39b2cdbe8b482d3f205c5a4dcc42d592c9c18ba7a9aa81a98d27dbfb4331e2d5db79a4c08e121565b206d84898d242500a7c82677
 DIST caja-hide-0.9.0.tar.gz 17487 BLAKE2B 182a4e65745a6c3dbbc40121d95f7b5b34b4660ceb9fcffc60ddd51bdc3949191b7eafa258950b0a6b9a6befd63e4b6842481f20ba31b4bfab0668c261e87470 SHA512 86a3d5a661a731caf740c4086ffc041f9f5cb21f996bc21d92cf5d53df108d6d14b753165ee992f3d5574957850f041d03e4d78447fb4db67bf989f16eb5471c
-EBUILD caja-hide-0.9.0.ebuild 853 BLAKE2B 028c7a109d41a1be78f51f3f1700897ac5d5e1fce5f690ec07e5a4d4f19ac6c1bc2d0c5392ddbfc810c5ca0ed05dcf5b6bd66d5ba4d989c0cae9a49a4b76c08b SHA512 6b513d15eeb5b238e54048113e8e3e7c228930330a1ebddf164a51ef42bf0cef792396eb976db36927b1f2c9794bbe4b716e3c3d2d467e3e1af39d2bd1ae1141
+EBUILD caja-hide-0.9.0.ebuild 841 BLAKE2B 1ab66a8ee277208df6084261653abf7da35cc434d2de2c852e1413fbe0ceb30b7cfd1e6e52ec97b39fa86a433d023e3d8eca7802dbb8a47a856799320d6bdc0a SHA512 074f4720d9008c38f4f7ed0c5f988d868924283c278d4f3690e85d327aafa261c4fa117502b9ada6edeec6de86cadf33b57ad78aaf1cc8cc2d8d763f0db2dcb5
 MISC metadata.xml 338 BLAKE2B 58a272cb80dfc7bb6754fa3d8d92cc2c807a0db4aa78c993e6da77ae12a7be263743e4dd98daac68b885f6aee6fc6eddf5b60d8f5a17cc5df00828b9971b2f31 SHA512 9ae48d0c41a99e1c2138005137963e10963afba5cf274244a23267076eca0faffc3b4ec87dab5d1c71d6526d6c88d1b7665248a7bbfe51b2990123ebf2cdc92b
diff --git a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
index 4140e5646a21..d46c9b8feadc 100644
--- a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
+++ b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_8 )
 inherit python-single-r1
 
 MY_PN="Caja-hide"
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	$(python_gen_cond_dep 'dev-python/future[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/future[${PYTHON_USEDEP}]')
 	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
 	x11-misc/xautomation
 "
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 1dca4395f95b..2cc582204e12 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 55352814bdaf..37bd026cc9dd 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,3 @@
 DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-EBUILD terminus-font-4.49.1.ebuild 2725 BLAKE2B 9bfdf6b6888fc1f1cb35551b03d1136b76743cf36a59d4daa1ef9dc38db250cbac572a8c99542baf6a202f5f825b3c157d2c234ca78b3e14b353c80f5aa27773 SHA512 fc6dbe24f63f683734ea36cd80108599e2ba51087fd396c2c10011539539d5a4becfc80f5f0c493add1ac68d111885025117c9c3cb8e8f64a738f864cebd426b
-MISC metadata.xml 1925 BLAKE2B d80e4a334efca11b8446d575026f1cb8ae828a8fc809e9d10d82af6048f8a09ae46cb6d95b41179708c9b5179c7fc0f7e162cf852f2c5ef6fe7bd58e2d3cb90d SHA512 9279bbd00606410c1f36c00a69f3f226da3be9f3a14165d2e56ed4b8e315ba6c7d9c720731029c0899b0bd2c357465ca5ebdcc0eb4a11456fb89d3fc900c01d3
+EBUILD terminus-font-4.49.1.ebuild 2589 BLAKE2B 2776be8ef617cc89f25a437cf9c2e5e84e13372d03af62e117148fd0812aa076b7e36a4ace481004cfcd808a220eea0cc1d64154ffaa245f7c370f40d1d6c3df SHA512 0ff50ac3845e37e9d6929a24b80cb000124f92fbff2335918773a9e89bd32477a8400373498cb3f1af585a69e3e5e5c7d99dc080cdc5a8f294bac8d221f8f003
+MISC metadata.xml 1944 BLAKE2B daba3c48ac7cf44de9d97f4a7cd652ccb1579945b1cd5a8971b28a58c98888497b745fb3552c1cbfeba47ae60b31e03b6992876d7f08b2370bda346e71077134 SHA512 f81cb538bf9144fc233eff9ec466dbc33fb27aadec4e76039469a8c0a0dd982c26d4240515cc17867378e9a2f4ea37182501e52f880db9d8fac8d3cd7ae6fe6e
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index ba130008fda5..627ca1e213a0 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -18,14 +18,21 @@
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
     </flag>
+    <flag name="center-tilde">
+      Place the '~' character vertically centered on the line instead of to the
+      top.
+    </flag>
     <flag name="distinct-l">
       ll2 variant with more distinctive l (lowercase L)
     </flag>
     <flag name="otf">
       Install Open Type Font (OTF) (required for HarfBuzz backend)
     </flag>
-    <flag name="pcf">
-      Install Portable Compiled Font (PCF) (X11 bitmap fonts)
+    <flag name="pcf-8bit">
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts), 8-bit encodings
+    </flag>
+    <flag name="pcf-unicode">
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts), Unicode encodings
     </flag>
     <flag name="psf">
       Install PC Screen Font (PSF) with unicode data (for linux console)
@@ -47,13 +54,6 @@
     <flag name="ru-k">
       Changes view of Russian letter 'k' (see homepage)
     </flag>
-    <flag name="center-tilde">
-      Place the '~' character vertically centered on the line instead of to the
-      top.
-    </flag>
-    <flag name="pcf-unicode-only">
-      Remove non-unicode PCF fonts that could be problematic. See bug #520222.
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">terminus-font</remote-id>
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
index 7fbe98e86d71..6c5eb7ba0f45 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -13,20 +13,21 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote
+IUSE="a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
 BDEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
+	pcf-8bit? ( x11-apps/bdftopcf )
+	pcf-unicode? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
 FONTDIR=/usr/share/fonts/terminus
 FONT_CONF=( 75-yes-terminus.conf )
 DOCS=( README README-BG AUTHORS CHANGES )
 
-REQUIRED_USE="X? ( || ( otf pcf ) )"
+REQUIRED_USE="X? ( || ( otf pcf-8bit pcf-unicode ) )"
 
 pkg_setup() {
 	python_setup
@@ -62,33 +63,26 @@ src_configure() {
 
 src_compile() {
 	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-		$(usex otf otb '')
+		$(usex otf otb "")
+		$(usex pcf-8bit "pcf-8bit" "")
+		$(usex pcf-unicode "pcf" "")
+		$(usex psf "psf psf-vgaw" "")
 	)
 	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
 }
 
 src_install() {
 	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-		$(usex otf 'install-otb' '')
+		$(usex otf "install-otb" "")
+		$(usex pcf-8bit "install-pcf-8bit" "")
+		$(usex pcf-unicode "install-pcf" "")
+		$(usex psf "install-psf install-psf-vgaw install-psf-ref" "")
 	)
 	# Set the CHECKDIR to a dummy location so we always get the same set of
 	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
+	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${ED}" CHECKDIR="${ED}" "${args[@]}"
 
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	use otf && FONT_SUFFIX=otb
-	font_src_install
+	use otf && FONT_SUFFIX=otb font_src_install
 
 	einstalldocs
 }
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 240884d3d9bd..8a37e33c29ea 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index aaa8036678e7..8257327bb34f 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,5 +1,3 @@
-DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
 DIST ahoviewer-2.0.0_beta.tar.gz 488564 BLAKE2B 325d9689e13fc2847d00be3e77eb5cd8234c98d0c516d3427d4275beaf6cc08ba8a054dfa047ec5e00e4693f8b14f730694358dc22a15e8d503bf67f232c1772 SHA512 6a38da0810c93886233a41d1fdc3f9779158c54b328c13cb2eea9e921057913fd3bb48370b95526f2bc8635ca4ba0967e7edeb95052ea689b05fb8555d826cf0
-EBUILD ahoviewer-1.6.5-r3.ebuild 1774 BLAKE2B c78b47185467f18bed89a39f2faa7c435b4e493207d6fdf004f984d34780d05ce410e16603dcf1a55a79d8af1b29e53b5b3356c59a3d5324111bec2ead1144e6 SHA512 56f9f6370203be73749c6e552e448a0cb8f2e4c50096b880024a7fd682823a0e4ec0600b36010cac2ff91ed5ca0f74dad57fc42dd090d40640af21de43751118
 EBUILD ahoviewer-2.0.0_beta.ebuild 1975 BLAKE2B f4ded42ed2acce53d6d72872e5f108f76bb58be7ac884b8b4db2943c949d2da3c270d956beb290f3fcebaf1e59466a7a2997a25bdb03f2ead3d4e7f1d874b92d SHA512 20eaa9a7b32ace00b176cf197cc2ed6da64268ba4f083512a7753bf32b3305a9922dbdf70e3b97792462830ff40cb1267ac2b496d0958dbc857082c15b895c5e
 MISC metadata.xml 431 BLAKE2B d3fd17228e1676a9075e20f035d842a7a09c5eb149f4487c8b5070ae76853993f11ae647f2b8832cb5c0cfab68f8326370ec0a8d03bb39588b00ccd9d7392041 SHA512 85583bbec83da4404fe986940b6151afb8e864189b3d225bb9a6d804676a3e972113408eb039fa7a95f79e52346b35da9a6b60cb9050e4440ff891601dddbfd4
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
deleted file mode 100644
index bff03cef4b0c..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK2 image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnutls gnome-keyring +gstreamer +rar +ssl +zip"
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libxml2:2
-	dev-libs/libsigc++:2
-	net-misc/curl
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			>=dev-libs/openssl-1.0.0:0=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip )
-"
-RDEPEND="
-	${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable gnome-keyring libsecret)
-		$(use_enable gstreamer gst)
-		$(use_enable rar)
-		$(use_enable zip)
-	)
-
-	if use ssl && use gnutls ; then
-		myconf+=( --disable-ssl --enable-gnutls )
-	elif use ssl && ! use gnutls ; then
-		myconf+=( --enable-ssl --disable-gnutls )
-	else
-		myconf+=( --disable-ssl --disable-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 380e636eb624..296edbe495e9 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -1,6 +1,4 @@
-DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204dab249ca2652583421fd444ff6fbbce54e16f02072534050c52c67dabe3c4e6fc977c6aff7317a0df9357d4 SHA512 c22bbc5ad154f35d50d28e5331911d0fd32c5e7f25b659e48274baa1ccc9e3e8b9f771a1bfdf39078c9e959c3fd84b3ccd8528f20f7a80baa7c59bc579579756
 DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539e5c1337e05cdb3f60e39b4135294c5709a92ae670821b1e5cb39f22567e2188c18671681db52f667789c6d SHA512 3e075efd81c829817f42fbe2163269581aa6ac972ec8f14e04237598e08722cdda78cc702e8628a6f77e6c2181ab7bc438f56975f5ed883f5ed9c53ca13edf9a
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
-EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02
-EBUILD album-4.15-r1.ebuild 944 BLAKE2B 753a055d94e402574b46fcd854ca31035041268e18ed51dd1db6d51c88f33dab97e05cc78e3c968f7ea198e42fba5a0553564cfd59360ec622727fa0f1932ab2 SHA512 7f002d8755a262be08180c07a659b0898f261fbada65fd75ed04fec575d66d57332745cd8d2434b8a215ebab50690644a26086302bb77105e596d03d525ca266
+EBUILD album-4.15-r1.ebuild 910 BLAKE2B 4aeb1572e4643d51d5c24d749959c2776ec90c3137093eb69788e589cb9a2de874cd03ccb9980c473f02ea4de6b0a55ee46cec6c60a221f6c0a9cf030e2ecbf7 SHA512 2966f27f8e7cee628fc888bba5b572fe6ce34844c5d2b073ee3f5d3da3c35a161c420f77ba16798396148945f31ec78d70668edfff9e3c5d02bc4372dacc39aa
 MISC metadata.xml 336 BLAKE2B 837ab4247c02a88070c8bedd8b3a17666672f15d58c0859571c8d5287dd139c87a00c9cb8443961403a70d41456fbc6bbc6f8c4ed519e8ea7a27528337626377 SHA512 57056eb7f228138441d468ebf9ae672dee62f258c33fde97dd6cafea4b9deadb418a011d4222bf75ff8d6953d070a5096a0981c0476c5302566ccd6e643bea0a
diff --git a/media-gfx/album/album-4.13-r2.ebuild b/media-gfx/album/album-4.13-r2.ebuild
deleted file mode 100644
index a590351eb9fa..000000000000
--- a/media-gfx/album/album-4.13-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="HTML photo album generator"
-HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
-SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
-	http://marginalhacks.com/bin/album.versions/data-4.05.tar.gz"
-
-LICENSE="marginalhacks"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc ffmpeg plugins themes"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	media-gfx/jhead
-	virtual/imagemagick-tools
-	ffmpeg? ( media-video/ffmpeg )"
-
-src_install() {
-	dobin album
-	doman album.1
-	dodoc License.txt CHANGELOG
-	use doc && dohtml -r Docs/*
-
-	dodir /usr/share/album
-	insinto /usr/share/album
-	cd ..
-	doins -r lang
-	use themes && doins -r Themes
-	use plugins && doins -r plugins
-}
-
-pkg_postinst() {
-	elog "For some optional tools please browse:"
-	elog "http://MarginalHacks.com/Hacks/album/tools/"
-}
diff --git a/media-gfx/album/album-4.15-r1.ebuild b/media-gfx/album/album-4.15-r1.ebuild
index c62b27853d48..42bc6094f55d 100644
--- a/media-gfx/album/album-4.15-r1.ebuild
+++ b/media-gfx/album/album-4.15-r1.ebuild
@@ -13,7 +13,6 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc ffmpeg plugins themes"
 
-DEPEND=""
 RDEPEND="dev-lang/perl
 	media-gfx/jhead
 	virtual/imagemagick-tools
@@ -29,7 +28,6 @@ src_install() {
 		dodoc -r Docs/.
 	fi
 
-	dodir /usr/share/album
 	insinto /usr/share/album
 	cd .. || die
 	doins -r lang
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index c583fe403ad8..e2f9734d758b 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,8 +1,4 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
-DIST alembic-1.8.0.tar.gz 860886 BLAKE2B eccb1c74e90094a9b473ecb66260714a519110c20b18248c4fc5ecff5edf2b424b303764f80ee76333e588e85a92499d75a8104b972ccd142cc26532fd89df30 SHA512 23fc881863741f7fd081342f5c53c1ec3d00ab300ba8cd10e4a659ee820a9ed1244cf7cf2fd40482f6be32b9d7df44128363246e942bd03c802f3a2a81533b57
-DIST alembic-1.8.1.tar.gz 861482 BLAKE2B fd23e6b080dbfd689fe0d63e1cf815cd26dda0624181b4b536e81a59c497d4f22481db1206d8fb140734d90a24f06f2892b6fbd9c57cb81c5fa2d700f3bd4aab SHA512 895493f36c895aef0675e1300ee3bbbf1b8819b4978b842c48810078e51219423500f74014eafe357a318a755ffa8c5c17c2c806b4216bab6cd334908bf684a4
 DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
-EBUILD alembic-1.8.0.ebuild 1297 BLAKE2B 532e1266cc1bc0be96e2c8951d6f54bca5ee55bf6ad822529361bf98c5cb254fc7c7b08ad1881f292d8da58d82b0ddf740942a2d12dbf4387542747eef161672 SHA512 49699ced65a5a8d40613e8d0af72bd4d42309dcea2acd0474298a5ede4422fef27adc5fbe0443042405dda2af7611d92ab2b4163d7f1c40650e270558efbb14f
-EBUILD alembic-1.8.1.ebuild 1235 BLAKE2B 0ba9f4f0d4b59b5f6cf9f94522ab3d1c18dd426c4124c4e95c19db8067d742c2ebce0260705b7d0b5de883df1f7ad5671f8949d94d694cddcd8fb603f8d3c027 SHA512 93f4f680498c5e1c291c8647e80624e4f3915090201667d4c1100c9bf1f1362914fd2510608e8b6d459341b43fd166cf42b0579863f65c36b095d55449f29290
-EBUILD alembic-1.8.2.ebuild 1235 BLAKE2B 0ba9f4f0d4b59b5f6cf9f94522ab3d1c18dd426c4124c4e95c19db8067d742c2ebce0260705b7d0b5de883df1f7ad5671f8949d94d694cddcd8fb603f8d3c027 SHA512 93f4f680498c5e1c291c8647e80624e4f3915090201667d4c1100c9bf1f1362914fd2510608e8b6d459341b43fd166cf42b0579863f65c36b095d55449f29290
+EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb
 MISC metadata.xml 823 BLAKE2B a7aa430883c5db2c17c75688d7c52bb3bfb21859d272d4171e3730f0d414e84b84cbc39c119a6c770fd0b1849489825ac826da62ceb4bad1a33b67f982904d47 SHA512 9f73afcf88484bc7958259bf91218f21cf7212405123dd52764a807b829b8d71602804fe698ee541a54d0771fd8b82b92bcc40b6598229bef2b11277df8da7c9
diff --git a/media-gfx/alembic/alembic-1.8.0.ebuild b/media-gfx/alembic/alembic-1.8.0.ebuild
deleted file mode 100644
index 8a71d3328dc0..000000000000
--- a/media-gfx/alembic/alembic-1.8.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
-
-inherit cmake
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-# arm{,64} either pyilmbase needs to be keyworded or imath merged and keyworded
-# to re-add python / pyalembic support
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="examples hdf5 test"
-RESTRICT="!test? ( test )"
-
-# TODO: once imath has been merge, switch to use imath instead
-# of ilmbase
-RDEPEND="
-	>=media-libs/ilmbase-2.5.5:=
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-PATCHES=( "${FILESDIR}/${P}-0001-set-correct-libdir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_SHARED_LIBS=ON
-		-DDOCS_PATH=OFF	# currently does nothing but require doxygen
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		# TODO: needs imath merged and keyworded for arm{,64}
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/alembic/alembic-1.8.1.ebuild b/media-gfx/alembic/alembic-1.8.1.ebuild
deleted file mode 100644
index d6553f86e84f..000000000000
--- a/media-gfx/alembic/alembic-1.8.1.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 cmake
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-# either pyilmbase or imath need to be keyworded for arm{,64} to re-add
-# python / pyalembic support
-IUSE="examples hdf5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-libs/imath-3.0.1
-		>=media-libs/ilmbase-2.5.5
-	)
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.0-0001-set-correct-libdir.patch" )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		# TODO: needs imath keyworded for arm{,64}
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/alembic/alembic-1.8.2.ebuild b/media-gfx/alembic/alembic-1.8.2.ebuild
index d6553f86e84f..70bbe084164e 100644
--- a/media-gfx/alembic/alembic-1.8.2.ebuild
+++ b/media-gfx/alembic/alembic-1.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 # either pyilmbase or imath need to be keyworded for arm{,64} to re-add
 # python / pyalembic support
 IUSE="examples hdf5 test"
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index fb0f8ca12c31..b7c66296aa22 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
 DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
+DIST chafa-1.6.1.tar.xz 418720 BLAKE2B 5f6c42311d81bf508f5ec890d72508fd2255e226102b8a7c5c71a9bc1293cd75b08c6b640ca4e6fe9ae34ad47e4e408e25a1aeed7057a5bd823550bea4526f4a SHA512 96cf772638e1a6874d94636a69d6c76d1040d956a16be851ea818292f5b2252867acd0891fede3e030de591b5567d820cf062c5a103a0943a0ea2f2ba34eea77
 EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
+EBUILD chafa-1.6.1.ebuild 747 BLAKE2B a309ab04266e19385050fdf7946296a9426672f5948586f3089d01f544ab6998c0c3f640c9a0c91a0b382a6199878254f3a8b8dd2ec0af7f3cab940211eaac7e SHA512 c5194bd1a700117084dc9f73d5b5466537bf3319ed6b791023b8e2c56398f62b680cf808ecd2a0a62619ea57f658543539ea8e46aacd41c755957837ace72ee9
 MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.6.1.ebuild b/media-gfx/chafa/chafa-1.6.1.ebuild
new file mode 100644
index 000000000000..0949da594e0d
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+	tools? ( >=media-libs/freetype-2.0.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-man \
+		$(use_with tools)
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index f58e4b722bbf..11b49407b3cc 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,3 @@
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
-EBUILD cura-4.9.1.ebuild 2157 BLAKE2B df6f36f6341244880322b4d5e99b7cae8ac3a017c9e6e00cff9889d24bd4dfaf12bc91a60fd05d245463650a04696651bec316af98ed09468a7b409f146a2303 SHA512 78a5fc75913ef78cfe8cafbd8bbd97a85a3053ee4b64fb3e7c00eeb7171802e9daf9f6fcbfa26b3c21a36607611f96e72d4e76734f8bcbe824075f7e97f97406
+EBUILD cura-4.9.1.ebuild 2091 BLAKE2B e3975d79b705b1747cf1e3b7b75af8ea0309930ff3ff67a2104966f58c06cfb4706427fe059e91eb618240ad998a669aba5a423a60b13a24eaab6c6ea5e99860 SHA512 ba9546fda3d7b27a031c93887e62589f209b0f500b8c3417d13750ebcb21bfdf30b54d78e16ddf7b043667f5f5f42d16db6cad5524eefa982ccae06b2ac70d52
 MISC metadata.xml 1082 BLAKE2B afade1233826e2557117dbeb80c2ade8e4f7541597d5bc071acf564d3dbd399206143346e520bba58f6ec17afe2f1c706a89372034d7ca2adabc2e7b3adb83aa SHA512 eeb78698a502dff0913b523dd6d2bd9bdb2ba3bd5eadef5b060de9a2d3323a35b9e7ee710744ec0dd141819c08be75df0b0f598b61f14c04575cc47c1d254026
diff --git a/media-gfx/cura/cura-4.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild
index 8c8c80d0005c..edbbb3c17dd2 100644
--- a/media-gfx/cura/cura-4.9.1.ebuild
+++ b/media-gfx/cura/cura-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{8..9})
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
@@ -29,17 +29,17 @@ RDEPEND="${PYTHON_DEPS}
 	~media-gfx/fdm-materials-${PV}
 	dev-qt/qtquickcontrols[widgets]
 	$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_MULTI_USEDEP}]
-			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
-			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[-debug,${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5-sip[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-			sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
-			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+			dev-python/keyring[${PYTHON_USEDEP}]
+			dev-python/mypy[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_USEDEP}]
+			sci-libs/shapely[${PYTHON_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 0f2a56351245..3d4711579c42 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,11 +1,12 @@
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
+AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 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 4385 BLAKE2B 746a68dce4a91157795160d756c5500a64f605ae685dc04b2fef89d9c7f1d55df392cfc0cf3d6d2ed042f591e48bbee95d1a12b6105d0410f19b3aa14e19a18c SHA512 4a26fcc51008bfdb117709deff531203056fd0db5859d0bbacbd298d9a9ee17dd7f8d7541bbcdfaa1a027d766c161deb480293b6643603f526615bd53be90ea7
+EBUILD darktable-3.4.1.ebuild 4458 BLAKE2B 232c71684688619c4f6248325b4805f2fec2840fd3198651c871eb9c73f0ef82e85ed0a985a89c5de3133939b469e40bd40091d72a612172b775a2d3c6217e4a SHA512 0264c756bc1dee91a6d6a447975fb0bad98995cd4974cde9686a0cdea3858b8a01498f3619286bd9d7651f4ded636e6236493605735a4394d300c4927536eb4b
+EBUILD darktable-3.6.0.ebuild 4431 BLAKE2B fd1b7cd67b2671e00a52696e063a94479da82392db7bb48d57b51152aeb5b1b078d451289166ddd6035c329b4c821cbd09f16655d17c9f58d7aa0f3d0dfb20b2 SHA512 1610759b81986d8c738d186731c6219134adc52ffb000eab8af444c0aedd718dbf35e380ff8db3154f7730ef403d7cc13d09db16f788b2418f88f83837125667
 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.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index 54b4518a454b..2f4bd3209de3 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-find-opencl-header.patch
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0.ebuild
index f73844b3854e..ad4c79e2d6ea 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-find-opencl-header.patch
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch b/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch
new file mode 100644
index 000000000000..72ab5aa91adf
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch
@@ -0,0 +1,20 @@
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -1,5 +1,16 @@
+ if(USE_XCF)
+-  add_subdirectory(libxcf)
++#  find_package(ZLIB REQUIRED)
++  add_library(xcf STATIC
++    "${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf.c"
++    "${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf.h"
++    "${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf_names.c"
++    "${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf_names.h"
++  )
++  set_property(TARGET xcf PROPERTY C_STANDARD 99)
++  target_compile_definitions(xcf PRIVATE _DEFAULT_SOURCE) # needed for htobe*()
++  target_include_directories(xcf PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/libxcf")
++#  target_link_libraries(xcf PUBLIC ZLIB::ZLIB)
++#  target_link_libraries(xcf PUBLIC m)
+ endif()
+ 
+ add_library(whereami STATIC "${CMAKE_CURRENT_SOURCE_DIR}/whereami/src/whereami.c")
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 32b077758cd0..43f84d795222 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
-EBUILD eog-plugins-3.26.7.ebuild 1730 BLAKE2B e7d93342118cb931baece78a6539ad3f58286242cf73568c4c95a822c9b0e5a0c931cad91660f16f35ed44586b9b24c28d2ae677e22950fc89d3f2ea17b13a10 SHA512 8b97359f433862a7df076f2e0eeb45929d121129ad5677b317c0703f4dc7cdf875bd845439de5d0b3943b2c26352ce82bc2b487fc15daf86340a6b86c7fccad7
+EBUILD eog-plugins-3.26.7.ebuild 1724 BLAKE2B bc1b80d1d3775b924554435d23188361933ca594cc552794182e617300b673cbfcdd523ae334de644b8d061bd4d4741a6799a714709ddc203c05b7e67118a1a1 SHA512 489b429a9b792c4405c0cb88c2c09178bb35bc5818c644f51641177b24ddbbd1a87969147024cabb310b1b8950a2c8d42983a71ded4fbbedaa8f5c8eb78eaa3b
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
index abf23601ba1f..5f727ce583b2 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome2 python-single-r1
 
@@ -35,7 +35,7 @@ RDEPEND="
 		>=dev-libs/glib-2.32:2[dbus]
 		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
 		')
 		gnome-base/gsettings-desktop-schemas
 		media-gfx/eog[introspection]
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 51af689ca762..cb3e754e502f 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -3,5 +3,5 @@ AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r1.ebuild 2404 BLAKE2B d0ab18a2209c7b93bb07dc1dd3cb4a09714987c1878540ee4258c112883b65523bd04236aeeb0c626e0ff7eeac76f3e99c79e2b15f9e96d924994724566d7433 SHA512 20f460a664de7e6a3c0e7eebcf7ee2e7fb8952ce5a71cd8ad3d21d13023adf117529c1ff94381cbf73dc92789e204c03b5f14aa7447a77b62ea452dc9e251124
+EBUILD exact-image-1.0.2-r2.ebuild 2414 BLAKE2B 8093c62f2d6fac896ca82b2a51e6c3b30224033eb176e8e7a6d891859020973215cbfae275ded00edfbb03ae43e0db69b0d034120b726a5a1bb9429b8106f8d5 SHA512 db192cd8b8859b873398ec1ed288a45ebc28a4476de6d9db8d80a41e0660d7f6f07200576208b0cb6495fb461fa21a3aa15cb6f440679bf7ee83d1c38ea95907
 MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
deleted file mode 100644
index 51f39a69c4e2..000000000000
--- a/media-gfx/exact-image/exact-image-1.0.2-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
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single multilib toolchain-funcs
-
-DESCRIPTION="A fast, modern and generic image processing library"
-HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
-SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig )"
-
-RDEPEND="
-	x11-libs/agg[truetype]
-	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	jpeg? ( virtual/jpeg )
-	lua? ( ${LUA_DEPS} )
-	openexr? ( media-libs/openexr )
-	php? ( dev-lang/php:* )
-	perl? ( dev-lang/perl )
-	png? ( >=media-libs/libpng-1.2.43 )
-	ruby? ( dev-lang/ruby:* )
-	tiff? ( media-libs/tiff )
-	truetype? ( >=media-libs/freetype-2 )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-"
-DEPEND="
-	${RDEPEND}
-	swig? ( dev-lang/swig )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc6.patch
-	"${FILESDIR}"/${P}-g++.patch
-	"${FILESDIR}"/${P}-dcraw.patch
-	"${FILESDIR}"/${P}-php.patch
-)
-
-src_prepare() {
-	default
-
-	# Respect user CFLAGS/CXXFLAGS.
-	sed -i \
-		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
-		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
-		Makefile || die
-
-	# Show commands.  Use qualified CC/CXX.
-	sed -i \
-		-e '/^Q =/d' \
-		-e '/^\t@echo /d' \
-		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
-		build/bottom.make || die
-
-	# The copied string fits exactly.  Use memcpy to reflect that a null
-	# terminator is not needed.
-	sed -i \
-		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
-		codecs/tga.cc || die
-}
-
-src_configure() {
-	# evas -> enlightenment overlay
-	# bardecode -> protected by custom license
-	# libungif -> not supported anymore
-	# python -> allegedly not python3, but python2 only
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		$(use_with X x11) \
-		$(use_with truetype freetype) \
-		--without-evas \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_with png libpng) \
-		--without-libgif \
-		--without-jasper \
-		$(use_with openexr) \
-		$(use_with expat) \
-		--without-lcms \
-		--without-bardecode \
-		$(use_with lua) \
-		$(use_with swig) \
-		--without-python \
-		$(use_with perl) \
-		--without-python \
-		$(use_with php) \
-		$(use_with ruby) || die
-}
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..d7c17e6ed530
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
@@ -0,0 +1,105 @@
+# 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 multilib toolchain-funcs
+
+DESCRIPTION="A fast, modern and generic image processing library"
+HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
+SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig )"
+
+RDEPEND="
+	x11-libs/agg[truetype]
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	jpeg? ( virtual/jpeg )
+	lua? ( ${LUA_DEPS} )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
+	php? ( dev-lang/php:* )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.2.43 )
+	ruby? ( dev-lang/ruby:* )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+"
+DEPEND="
+	${RDEPEND}
+	swig? ( dev-lang/swig )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-g++.patch
+	"${FILESDIR}"/${P}-dcraw.patch
+	"${FILESDIR}"/${P}-php.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS/CXXFLAGS.
+	sed -i \
+		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
+		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
+		Makefile || die
+
+	# Show commands.  Use qualified CC/CXX.
+	sed -i \
+		-e '/^Q =/d' \
+		-e '/^\t@echo /d' \
+		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
+		build/bottom.make || die
+
+	# The copied string fits exactly.  Use memcpy to reflect that a null
+	# terminator is not needed.
+	sed -i \
+		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
+		codecs/tga.cc || die
+}
+
+src_configure() {
+	# evas -> enlightenment overlay
+	# bardecode -> protected by custom license
+	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		$(use_with X x11) \
+		$(use_with truetype freetype) \
+		--without-evas \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with png libpng) \
+		--without-libgif \
+		--without-jasper \
+		$(use_with openexr) \
+		$(use_with expat) \
+		--without-lcms \
+		--without-bardecode \
+		$(use_with lua) \
+		$(use_with swig) \
+		--without-python \
+		$(use_with perl) \
+		--without-python \
+		$(use_with php) \
+		$(use_with ruby) || die
+}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index ab54a3f1693a..ec51c0dea27d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -8,6 +8,6 @@ AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAK
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.2-r3.ebuild 12374 BLAKE2B 927540e365fb77eb8a547adaef29f2b3cf804cf5c2187e8cd1f5f2c214e30e175f8bd4c45c9235e897888b29113074003eb0e49a7ca660bc00f711c25dd43293 SHA512 8dd47065bba4f10c8b3185c3d26c1064aab30c8c7433d7fa4a7d2347b11ecab1f317360e75a5a6c8604a579cbd3ff5e1ad531a15011ca4f2a6b177c3319f383b
-EBUILD freecad-9999.ebuild 12128 BLAKE2B 6a6e494ee9ea040a606976c3c60795d22a4462eb38de8c264c2f704815e6ee4873962fac94d8f662936e7cc31b107df90386f9676c90646c2869ea9d1804d287 SHA512 2383306704b548cb855c7de1bee5a99e216bab2f1fdf6141356fb2ade5ae7a246c5cf80f9b1d1e8fc04d9901f7a1fa930c4f82a9942dc603c66975bf42b11096
+EBUILD freecad-0.19.2-r3.ebuild 12318 BLAKE2B 42007a647c90b2c2f2584e663dbb2dfe1a7378067e03fadd42bd5f2fa7196e3669f1dd6a061e5379b279af3162da6c5cf8ea5cdb597341598d9339c4fd3b9991 SHA512 0a0eaf83098b180772d23468fc494838b6e4f8360bbddacbd6f4c86b3b1d414a1f10918d8e9c17d37478e1a2710092c10e58d7143ad0a1ef8b55af026a833b2b
+EBUILD freecad-9999.ebuild 12072 BLAKE2B 72c3a32d41b24f8a074f9c839cec133c964e428588c19ce02a60b079caee2534b674438e96f44b1c8754709b70befc52af48cde3e2b982b19e421cf7687c7fd2 SHA512 494ae6bde08c2092831f4d65dfe979afb80bd806af63fb3c56c326a2bd3998918d4183c82d5bba5c065ee652086ca3d800c273aebad413a100a161afa923995f
 MISC metadata.xml 3267 BLAKE2B a9ac18b801fbe7f379298f8e0f820e83441536bfc28a09963990006d2251deb88211d80e086d13646a8ff18380e8aa4c0ac399765c557194c8311475f34744f7 SHA512 1b8674896d56605d8018fd0cc1a56ca6e121171c9630d76c5b1933a78dd31b619f27e986163b01051f0ff8e32b390498a8f0b534103d67a6fd32a91cea97a300
diff --git a/media-gfx/freecad/freecad-0.19.2-r3.ebuild b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
index 954e1f8b1fed..70fb0270fb59 100644
--- a/media-gfx/freecad/freecad-0.19.2-r3.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
@@ -83,15 +83,15 @@ RDEPEND="
 	openscad? ( media-gfx/openscad )
 	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
-		dev-python/pybind11[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] )
+		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+		dev-python/shiboken2[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index cb6c6efe011b..8c0caca6adc6 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
@@ -83,15 +83,15 @@ RDEPEND="
 	openscad? ( media-gfx/openscad )
 	pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
-		dev-python/pybind11[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] )
+		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+		dev-python/shiboken2[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 3f2dfc379e2d..99569e14262c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,6 +5,6 @@ DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f
 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.99.6.ebuild 6837 BLAKE2B 451ec9116fdbfb48ff788495e50827ce4a353c1bbed8d4c70b5fab6dfa91cb2689d127492ac4f65a49b1cadff0c95d4d513fe9932ad9b9b81d01ef89291987c0 SHA512 56bbda601c4e6763605db989de30842f6af3f1fe166f09afe2b2d93a638a7f75c0e7f5744e05c18d1f8771bd4400283c5579ec6faa6260dd0f281825b06578fb
-EBUILD gimp-9999.ebuild 7011 BLAKE2B 5c9703b19e17a0e95e88d27c8a37cd316decf0d721c55243bc456b0a6467c6d952bbefaf79938358c03b2bb17b2c984375c837f992670640e180fe9e33e232f9 SHA512 c4c6e9ad7f32b76db12469398d7a49001de4e6043c536b09803fcfced310d1166b6877a72ed67e628ccfa8e06effd723bbeb3c4ba68e30de9815c98df206405f
+EBUILD gimp-2.99.6.ebuild 6831 BLAKE2B a1cfcbf93e7d9b63c5679c39f6ca3a45cc08f09907e710db327e86e6a366d36a5f21e21ca725e5ec846fac5a6ba87a222fcf2aa233c7a754df50d8b84979178f SHA512 81fa90363f67f232b5e552b91810ae8dc2a180fe8c508b46f977a69afe6c9d895ed8340acf48d503fe8db9a5d2c6eb9a37d39a1d0cbc894c97a846655dc9afc8
+EBUILD gimp-9999.ebuild 7005 BLAKE2B fe9ced0b17ab49bc548e8164ca79725d436b85a34b0200bcba5e35c94ff0999119190b24291869821cb6a6c4350c1db12e6f04c50f224ba5b843cb4974a4e9ba SHA512 88a9a45a3486c7e578de7fde22a300248f8f8658c3c01ad13e5b5f7c3f9d356900cd12c3485fd98b21c60d7e8b76c06cc5efd40ca8a449dbbfc46efe5fad697a
 MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/gimp-2.99.6.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild
index d2c37000187a..ba698e284a38 100644
--- a/media-gfx/gimp/gimp-2.99.6.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.44"
 VALA_USE_DEPEND=vapigen
@@ -74,7 +74,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 		')
 	)
 	udev? ( >=dev-libs/libgudev-167:= )
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index e412365e13ec..9e548653f6ee 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.40"
 VALA_USE_DEPEND=vapigen
@@ -73,7 +73,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 		')
 	)
 	udev? ( >=dev-libs/libgudev-167:= )
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index c70d288759fe..3848a897d2af 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,6 +1,6 @@
 AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e67b6ca0dbae58dfac1c3bf44b1dd07a7b33248a255728e2b9c6b87f534ef1463b20d2f5df8f2e07bb619b97b428fc14e9f8939e4 SHA512 6eb044a143acc0decd64f90578b98a41a82c05a0bbf90e35646af1007e685d0d37a08ad3e90674bc6b5fedf460695b27f771a2776bfb391af03f6c1674592060
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.5-r1.ebuild 652 BLAKE2B 543b90065074488e91faa5ae0f310d10a0bcd84913c3a0143f9fce8c367c8a6b1659c69c2b824c012b889163a5afce282d5b49f38fa7c7352ebcda245fb448d8 SHA512 5b7a0856bb9cfa2296c4d588bb4e2232204c50955928a10f6c94507aba495452937b89ba5d49bb32fcbdeb7a92ad938aa70ba638e14ddf41396972f0e47b053c
-EBUILD gpicview-0.2.5-r2.ebuild 580 BLAKE2B d3637083f6dc2f4e0b5b83ab113089470f6095b6aeaf52e06909ca30cf63c9b95a5532ddcdb575573f9794603d296d5e146b115e4ad82c47990712d3e472bee9 SHA512 b3a64073f6fa8fad7c1c21077c6f2b0f4da2884e5cd8954e390a661a3c8ec4bbdcd7e06272a922522d102114e7acd88495502887b1e8aa10d0be36380ff6bc24
+EBUILD gpicview-0.2.5-r2.ebuild 587 BLAKE2B d96a5f1a08c1a404f868158266c30dd4d09531c523d3fd53439aa9fdc5f0c65c87ea79dbc48266cc712919b7dc1c1591cc55bccf64c2d93ded559ef7ec3cbbbf SHA512 e11da0c9ba2efa20e65d2984cdc423504169e72248facc7f865aa145f4ec4f2e2e61a1a10972e2b4b90bc8892a162c2829e0ae6ec724e468ef50fe313f49353d
 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
index 5b657769e158..104042801fa6 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 RDEPEND="virtual/jpeg:0
 	x11-libs/gtk+:3"
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6c7fa070729c..612972b0bea9 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -7,9 +7,9 @@ DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb70
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 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
+EBUILD hydrus-444.ebuild 4096 BLAKE2B 38d338d034c353723481cc8daf2bb8f99ca6443242ba8692cda6cfc663271e763b9b53aff7f3dc2e407676586eede2895fa669aaf19be2d2e95b2dac2e6c5823 SHA512 c722905f3ca2b6097cd3c50848dec6c0d7279765fd5792947eec7b405ff62770bc29e62e38076eebfbe18347724d8b58b7b719165c18b7cd477a27c83282e680
+EBUILD hydrus-445.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
+EBUILD hydrus-446.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
+EBUILD hydrus-447.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
+EBUILD hydrus-9999.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index fb12102cde91..d09faedb63c2 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature
@@ -33,35 +33,35 @@ 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}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
 		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
 		)
 		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
 		)
 	')
 "
@@ -69,9 +69,9 @@ 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}]
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index abe83ba38720..c735f0ac9e1f 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature
@@ -33,35 +33,35 @@ 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}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
 		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
 		)
 		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
 		)
 	')
 "
@@ -69,9 +69,9 @@ 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}]
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index abe83ba38720..c735f0ac9e1f 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature
@@ -33,35 +33,35 @@ 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}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
 		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
 		)
 		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
 		)
 	')
 "
@@ -69,9 +69,9 @@ 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}]
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index abe83ba38720..c735f0ac9e1f 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature
@@ -33,35 +33,35 @@ 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}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
 		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
 		)
 		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
 		)
 	')
 "
@@ -69,9 +69,9 @@ 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}]
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index abe83ba38720..c735f0ac9e1f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature
@@ -33,35 +33,35 @@ 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}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
 		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
 		)
 		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
 		)
 	')
 "
@@ -69,9 +69,9 @@ 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}]
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 36df496ab4ed..592e74769319 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-17.tar.xz 9172828 BLAKE2B 87724cfad2b11fa3901dcffb243c314efe303de6f6f17382b82fbbd05b963b70394f17f68b1d87cc53eb7a12233a62241145d4f7f9e48ce8b1fedb9be3dda981 SHA512 c966524b82fd667b2eea45a78d4c4f62745f744889ca15c4b0a5bf390f47c801fff926ecd54e48b42b6142637ff95babaa1464fb8eb401c615fcc000166f46b7
+DIST ImageMagick-6.9.12-19.tar.xz 9183520 BLAKE2B 144a31c9f5a0e3489d362bf42a0ba5b3835f3d3e6b85d8573a9ca5188f04e0c5e6c16bd59510621805b2941331df412d845a0650d19a05bc97dac1e0c06b8e1b SHA512 1175d6330cd9c4dc8f4b7c1dc178a4654a9fcb17e209c10dc8eb776cb64233a8fa1c512d72ded50f0588ec35a13979d30e37e966ddce27fbd175f48698946b88
 DIST ImageMagick-7.1.0-2.tar.xz 10312288 BLAKE2B 0c79b02a84c883e8016856bd5543a036228e9febab0160525737ab1105d3af52595959412b36d6120c52a11efb7a0f4c0638aa04d11b8dc3774fe655c347e929 SHA512 e9b38ccc56ad6936c59adbd934148aeca441f41015be8d2d4b7dd4106a120748aff8cba0239d8ada4288d679a19931696a0bec5ae05681eba7d3078fa119ad0a
+DIST ImageMagick-7.1.0-4.tar.xz 10310828 BLAKE2B f7504d47e95be57b5b2f02f0ac8ea526c0b6f60cd0e3ace3445e6d52cc7cf9d4287e1cb24d4451587807809e671f459c107b1dfcb3a99436d112591a32fa5365 SHA512 21bd565227eef40bf967a23061e799dc0cb767c226717a66135ecc07a812495fe62c0d36c38b5c801356c63a9e4bf5a48b04fc56fcf6c0f5e37c2ccf52fce855
 EBUILD imagemagick-6.9.12.17.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-6.9.12.19.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
 EBUILD imagemagick-7.1.0.2.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
+EBUILD imagemagick-7.1.0.4.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
 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.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
new file mode 100644
index 000000000000..d17773f5081b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
@@ -0,0 +1,262 @@
+# 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-7.1.0.4.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
new file mode 100644
index 000000000000..42e594451118
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
@@ -0,0 +1,269 @@
+# 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/inkscape/Manifest b/media-gfx/inkscape/Manifest
index c335c9f60b9b..38a4111306ca 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,5 @@
 AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
-EBUILD inkscape-1.0.2-r1.ebuild 4150 BLAKE2B 756fec945d62135590e0347adcbb98436159c487134b883ec5316d7140062377e638c3275b092a13baff70a692ed287f1081271163fa39ae5bdb6720dba2526d SHA512 bb997baf9aa3d21325af5be627908d7ff20a019f23fe680954d85e1b48c579c9bb4902f1d5f6de820a6415243e7b4c997f496ca877bacc8bc64debb80a51afee
-EBUILD inkscape-9999.ebuild 4064 BLAKE2B 4715f25355cc7ed6241d1f9ce1ed81685591a206be427ebc745a9138f36d9f9c9e924234e64904040adf66927b955063e99e197d3efb4ce0adee0f52334bb371 SHA512 2f7f58f971acceabd76e01acf0d468a11ba734bd5b2a9ec9af0179b9067ce4f41172507c873b577c7d0c47bde9115ebd4c48d861e76f6bea6a4f7669b12b5669
+EBUILD inkscape-1.0.2-r1.ebuild 4132 BLAKE2B 262017e955a6f2df6d81618d4b1f7c2ac1ecd2756a7cfb08508d9a9b4f3b86cae13acb9977c38b0603d27a49be5db6f6b04cd4c4e12aeb72be95911cbdc03922 SHA512 94ea15b42ca8dae2f9879cd7881dec93990411d5513049881580432f2ba34651e4753d021b7818007df4266d5be6e2b6562224d5ec5018770ddb320005824bcd
+EBUILD inkscape-9999.ebuild 4044 BLAKE2B 84c522e414e89885ed195bd6f12de31a4557a30cc5d1f1a331ee63de238830a96095c797bdec5bc7beb9e8b37ddc1797d2b292e5b1e62ff2c18261d4d78dbbcf SHA512 9e05e5dbb98f7dedf2e7ca17778955d0b37fbc8b462b22f807a0f0cb7d08b4b1dd2a6962f68b32474e5d04ed7338ce043afebadbbef3fbb4e0da43102499284b
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index d70335ea2fbb..975ed9f12d42 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
@@ -50,8 +50,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (
 		app-text/libwpg:0.3
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # on that.
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 5dbdb4b49977..963ed3548658 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
@@ -50,8 +50,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (
 		app-text/libwpg:0.3
@@ -87,7 +87,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # on that.
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index baba09d6792f..b4bd9f4962d6 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,5 +3,5 @@ AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f9
 AUX krita-4.4.5-pykrita-crash-on-exit.patch 2029 BLAKE2B 82b5146f25165416ac6e3f2ea46315e87bf53f5b34a3c3820bddd2e975f782e945db6f985a5fa347a8a2f644e15ea7f60854ea0874f1a71e213819aaea70c454 SHA512 9848301759c51724c3bd2f9c67f38073e6043d3bbeb8c557fe7ab6261c9664f97215ab602808f6c495cf7a23c6e91f19823b3d3cdac8f135ff878dc0fd63a653
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
-EBUILD krita-4.4.5.ebuild 3500 BLAKE2B a13200741bc0d18fe32a7224371e3c2acc1d22d3581d6661ffba931ed9044c886a4047f9aac280719979159f5d45a2b17b3a921858dab6bd80beee0b6a1a023d SHA512 fe1ffbebd161cd2dc6c83f34d96dfa007b1dcbab9f8a8ce10310ff3a0a31b5861eaa7217fe8e9a129f068e50e310df4257a29e06f3c87f299a0378959ee9cff1
+EBUILD krita-4.4.5-r1.ebuild 3498 BLAKE2B 157ab6af565cfe24f58b871aff9e067ab5613cd953d2556c18d7023f372b6c4ff601b078ad4d9e69b2c39e553a7f75e71f09a23f695e7a64174625ba787442a3 SHA512 c33a0d672f8a1b844e93c034a23399322a82116c3721f3e52b6b519802a700d121a5fa458ec5d752670bd9e0e39f87d3a23f764e9e7df9b8c91acb14a70df7dd
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..fe539d739267
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.5-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8,9,10} )
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT+=" test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip:0=
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}: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/kiconthemes-${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
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( =media-libs/opencolorio-1* )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		<media-libs/openexr-3.0.0:0=
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
+	"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/krita/krita-4.4.5.ebuild b/media-gfx/krita/krita-4.4.5.ebuild
deleted file mode 100644
index 24eb620839d2..000000000000
--- a/media-gfx/krita/krita-4.4.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8,9,10} )
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT+=" test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}: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/kiconthemes-${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
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( =media-libs/opencolorio-1* )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
-	"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest
index 6862634c78e1..ccc100a456a7 100644
--- a/media-gfx/libredwg/Manifest
+++ b/media-gfx/libredwg/Manifest
@@ -1,3 +1,3 @@
 DIST libredwg-0.12.4.tar.gz 18318912 BLAKE2B 21ff443881c19782c747ddf880eba23090295432edf4367161472aeef970e1b93983967e667ca2c3e140bf0b97e7b238bbe4a342815df365cee10bde83a04178 SHA512 df9424f475be512a6e9e02a1156a7d6a966f684f5753f420843593ee9dc236bd33bd10dbd627bab1b9adab9b8e7cb3a6b464c15e643ae755bc7e11974c05cd7a
-EBUILD libredwg-0.12.4.ebuild 1890 BLAKE2B 12511d396de500179724a8b26b42fa4f2e280b7d12c8101c21843e2654e6c585eb03349355b29e21bdf76136dac76ed7484b14aead21d57d0de72078f69502ec SHA512 8d77ddcfbbdd6d33122af2263ee8a0536c06e349833a0e28861094fa395cfcc57458104376b7bf50ef79439963515150bd3d7eefb7b8825670aec9ce264fbb30
+EBUILD libredwg-0.12.4.ebuild 1976 BLAKE2B 4fd3fd0915a08a3da9c0c79cccb8d89e011218195be7945809dafa62ee2caa77eef55d892e137a388f9cd6f46ed85ff29900cf09720d3863183d21fd7c7e1984 SHA512 7ad49f1abb0a57ac05adc2422e8044fd2f7beac60aeebbd21daf82af561cb03f6d632e1223e3a246961519a8ed2f020a85ad408cff283e5b23ffcb9d9baf5bf8
 MISC metadata.xml 405 BLAKE2B 41ee7b222f85ca930fcf5d84f8c75dc99a72f9fe32457b3384fbd4f58606949438d2371d182af0256637cbfd6e20f008d43cd8608e4d9f9b392709ac2276bf79 SHA512 107e0c7e4c27421bcbea9aa7784c1bc1bec84abd27602621a9d17ed62555324d584769994ed13dec8856ecc9955dba1b2080315a46c494a3c0cc4e0b62ffdd83
diff --git a/media-gfx/libredwg/libredwg-0.12.4.ebuild b/media-gfx/libredwg/libredwg-0.12.4.ebuild
index f6d7f18dea12..6edddbd8e788 100644
--- a/media-gfx/libredwg/libredwg-0.12.4.ebuild
+++ b/media-gfx/libredwg/libredwg-0.12.4.ebuild
@@ -34,6 +34,11 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	perl? ( dev-lang/swig )
 "
+BDEPEND="|| (
+	sys-devel/gcc[sanitize]
+	sys-libs/compiler-rt-sanitizers[asan(-)]
+	)
+"
 
 src_configure() {
 	perl_set_version
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 23dbeebf5f3a..4fdda75654d9 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4591 BLAKE2B b4f021ddee8d71229d8da5f5c8de887d7b48aacab6ad7d205626a33395e9fdecf34e5f7be52a13dd9823b0a6052e8b99afcae307169b170b9bbca76c3063e381 SHA512 703f21c9dbe850608a50b9b96f1c1ee570a0ecfec4687069623f0543f44305be930453f1063cca5420d5adc1c1e7e3cc5514f2d7c1dfbc28d9bc8e58e7cacf81
+EBUILD povray-3.7.0.0-r1.ebuild 4611 BLAKE2B 83dec3e35bfdeff46ec156f9c746fcca4c86608bf00344ff290ba1ebf9786812db0777a9f4cd2c0de760350fc95c8d8da62e12f5f407fae339bfb21b92a400e2 SHA512 70f40fabf0e3a04b4bc978ee4976cd673745b90d7061397bb7027f4115277678182b633af938ce8015e7356ca5da8b65bf9abf95cd89e3a95a04883061c8fc17
 MISC metadata.xml 409 BLAKE2B e2a6e08275a5f651f9f01b40d2b65a96ab4e339913a436310ff628c16c4b75c2c760ffd83fc028b4b281c86eb21097f8a4f837b33c44ea86c7c5c179377e824a SHA512 fdd7e78c78ae071ae955489caf83beff36f2db53a85bae66a2660db005bb40ff27a4a34312ea293b319c346f5ed68c55ac488abfd09eece266eb003362a56987
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 0808cab1667c..f6193beca6b2 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -15,13 +15,13 @@ else
 fi
 
 DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
+HOMEPAGE="https://www.povray.org/"
 SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
@@ -30,8 +30,8 @@ DEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0
 	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr )
+		media-libs/ilmbase:=
+		<media-libs/openexr-3.0.0:0= )
 	tiff? ( media-libs/tiff:0 )
 	X? ( media-libs/libsdl )"
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 606798f664e0..3a62e27c6679 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -3,5 +3,5 @@ AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe
 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
 EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-EBUILD yafaray-3.5.1.ebuild 3105 BLAKE2B 32a01a24dc8273fdebcb5e51d537341e25721e1c30f68011e7cbb76c10dd376ef3699d3714bc5ba6c473786b5f4611ef010f675a9efb95cc815c36f19982fa90 SHA512 181ad2143517df7b6965300f5f1ccc2f80398d32e1d07c71947977ad4a1c336134fb7296d6e93ad493140dafe69790b3cc8e48b6a118aa78d4573d27fff2e012
+EBUILD yafaray-3.5.1-r1.ebuild 3110 BLAKE2B d5cf41be94638e0f2a7ce1e71bf4eb337490356903de173a6ad1b2c83899c023d8ad6bcdd19516ebbcaa396d9a2e3ebcebb2f021db9934ce69f76063dff3437d SHA512 e7ebc78775c2c4c4e34d174967cd5d2afc74cbdd5c57b2ede180048215c5e7724f7ff0050de589af5acde0c8b8b691ae158c9a715a975af52d5978073068f22f
 MISC metadata.xml 1089 BLAKE2B 642427525ab36b55b7fefbddbd48f0f4133abadc830c23f7278e5ac2f37643d7a4b228139c3adfe10f7049b5674a4d7440d0e1d3d656f478e88d96ef485e9781 SHA512 ce02f7dd179775bde5ac0661fc2ae838281ac8e25ccba802c9f96b14351cc6ec5aca6cfd6f3882028c9981f398d40554cd5fc5c32afa393212585bc9d9b0bfeb
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..2e4fb63fdf46
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# doesn't build with ninja when qt5 and python USE flags are both enabled
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A free open-source montecarlo raytracing engine"
+# Regular homepage is currently down. Upstream is working on this.
+HOMEPAGE="https://www.yafaray.org https://github.com/YafaRay/libYafaRay"
+SRC_URI="https://github.com/YafaRay/libYafaRay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libYafaRay-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: according to upstream, the blender plugin doesn't work with >=blender-2.8 (yet).
+RDEPEND="
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg )
+	opencv? ( media-libs/opencv:= )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
+	png? ( media-libs/libpng:= )
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtwidgets:5 )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch )
+DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	append-flags -pthread
+	append-ldflags -pthread
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# enabling BLENDER_ADDON doesn't build anything, but set's some wierd
+		# installation paths, so keep it off and install the files manually.
+		-DBLENDER_ADDON=OFF
+		-DFAST_MATH=$(usex fastmath)
+		-DFAST_TRIG=$(usex fasttrig)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OpenCV=$(usex opencv)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_PNG=$(usex png)
+		-DWITH_QT=$(usex qt5)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_XML_LOADER=ON
+		-DWITH_XMLImport=ON
+		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DWITH_YAF_RUBY_BINDINGS=OFF
+		-DYAF_DOC_DIR=share/doc/${PF}
+		-DYAF_LIB_DIR=$(get_libdir)
+	)
+
+	if use python; then
+		mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use python; then
+		python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
+		mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
+		rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
+
+		if use qt5; then
+			python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
+			mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
+			rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	einfo "To confirm your installation is working as expected, run"
+	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
+	einfo "as an input file, then compare the result to"
+	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+}
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
deleted file mode 100644
index 2b65a4e8f72e..000000000000
--- a/media-gfx/yafaray/yafaray-3.5.1.ebuild
+++ /dev/null
@@ -1,116 +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} )
-
-# doesn't build with ninja when qt5 and python USE flags are both enabled
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A free open-source montecarlo raytracing engine"
-# Regular homepage is currently down. Upstream is working on this.
-HOMEPAGE="https://www.yafaray.org https://github.com/YafaRay/libYafaRay"
-SRC_URI="https://github.com/YafaRay/libYafaRay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/libYafaRay-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype"
-RESTRICT="test"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Note: according to upstream, the blender plugin doesn't work with >=blender-2.8 (yet).
-RDEPEND="
-	dev-libs/libxml2:2
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	opencv? ( media-libs/opencv:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:= )
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtwidgets:5 )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="python? (
-		${PYTHON_DEPS}
-		dev-lang/swig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
-)
-
-DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	append-flags -pthread
-	append-ldflags -pthread
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# enabling BLENDER_ADDON doesn't build anything, but set's some wierd
-		# installation paths, so keep it off and install the files manually.
-		-DBLENDER_ADDON=OFF
-		-DFAST_MATH=$(usex fastmath)
-		-DFAST_TRIG=$(usex fasttrig)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OpenCV=$(usex opencv)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_PNG=$(usex png)
-		-DWITH_QT=$(usex qt5)
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_XML_LOADER=ON
-		-DWITH_XMLImport=ON
-		-DWITH_YAF_PY_BINDINGS=$(usex python)
-		-DWITH_YAF_RUBY_BINDINGS=OFF
-		-DYAF_DOC_DIR=share/doc/${PF}
-		-DYAF_LIB_DIR=$(get_libdir)
-	)
-
-	if use python; then
-		mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use python; then
-		python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
-		mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
-		rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
-
-		if use qt5; then
-			python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
-			mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
-			rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	einfo "To confirm your installation is working as expected, run"
-	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
-	einfo "as an input file, then compare the result to"
-	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
-}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8eb56131667d..7795ab94b721 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -6,5 +6,5 @@ AUX zbar-0.23.1_python_tp_print.patch 1671 BLAKE2B e7d869e64879fb77151b1e8d66865
 AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
-EBUILD zbar-0.23.1.ebuild 5378 BLAKE2B 0a0600179d7dc1812dbaad0446b91d30f4bbbd0d6d2271800afada662ab1bbfdbcdf22c78908594b0dddcf13ce5ea107d5f039a580137cd3e58c1f8c4986358a SHA512 6eb6125996b9b2fb138e489aee1189b1a480dbb1b990cd7996b83fc59a31e0fef7c3b1bec14db7381837784d644e69e6b5f7e40bdf5429411120af04526d3e00
+EBUILD zbar-0.23.1.ebuild 5372 BLAKE2B f9dc36d7e2418baf676c04b565581800750d3da8aaf830a21b1445358522b391f7a22a8b06c76c171402a79ef3a94763316c134cdf6d8fdf5d02d3f34833677b SHA512 41142df60af20c0a6e83731f029c2e77f8b9b2a046f1ac9f52a0c97209fb35441101182a1f18d122ec6a7185681470a8327cba0efd5b8993339a3028494d4275
 MISC metadata.xml 737 BLAKE2B 51ad296b25247d05d1872f0ce6ac5ab5dc0c3c0141c19a851a13c5dab881c2c6f7c8b538bf86783ea9138318e369e25d1828d866adb050dd98dbd336b6932a1c SHA512 0811b0674da5175f0ba71238a8ecad01a5d0000dec24988df42ab91748de016e717471822d6903f279ad411cb50207bc6c4dc6de11268e065961a96948434e6f
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index 7b07b269b68f..56e14bbc04eb 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
 
@@ -67,7 +67,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 35b04b636a22..29af07510c34 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 86180bf7989a..2719d2ee2a72 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -6,7 +6,7 @@ AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bb
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
-EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
+EBUILD allegro-4.4.3.1.ebuild 2977 BLAKE2B cb8b478a8970c24c7fd7c2a6c8650d9263762d3e67971c94e33466ecf95a357a8e9df3de78a8618730c97d48cff6e638b242f55718a2ea66dc07911af966950b SHA512 e9fbde100e978f62058f446378b0514e62e315a8e2a869623168e3bbcd4f057d67a9b7524028d6d1fd8afbb423043486942701fb215d37d7dd35c50e5f2c56ef
 EBUILD allegro-5.2.6.0.ebuild 2969 BLAKE2B cbc457b3bc7486368625b4e68f0e2113bf2ec6d7c8c06ac2a04f2f52845c3d24bbb35ebb421d3a036daaec70d08384a803fd6b9c18af3d6407f05c1af55b8ef5 SHA512 ae3061752943fadcfd1500014476f164699233d54a4d1f853f852476fd0e65d04a6f4942283a9bbff37fc29020506f987a80b8e8d792f9978c084f633d7d43fa
-EBUILD allegro-5.2.7.0.ebuild 3237 BLAKE2B 6601d15cfbdf58a24fc157d5c23cffff5de5621716f68c9cad05125157b377962d1821a8fb7cde3b81f8d89f4b4dc50df716a09074e8c1564a767b47d3a31c0e SHA512 0f12764cc79847fdf4211389916053fe0805bfb34df335ff8618048b59db2beb17954af6d3f8d781a560e712c83daf147559ca5089a39d94e07ba958ae1b72b6
+EBUILD allegro-5.2.7.0.ebuild 3244 BLAKE2B ae90976458b74539cdcb9260ebd7195a1912b41e0250abf0525b06d3bcfef02311e47ad65031672c9d777a86e5a287165b54a889e7ac0a668ba4412107304aea SHA512 35371b138febed8ee87b66fdda167bbd84f31b573382e6b648d16d77aa78cb20cf10f7acacff8059577068cc46172167e08d9b015b36848deddbd2f5c3d37a51
 MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae
diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1.ebuild
index d5f82c7961d7..4c4d839a1c30 100644
--- a/media-libs/allegro/allegro-4.4.3.1.ebuild
+++ b/media-libs/allegro/allegro-4.4.3.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="Allegro MIT GPL-2+ ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X"
 
 RDEPEND="
diff --git a/media-libs/allegro/allegro-5.2.7.0.ebuild b/media-libs/allegro/allegro-5.2.7.0.ebuild
index c6241370e13b..f577c06555da 100644
--- a/media-libs/allegro/allegro-5.2.7.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index c17688bb2659..3ba86eef00dc 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2127 BLAKE2B 2182ec8999f3ec83b93dc1e247a61f5ed2f383d54b8901f40ec1c11e933916235d725e60f8a8423a6f7cc4eb131f225014c015187dcd3fa28d1a600b3372c570 SHA512 e98887fbb86ee933bba86c1b3538e34a3ebb0b6361b4e49b554a85a69feeb1dd652233565c13043c5763781a6a63330c12f0d3b15ff91951b23b7a46fab9778f
+EBUILD devil-1.7.8-r2.ebuild 2142 BLAKE2B d9ef2e6223ea2de918726a6f73f6cb342aea5a092be8a2e0ead630bcf0ef31af3f6ef79ef043c0e9eca2b8701d9ce2462b801bb8405acc92f0c6aacfc1dab14a SHA512 0539a865a64ffc14e0afec959e28277c81bd83f1c4e31155bd43b24429000e983e839e71c8b8639b2145ee374d94ec2c0501b9752b9bb01483c87d5f910331e4
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index fad8f814c325..2e70bc70215e 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.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=6
+EAPI=8
 
 inherit autotools
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
 IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
@@ -30,11 +30,11 @@ RDEPEND="
 	sdl? ( media-libs/libsdl )
 	tiff? ( media-libs/tiff:0 )
 	X? ( x11-libs/libXext
-		 x11-libs/libX11
-		 x11-libs/libXrender )
+		x11-libs/libX11
+		x11-libs/libXrender )
 	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	X? ( x11-base/xorg-proto )"
 
 PATCHES=(
@@ -86,5 +86,5 @@ src_install() {
 	default
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 3d88e09937fd..7e1cdd3ca6a2 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -3,8 +3,12 @@ AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667
 AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238
 AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
+DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
+DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6744 BLAKE2B 0ca789f56a698d01a7de9d0a285d8d09568ee50d66ce044963fa1c8cf6c8a601d8d042d09b82c2c3c2918ad35149d590cff81051b750eabd0e7979b25e9d64f9 SHA512 517942a03670269d1184fad384cb2ee77b84d2192ecbcb3fa28deee9e7148eef965b0a55c941994cf54e971034ad20367a1d8c69852fdc04f6eb924fdfe7893b
-EBUILD freetype-9999.ebuild 7204 BLAKE2B 8fddb4b9232c960abb584841ca406c43820b994f6ed19d8c238dd8770b9afa4b151ead08c28539314de18f8f0818c19b7caf8e02f29ca0697b8b48d2c9ad6eb7 SHA512 d22668dc29e767cff3545c9e41bf132d9637fbcc55a0ffaed696432e24914f9901d169e1422084e294815eb09990ee97da217efbddf24397834f259e5af91e54
+DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
+EBUILD freetype-2.10.4.ebuild 6685 BLAKE2B ff901fcd11233f9c6a985704ff2296d86331618e02097274edc12fa792d9a11de530eb6f761514b4d03e11b00d42c993c73b3936a9b9bfa0cab15c9eea36f501 SHA512 e991118b3868791a4dd4cac750d4a31935766a97cc4998a0561f0a296f54e8bae7da7057226642e83cf61199dbaa463c17f97422edd73f30a65ad9dafd9ce750
+EBUILD freetype-2.11.0.ebuild 7145 BLAKE2B f07030afe12ba89b7a67cf9a38e01968f814dcd14411c0917dfee7fec3fb1349b733446ee6f7a279efba38237b39b4293470b3e30a44553bb03411807a726ace SHA512 18d39d3e1eb0e5cc4af16baf26880a30125bc6516fa71d4df16e27291f89591ecbf7659368e7c80ba4d0d352f721d6c456cde3c2147686031bd7017b638d9e33
+EBUILD freetype-9999.ebuild 7149 BLAKE2B d9698283807a6799874f8a091e1defce0493d4595b59fe4b9eae558523bcdea09576342dbb5ea4c8c67982a74391e9ac2aa6c6d39f3ae29db752cbf12e5214d5 SHA512 faf5616c0a855be291e1613cc0c2082bda0092e106c053989a333c4b7d3ed2ef7d41094e7e174f516aed831e0701e378ba3bacebbd0a95022bed000b0b1fdc30
 MISC metadata.xml 1613 BLAKE2B 93afe7641d11f06f2b6c87348498fe292b50f1b6240019532bc8639bf2b70c0511014c720e3fc7fe0e0f033bb4449745df0a489597750e4d99695798bbbdf2b1 SHA512 ee0c14554af76884f8efced54d2dd7b0dcb90c3aeb8e6ed638956a79d840bc825c32af49230f56e7659bdfc4cfe761068c0ebf31ee3cd28f79078cd5738e052e
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 828493a8d241..4bec88e1dd43 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -43,7 +43,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
diff --git a/media-libs/freetype/freetype-2.11.0.ebuild b/media-libs/freetype/freetype-2.11.0.ebuild
new file mode 100644
index 000000000000..7f20a7b5a1dd
--- /dev/null
+++ b/media-libs/freetype/freetype-2.11.0.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="High-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
+		local dlg_dest_dir="${S}/include"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
+		# inspired by shipped autogen.sh script
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;${FREETYPE};" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+	if ! use adobe-cff ; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug ; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils ; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X ; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-biarch-config
+		--enable-shared
+		$(use_with brotli)
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Installing utils"
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge ; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header ; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 1caabaa6c63d..85c3544019b3 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-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 flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
@@ -42,7 +42,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
@@ -61,10 +60,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index 7c71f48a2081..9497f0b4f748 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680
+DIST gupnp-dlna-0.11.0.tar.xz 87920 BLAKE2B 8391503c66da267d936563b1b39b1f390bdeb2d4511a900fb99faf968307026e857b66d2f43dd14309e9e4e9790801538947f6c8506391c0da39db6a7b854a6b SHA512 26aad6eb3f7705fa586552a1e4d6931b3ff28b6dbcfd7a626dea297ffd90e67f02957b68e0bb6c80e4fd445dbba1bd47dc47bcf8ac389ff2bb0622cd9ca7f3d1
 EBUILD gupnp-dlna-0.10.5.ebuild 1522 BLAKE2B 24ddc3af27cf3342545772827ba1f17844c14f0c2ab9cf7564e5d8d8988163d7582bb5e8d7872ac16443e58356d9bddde3ecfa19ccb2729ebc5c6ba689815937 SHA512 c738ba044bff0cac84ac42b29b4470118ddb69e7006d4f362f684058864a1223df9f3e4b18e5f8739c3ff0a2886c0ba3032e01658a7b4e93ddf55dd8fa096fa0
+EBUILD gupnp-dlna-0.11.0.ebuild 1092 BLAKE2B 1f3dab8d9de1c4b1613626a7d86d3bd176a3cc22743af6daaf77e0484e107dd92701cf111fb78aa307bf2b2f853909510c19af15eadb81d6e087c6a63a226d6c SHA512 694b609ec782e2c1637668ab8e76314a81405335bf3f67339f00bdfe3e3851866b487a1eb58de0b10d0a0ecde420b9c63b4a542b79cb4087d653f606b8e57c43
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
new file mode 100644
index 000000000000..53b0232ab7d5
--- /dev/null
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-dlna"
+
+LICENSE="LGPL-2"
+SLOT="2.0/4" # subslot: soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/libxml2-2.5:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgstreamer_backend=enabled
+		-Ddefault_backend=gstreamer
+		$(meson_use introspection)
+		$(meson_use introspection vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f3f573b7a234..0eb2a6685054 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,7 @@
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
 DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
-EBUILD harfbuzz-2.8.1.ebuild 2492 BLAKE2B fa89daa0b745c7b5035bcb4e94dfee1e8d7bcdaac1a59e2f394a5f705254fe463922251d95e87868c78e8d4123fda3bb946757a18054cd86337de1484a6a679d SHA512 582d14b536c6a9bddfe6a74b00e0e30672d5e4fc86786cf7dfa5d6fb52432b2fc31ad081c44f7b1a4c07d8f2b5362a0448ef04bc28827e836a1b648e0254f20b
-EBUILD harfbuzz-2.8.2-r1.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b
-EBUILD harfbuzz-2.8.2.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d
-EBUILD harfbuzz-9999.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b
+EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
+EBUILD harfbuzz-2.8.2-r1.ebuild 2567 BLAKE2B c3d727edc7b320f54dd2e09d29f49bd57717c4db4e49123869cf0bfc2eb28475587ef78ddd24222afca5a6e92fe4076efad2bcb8ae63fdb0f2ec4d21e74af36a SHA512 c677139803efe70c41326932b7d26b7567ece5cb97d334314a73176fccb68452bcc99fb72fb6aa677ebc79855678af6e1201e2d17cc73ad9349d230cb676a09d
+EBUILD harfbuzz-2.8.2.ebuild 2505 BLAKE2B e1cecf62258e0ea429215a93982370049e83d1675270fcda4c2fdf7b62f313aa5779b30a974c7b1a110644387044d022e040a5d864372e623b29ff920e836779 SHA512 9026825422ce7bab7773a9e6803b7f43cb65c192f83d0286244730fb06eefc63f8e61e39cbd30431c24b74df30897ad4fed5ca7ad0a6ae3bd658f5ce325e5eee
+EBUILD harfbuzz-9999.ebuild 2567 BLAKE2B c3d727edc7b320f54dd2e09d29f49bd57717c4db4e49123869cf0bfc2eb28475587ef78ddd24222afca5a6e92fe4076efad2bcb8ae63fdb0f2ec4d21e74af36a SHA512 c677139803efe70c41326932b7d26b7567ece5cb97d334314a73176fccb68452bcc99fb72fb6aa677ebc79855678af6e1201e2d17cc73ad9349d230cb676a09d
 MISC metadata.xml 817 BLAKE2B c5e4059fe45c0727f6fc831402f6ea0617ffcd70db271b8c36365c8f815347ba12f6a0193ebef2ebb614ef382ddf690e686997045f0eb6e9ec3ebced9147c475 SHA512 9516b81d89c29a1545555925a377c303c69842808915a1a4e376dce77af29a9f9d1f1c0eb0cf4ae5f6698378bffbb81943df5add554cf8a4207fc4aa0978ab84
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index 453389b63317..4cb7ec1c415f 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -78,7 +78,7 @@ multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature cairo)
 		-Dcoretext="disabled"
-		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc docs)
 		-Dfontconfig="disabled" #609300
 		$(meson_native_use_feature introspection)
 		$(meson_use static-libs static)
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
index e77ca3c2cf7a..86a480282559 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
@@ -87,7 +87,7 @@ multilib_src_configure() {
 		$(meson_feature truetype freetype)
 
 		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc docs)
 		$(meson_native_use_feature introspection)
 
 		$(meson_use experimental experimental_api)
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
index 9f52c19d3421..91e50bcaf5b1 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
@@ -78,7 +78,7 @@ multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature cairo)
 		-Dcoretext="disabled"
-		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc docs)
 		-Dfontconfig="disabled" #609300
 		$(meson_native_use_feature introspection)
 		$(meson_use static-libs static)
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index e77ca3c2cf7a..86a480282559 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -87,7 +87,7 @@ multilib_src_configure() {
 		$(meson_feature truetype freetype)
 
 		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc docs)
 		$(meson_native_use_feature introspection)
 
 		$(meson_use experimental experimental_api)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 6cf3905ad375..9ffbb45cfd23 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 EBUILD ilmbase-2.5.6.ebuild 1080 BLAKE2B 6d186c002551cde60e7c6d2642bbea2087e247a6619cbb625558130bb7c743b3c4d9dae94c7078165eb78be1c51d4f02301706a67cb71b63e111403eb80a871e SHA512 1431d949d5687df526a45d8bc41e0e6c958c15d4e0c873e82548ab5f22414fcfedd5a12a59fee6a105b92813c14decc4271cba7c6e68acf2fe4017b675525359
-EBUILD ilmbase-2.5.7.ebuild 1091 BLAKE2B d8ef6e5ff67d0f6482d9e6f29d300e26f373443cfddd325cdd06cf7f4423ed4b5294e264271045806fc2d477f6818009d5ba6ec198873153f3dc331508285605 SHA512 f3cf1d268678b80252696ffd59640cccf1f7d73ef45ac8c2aa3274a377a60337bcdc776098ebe68ab9d623418d8da212cc2f9bd4501b37d042d493d72e8fbe15
+EBUILD ilmbase-2.5.7.ebuild 1090 BLAKE2B c7bb12c40a49c20ed403985f85d50b27f8da9d68bf5682ee09e766bbcb3072fdf112f00724d3ba2f316856d619cab9110c69a253b0169d304d529411e89e66a8 SHA512 e57f77c2d2fded932af373aa3e1d29696cd4184ae6a6354b8c04b1a14eb5c14b3506fbac0fb18d79e618881b0631f97d42e7c2a625ac62e36f17b97e86333255
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
index 937df9029dd0..f4151651546a 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index b3f514ef42b9..1b1ebe7c07a0 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -10,5 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c
 AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c
 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e
 DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
-EBUILD imlib-1.9.15-r5.ebuild 2139 BLAKE2B c9a89a74b66b6cc50ba454f6a48d6077cc7fdf57287d115156b7487ca8ede1136944883df43391b1435f42149d837551bfd137f96910b966cc548412a5eb509b SHA512 dcf9c97d784e85866c7c8bddad1e4c14d9bee96cd98abd5b29e073a2142e4e01cb58a2ed2ac736b30b96ebad038ebdb3bdb15d8158062ce9b3d5b3ba743ba6b6
+EBUILD imlib-1.9.15-r5.ebuild 2146 BLAKE2B a4a29abbd10945eb2f73420c9197480b01ef866e50f0dbb96d76d66b4a704513f60ab1feaf66d477d81c96ae120e1643e41cc76d598980b926fa314100c46c0d SHA512 8d13720a5b9f36c97f809e306e653c3b5cd8543de68b8f977eb708f0eca97b2d0632b657979e809a32a1c86dddb0c0e726feb444bcadaa12cb41c18419086879
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild
index 90044b6e28b8..638c7d6d914d 100644
--- a/media-libs/imlib/imlib-1.9.15-r5.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index dc7a692b7952..f54b7affad21 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 1676 BLAKE2B 6361cdc5748b06d7ba2c07718955aebf109fa2e2373a625de6f1724dd0f8699124694647cfe06982620018ac8a40be90a281bc8d13307650ff63d0d61e3f4473 SHA512 3855db86f275be862fd7646364704dd4ffad3740c6faecd3d2f6422d546bed4e9288a648a58cd735ff5f109c239aa14121fa7716cf9ddc080983e0d22ea5b85d
+EBUILD libao-1.2.2-r2.ebuild 1675 BLAKE2B 74dc839aba3d44d1824c83a284af5089ac672be4bff6129f841e69ab720acaf03e7bac91be969316df531daa4c19bd380ca6ffcf4b8d12ad33423396ea9aa577 SHA512 384f262d8865d81ec3e6c566a7dd1b4c235e07cb670e5b3ec320022adeceac895563ddfa3282a683eb71085b6664f319acb7c19457fc18db34fdb8df105c05ef
 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 9adab706b812..5b5237e87e93 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/libffado/Manifest b/media-libs/libffado/Manifest
index 546be135e7ee..9dbc52c473dd 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4-r1.ebuild 2644 BLAKE2B b3e90f86152e3a3f4df3e582565a48f2b369f059b2f2c66f82e52ef945e3f337e691684ce7ab91b8b70618e1b56dbafc23c95b785af36dd39095f29539212d01 SHA512 d65e46ee301a29e2dfe53a353914f7d97aec77eb880ef50af97034a3289a14f44af71e2798b7dafd6774298747d73d229dc1ae5d8db11a258b9f7eec3c2745b7
+EBUILD libffado-2.4.4-r1.ebuild 2632 BLAKE2B e6e761a324ba3d8348bb30ee1c1f6dede49169d7cb07626da0cd4386424804259f4f7724d25d87efbcd2bacc11fd0119e6b15afdfda8a959e9b59446a4be3533 SHA512 d48260769dd69f9fcb327e8761b611e954987e4db53b769be36a9ba772387c289a894b40e320aefa3e56702b15cf49f9386ff9efd647e3c5f2d5c4dec6e4723e
 MISC metadata.xml 596 BLAKE2B 4e8cd1f78c34bc23f8f93a0e37df668e8cfb3afff1e0468ac6e5d90ddcd7bde6d6056f602ca1b6d8979223a439c2a81f99b4abf620615c7fc96d27e0e03f4ab9 SHA512 317d5a82f6594de45b1c4006d70204c4f44f085868521673ca9f92e97db4d6e6c3f02cd7aed39b772f5abfc251dc833a52d72938b2eaa4963824c7454d62c703
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index 88abda7bfe6d..4baea5208b92 100644
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
@@ -37,8 +37,8 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	qt5? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
 		')
 		x11-misc/xdg-utils
 	)"
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index 92c53fcb2270..69d6a70f4c6b 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,3 +1,5 @@
 DIST libkeyfinder-2.2.4.tar.gz 79053 BLAKE2B 4d30931451625b00e1ecc2bfb6349497887ab805b5a986e05dbc51fb007a2aededcefbf9fc18c1beb7a7bc4e368c763a658979b5c5c6f7e91f4a21797ad414d7 SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56
+DIST libkeyfinder-2.2.5.tar.gz 79220 BLAKE2B a0a9b6b0d392d8da7be479e30a733f64f0c0723a1890a969ff1cc0ffc56599778148f7fe081724e83f1b3cc2217bb52f46418ed328da7d34d9229aabf24cbaef SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb
 EBUILD libkeyfinder-2.2.4.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
+EBUILD libkeyfinder-2.2.5.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
new file mode 100644
index 000000000000..b102bfc23bfe
--- /dev/null
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Musical key detection library for digital audio"
+HOMEPAGE="https://github.com/mixxxdj/libkeyfinder"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-libs/fftw:3.0
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "s/NAMES fftw /NAMES /" \
+		cmake/FindFFTW3.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 451348a0c7af..8d04789c78f6 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3-r1.ebuild 1176 BLAKE2B bfe03984708e67885728e396aa1bd88319c2331ddb0e412927526a2f99c6d5d44688c6c8a768572c0589fe3e722a428043812eee7fd977c10656b528e322a312 SHA512 1d7dbcaf2e1d99b647710c426b2d784ceb94992762457d9a6fd842b534d24aaa5a7faaeca0ca5329c76dff2dc56c6bea63577afdb9567dd4dfe9074a55c45294
+EBUILD libmng-2.0.3-r1.ebuild 1183 BLAKE2B a1a32690bb385d1da40ed6e37c5f0d4407647d2bcda137f2bf0abe88e29730f789a9012f1e2ddd0750eb5f93e935d96c566b3005014371b74ed45b7bc8116200 SHA512 bfc98412688d2261182198cc2172d8713c61133713b550717db4994112106e10181d12575d21dd3afae431ceeb5e8dd689ace57e4b148953ac3e3c96ef5a6825
 MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c
diff --git a/media-libs/libmng/libmng-2.0.3-r1.ebuild b/media-libs/libmng/libmng-2.0.3-r1.ebuild
index 2a462dcbbc22..572fba4d19bd 100644
--- a/media-libs/libmng/libmng-2.0.3-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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="lcms"
 
 RDEPEND="
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index c35e1564c4f6..0565c76f0f9c 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,3 +1,5 @@
 DIST libsidplayfp-2.2.0.tar.gz 794840 BLAKE2B 1641808e5821f824186b0fd7108dde67ca476724dd4c554dbcca9acd2778c1384e9fbc016658c2c399dbe001100f56658b56234e23032a90aaa75a8faed92792 SHA512 29412410ba1690ad6c9e98f172a0cc49e5d1cb828329da152aa76472ef524932d8b2b35f48f831dbfad08d0c78be22440fd939a1e38b7046cf37fbd34555c683
+DIST libsidplayfp-2.2.1.tar.gz 793924 BLAKE2B a1f11cc4100f18bdd1732c704ac87093d5626627f3b6fc215292e43e63061a79ca8870c3e5a6ea945e24f40a4207d3173e7fed5e05ea52981784389bcfb2af29 SHA512 34a8f6abf6a60ea3fa774e5884736e6dfdff1de9290b656e4ae783e1e15d7b197b03bf400ca0018fd569cfc16a2e30ccb41d0008e800c30f895cd6e3432b048e
 EBUILD libsidplayfp-2.2.0.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05
+EBUILD libsidplayfp-2.2.1.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
new file mode 100644
index 000000000000..219eebf19780
--- /dev/null
+++ b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library for the sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	# fix automagic. warning: modifying .ac triggers maintainer mode.
+	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index abafcfa2aba7..ab59495dcf4b 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
-EBUILD lv2-1.18.2.ebuild 1364 BLAKE2B 883cb424f35f350d20353917654aa72789f177a2af186a8cc0b2c2db126a79ecca24f1696fa63ddc3fea7c13ec850e4e56aa6dba6033372f024d94df5161a0a2 SHA512 f8a0f05fa0781ca71b814989cf8405b99ac446dd7249cd2f7486415d93d5e5b74a5be6222afd57151b3e1c8c7378fbf697657bb53bcbdec16b576fca5b23f1bb
+EBUILD lv2-1.18.2.ebuild 1344 BLAKE2B ca4f75798164a38b7475229cafe087f9e0f2995d4fe4a5d5978c90cad059e475d1f7765960be93fe8bbbf241bd696e1200f286f555b37026d13d81d8bb273d1f SHA512 57d251c8b3f607bcd2ad9a47f326b07159f4c6896e99bb19b17e39916d0b68fb823071c4ceecab8d00717709552d2907ab291ef7245e97016028da3bf968515e
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index 9ee27fda790e..24693c0ff469 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
@@ -33,9 +33,9 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/rdflib[${PYTHON_USEDEP}]
 	')
 "
 DOCS=( "README.md" "NEWS" )
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7c203b479829..aff0f08412f4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,12 @@
 DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
 DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
 DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
+DIST mesa-21.1.5.tar.xz 15286704 BLAKE2B 3cf5577e3c47e07ad52460383843e2f9147b76128301c7e993e71d0e84b39b0d968dbb4176b13c283f0e9c9f18823ec001ea39a874e0a5b077c9d573a05486bf SHA512 d9e0e1b6a1d717febee2aa67b06620c9a21e061ea7e594be5b4c382db1ed6f5acf5d13a75a9f2bba9c32621466ebc816708606e16e8b34700d987158fd8f0b7b
+DIST mesa-21.2.0-rc2.tar.xz 15599008 BLAKE2B 546ea33262b5349f3267ae68f9e2dfb636573ef962c636669241c904f0756187a4caf8cd4150307d2d7243f7bf3e0aa723571f36b7387635fe717363f62d105d SHA512 1701489fa56731170c9ef1ba209498f5c6219cfcc6a1a55c3c387497df997c089d17c66ce621609f6346bfc1b3b3c836280f448a3233ac35eef60b4b5a48424b
 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 14936 BLAKE2B 8cd4c9305cab8084015db25061a5098f1e686e83001f75d25eb2aa9dae82f2c545d3c43d36aa769e46dbd85a555c23b103fb148b2af5957334bfea4435be45eb SHA512 e8a8255ba66aef51e74de4a2490affd4bdf75db8d0e94452d7df2e3cb47052d35f6b4f9865fe3236328a9d8679712277fb3de9ff5c0a6c7f1a895449c4da8b96
-EBUILD mesa-9999.ebuild 14877 BLAKE2B 09baa10ab66a17a1c2ce4f320c2e97843d15a75e1a9e43c74a94fb9ba9bc316f5bd8188c35ccf686823f838e33c9bbcfb6183432d253281eaf1eee17f825142f SHA512 f50d925183fdb79f6494c71ca10e6d409ca7adee1b58eb7ebec50bc4d07f8d34ff4c95d311ab8e2618836342ea70bdfc5232b63b62c6819fc1e64011b5384450
+EBUILD mesa-21.1.5.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
+EBUILD mesa-21.2.0_rc2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
+EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.5.ebuild b/media-libs/mesa/mesa-21.1.5.ebuild
new file mode 100644
index 000000000000..2849134b7198
--- /dev/null
+++ b/media-libs/mesa/mesa-21.1.5.ebuild
@@ -0,0 +1,556 @@
+# 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 llvm meson-multilib python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+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"
+
+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 )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-21.2.0_rc2.ebuild b/media-libs/mesa/mesa-21.2.0_rc2.ebuild
new file mode 100644
index 000000000000..e3fd921bbaa0
--- /dev/null
+++ b/media-libs/mesa/mesa-21.2.0_rc2.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +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"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b3ab8d6070d6..e3fd921bbaa0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit llvm meson-multilib python-any-r1 linux-info
 
@@ -33,17 +33,16 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic d3d9 debug +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"
 
 REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
 	gles1?  ( egl )
 	gles2?  ( egl )
 	osmesa? ( gallium )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	wayland? ( egl gbm )
 	video_cards_freedreno?  ( gallium )
@@ -71,7 +70,7 @@ REQUIRED_USE="
 	zink? ( gallium vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -507,7 +506,7 @@ multilib_src_configure() {
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
-		$(meson_feature dri3)
+		-Ddri3=enabled
 		$(meson_feature egl)
 		$(meson_feature gbm)
 		$(meson_feature gles1)
@@ -515,7 +514,7 @@ multilib_src_configure() {
 		$(meson_use osmesa)
 		$(meson_use selinux)
 		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
+		-Dvalgrind=$(usex valgrind auto disabled)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 2f110b0a32b7..902cfb6454b6 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -8,6 +8,8 @@ AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
 DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
+DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
 EBUILD opencolorio-1.1.1.ebuild 2624 BLAKE2B 46b336fa43c481d6170d8c2f5d95607d9967a7a8190f759371f9941a7c360de5bcbdc933797e9b7176c4abe5011dbe8f28d9683c12d573e308427bc9ee851018 SHA512 c7c6818dd52502fdfc5ed8e4c472ad4734e0f3ff3f733320e531ba586fd253de1bca13ed15588ceb379c7bdd7cc0416758aac10249e2841b956545cdbb80f67e
 EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
+EBUILD opencolorio-2.0.1.ebuild 2685 BLAKE2B 5001664e0d729861378707bba636f8af2cb89592a10ffe10b091a5c04d89aff567b8ef67baf6914e670b8b95d16c9dbab8ff720d436533a8f8cdfdb3e08718f0 SHA512 f9aa4dc1c2335c828635ad578df7bba3fe9d4c208cae3208d51f6eac03aa6894884bfc3327d1877547a9ef77b3c7e4239becec172e85048a2fe694fbefdf66d0
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1.ebuild
new file mode 100644
index 000000000000..ecaac6c1a4aa
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.1.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_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+KEYWORDS="~amd64"
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-cpp/pystring
+	dev-python/pybind11
+	media-libs/ilmbase
+	dev-cpp/yaml-cpp:=
+	dev-libs/tinyxml
+	opengl? (
+		media-libs/lcms:2
+		>=media-libs/openimageio-2.2.13.0
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_JAVA=OFF
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=$(usex test)
+		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+	)
+
+	# We need this to work around asserts that can trigger even in proper use cases.
+	# See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+	append-flags  -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index f2968976dff1..a080ce0b9ba3 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,7 +13,7 @@ DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c6102288
 DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
 DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.5.0.ebuild 20509 BLAKE2B f0c9cdab62f516faf0b992bc7feb508c2889f552bbc520cc93f564782f54583ad6816ef9db9b1ad812dd84f75dd99a3d8fe5412b27fb3b659f6aa141abc4c4a3 SHA512 78ca91218694de32ba693650225e0fd84ba0ebe9451be348dde52bac27972d87449b49633f318333dda838e31a5d043351493531e88ff88945a41460f50011a5
-EBUILD opencv-4.5.1.ebuild 20596 BLAKE2B d371a3b93a3efd2db319aa547f1384b77d43483f1538d981ec091f2699a4798e54035a7ee89c9462af857d8109f04da9a5d5fa0903b2a7d103f78ecfd746994e SHA512 deb18e47fb7c9a003701aecc2343b8735fc0d437e415b77a04b40231c4270ece20beed4e5e49f2698a41fae086eeb53a0bf897082e64f858bddc214b40201a17
-EBUILD opencv-4.5.2.ebuild 20601 BLAKE2B f065985f61e9519b12a9900fc115358f1769dd8dffbb57dd3a3d1aecaf4352df18d647d0d4525266e9ac75dc838d6a45bc7f879f024d2bbdb45fbefa86033604 SHA512 8af05e9ea0ed6795f9259eb1d5b83d2bb0462ee3e7c608d4aea207058ec6c1e5ef15689dd851ad0ac33f1c77dbbf77a0d3962d10f73e92a77b10579a3f925985
+EBUILD opencv-4.5.0-r1.ebuild 20519 BLAKE2B d49c3660825ac597bbdb2d8262b9c024c734931140533de7fabab3d561cd0bbaa4c832af41e9063c2eab76729febdce7598307ff694004fd71127ee0f4560c60 SHA512 4612b55bbfc160b42b97d684bc8053e6f499bd460a8a7c5c6ab30e092597e47c5433f7c02176ad80a8c6045568de5b5336bd862dd6e4c3c74b8957bc42642fcf
+EBUILD opencv-4.5.1-r1.ebuild 20606 BLAKE2B d1bdbff23f18fe325f0912704939383e9c03d278e33b5606eebf78049c374a6c2f64d4e8f28b169ac8f191d78115238fb2ac9772080dbbff09330188928b72fe SHA512 fb4cae4db0090c83d6a06eaf2761a639d5c87b1020b88e9795afc49a914fbf1a69bb62f1604a0681a9a13816983b22679523ac80d6f502b66e10555de318e1ae
+EBUILD opencv-4.5.2-r1.ebuild 20611 BLAKE2B 18288e0af05a7476ecf83db758e70e922d179ed0cd96a47570d6652cc9a407ba0cb947c1c855a84f96177901262e2df5f00888f7db451f97902e2aee768f4bb0 SHA512 597f8cb0c7676347c1def2faf9e7f23d695565af4cd920d8d7031839ece247dc61908f3e9f54b5dad37c1e05b381762874cf1f61c143c6e0be75ebff81f3a39b
 MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/opencv-4.5.0-r1.ebuild b/media-libs/opencv/opencv-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..80cfca7c7c30
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.0-r1.ebuild
@@ -0,0 +1,566 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+	eigen? (
+		|| (
+			>=dev-cpp/eigen-3.3.8-r1:3
+			<dev-cpp/eigen-3.3.8:3
+		)
+	)
+	java? ( >=virtual/jdk-1.6 )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
deleted file mode 100644
index afbb574ddd3b..000000000000
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ /dev/null
@@ -1,566 +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} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.5.1-r1.ebuild b/media-libs/opencv/opencv-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..8e273550454b
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.1-r1.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+	eigen? (
+		|| (
+			>=dev-cpp/eigen-3.3.8-r1:3
+			<dev-cpp/eigen-3.3.8:3
+		)
+	)
+	java? ( >=virtual/jdk-1.6 )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
deleted file mode 100644
index 05513b4f1742..000000000000
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ /dev/null
@@ -1,568 +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} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
new file mode 100644
index 000000000000..d978b3421497
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.8:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+	eigen? (
+		|| (
+			>=dev-cpp/eigen-3.3.8-r1:3
+			<dev-cpp/eigen-3.3.8:3
+		)
+	)
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/opencv/opencv-4.5.2.ebuild b/media-libs/opencv/opencv-4.5.2.ebuild
deleted file mode 100644
index 1fee51d33a51..000000000000
--- a/media-libs/opencv/opencv-4.5.2.ebuild
+++ /dev/null
@@ -1,568 +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} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 88a0a26ef324..9b7c37ace5bc 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,10 +1,12 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
+AUX openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch 6235 BLAKE2B bbde922a018390d11685ef76c3202419c639f8075adfbe5952bed585055376375fb2bd31463c140500feee1867245d6a6f7c59888d1d0f06979834dc181dc45c SHA512 ab3a405f119ce1f6e478923e99203a8ee6122d9a585f5d667555aefa6402e85def2df8410c88a20eb3e4b1c298f9f90f7a2ddd9377f75b57d40485a2ac9890c8
+AUX openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch 9741 BLAKE2B f92fd894f339bce71fa1b63437fafa033c0f4d3bc164534b824ed44e00d1c23de2191b44168952d89969d4a36b7635476740543b0b093c048680fffb6a2e54aa SHA512 a5ba9b29cd63d6bd65adf3a181dbada23720a98ff683262f08be88aaff4cbfce6286e5067e666db08978b9617a61a1d05503cbac25aa86b26f632b384bd63a43
 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
+DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
 EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
-EBUILD openexr-2.5.7.ebuild 2121 BLAKE2B 617e588fa2578ec358c5b4f21f03f2c3feb7ecd7141fd6e45e652021b58bee0694c2fae2efbb23513bb5903e6d7fa94e143de25cf716c816782f986231331692 SHA512 d0a0fdf11f53bbd2ecbc82d5ebbecae3aef73ae4fc127ea529506bf74432baea18358e6b3686d2ef1ee3fbebd444e629c77c6e6015975fc37f36fd5506bdc5f7
-EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
+EBUILD openexr-2.5.7.ebuild 2120 BLAKE2B c31fbd571fc53343e733419e90f84ad1648506acb8bd66d87bf239bbe1e22c588c0e0cd906ac43c27f82936e1c42c33e990619655961220e9e7219aaae0d00c1 SHA512 56db8658cde7e044056949d4a4704435ce4f8fea3519e3d1c823f92cd2579d29a2a6c6ca2e3393ced9a77628e36962b35303ef01be06dc491dbcd5eea5ed7b7b
+EBUILD openexr-3.0.5.ebuild 2147 BLAKE2B 4620226043268d73a1e290003849584d46604e42b04e18cf67ed918a41cb376b5951387a485cef227295ee4630d3e137a829081baf7c16ab53d701ec96bac88c SHA512 198c920c8457c94148a9880c7ab4c843bb3cedad6c60b6d42305962e251885ef2ea81c3ef0f584d42f663584832e448e65d6c971bfd2184fc27e77e10683d6dd
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 000000000000..30991f423b00
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,119 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 2 Jul 2021 17:46:33 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/CMakeLists.txt             | 8 ++++----
+ cmake/LibraryDefine.cmake        | 8 ++++----
+ cmake/OpenEXR.pc.in              | 4 ++--
+ cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 2014d27..7dfb2f2 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -200,7 +200,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     )
+   endfunction()
+-  openexr_pkg_config_help(OpenEXR.pc.in)
++  openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
+ else()
+   message(STATUS "-- pkg-config generation disabled")
+ endif()
+@@ -220,7 +220,7 @@ include(CMakePackageConfigHelpers)
+ if(OPENEXR_INSTALL)
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+   VERSION ${PROJECT_VERSION}
+@@ -229,11 +229,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+   FILE ${PROJECT_NAME}Targets.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
+index aa5bb46..2767420 100644
+--- a/cmake/LibraryDefine.cmake
++++ b/cmake/LibraryDefine.cmake
+@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+     install(TARGETS ${libname}
+       EXPORT ${PROJECT_NAME}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+       PUBLIC_HEADER
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
++    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+     set(verlibname)
+     set(baselibname)
+   endif()
+diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
+index 7d9bb7c..c7e1dd6 100644
+--- a/cmake/OpenEXR.pc.in
++++ b/cmake/OpenEXR.pc.in
+@@ -5,9 +5,9 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
+ includedir=@includedir@
+-OpenEXR_includedir=@includedir@/OpenEXR
++OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
+ libsuffix=@LIB_SUFFIX_DASH@
+ 
+ Name: OpenEXR
+diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
+index 8022e2e..9f919c8 100644
+--- a/cmake/OpenEXRLibraryDefine.cmake
++++ b/cmake/OpenEXRLibraryDefine.cmake
+@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+     install(TARGETS ${libname}
+       EXPORT ${PROJECT_NAME}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+       PUBLIC_HEADER
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
++    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+     set(verlibname)
+     set(baselibname)
+   endif()
+-- 
+2.32.0
+
diff --git a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
new file mode 100644
index 000000000000..d6c6b532c879
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
@@ -0,0 +1,229 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 22 May 2021 17:04:12 +0200
+Subject: [PATCH] add version to binaries for slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/bin/exr2aces/CMakeLists.txt       | 10 +++++-----
+ src/bin/exrenvmap/CMakeLists.txt      | 10 +++++-----
+ src/bin/exrheader/CMakeLists.txt      | 10 +++++-----
+ src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmaketiled/CMakeLists.txt   | 10 +++++-----
+ src/bin/exrmultipart/CMakeLists.txt   | 10 +++++-----
+ src/bin/exrmultiview/CMakeLists.txt   | 10 +++++-----
+ src/bin/exrstdattr/CMakeLists.txt     | 10 +++++-----
+ 8 files changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
+index 72c4e1c..ede5973 100644
+--- a/src/bin/exr2aces/CMakeLists.txt
++++ b/src/bin/exr2aces/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exr2aces main.cpp)
+-target_link_libraries(exr2aces OpenEXR::OpenEXR)
+-set_target_properties(exr2aces PROPERTIES
++add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
+index bbd26c0..cbe8401 100644
+--- a/src/bin/exrenvmap/CMakeLists.txt
++++ b/src/bin/exrenvmap/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable( exrenvmap
++add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
+   makeLatLongMap.cpp
+   readInputImage.cpp
+   resizeImage.cpp
+@@ -11,13 +11,13 @@ add_executable( exrenvmap
+   EnvmapImage.cpp
+ )
+ 
+-target_link_libraries(exrenvmap OpenEXR::OpenEXR)
+-set_target_properties(exrenvmap PROPERTIES
++target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
+index c427445..b8b0e9a 100644
+--- a/src/bin/exrheader/CMakeLists.txt
++++ b/src/bin/exrheader/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exrheader main.cpp)
+-target_link_libraries(exrheader OpenEXR::OpenEXR)
+-set_target_properties(exrheader PROPERTIES
++add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
+index bb8b548..03c0687 100644
+--- a/src/bin/exrmakepreview/CMakeLists.txt
++++ b/src/bin/exrmakepreview/CMakeLists.txt
+@@ -1,17 +1,17 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exrmakepreview
++add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
+   main.cpp
+   makePreview.cpp
+ )
+-target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
+-set_target_properties(exrmakepreview PROPERTIES
++target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
+index 6c8dfa5..7116b54 100644
+--- a/src/bin/exrmaketiled/CMakeLists.txt
++++ b/src/bin/exrmaketiled/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors (c) to the OpenEXR Project.
+ 
+-add_executable(exrmaketiled 
++add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
+   makeTiled.cpp
+   main.cpp
+   Image.cpp
+ )
+-target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
+-set_target_properties(exrmaketiled PROPERTIES
++target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
+index 7f8fc1b..dad8c8d 100644
+--- a/src/bin/exrmultipart/CMakeLists.txt
++++ b/src/bin/exrmultipart/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exrmultipart exrmultipart.cpp)
+-target_link_libraries(exrmultipart OpenEXR::OpenEXR)
+-set_target_properties(exrmultipart PROPERTIES
++add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
++target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
+index bbac3a6..eba48c1 100644
+--- a/src/bin/exrmultiview/CMakeLists.txt
++++ b/src/bin/exrmultiview/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exrmultiview
++add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
+   makeMultiView.cpp
+   main.cpp
+   Image.cpp
+ )
+-target_link_libraries(exrmultiview OpenEXR::OpenEXR)
+-set_target_properties(exrmultiview PROPERTIES
++target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
+index 79205fc..35ac580 100644
+--- a/src/bin/exrstdattr/CMakeLists.txt
++++ b/src/bin/exrstdattr/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+ 
+-add_executable(exrstdattr main.cpp)
+-target_link_libraries(exrstdattr OpenEXR::OpenEXR)
+-set_target_properties(exrstdattr PROPERTIES
++add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+-  install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
++  install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+-  target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
++  target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+-- 
+2.31.1
+
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index 8a5f1c968b22..d9bb63b65698 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 ~riscv ~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 )"
 
diff --git a/media-libs/openexr/openexr-3.0.1.ebuild b/media-libs/openexr/openexr-3.0.1.ebuild
deleted file mode 100644
index 5b225425f836..000000000000
--- a/media-libs/openexr/openexr-3.0.1.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
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0/27" # based on SONAME
-# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!media-libs/ilmbase
-	dev-libs/imath:=
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-#src_prepare() {
-	# Fix path for testsuite
-#	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-#	if use abi_x86_32 && use test; then
-#		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-#	fi
-
-#	multilib_foreach_abi cmake_src_prepare
-#}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DOPENEXR_ENABLE_THREADING=$(usex threads)
-		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( docs/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-3.0.5.ebuild b/media-libs/openexr/openexr-3.0.5.ebuild
new file mode 100644
index 000000000000..242e04c95413
--- /dev/null
+++ b/media-libs/openexr/openexr-3.0.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/29" # based on SONAME
+# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-libs/imath-${PV}:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
+	"${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	cmake_src_prepare
+
+	mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DOPENEXR_ENABLE_THREADING=$(usex threads)
+		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
+		-DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
+	)
+
+	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc; then
+		DOCS+=( docs/*.pdf )
+	fi
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+	cmake_src_install
+
+	cat > "${T}"/99${PN}3 <<-EOF || die
+	LDPATH=/usr/$(get_libdir)/${MY_P}
+	EOF
+	doenvd "${T}"/99${PN}3
+}
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 3ac34ce4a32a..ed8c5942bccb 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -5,5 +5,5 @@ DIST pa_stable_v190700_20210406.tgz 1462695 BLAKE2B 2e00cc0f7bfccf732bd3256b4379
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
 DIST portaudio-19.07.00-audacity.patch.bz2 2750 BLAKE2B 479cdc76615b60e454a6712c26bd4ac9d9e577f83d4c11a8f3e75c0a1c13ab0a443c91441a57da8cd2b9656649bd53ee0d2e23c23fd788ba7f95c67985b941c6 SHA512 d0e40b5df2b498ce3d9c56b0c7a896cd22ac3dd79b4ab3ebac151a82a824f7e74d62c3848c3ad0f3c499c9d1262b9c1f9cbfc2c5fdd0a5f20e9570357b7670b2
 EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
-EBUILD portaudio-19.07.00-r2.ebuild 1739 BLAKE2B f9a4f6596e331ae87b0939f7d3d44c6e952cda0e8b6e7fee647ba74d479fc1575239b4136c4dc0271a636bb48aeacdc9ac96c7ae0ee9a3a59a13036296a58651 SHA512 cf10b1439dca837e09490a4e3d2709f63f2859ddbaf44ae8c3a9283eda04163a8cfbb3bb95e41df2e4ce51cbb895e6b4ef9d729c7472d61a2d31088bf35451be
+EBUILD portaudio-19.07.00-r2.ebuild 1736 BLAKE2B 6dca4b1fef9306568fb81e04932506133d7c688bb68667e7991eb580264c383344c7d1ea2b6a822e169de69473301439af054a00457ea4c031dfaa453215e704 SHA512 4368aaf1ab4a0fcd73817cfb1b8f645a35604e59ad3b3bc4e8d7c2bd84d4b0d372a29ea57e5305f7c4ad2e3035fcd85c985a93acdd7bb46dcaf4ee0d13fbf8ce
 MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
index 50eddce6d970..a0e7627a2800 100644
--- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 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="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 293ccda7926d..978431bc221d 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,3 @@
-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.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
 EBUILD rubberband-1.9.2.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
diff --git a/media-libs/rubberband/files/rubberband-1.9.1-build.patch b/media-libs/rubberband/files/rubberband-1.9.1-build.patch
deleted file mode 100644
index 2d8faaee795b..000000000000
--- a/media-libs/rubberband/files/rubberband-1.9.1-build.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 65ee113..0c089fa 100644
---- a/meson.build
-+++ b/meson.build
-@@ -97,14 +97,21 @@ endforeach
- 
- fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+if get_option('programs')
-+  sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
-+endif
-+if get_option('vamp')
-+  vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+endif
- thread_dep = dependency('threads')
--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
--have_jni = cpp.has_header('jni.h', args: extra_include_args)
--
--javac = find_program('javac', required: false)
--jar = find_program('jar', required: false)
-+if get_option('ladspa')
-+  have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+endif
-+if get_option('jni')
-+  have_jni = cpp.has_header('jni.h', args: extra_include_args)
-+  javac = find_program('javac', required: false)
-+  jar = find_program('jar', required: false)
-+endif
- 
- 
- # Check FFT and resampler options and set up dependencies and paths
-@@ -255,37 +262,41 @@ if ipp_needed
-   endif
- endif # ipp_needed
- 
--if not vamp_dep.found()
--  vamp_dep = cpp.find_library('VampPluginSDK',
--                              dirs: get_option('extra_lib_dirs'),
--                              has_headers: ['vamp-sdk.h'],
--                              header_args: extra_include_args,
--                              required: false)
-+if get_option('vamp')
-   if not vamp_dep.found()
--    vamp_dep = cpp.find_library('vamp-sdk',
-+    vamp_dep = cpp.find_library('VampPluginSDK',
-                                 dirs: get_option('extra_lib_dirs'),
-                                 has_headers: ['vamp-sdk.h'],
-                                 header_args: extra_include_args,
-                                 required: false)
-+    if not vamp_dep.found()
-+      vamp_dep = cpp.find_library('vamp-sdk',
-+                                  dirs: get_option('extra_lib_dirs'),
-+                                  has_headers: ['vamp-sdk.h'],
-+                                  header_args: extra_include_args,
-+                                  required: false)
-+    endif
-   endif
-+  have_vamp = true
- endif
--have_vamp = vamp_dep.found()
--
--if not sndfile_dep.found()
--  sndfile_dep = cpp.find_library('sndfile',
--                                 dirs: get_option('extra_lib_dirs'),
--                                 has_headers: ['sndfile.h'],
--                                 header_args: extra_include_args,
--                                 required: false)
-+
-+if get_option('programs')
-   if not sndfile_dep.found()
--    sndfile_dep = cpp.find_library('sndfile-1',
-+    sndfile_dep = cpp.find_library('sndfile',
-                                    dirs: get_option('extra_lib_dirs'),
-                                    has_headers: ['sndfile.h'],
-                                    header_args: extra_include_args,
-                                    required: false)
-+    if not sndfile_dep.found()
-+      sndfile_dep = cpp.find_library('sndfile-1',
-+                                     dirs: get_option('extra_lib_dirs'),
-+                                     has_headers: ['sndfile.h'],
-+                                     header_args: extra_include_args,
-+                                     required: false)
-+    endif
-   endif
-+  have_sndfile = true
- endif
--have_sndfile = sndfile_dep.found()
- 
- 
- # General platform and compiler expectations
-@@ -386,8 +397,10 @@ endif
- # And the build targets: Static and dynamic libraries, command-line
- # utility, LADSPA plugin, Vamp plugin, JNI library
- 
--message('Will build Rubber Band Library static library')
--target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
-+if get_option('static')
-+  message('Will build Rubber Band Library static library')
-+  target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
-+endif
- rubberband_static = static_library(
-   rubberband_static_name,
-   library_sources,
-@@ -425,7 +438,7 @@ else
-   message('Not building Rubber Band Library dynamic library: no_shared option set')
- endif
- 
--if have_jni and javac.found() and jar.found()
-+if get_option('jni')
-   target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
-   message('Will build Java Native Interface')
-   rubberband_jni = shared_library(
-@@ -460,7 +473,7 @@ if have_jni and javac.found() and jar.found()
-   )
- else
-   target_summary += { 'JNI library': false }
--  if not have_jni
-+  if not get_option('jni')
-     message('Not building Java Native Interface: jni.h header not found')
-   else 
-     message('Not building Java Native Interface: Java compiler not found')
-@@ -474,7 +487,7 @@ install_headers(
-   subdir: 'rubberband'
- )
- 
--if have_ladspa
-+if get_option('ladspa')
-   target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
-   message('Will build LADSPA plugin')
-   rubberband_ladspa = shared_library(
-@@ -509,7 +522,7 @@ else
-   message('Not building LADSPA plugin: ladspa.h header not found')
- endif
- 
--if have_vamp
-+if get_option('vamp')
-   target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
-   message('Will build Vamp plugin')
-   rubberband_vamp = shared_library(
-@@ -541,7 +554,7 @@ else
-   message('Not building Vamp plugin: Vamp dependency not found')
- endif
- 
--if have_sndfile
-+if get_option('programs')
-   target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] }
-   message('Will build command-line utility')
-   rubberband_program = executable(
-diff --git a/meson_options.txt b/meson_options.txt
-index 1703806..cd637f1 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -31,3 +31,22 @@ option('no_shared',
-        value: 'false',
-        description: 'Do not build shared libraries. On Windows this will also ensure that the static library is called simply rubberband.lib, not rubberband-static.lib as it is in the default build.')
- 
-+option('jni',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('ladspa',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('programs',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('static',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('vamp',
-+       type: 'boolean',
-+       value: 'false')
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index be8ef82e9627..c5526d23a6e0 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/hexter/Manifest b/media-plugins/hexter/Manifest
index 4cfbdde6211d..5c7284564c76 100644
--- a/media-plugins/hexter/Manifest
+++ b/media-plugins/hexter/Manifest
@@ -1,5 +1,3 @@
-DIST hexter-1.1.0.tar.bz2 737430 BLAKE2B 9c79da379a69bc4ceceab11dc725d965bb923384e060e24eb7e7d1f65650d5c77206a79d02403e7a952c2eb3c46262b5905e5b07872fb5b060525ed0f275cbc4 SHA512 8d433fae44b0620c3866c9a3b2445271a039c8ac3ad12c71ca34d667a85b95b9bddd7e04c4eaa2c27299c66b9cce16d104b5fbb376dd3cdc85f7e4d6c9b28529
 DIST hexter-1.1.1.tar.bz2 738789 BLAKE2B c3feb3cbed77ba7b6c7dec9158af60cca0c02c2f3f65eb6a80f0f57593998e3ecf28599736e94e56e5d1daa72b2868a2831b4491eb73bee6302ed78fbe1712fb SHA512 db744ba7c9066f6b47b8e6e31c830fdb1760ee5e8df5a8f287878bc62891d1d1b10a568bc58b00fc732933c9ff1f816e1d88c836741c302bbb4353c96ac291cc
-EBUILD hexter-1.1.0.ebuild 740 BLAKE2B d1458a9cadfdc8fa34e0d74a26bd3a3799065e9458436e59da37aa90fd05a9746ebb65c4e2f96d4301127af9f0c0c8a019df52a1fec471216262fd21313b65e5 SHA512 60a08c3b0a57877868254c7ec59905c8d53e83edccaa88fb59b057a3c1d894c5a99ebcbe4a139ac6f8b317496518ceff411dce933a0d4e19fc647026789cbabc
-EBUILD hexter-1.1.1.ebuild 730 BLAKE2B 279becc2d7717196889a52673dc8c833edb793ffb2e8c5e630b5545d6138110b1798aa15a658d955750827f1f9be3b77433268acd226e06fdc338221fe859c3d SHA512 68004481666eab2300421f4d2b7454f5965e2441172025526e752bc41356678bd6762f16884f3e2c475ea555549f45e7219dc9e96798c5ca08b06c4c222db43d
-MISC metadata.xml 433 BLAKE2B 7bff94c87e78273a579ae464d3cc071ba60b9a7963937e1ca9b4883a7abc17690edfc2b6d3cb41079fa555c6658e6f73facd5f8d301f0d3dbd3d5a3473d8004f SHA512 3f451cf291b522db82eac8537947668088eeb8c21c13a99a22b830f3a197027b1923b3c2ebf0db7dd6321f2218612b8b2c82626717c7fee42337629430da5e22
+EBUILD hexter-1.1.1.ebuild 728 BLAKE2B 8d5dc5cd2c12dac7b3925af228987dbe76ad07a90b1e6d472f03e37b3bd0de3147d273b1041e300767748ad0e1fe98a6c438cebc094ee3b429079d8d1094785d SHA512 30c46ff2fa00cd9af2494a029facb918d8ad878cb27cea752b1c4c2b07c198d4e38407bbc331686e19d4aa588121070bffdb1a062ac96734c655be53f0625fb9
+MISC metadata.xml 343 BLAKE2B e857bc160f1b72d05f1395dea52fac9f2084e559480515b1f123c027d24e3e2c170045006dcf877a7dc7fdd5df7e8cb412d74f6c0f8f3ddd5df7242da15f57e5 SHA512 a7eb8732dae53f7a4c9766de1a04a093483149b52c4b180bcb44b32c751741414b075e65c191c0fa01d50af75ca24d569c0d001211a826e546fff94886b0a44d
diff --git a/media-plugins/hexter/hexter-1.1.0.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
deleted file mode 100644
index c2ad330e29d9..000000000000
--- a/media-plugins/hexter/hexter-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
-HOMEPAGE="http://smbolton.com/hexter.html"
-SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk2 readline"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	media-libs/alsa-lib
-	>=media-libs/dssi-0.4
-	>=media-libs/liblo-0.12
-	gtk2? ( x11-libs/gtk+:2 )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-"
-
-src_configure() {
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	econf $(use_with gtk2) \
-		$(use_with readline textui)
-}
diff --git a/media-plugins/hexter/hexter-1.1.1.ebuild b/media-plugins/hexter/hexter-1.1.1.ebuild
index d36ea4490cc3..d1b73627238b 100644
--- a/media-plugins/hexter/hexter-1.1.1.ebuild
+++ b/media-plugins/hexter/hexter-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="readline"
 
 BDEPEND="
diff --git a/media-plugins/hexter/metadata.xml b/media-plugins/hexter/metadata.xml
index c524cb77afce..140af081ec2b 100644
--- a/media-plugins/hexter/metadata.xml
+++ b/media-plugins/hexter/metadata.xml
@@ -5,9 +5,6 @@
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
   </maintainer>
-  <use>
-    <flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 based GUI</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">dssi</remote-id>
   </upstream>
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 793ec19aa1b9..9b5a338e92c2 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,6 +1,12 @@
 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
+DIST kodi-inputstream-adaptive-2.6.20.tar.gz 761163 BLAKE2B d7659e85b20b09702ce0d0eebbf05b0aedd3e54ed9234c968f11a0a7a4d8c485cc9ce3a74ff9b654c7f8c8bae78281527ed5f9dd26e0f75dbde6e4cdf61df3c9 SHA512 1af27e40193eed17e1556eb40749827a7436cbc3528a00e1df0398bab5712a988d2761852ef1ed096f6c3a2ac81ded0698c85a125f6317ab537b2eb2da344a8e
+DIST kodi-inputstream-adaptive-2.6.21.tar.gz 761311 BLAKE2B 3d9ca58f52d10e7b4fc2c1bb6b761a7adde47802146723cdae56770a748e1454a3953816b9a151608ad65dd92107b209fca073180d35bfedc86f05a90275a6b3 SHA512 d808abaa961f7e5f21ae59c87cd379f771714102932791e50b4374ce07bbf747c00c75728858577589e9fc82f8811b509e03a79441d3a3ba2f7e8313a83596c0
+DIST kodi-inputstream-adaptive-2.6.22.tar.gz 761392 BLAKE2B b325eef1113f33572c8a8cbc75f7ac85d38d4bb7a2a9d12340bec0b0c03a24cdb795de2af712f9effb474469bf98f853f2a543df4aa8b98fed9ee1422066b9a9 SHA512 e8ff725351548604bdbc0f6cac02696a64dfeb608edbed13eed50cd639679a125f5a5fa133e93e90b010ea0fde34e21a6cdea130cfaca26f9c4fd543ab94c1fe
 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-2.6.20.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
+EBUILD kodi-inputstream-adaptive-2.6.21.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
+EBUILD kodi-inputstream-adaptive-2.6.22.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.20.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.20.ebuild
new file mode 100644
index 000000000000..eb913a08d263
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.20.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-inputstream-adaptive/kodi-inputstream-adaptive-2.6.21.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.21.ebuild
new file mode 100644
index 000000000000..eb913a08d263
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.21.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-inputstream-adaptive/kodi-inputstream-adaptive-2.6.22.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.22.ebuild
new file mode 100644
index 000000000000..eb913a08d263
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.22.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-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 079aab66d135..48e3dd1e1d59 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -2,9 +2,11 @@ DIST kodi-pvr-hts-8.3.0.tar.gz 181974 BLAKE2B d86bea7a037ea0abf4a2e6e9b45fb7c69f
 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
+DIST kodi-pvr-hts-8.3.4.tar.gz 190740 BLAKE2B 10dd05d406b6e6b9a2608f0d9347997d9c939ba5ac937eb03d49ca8a9200dae6fee4f50c787a0004739218c35b95f14f2085a604183fd83869d886f5662f20ff SHA512 f7aadb37de471b57267984ca92484fab0736cf38db2f437dabad63ecbfd56b61f51fce077389d667eecab4f7445bfa458fe1ab8933607a81d1d69f3448810934
 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-8.3.4.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.4.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.4.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.4.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-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 3c744b6e788f..fdab634d5e75 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -2,9 +2,13 @@ DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4
 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
+DIST kodi-pvr-vuplus-7.4.8.tar.gz 947667 BLAKE2B 3031fb16698dfdab3c6466a44870760a930475929652b42fe72164bbc152db4886d5a78b1240c0729a6746fa9424515ac0a2ff583e9a0d1c87354a1e243cddc9 SHA512 669dd29a70efd6ef5b9698fb74560262bc2aff9a73c2220a452aa09b6f88323553338183cb9de95c268c1fef44352efade202512b531de90aec46cea402e46d4
+DIST kodi-pvr-vuplus-7.4.9.tar.gz 947759 BLAKE2B 58ad0cf68b8c70bee7c39a2e5a1eec874073de03cfa34b66c8f65b4fa84de88dd0c9a2d3fdeec55236265cd6ae748dde74942e1dd68b71ab64940b327c017426 SHA512 beaa89a348ef0fba0d51d982590731102d548f2c95c095ceed132306e7b76b4e5d9613be135c9c05d86a38b8b7203ec750e80dbb8bc5692d5f653fab9137c1c4
 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-7.4.8.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+EBUILD kodi-pvr-vuplus-7.4.9.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.8.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.8.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.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 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/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.9.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.9.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.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 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/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index 164b0867045c..ed7438ab92ea 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-visualization-shadertoy-19.0.0.tar.gz 12505986 BLAKE2B 40a78df51168427d4b3fb6878f1cbae8f63d67c21f3464943aa2a4715ad8625e8b00e7b396572e0f05651f4bf0cc43381a0a52af4700d18e4ce2b113b6af0e50 SHA512 02b56651e6ce2b0fe489288bb8269572a2ed1112ef5664f4fd7569e07f22224616f489bdad5b268139e22e2417f4dcc4f79f96185ba9d8fe5940147e34325415
 DIST kodi-visualization-shadertoy-2.3.0.tar.gz 12483281 BLAKE2B a2140c52820a235d9c3d469fea0d3d1b20bc33d697915a6dd789fe0c25addb5296d80d643ee2d99613b3f3144b41c451b2a418798df7a5aa869f96e79187b3f4 SHA512 7693e67b3aaad0b6bc78c80b1bdfd92348de139acbb1292b56e9430dfd939b242f56e5c732625bece0088ef9e2a5627fe2f9a19aadbf076c54647c9e6929874a
+EBUILD kodi-visualization-shadertoy-19.0.0.ebuild 811 BLAKE2B 283765bd9e0e100749603a09e0f461c4f606804c458a6652696263b1c1aad8a4d67ef52ad90bcec32970df77be15c74aedb7f08e9a1872e8289c7b89a3c334dc SHA512 91c3f428e8fe61fd629cc20ca14036604559c8e7e8424d8e0de1a2ca0863961f15735456e5f5b6f9456eead0c9376afe261ed8b8b3dcef47c1e14157e5f916b1
 EBUILD kodi-visualization-shadertoy-2.3.0.ebuild 811 BLAKE2B 45c0def4a70f2b01630ee18dbc177ad528e9b990658a1f73ede94bac9fbbf8ce54bfd5c79595ec2fc62feac646ab8358e6d8207f796ce702c7f20b9b3c20f764 SHA512 50a3e20efd233fdf9104084447ceed17dacc8020e1b816113d6547a1df809c92cf1d6f5e45bb077796349a6910e612ec6a4ac64fe5f4d09fbd82987ca075b1c0
 EBUILD kodi-visualization-shadertoy-9999.ebuild 822 BLAKE2B eb354b7a28e9512cca2babb7a85d2842a13186b4656c7e043a27adeaecea9d554cd8f665dac8052d4df76f7feb5e7f9865e2bd87c854d72e75a42d5afa870089 SHA512 0a809e0ec9c2c68cba8adc0adcc7e4baec3b69f2c57831e055348e74043d76bf70ea2af8a22a97aa2270746f998a9b23e0141c6d07cc94d5f1aaaa719a9a16d4
 MISC metadata.xml 371 BLAKE2B c08128796ef45f0b7328ae8a8c89527181f79450d7b76ab85931e8f48fab219a21f46dc9c541e0820bdeeb54bffcab382996fd3c24b1fa0b7bcb1d55ccb448cd SHA512 b27afda7facc52025ba34c428656957042a8ad4e903b62b629f9251b149a6a346df8e9fcfa2f2a7a7c1dca327fa35199f88d0d655f15aa1938afe7e809567b85
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.0.0.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.0.0.ebuild
new file mode 100644
index 000000000000..df94a882ffaf
--- /dev/null
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.0.0.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="Shadertoy visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 22762bd6bce7..03db46e26889 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-visualization-spectrum-19.0.0.tar.gz 327030 BLAKE2B 5265d568cfef5faa8f2acfdf6a590d1b6fc306169bdafad1dccaf6c93befaedf18ef555345081047602ece0e084e235d14880c29abe9c4302be71ca9f0cfca52 SHA512 9a55a5c6718fe12e1eba71c4c0797ed151180f0b220ea76aa88ba5792e31443b3e8a2add725dc4074993e2789b67ade6d84f8a23d87ffe9ec91c23395872ad53
 DIST kodi-visualization-spectrum-3.4.0.tar.gz 315666 BLAKE2B b87b2f29a3dd2cb46058661362823f3e6005e354468a5b83ce65b5e5ee59fc56c9a35a22207c61e98c83e964ea682501296a66f376f9259e73b5e76250e08281 SHA512 c653c867dc1fa4d0c4de9cb3e5dcf90daf73ffdeb2b4f50bdcb651799fd1adec549a11889e4a7fa3b9bca46ad36c68e5cea925b0cf5d006b975215c682b9b584
+EBUILD kodi-visualization-spectrum-19.0.0.ebuild 901 BLAKE2B fd3259f6311f804abc601f38b5949aedaeca3a55dd7b32354454cf2134d269492a5de170d9ac87a4c910b44991a3951fd19d1d69f78b428684f300b5331287c3 SHA512 621d29160f83584c88578181031f2ebe8964581a20b0544797daffd0269f1087c378a1f658304092e5395cd64412f6da6018dadb8d06a2fc9a09048f110fa150
 EBUILD kodi-visualization-spectrum-3.4.0.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
 EBUILD kodi-visualization-spectrum-9999.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
 MISC metadata.xml 370 BLAKE2B 9660b98180f5e561be6f3fea3180c29109a6ce96f56e2e911e2c28acef668e8acb6ea6f86296ef8aa33a16e470b4cbe691a4035b0cca0b162b4e993ab7c9118e SHA512 6289890802f971af2c1186be792a052bd32dc9384b12ac99ef788bcb8f14b41f98d9eb150a2ca490eb1478d8cdd5f286c295f7b9fb29de0e0cd895e802e53107
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild
new file mode 100644
index 000000000000..9e7e857571e8
--- /dev/null
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Spectrum visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
+KODI_PLUGIN_NAME="visualization.spectrum"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index 6abb4fb44ffb..117050d4775f 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,5 +1,7 @@
+DIST kodi-visualization-starburst-19.0.0.tar.gz 139450 BLAKE2B 610d62f35f2bd33385a37605072291a6df29f21830b37983563000b03bfdc572aeb58446423bf397cdbcc28e493c394ab368162bcde8ca7ce5e925bd24d76b61 SHA512 de531db6f095171c29c16b5d0f9c2a0c438b21b2b069074f62ff2b9c94912bf7a513cb2ef342c715162417ba61d1932f0f067c4eac7e7418658548b363178c71
 DIST kodi-visualization-starburst-2.3.1.tar.gz 139560 BLAKE2B f906e1f2b60c7685e354f44f4f1d2484d18adc21255ff207fc9f9a55dd7815089cab341acd06dc71cb07469508a0c0412ba1a6e1fbff26c2bd3f7445eb56fe44 SHA512 58b332c4b8729a599710cac969ceaacc23c158b30544fd5fdf9b2d168718c4c032c89e6980d3dd107dbe5de40435de6637cd25f597a3cb01287b80876cd97ff0
 DIST kodi-visualization-starburst-2.4.0.tar.gz 139487 BLAKE2B 094eb87051f3d296f1a66ed497d49e57b6080d5f2db2c6a7736056c80983282767e8ffdcc1108b3f59f0449819c274890abd463f6dd3140fcf9e5424899f9a53 SHA512 2c7ed9b1edb9310d48fc53d5eec9746d3fb51beefb24ebf7025d4b5c72ea67c89c8b92846d4daac0ec7806ebd8c39d774479cf582feac1fcd8364ad67d0f3a64
+EBUILD kodi-visualization-starburst-19.0.0.ebuild 904 BLAKE2B 960f3aab5bf0a13cf6683cb7808c2ccdaa0fa43aa0d27f44f33d5a351c905365ccfa117a81d9c4a630c75dfa4d28c0c5611cae0b63a613aa14a131edb55c59df SHA512 4518576f94aa2ac13fa929d755b09972cbb6ebca2c048dc31ea293f205a8e1cd980f92097807e50042e7728daed2db949f023fd3d02b28354fde44a494c46b43
 EBUILD kodi-visualization-starburst-2.3.1.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
 EBUILD kodi-visualization-starburst-2.4.0.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
 EBUILD kodi-visualization-starburst-9999.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild
new file mode 100644
index 000000000000..dbe1f950f0c0
--- /dev/null
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="StarBurst visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.starburst"
+KODI_PLUGIN_NAME="visualization.starburst"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 0422ae00b5c1..ee815638e94f 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-visualization-waveform-19.0.0.tar.gz 552364 BLAKE2B 589d34553d63f38322fbaa0a68a5c47e45b0339bdd0ac32e9b48ed5a6e2cdc066b23ee6eafebe6ce9938159f05d17e29c320776260913c1fc48ce82163587264 SHA512 f98b8b490e3855986d82e42469df0552aa272c0717215a756958f978ea68c9224a35c8ef75d97cfde0bbd9d7c00cc81abb76eb4eb243b64c502065bfdc554d9f
 DIST kodi-visualization-waveform-4.4.0.tar.gz 540721 BLAKE2B 5d154dc309ec1db62f1b26578f26970c633671aefe00c08bcc0f15bed33b51f6c459f1849dad6c144eeba8aacc6f8003a76e96e10fc4e9a8d0b623342b82b875 SHA512 8452b5c9cb57c40fa79c58278ea6fa32e4a6845f0cb1555009aedcb3ce5759330918aa2c10c4fdc7c9fef97e6afff61d6145344ce5fccecbc576f64ac036d0a3
+EBUILD kodi-visualization-waveform-19.0.0.ebuild 901 BLAKE2B 396e59e6ab5d50130945cda03cacbf1db80b8d7c4b7ae18ba974d64fe4373b33b90bee20b138e11698c0d63607a23b76be4ea56395ec2246abf2663b1ca24b5d SHA512 3e23bd1d35340714335dd0c8d3bafd3e173dfc0bcaab98c802d4f388e572dab9bac532e889d3688456ed8dfab6ee97cee938716a454042daa119f0258b849be1
 EBUILD kodi-visualization-waveform-4.4.0.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
 EBUILD kodi-visualization-waveform-9999.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
 MISC metadata.xml 370 BLAKE2B 4e67a09099ad95d4318a8fe4500337ec8e2cb804cf94c5238e60e457631a1813a1eee4040afe4baf9f1943394d43d9f7be035aa2ab3e133411502ca02a75d81f SHA512 adddd37fefce2eb74d04bce22dd479d8f0bf2255ff70b034975c87219ab5c36a7484c27e70894879bb5309a5ef6872a3bb0e01f9b4ffcfe2d77658170b9bdc39
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild
new file mode 100644
index 000000000000..e48f1725e4a9
--- /dev/null
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Waveform visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.waveform"
+KODI_PLUGIN_NAME="visualization.waveform"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/zam-plugins/Manifest b/media-plugins/zam-plugins/Manifest
new file mode 100644
index 000000000000..afb35485c18e
--- /dev/null
+++ b/media-plugins/zam-plugins/Manifest
@@ -0,0 +1,4 @@
+DIST DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz 2114589 BLAKE2B c8f2cd92b47aa55a467ce14ef2adc8f776c6ce966df680b10c3efbd35ec45fd05ad3a7dee68788701a36a032d563ce2767236397daa0757095b653ecfefcb0fa SHA512 0eab116c5b57d44dc340400340d8fc8456045bdc7e8dbeaccb80f87c7c2e1784f2b24edb8e01e3b6e23807dec86f18caf7227db2c2fd491135b283e795701fb1
+DIST zam-plugins-3.14.tar.gz 23924833 BLAKE2B cdaa13d728cd7a9f7fa2ed53b04b76988bc88d0aa719c57913fd73be778186821d316add5eeea692dabfe1ca222c2f9aaf564abc1128f69da33b8aa592255eec SHA512 30c168ee855011b2f17fcc5e440039628399ab40b69bed9af284713df6155360b38d8249b3de1616e9a2f39885cff43c9e2505868aae891fd22bc92297c1962c
+EBUILD zam-plugins-3.14-r1.ebuild 1794 BLAKE2B ce8852d51993ce47dd911d496f7b9b103f020f1e1e5aeecd396cf461c479507a57c57ac37cec8dfacd846317d1fabc0363a2329c522d5fa95dae10dc67179e6c SHA512 72552a0195c80a1f27d4e71c71f5c3a2b340429a66f09b387fc5ffe3cd18f796c64fc999d87731b8724e80b0927d24f63d510daf552c9877474a511bfd69f846
+MISC metadata.xml 450 BLAKE2B 387157bf41d9b210ee034118359536b641f5f6ff78399f71dde8ba35deed919077491f7d63e836bddbbafcd70632a66d56ddfa02ab86929ef53177f250063068 SHA512 1ff12b862fa6f3a4d8f171466d8abaaedf24c717c5b563f94ded0e6575282d49a3b864b7a9e66d37dfee7b2a802d552a5f5ea1b796af5e8a87388620ab466233
diff --git a/media-plugins/zam-plugins/metadata.xml b/media-plugins/zam-plugins/metadata.xml
new file mode 100644
index 000000000000..3e38f44744f9
--- /dev/null
+++ b/media-plugins/zam-plugins/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>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zamaudio/zam-plugins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
new file mode 100644
index 000000000000..1c760fe76695
--- /dev/null
+++ b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DPF_COMMIT="9243625aacb9fb8dd9fe4bd479b227149eb37959"
+DPF_P="DPF-${DPF_COMMIT}"
+
+DESCRIPTION="Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing"
+HOMEPAGE="http://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins"
+SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/3.14.tar.gz -> ${P}.tar.gz
+	https://github.com/DISTRHO/DPF/archive/${DPF_COMMIT}.tar.gz -> ${DPF_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jack opengl"
+
+DEPEND="media-libs/ladspa-sdk
+	media-libs/liblo
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lv2
+	media-libs/zita-convolver
+	sci-libs/fftw:3.0
+	x11-libs/libX11
+	jack? ( virtual/jack )
+	opengl? (
+		media-libs/libglvnd[X]
+		x11-libs/cairo[X]
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	rm -rf dpf
+	ln -s ../${DPF_P} dpf || die "Failed to create DPF symlink"
+
+	# To make absolutely sure we do not even accidentally use bundled libs
+	rm -rf lib
+}
+
+src_compile() {
+	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
+		BASE_OPTS="" SKIP_STRIPPING=true \
+		HAVE_ZITA_CONVOLVER=true \
+		HAVE_CAIRO=$(usex opengl true false) \
+		HAVE_DGL=$(usex opengl true false) \
+		HAVE_OPENGL=$(usex opengl true false) \
+		UI_TYPE=$(usex opengl "opengl" "none") \
+		HAVE_JACK=$(usex jack true false)
+}
+
+src_install() {
+	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
+		BASE_OPTS="" SKIP_STRIPPING=true \
+		HAVE_ZITA_CONVOLVER=true \
+		HAVE_CAIRO=$(usex opengl true false) \
+		HAVE_DGL=$(usex opengl true false) \
+		HAVE_OPENGL=$(usex opengl true false) \
+		UI_TYPE=$(usex opengl "opengl" "none") \
+		HAVE_JACK=$(usex jack true false) \
+		DESTDIR="${ED}" install
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 65da5a038fe2..aa1a6d83d7ff 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index edf221941977..98999ea94ef2 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,5 +1,7 @@
 DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4efd41c5f49857fe9e3c1ea22c2db7e7fabfdaa1aeacb82ee3d712313681c5a0bf08cf790a6f63813d6de9a4e1 SHA512 0f143a2ba5afe766219133d76c398b0a8b3d61cd8313d50a18585f2b1454e4aa5802b9a4995b40e0dc4de3b1e58850f76fa9a5342ebe06be20ea1ace5c187eba
 DIST flrig-1.4.0.tar.gz 885450 BLAKE2B 1ad18c07a4812168653969e7f00c8cf2a865caa7764fbbab755ceabf95e6ccabc133a1d1b607b9ee7db9be2d805e76850864f06de5e01762361aeec54bf3d681 SHA512 2d0ebbc51af784b423fe0bc658bacc99975660ea44e613922847d2acdc072c4b0e89eccd05adb88773364cd96a19e2daf3535aa5313690e999b047acbb472ec8
+DIST flrig-1.4.1.tar.gz 916690 BLAKE2B bd411693145e4b69a0fc07d4412ff1c76be1b1a3507176ecf7676581a931caa9b992d279d27afc32a3fa7441cbedce203805ad9cb3ffd0ea145cb6adb7296287 SHA512 d365ea6c260f97fc6a0fe78b49ed69991fbefb06b7e0f4788eac6b0f959c1a1c511596f5ba950ea7153de9dc6ce65f232de0ba0f960cd7b1f31381bfa5e7c90a
 EBUILD flrig-1.3.54.ebuild 494 BLAKE2B 18a4362c3b53317561478c01954baffbe8b446143cc28d699a8b07c407ccba3b588052d9fd153e024e9605dc310716fe18c882d5a227537bcbf1150d7c2bea99 SHA512 186692d333262ddcd7454760618d5e075464cf43b7769d38804a38419fe7dc120befa0c687cccb19e3a3fdf732338d3c17a04c5edc36b0c3b51a71af90875e18
 EBUILD flrig-1.4.0.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
+EBUILD flrig-1.4.1.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
 MISC metadata.xml 325 BLAKE2B 5a0f279d13c08ae0f8f26ccab563978f7aaf5b4919bdd1b4eb0e5ef102f40d86ac46802d43f7303e97106ad6fb3f52256b03222623bea4b1ce1f7c5350dcceb1 SHA512 90a892833f50bb0d2c4cf95887f83f0fa2c1afd4f33c498e72e157ab9713677127511b44e13d9c4146b6aedd0876acde69cc89c6b5a80a0a847a00683945ffca
diff --git a/media-radio/flrig/flrig-1.4.1.ebuild b/media-radio/flrig/flrig-1.4.1.ebuild
new file mode 100644
index 000000000000..955cc391d619
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1d754e793b3d..1f87c7f18ef5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index ab8771b7522f..9f6ac1760e46 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -3,6 +3,6 @@ AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r6.ebuild 4532 BLAKE2B 4ade846a90fbe3438a86c7a0c4794e34bf231ccd4c2dd3ef3f0a8978edc6dae17fe23f8bde7bb7e1f738086f10b62b521f881c8ad2601c7c1703918e59d35323 SHA512 db10f1e25109ad3c953ae6d71db8db80733145dddafb782a3bb79bbb7c6c26fccb281dcf565ad131b69d2ef46721d113c0e08a48f37a4ca7aaee6c1a5fb4d99f
-EBUILD beets-9999.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955
+EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B bf85e77c183218f604cf08a3ad68ab8a6974b3e08e837c94ea3f09ec57c3e540f766ca380825a9b5632d1181eaa23bd7897e96f335ae480a726837620608cff3 SHA512 da1492f8a3c662e43fbdee71d2f9e7cb731a2a1ab203a241f19352576e52c5859a1fdf9c766f07df832bb70c7f5e20a610c70a966a6d903a58249a4d28537227
+EBUILD beets-9999.ebuild 4309 BLAKE2B a2f74c59f961c391a3f6f00e8d88366b7eb48ae69a133de996181bd38f1d47f837ecf43b120f2334c3f09203cb80d9ed95c3b985baf4c57ef3f2a451730e9309 SHA512 fb2135dc3c5b6e87257b7c5f3820688f79ff6018eaa4a3d13eff0fb942e8a6aadbd41a0db0a384dd6179888c55d8edc87abd5bfc024708b72221eb7bce2ee9e7
 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
index 4fd12ebc72c4..742f2c162d47 100644
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -31,15 +31,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -51,23 +51,23 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
 			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index cc6a223082b5..c7d2d2175706 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -31,15 +31,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -51,23 +51,23 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
 			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 08a7c5377813..c59f5da351fc 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,7 +1,4 @@
-AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 AUX brutefir-1.0o-ld.patch 4226 BLAKE2B 2173740f52c60845e181508619d26b0aa21f52329d6f35ba62fbeaec9ce62f69041fcef84d1e3e999fbd34568116b51716a90b1ea8b4232e20a032efcbbb9f86 SHA512 bf8f736a634b80d40a3880393b9958f78278f83c122e310a8e3848ec83634e6d729754cae22c3e455292be84ba0ce8e794fe1009cb5c9eeb3bdc2efca9037b1e
-DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
 DIST brutefir-1.0o.tar.gz 246504 BLAKE2B ab2b3c1d22e45422d01aa45a9e869770cbf017d85c1f7af54562a0972545df1f9ae5aa0d155baa02ee5aeef1c65eccf6bc9c9f75edce0f54882e4095ba2f1493 SHA512 e696948eeabb54a9cea8a9f2629c11c620fd37bc685cf32d3c21b1ea89ae7127f703c04a1f1775b073f5135b9268cc0a387c8087da5828cc2194295f850e8d1f
-EBUILD brutefir-1.0k-r2.ebuild 1066 BLAKE2B efbf3ea427688107fdac99fa6c84d118b39bb6a696f01bab9be1fff2080009a1137872383e46033d2570fa70cf6b52d5e860943f988f84dfcaeeacf34ed65c49 SHA512 044b154d4582ccebc9b76c083fa81742b59432216099ac2d73b41f919afee3d88f9f49d671a23d7d491cc27f7cc0cddf9d2096299fbd3877bb07e063c3e8c6a1
-EBUILD brutefir-1.0o.ebuild 1065 BLAKE2B 7de0cc6545b88c7755912bad73bb524d8556722161e98e12e67c48f5df070e41dc7e5c1443e5e18d98012ac32a2d4e71356238eee7ddf1251ddcc43477b758d0 SHA512 765229b15dae7542fbda5d9a1d0c6d4528e12c7e9d7fcf06bf0ce41d4526c728efd853103542a63b271ec79634a22ae25da245d777fe06357e85a81c02af12f3
+EBUILD brutefir-1.0o.ebuild 1063 BLAKE2B fa81db073894f7d0fbc8140846c9793fb5f1c2e1946803f1946b0ca822293c0b511458fe3d9b25a0a9e1f6e4848e88f34483f5b2dccb7dd6119a4255fb070a11 SHA512 b18c3cd495134c8fd596a6408eb1d4c521b9dc535c93001c4af6f7e380ff37b89552a30dbb6b9d4d0b673cde9f9885f83f379328314ce33adab508ff44902a1c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
deleted file mode 100644
index 28ddf46c7b96..000000000000
--- a/media-sound/brutefir/brutefir-1.0k-r2.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="https://torger.se/anders/brutefir.html"
-SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sci-libs/fftw:3.0
-	virtual/jack"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ld.patch )
-
-src_compile() {
-	tc-export AS CC
-	emake
-}
-
-src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install
-	dodoc CHANGES README
-
-	insinto /usr/share/${PN}
-	doins xtc_config directpath.txt crosspath.txt massive_config \
-		bench1_config bench2_config bench3_config bench4_config \
-		bench5_config
-}
-
-pkg_postinst() {
-	elog "Brutefir is a complicated piece of software. Please"
-	elog "read the documentation first! You can find"
-	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
-	elog "Example config files are in /usr/share/brutefir"
-}
diff --git a/media-sound/brutefir/brutefir-1.0o.ebuild b/media-sound/brutefir/brutefir-1.0o.ebuild
index 62520e57bd6b..50944dbbc9bf 100644
--- a/media-sound/brutefir/brutefir-1.0o.ebuild
+++ b/media-sound/brutefir/brutefir-1.0o.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/brutefir/files/brutefir-1.0k-ld.patch b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
deleted file mode 100644
index 6860b5f360b5..000000000000
--- a/media-sound/brutefir/files/brutefir-1.0k-ld.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-The problem is that it passes -fPIC to the linker, and it does not use gcc as
-frontend, it uses ld directly. The problem is that -f on ld that produces a
-DT_AUXILIARY rather than causing any PIC code production. Fix also DESTDIR
-handling and add LIBDIR variable for multilib systems.
-
-See, http://bugs.gentoo.org/252338
-
-diff -ur brutefir-1.0k.orig/Makefile brutefir-1.0k/Makefile
---- brutefir-1.0k.orig/Makefile	2009-03-31 22:36:20.000000000 +0300
-+++ brutefir-1.0k/Makefile	2009-06-21 05:44:03.000000000 +0300
-@@ -1,11 +1,13 @@
- ###################################
- # Where to install
--INSTALL_PREFIX	= $(DESTDIR)/usr/local
-+# PREFIX	= /usr/local
-+PREFIX		= /usr
-+LIBDIR		= $(PREFIX)/lib
- 
- ###################################
- # Where to find libraries, and their header files.
--LIBPATHS	= -L/usr/local/lib
--INCLUDE		= -I/usr/local/include
-+# LIBPATHS	= -L/usr/local/lib
-+# INCLUDE	= -I/usr/local/include
- ifdef FFTW_PATH
- LIBPATHS	+= -L$(FFTW_PATH)/lib
- INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -17,19 +19,15 @@
- 
- ###################################
- # Binaries
--FLEX	= flex
--LD	= ld
--CC	= gcc
--AS	= as
-+FLEX	?= flex
-+CC	?= gcc
-+AS	?= as
- 
- ###################################
- # Flags
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
--CC_FLAGS	= $(DEFINE) -O2
--CC_FPIC		= -fPIC
--LD_SHARED	= -shared
- 
- ###################################
- # Objects and libs for targets
-@@ -74,7 +72,7 @@
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
- endif
- BRUTEFIR_LIBS	+= -ldl
--LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
-+LINKFLAGS	= -fPIC -shared -Xlinker --allow-multiple-definition
- # assume that we have alsa, osss and jack
- LIB_TARGETS	+= alsa.bfio
- LIB_TARGETS	+= oss.bfio
-@@ -83,11 +81,11 @@
- 
- # Solaris
- ifeq ($(UNAME),SunOS)
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
- ifeq ($(UNAME_P),sparc)
--CC_FLAGS	+= -Wa,-xarch=v8plus
-+CFLAGS		+= -Wa,-xarch=v8plus
- endif
- BRUTEFIR_LIBS	+= -lrt -ldl
- endif
-@@ -112,43 +110,44 @@
- 	$(AS) -o $@			$<
- 
- %.fpic.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -fPIC -shared -o $@	-c $(INCLUDE) $(CFLAGS) $<
- 
- %.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- # special rule to avoid to get warnings from code generated by flex
- bfconf_lexical.o: bfconf_lexical.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- %.c: %.lex
- 	$(FLEX) -o$@ $<
- 
- brutefir: $(BRUTEFIR_OBJS)
--	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
- 
- alsa.bfio: $(BFIO_ALSA_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
- 
- oss.bfio: $(BFIO_OSS_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
- 
- jack.bfio: $(BFIO_JACK_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
- 
- file.bfio: $(BFIO_FILE_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
- 
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
- 
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
- 
- install: $(BIN_TARGETS) $(LIB_TARGETS)
--	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
--	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
--	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(LIBDIR)/brutefir
-+	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
- 
- clean:
- 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index d23240331274..73138922612b 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2414 BLAKE2B 32dff6e89a16624af031a3b42ce21b4bc9d8e75747a4c68427b2f2689841a7694d81546ec101cd33accbf3b0fdd0d72b27e3e408d23f1770d83c0dc10bc201f0 SHA512 514fea7a00b8371b10c106121961818f9e8cbbba80be602f1eeedb01c513f897331adf9cd6cf8e0e3b83e29bc69b4674c050d43f425f61ec75a6fdf5968bac5f
-EBUILD cadence-9999.ebuild 2385 BLAKE2B 97e0c262182d80e2bb66039d53ffa7544a29627a17ebc2ef5662188b63ac02a50d2840fbbbc3d1a987456fab837a962fc6edc5bc317a308dfcad5f85f618df24 SHA512 9c66e750c5bc3386c8a60919cca0e6da2ac992c04d12b6565d9952e2825857a6fe344739a943fcbffa76aa4dadf8f93282dbe8910df2474020513d4d40586240
+EBUILD cadence-0.9.1.ebuild 2400 BLAKE2B 1a4ebfc57a21ebb69a4852fdb10767a21f8310d93ccab1aefbf9cabd7936df119a8b13775586c0da35b8697539f406ae8701eb23bcbdb4aa4515b91ab61c3737 SHA512 3ea75d54a08a6e49dc35624cbeafd9681381c118c5bfb3878edd064c8f3ae766133b38939c74a165f708ad9bea4b150c94e89a66f9b0deeb9e4118fc4d312efd
+EBUILD cadence-9999.ebuild 2371 BLAKE2B c3a7f029aed508edd6c101ad37d8c2e4fcb0c31a87b36cc5b72e489b5ffa38c7fde095a089f5c90b9213d673319241a1aec75d74f70c5d36def47fc9de30fb89 SHA512 e2fc0edeb8259fb68cf87c5d2c676db3c3d0d7b600a9ccdf8a73360a13115cc80911218465e84c4ff0223e8963832851a10d10a4f16da2b5440dfd8cbd292f6c
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 7ce406e271d8..b58caa5bcf98 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
 	media-sound/jack_capture
 	virtual/jack
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 8aa575803de1..d8aac43cc777 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
 	media-sound/jack_capture
 	virtual/jack
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 507bfdb4a5ac..ae0b0b62a0df 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-EBUILD cmus-2.9.1.ebuild 3706 BLAKE2B 87b99a5d1fa95c12204dfd1e550b622543fa40272633fcf6ffdb08bd3d7faaf72c624b59812c90c4ba8af3f779f80dc916c584d5e2c416d62e10f2de40ee6431 SHA512 47638d4588881af8e245810dc23ea2f15326f4356bde80e582127c80f557dea07640e1281bcf4b860b63c12476e5328e14cccad051256a032a4748c0174bd5a9
-EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade
+EBUILD cmus-2.9.1-r1.ebuild 3708 BLAKE2B 3d2134bfbc561a3ad29c4bf6a0d9cefb7e38d6e65d619771c0f696e9e48d2d838d0cbe6dafd21feaee09fd75e3ef8617d7b329060e6a885179b6b16021749b64 SHA512 7eb1581f02ea726dadd38e1899f4b2526b18ed2fd895864d35fcab9c7bb255cca0e9df321fbb803aee6c044bb23ee9ca49c2a47f736fd9f05ca2588dd517cb31
+EBUILD cmus-9999.ebuild 3667 BLAKE2B da52cc5e70612f744fa9f4d8d4f86024078d7c796ec53e0449eb4a5e9d8c3e0c041dc55c0b361b84660db872ef33d03d07593b6b033b0a473cfde755868d593f SHA512 2a5e039d01cba09309d8a9de2d4e2ce54e1dffcf330cdfb212e28f13e91952b6a96be424e0230ea60e709e99f152d25b3907288fabd7a02763683cf3940758c5
 MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.9.1-r1.ebuild b/media-sound/cmus/cmus-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..a6b4ad7154ab
--- /dev/null
+++ b/media-sound/cmus/cmus-2.9.1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Ncurses based music player with plugin support for many formats"
+HOMEPAGE="https://cmus.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+	+vorbis wavpack"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	sys-libs/ncurses:=[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 )
+"
+RDEPEND="${DEPEND}
+	pidgin? (
+		dev-python/dbus-python
+		net-im/pidgin
+	)
+"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
+
+DOCS=( AUTHORS README.md )
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-atomic.patch"
+)
+
+src_configure() {
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
+
+	local debuglevel=1
+	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
+
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config ffmpeg CONFIG_FFMPEG
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	if use elogind || use systemd; then
+		myconf+=( CONFIG_MPRIS=a )
+	else
+		myconf+=( CONFIG_MPRIS=n )
+	fi
+
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_compile() {
+	tc-export_build_env BUILD_CC
+	emake V=2 \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
+		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
+}
+
+src_install() {
+	default
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/_cmus
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/cmus-2.9.1.ebuild b/media-sound/cmus/cmus-2.9.1.ebuild
deleted file mode 100644
index 8b85f4342e55..000000000000
--- a/media-sound/cmus/cmus-2.9.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
-HOMEPAGE="https://cmus.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
-	+vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	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 )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
-DOCS=( AUTHORS README.md )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-atomic.patch"
-)
-
-src_configure() {
-	my_config() {
-		local value
-		use ${1} && value=a || value=n
-		myconf+=( ${2}=${value} )
-	}
-
-	local debuglevel=1
-	use debug && debuglevel=2
-	local myconf=(
-		CONFIG_CUE=y
-		CONFIG_ARTS=n
-		CONFIG_SUN=n
-		CONFIG_SNDIO=n
-		CONFIG_WAVEOUT=n
-		CONFIG_VTX=n
-		CONFIG_ROAR=n
-	)
-
-	my_config cddb CONFIG_CDDB
-	my_config cdio CONFIG_CDIO
-	my_config discid CONFIG_DISCID
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config tremor CONFIG_TREMOR
-	my_config opus CONFIG_OPUS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config ffmpeg CONFIG_FFMPEG
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config jack CONFIG_JACK
-	my_config libsamplerate CONFIG_SAMPLERATE
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	if use elogind || use systemd; then
-		myconf+=( CONFIG_MPRIS=a )
-	else
-		myconf+=( CONFIG_MPRIS=n )
-	fi
-
-	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_compile() {
-	tc-export_build_env BUILD_CC
-	emake V=2 \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
-		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/_cmus
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index dc3b1a64b34e..3a73e7ed9e71 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-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
@@ -28,7 +28,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ff3f667fd0aa..b0ff2a38703f 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -9,8 +9,10 @@ DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 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
+DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
 EBUILD csound-6.16.0.ebuild 7121 BLAKE2B 37403bd6c1326b4684a43e47d60e01eece0ec35f05b8d883ddec22f2648045388e76afde0f62ae8bc8b3dab5ea1b38a85398c1993a147619e37424ef78398e5a SHA512 1b81cd50e7274ce13f99241915c8070b0918160f9669a6b1cbe9a8a58dfdb62030d5dab990dd9d36f893d1f147fc85d6e906e6813253b7a5e7206cbeee734f4b
 EBUILD csound-6.16.1.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
+EBUILD csound-6.16.2.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.2.ebuild b/media-sound/csound/csound-6.16.2.ebuild
new file mode 100644
index 000000000000..b8549ffc9aab
--- /dev/null
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound$(ver_cut 1-2).0"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			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"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+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"
+
+REQUIRED_USE="
+	alsa? ( threads )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+	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_DEPS} )
+	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_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 5368e7291011..a04c3d30edf1 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,3 @@
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
-EBUILD dir2ogg-0.13-r1.ebuild 1208 BLAKE2B aab3238a9de44908065d0b172fb12cd252c3bb014179fbb65e37e34ea1d1b4bf5a4260f6f3335ba1c2fde10dbb3df28183958815a98c40d4db7e3f7c64d53211 SHA512 c2c3b62ccfedd7643528803b58a9fa9674b6bc9d5a6248cb9c2b382cdb010e5020c4129eb752d59f11438b9466ca432b422a5afa24093a72fbaa68a200238277
+EBUILD dir2ogg-0.13-r1.ebuild 1202 BLAKE2B a6b4511265be4fa7c01c85d85834f54fe9f14e1b6c5bfe0dc04b82164bb614fab4db1ed324d0938068dec02e38f32b26007a20f69d44788aaa356bdc4475e595 SHA512 1fd9148ff3a6c58497271524d3a65bc443cbdf50de7c7771f06ac06ca68c6be11acd31184885cfebfef36842931cbae7e563c66a4132261d8c562766286cc213
 MISC metadata.xml 445 BLAKE2B 4c9df40d55c76b73a306d4545da2f0f9a96eec30eb595f7c3646473ea19d487d3e493f9993a201a49710e6b636a58a7689d32a0bf8d0c9b3e305b3084fbc3438 SHA512 4f334533b08adb0b5e100b7facd73dc45e358f4d22739b26e897ff8fd899f07dba1f1d2b27acf3443b72c0306b644334ea392edc5fb2139252cccf253aa28f9c
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index e907dba50b31..0b4c50e8cdbd 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
 	')
 	media-sound/vorbis-tools[ogg123]
 	aac? ( || (
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index cecba42c86ae..9fbc43fdef58 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,3 +1,7 @@
+AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
 DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
+DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
+EBUILD easyeffects-5.0.4-r1.ebuild 2267 BLAKE2B af9ad6a20cd77d8400ecf0fd91889795044414787ff96e7213d9a9a23f1269ca3936136506175600b45bdb1e046dbc7249eaa172e8c9de3450193bbd132fbfdf SHA512 601783a228252724fdd157fdfb5ffc7e83d40aae0f8f6eae69b53f5bb073d6f3ef45b80ded69618821496bbe037071f4f6b5b359ed1ca5cc52563d6ce19d4b0e
 EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
-MISC metadata.xml 694 BLAKE2B 0995339a202cfc2134c90d19c18a9efb8be097ff69d996d53470bcc94b3c6ad47376749c95ab94a3da917df33ebf01b993b538f7163224dad04eec01efe10ca2 SHA512 941917bf4e9ee80f56f9b7387028dee554210848e706aabd8fe523a635c7d7c77d192a1fdb751dc54c499627409656fa3a180859498aa4b9c0ace386ae789f35
+EBUILD easyeffects-6.0.3.ebuild 1816 BLAKE2B cbb1e54c3b2b7189b0a061d06001b34f6649b585f372c8517e0ece28032f9e8c86ff5284471709f5541ac521170609f483a230fd546c0efdbd8e24fb1de6c5b0 SHA512 e3aac477fb345dd72fc55cc36a20d2cf4e099ff5868638ec7c65b37efb38764c2e45f13f4a08c099274d4d79de6083b17e1290003fc8cb96cb86e3fd0e1c18bb
+MISC metadata.xml 1098 BLAKE2B a64c34f1ecfabe52d954e6f1b9a3e5137c3b68a169166dae3f5cd0b02e22759b1e5e60e530d137e6460407247c1e4ef5c3de59ad959f9467fa296571aa823910 SHA512 303657f7a638668a65c9e17d39de40f46871b0a916ec39198529ab1270b0234705e819ad95a366a127a79fee5243a935d3f99c9daa0bad19ef7bc27f364a0828
diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..a2d4b3ab7ef2
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
@@ -0,0 +1,84 @@
+# 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/tree/pipewire-gstreamer-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pipewire-gstreamer-legacy"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
+
+DEPEND=">=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
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.24[gstreamer]
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	rnnoise? ( media-libs/rnnoise )"
+RDEPEND="!media-sound/pulseeffects
+	${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=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
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.4-meson_no_automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+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/easyeffects-6.0.3.ebuild b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
new file mode 100644
index 000000000000..226bf5a1acd0
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	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 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf zamaudio"
+
+DEPEND=">=dev-cpp/glibmm-2.68:2.68
+	>=dev-cpp/gtkmm-4.2.0:4.0
+	dev-cpp/nlohmann_json
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-3.0:3
+	media-libs/libbs2b
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.31
+	sci-libs/fftw:3.0
+	>=x11-libs/gtk+-4.2.1:4"
+RDEPEND="${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++20 ; then
+			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
+		fi
+	fi
+}
+
+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/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
new file mode 100644
index 000000000000..4e547d404f80
--- /dev/null
+++ b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '5.0.4',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index e4010fa254cf..76b0b6c7e4c8 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -10,9 +10,14 @@
 		<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>
+		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
+		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">wwmm/easyeffects</remote-id>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index df0247f1dfd6..2e6da8e7634d 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,5 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
-EBUILD exaile-4.1.1.ebuild 1745 BLAKE2B 1208834f32ceebabba8a497a7a0a1d830ede5905c58c73bf65bedc49665fc2c89196f46da8b8cc1963a428694763ce970744f083947819ca26ab304ee32b0251 SHA512 9413433a313b67ff2240d0539c16172b211c0ef5b567259dc9a54df39fac15cf8981e557e9fcba24e2bd5deaacd05f9c77ca74c3eb5b7242c20481e46bd2527f
-EBUILD exaile-9999.ebuild 1752 BLAKE2B 49f121420c3cbe72fbc917f58f16c6156862a58e865dfe8571c826eff0cd67977f5e2d5fc31db7d9ac4e3da90b5405253dbf52ad4b38f52c34f48f47d1111deb SHA512 253ade14a8f5581a6700fe27d7a9ce1a0c5d16dd9433d084411a25ef48440b4a7fc0d26d11b059af0a6bd2a8e05989d39a96ca409fc0578ab27da3a2b9116f86
+EBUILD exaile-4.1.1.ebuild 1703 BLAKE2B b2dab1ea5dbb7188d1276c95d50cfe5b702f46c6854109f44e4320f27fe8d522e396abbc974e5cf3521c48d14821bc483ba25a71be80efdd63dda181efd7992c SHA512 3e6a8eebee581fb2d5bd25dd09e98fc1a412f4e14d39803e099db275501a5930f59abb3a5460d7588e86e2bc15cd3f382fc8f57c59e518066f734e05b8f04e56
+EBUILD exaile-9999.ebuild 1710 BLAKE2B 58b646c3cbbdaa1bd036dc003feec9489ed67d7f35235127334dc38cef5c23af100c7f0c6d864c05b4c6d64a4f8cd635d5475aa6fb46580d9039546147099c3e SHA512 5977d8d627fdc9c20b0d4219f2e19f9d3d8de6823f42fec0b1f04b41503aa17f4e719b7c83227be51b666479ea36bcab464a5ae93002e89d95fd1a8b8c2d78ae
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.1.1.ebuild b/media-sound/exaile/exaile-4.1.1.ebuild
index fa7f552d22f3..de0775df2e39 100644
--- a/media-sound/exaile/exaile-4.1.1.ebuild
+++ b/media-sound/exaile/exaile-4.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
@@ -36,13 +36,13 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.10:3[introspection]
 	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index 566fd8c3d201..93bda21f7a3e 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
@@ -36,13 +36,13 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.10:3[introspection]
 	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 69506cd6a677..04085932e3f4 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
 DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
-EBUILD gnome-music-40.0.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
-EBUILD gnome-music-40.1.1.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
+EBUILD gnome-music-40.0.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
+EBUILD gnome-music-40.1.1.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index 21901b881186..9a1f62b03fb6 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -26,8 +26,8 @@ DEPEND="${PYTHON_DEPS}
 	app-misc/tracker:3=[introspection(+)]
 	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
 	')
 	>=media-libs/grilo-0.3.13:0.3[introspection]
 	>=media-plugins/grilo-plugins-0.3.13:0.3
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
index 21901b881186..9a1f62b03fb6 100644
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -26,8 +26,8 @@ DEPEND="${PYTHON_DEPS}
 	app-misc/tracker:3=[introspection(+)]
 	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
 	')
 	>=media-libs/grilo-0.3.13:0.3[introspection]
 	>=media-plugins/grilo-plugins-0.3.13:0.3
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 84601a8aeaaf..d9c0cdb08a88 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,7 @@
 DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
 DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2 SHA512 93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
-EBUILD gpodder-3.10.16-r1.ebuild 1673 BLAKE2B 50032f1e8587327b1916e131695104702010320c970bac1b824941108b910cdf626fe64773b9b7dcb1c984abf9a7742c40607d3e1343e7558a0aa0a79b15e119 SHA512 344124d54a1bb16fc0ca739777b976d3b108426a4409c205d8ad7497fbfe3a22bc809adb679b74ab162477b921157c43f46b028e3877d9e8c28bd1b9e810adaa
-EBUILD gpodder-3.10.20.ebuild 1830 BLAKE2B 97adcc414795d43f50b9fc9f94ebbf8f7c43e4854669ea7d671ee0c56b79f01392843a0cd6192d49e219ac4f7a66a5359b4ee841d963a633cd908a71ca5a2874 SHA512 443227193b0f5b211268690346427bd31e44fa17149037b879c6998c71b43f0024e2cb13b5239300646ad262c318e52dedecec9dfd4485758df95251ae61a06a
+DIST gpodder-3.10.21.tar.gz 1105520 BLAKE2B c17905951c14a718e48d1bbded3abc41d62088bb517cda053e9fa71e3a952bb97ac57077d428cd58c3a048ae0cc18ef9385af97dcf8b460f3860674ecdb85c1c SHA512 5311a92469f605e489553e91586b788a8d07812e41c20d1ad0717c09ab6db6da22c356d5c1942293d1e27e25afe24caf3c14c15720250d8f230f2d7738206fec
+EBUILD gpodder-3.10.16-r1.ebuild 1623 BLAKE2B 5c5a48a012f963851856ed53392014b0260d02b6869f1ae1c6f33384f1fa3042cffd1d8224fd258aef76cd31db4818048153d6584e67bc05c2508f718a5180dd SHA512 517442df9abb6ebd96ba79a6c8cf904420d8621b825a8075ea4a684cc698cab4b00b2dfeb95a39caf41f678446d5bfbbb58117d3f68de74cb337a578e686af4a
+EBUILD gpodder-3.10.20.ebuild 1828 BLAKE2B c02cf9b22bc7cc28e7310638aebd5ddbf11c7f555ec75143cecc000aecbcd2749f6ac5013a6abbc5c9561790aea5d5e35445a8c0fad23d81987ef6baf5a3c794 SHA512 2b535457e59e5c1790c1396abc5efc53389c9b84f16823dabad1a1d608c3ba5c87d0f0850f7b78d966c31297d38040bb0a36d262077c27158f9bfd99b046ef2f
+EBUILD gpodder-3.10.21.ebuild 1828 BLAKE2B c02cf9b22bc7cc28e7310638aebd5ddbf11c7f555ec75143cecc000aecbcd2749f6ac5013a6abbc5c9561790aea5d5e35445a8c0fad23d81987ef6baf5a3c794 SHA512 2b535457e59e5c1790c1396abc5efc53389c9b84f16823dabad1a1d608c3ba5c87d0f0850f7b78d966c31297d38040bb0a36d262077c27158f9bfd99b046ef2f
 MISC metadata.xml 357 BLAKE2B e9cb306227c9b0dd894c9c2a54db89c56f343bf5e38c87cf9c5e6843a036e18b123cd0079feed2924ad5c561214d6767c2d6474852cb396e543d6d3a604dfb7e SHA512 29feefe6f7c9d11cb06c3b960e19f48b5b33ff1f3a2b58060e6171d9aa2ec0fea49ba23af47e9c2cbc52c2440628af3e735b1e976af3fef957c194589159dee7
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
index b7421bb06ad9..0d09892acd75 100644
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.16-r1.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
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -19,17 +19,17 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus bluetooth kernel_linux mtp test"
 RESTRICT="!test? ( test )"
 
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_MULTI_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_MULTI_USEDEP}] ) once they
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
 # support python3
 COMMON_DEPEND="
 	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/podcastparser-0.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mygpoclient-1.8[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 	')
 	bluetooth? ( net-wireless/bluez )
 	mtp? ( >=media-libs/libmtp-1.0.0:= )
diff --git a/media-sound/gpodder/gpodder-3.10.20.ebuild b/media-sound/gpodder/gpodder-3.10.20.ebuild
index 8bda4c68ffd3..7cff7c80eaa7 100644
--- a/media-sound/gpodder/gpodder-3.10.20.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/media-sound/gpodder/gpodder-3.10.21.ebuild b/media-sound/gpodder/gpodder-3.10.21.ebuild
new file mode 100644
index 000000000000..7cff7c80eaa7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+src_test() {
+	emake releasetest
+}
+
+src_install() {
+	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "for the youtube-dl extension" net-misc/youtube-dl
+}
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 78c7fffbca17..df374da07dbb 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,5 +2,5 @@ AUX herrie-2.2-fix-buildsystem.patch 1132 BLAKE2B af945efc12c6ab5604fada1e7d123d
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1845 BLAKE2B dcdb0be2847093b640388237398fabb82fb78be71be1b9346ae69eff613a931232a5d65cc5e972fc977ac529c28704d16c7e4829fecea5d829731ba45fc9103c SHA512 7bf9151d124a66e005dd58b65c1523b58ad6c3a5a5a4dea71b455f1b4adae4f9658bb5fafd493de02acd94d9abef885640c6d960c6dbba4cc969a7bfdfb9024c
+EBUILD herrie-2.2-r2.ebuild 1847 BLAKE2B 4f77a546bfd6214af935016f83747387fcdfc998d8c725aac5cd78a27524d33c7327cf048d2920d599730aa02ec8d7ba598e5f62ff2277bbfdd6570898b12067 SHA512 3c1423ebad9fc096daccda8cd5101fa88bc51a76426581659308a22d7985b2ea8956257b99cf1e73074840153c848b5c03d83ec48f8ac95fbb8119619adb1591
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
deleted file mode 100644
index d50e37ef8671..000000000000
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Herrie is a command line music player"
-HOMEPAGE="http://herrie.info/"
-SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
-REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	>=dev-libs/glib-2:2
-	ao? ( media-libs/libao )
-	alsa? ( media-libs/alsa-lib )
-	http? ( net-misc/curl )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )
-	xspf? ( >=media-libs/libxspf-1.2 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-chost_issue.patch"
-	"${FILESDIR}/${P}-libxspf.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-
-src_configure() {
-	local EXTRA_CONF="verbose no_strip"
-	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
-	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
-	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
-	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
-	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
-	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
-	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
-	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
-	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
-	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
-	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
-	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
-
-	tc-export PKG_CONFIG
-
-	einfo "./configure ${EXTRA_CONF}"
-	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
-		./configure ${EXTRA_CONF} || die "configure failed"
-}
diff --git a/media-sound/herrie/herrie-2.2-r2.ebuild b/media-sound/herrie/herrie-2.2-r2.ebuild
new file mode 100644
index 000000000000..3ae36bc01359
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player"
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+	>=dev-libs/glib-2:2
+	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
+	http? ( net-misc/curl )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad
+		media-libs/libid3tag )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+	xspf? ( >=media-libs/libxspf-1.2 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-chost_issue.patch"
+	"${FILESDIR}/${P}-libxspf.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+	local EXTRA_CONF="verbose no_strip"
+	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+	tc-export PKG_CONFIG
+
+	einfo "./configure ${EXTRA_CONF}"
+	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+		./configure ${EXTRA_CONF} || die "configure failed"
+}
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 2438d1dc1698..4a9323adb19d 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,5 +1,5 @@
 DIST jack-4.0.0_pre20200706.tar.gz 198987 BLAKE2B e45c2457c82901c5cd63f726be3a6931fdb09e9fd5cb1dbaec13951614a108f07c14f98ef7ba18f4c81a0da48d151f13e5f7250121e80c5e8b163c344ce07b15 SHA512 bcb2e629daf6b015cfcb63bb07eed37cc9a517f6581489846bc9cd236c5e9f7163765959f042cbc9a87160dead36cf023c79ce1e3207b14ff52959ed21989dc4
 DIST jack-4.0.0_pre20201220.tar.gz 199310 BLAKE2B d36f52d0cf1ce0744929c1d3da2e0929d3a0bfcfe3f7088bd4f1b170cafa0989921ac1a5a4d8ffec17a86c6eeca4f233c9ca0a159ec76629a5ba48d1686d22cd SHA512 8ff5b5abcfc39ffa373cd215ae5d1fdc9838e92040621e8455485e1243ec6e4bf0fb1675f3280441b2ecc993f996c30c77871e2ba14020ae76ed50634cff15f9
-EBUILD jack-4.0.0_pre20200706.ebuild 1361 BLAKE2B db3bbff27481d95b0ee9e717bc60125383ff1479ab7c489e17901371e023aa9a306ed7dd6f18510e1d763e1795bc8fa34b87cb0bd0bc0ab4132b717e912b1deb SHA512 85eb8d3084b20cdb7713a0e82bf2c2fa93dcb96993681cd9970f6b541110b783ab81d2288b3c946ebf085c141077c8114a783d1bb26cfed5c214d073a20de871
-EBUILD jack-4.0.0_pre20201220.ebuild 1363 BLAKE2B 8fa5e8bd135066f1da711e3ea8bd1afa56b8161fc4f50c902c9078be64c214401d3403a35539963297b728b9ff809eee3c950f972fda5a08182d386353443011 SHA512 1e0dd639c248d9b6a5942d8888e6b9fc4bbc55c18200a062aa1c3cc1c73cbaa162760d78aa63ea33fd636c5aef47cae651b9ddeb936d597cb1ad418dd908489d
+EBUILD jack-4.0.0_pre20200706.ebuild 1345 BLAKE2B 608439fbf85684f01b9b110380fdc996e5c67b0743ed21970c93ee536f4bf028ae328a6446edd97f3e72226313ca8e11511ab4a3b26f4b1cc20ce4f66f9286c0 SHA512 cd37a5293a4b1873a2af55343fef72038c280e3115493c51328502a4770525f35ca4ad7197b04bb0fa9eac1cf7820a4976b86adf156a726336465dd5e612ba58
+EBUILD jack-4.0.0_pre20201220.ebuild 1349 BLAKE2B 07ed1a94ad78ade5683e0574d4fa0d3206d10051113dc0b65001df3e40ca8e20f80cdf3f2b57524b71bdf236c859de2d3e6ce7c3e4153907e5b77eddd2aa239a SHA512 921d7368a62107d431be6476c54225650e2ea5163cc09908a7ee458ffe1d63fb9b06baff7f45637b380ba92bb0521048fd1ffd9adb3cfefbd117a6019f0d5e6e
 MISC metadata.xml 511 BLAKE2B be22d1c6187e0a7ff31a8a6f423b6b7653a2f7205e5e0a10613ca7c66874e84e15cdf0cbe08dfba3ac6ca147f7d70a3bfb65ba447280fdccb0d14adbe942a60d SHA512 0c3d517ceabe0e8066dc9bef24736a46a61ac64d2e577adc0865a15a16e36dfa0537e8beba1d795c52658057ecb36b959f4840a7b526552c6f38320cd0ef00b8
diff --git a/media-sound/jack/jack-4.0.0_pre20200706.ebuild b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
index 98d04e8d8729..74ca399343ab 100644
--- a/media-sound/jack/jack-4.0.0_pre20200706.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-discid[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 	')
 	media-libs/flac
 	media-sound/cdparanoia
diff --git a/media-sound/jack/jack-4.0.0_pre20201220.ebuild b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
index 2d00b9187d01..5afae97078b1 100644
--- a/media-sound/jack/jack-4.0.0_pre20201220.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-discid[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 	')
 	media-libs/flac
 	media-sound/cdparanoia
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 5f413e1408f0..2cfc677cb51d 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +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
+EBUILD jack2-1.9.18.ebuild 2444 BLAKE2B 0428836a0c60aac26ec8196765fab80a69e80f1051c23204249dee7101b58eeafa89d9ad73930aa1421fa959a59669bee2263b975c3ec015258c301578091ce8 SHA512 22f7c1128b06286f167c2f13b17dcda6d58239d11e80d3e22d14e95f96bd66d470b266d0db7f5124fbc9df20a4598c6e138822d5c07e3867598db0d216fde6a2
+EBUILD jack2-1.9.19.ebuild 2398 BLAKE2B e474d77d45005fc09f9de936d66d6d4fc4884e2514461cea31a2d1bbca955bc59b6eff61ef4360b69e3749a171dbbe044580ca9b7099fcaeeee582ff843e3e89 SHA512 673c1458aa4afaeed280d2cd4d7f66c8006e5737401c02389924531fc0153cd24250ecf8072e2e7894a4f644e3222dd40a2e3bb74c04f312f1397d5af7321fbb
+EBUILD jack2-9999.ebuild 2395 BLAKE2B f663eee6c44cb65f76a12d5b599a887cb0d56be0644dedbfb8e06368510a7ae18522c80bd9c0ef290ceb1af3e1f06eb60b3e4fb18b0c229df83929b155647cec SHA512 bfcfa9479713d773706964daacb266168d7c019da1af2528ee6aa2d1c327443718086536cd28b2fb71cee9da1a66dcb768f798164c0cb551f4e1cd9d829f6aed
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.18.ebuild b/media-sound/jack2/jack2-1.9.18.ebuild
index 0e31dae3a2bf..a5ee5eea6fa7 100644
--- a/media-sound/jack2/jack2-1.9.18.ebuild
+++ b/media-sound/jack2/jack2-1.9.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
index a696ea21763c..dcce141a31b3 100644
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 854d309843ca..06fe3cac36bf 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index a33d9415d503..f680753e5435 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4
 DIST kid3-3.8.7.tar.gz 3356781 BLAKE2B 967a7af8f3ca5413716b1f246d07fa1723f57113369f466f853c00106e81648efb19c54abbb27b802ca9dae308c44683764356ebbbc708c7454e9669ae0201f4 SHA512 9d1a2c64d05e19c7a8c33f5447f896043ffd68ec95387dc04502549d59cb0398dd6946d17bfce12ed57ea445e0b39c8b3769918069ee9f1862f2480482bf2a01
-EBUILD kid3-3.8.6.ebuild 2004 BLAKE2B 74400619f98177629513157b8daae32eed7eb73969dbc5bd6142e7403866cc75c881dd95a035fa9bbb2ca970ccd52150f57b72ed0146552a78f3fe2b92be2055 SHA512 7d7e8c90105b77b4ff7f5aa5b7c732be150e4bdadc9dac4d2aa7b423949e3bdcedb89e01545b371051c37a8979c34d85e3e470caf7161d4d9d4245d234bff4ee
-EBUILD kid3-3.8.7.ebuild 2007 BLAKE2B ad104714fb19ea8ef0f442c1ca5836683209daa955c031edd16b0cc7a25c1320b6c252928e3f1f0ebc0d5fca37edb6ae214adeb4e6f41e5d150976b07f5776ee SHA512 134eacfa43418eca65c8d960c378dcae0cf240257d1508875fefc8ba9e1f4d3d32858e1c8800eb6f15dbfd09fea513ed47bbd898ef41b9499dcf47ad7055dedc
+EBUILD kid3-3.8.7.ebuild 2005 BLAKE2B ada62f924eb468088bc94361fff8fc2985a9654a271035890e4680458f76f6bf0ea09fa8bd4e6aa3188602a3f08fa42d61e284189fbe12e8603f810c018b27a8 SHA512 d1f1ddaebcb873bf9d8b344b09a529317a0d9ce8232487e0ab53baecab22b71a083fe3d0302cfb9006c83f994b12b718153450cb2b723bfa7442815a8ec72d27
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/kid3-3.8.6.ebuild b/media-sound/kid3/kid3-3.8.6.ebuild
deleted file mode 100644
index d91a129de142..000000000000
--- a/media-sound/kid3/kid3-3.8.6.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..9} )
-inherit cmake kde.org python-any-r1 xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.8.7.ebuild b/media-sound/kid3/kid3-3.8.7.ebuild
index eb1e87a95e84..752bd1daaff3 100644
--- a/media-sound/kid3/kid3-3.8.7.ebuild
+++ b/media-sound/kid3/kid3-3.8.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index ddf83baf0c66..3d4746deb1f0 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
-EBUILD lollypop-1.2.35.ebuild 1524 BLAKE2B 360da0031d44177ecf8e0965653d6238080a2360557ff732e60135a599f4f1e25fd647b2ebe60d618af1fd774a0cd82169d400dc1f9a9f5a28613a4b96b909f3 SHA512 d04d122dc72180395082b41c29617167d95735a7461d361f64b304b3f676ad5f1a3c37a290ef43fd840a440dda7dffdbdda4fb8fdc74fd5d929d1b72653dba1a
-EBUILD lollypop-1.4.18.ebuild 1549 BLAKE2B 45fcf42b8f20f04da12381a310a41c376a9214b869bb279fb04702519b76d0d7592e20fa7379624830abf7509a564d4ca50377e9c71c05fefcc23ee1c54218b7 SHA512 6802e58a2799c975d4c5b91992397104e59dbcf0dd1bd7697f484e16faba5ab43df63ebfb8db8abe707d527f339c06aadb280a2c7611e722778a6dd9eeee6745
+EBUILD lollypop-1.2.35.ebuild 1486 BLAKE2B c9a720c44c1b8706fb7a6fa54c2c018cec8888edcb70b463b438d3d209bfd63bcf47b2e354cbdaa8ffe1c172b3d57fae674817122dc0e1a75c3a5cdf8e8e0557 SHA512 5643394a7d28e89e95c374675ea3a1807b708d2082f01ebb7f62cd6822e9af4d123e1a79e9d94f2960aa59b04ca01d25560d421729d1cc194d21b1796ba69a38
+EBUILD lollypop-1.4.18.ebuild 1511 BLAKE2B 4c553f05d9f7fe8059b65f890a0e0189baab5a4b27cf9c7d6852773ff1e70273be88d9a28d81d1a174f2589fec6ad0dd645a559d66c93aec940cb1fe27a2859e SHA512 922162352d0e46fc1e9552c2192fd7eeb979d7a094a99adac1c0a507966af2191b0777741421699009ac6e67a09ca41f0250bc3bdad8fbdf5f1629b121bfcb70
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 7f583f5eecab..33ce3a4d44d7 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg
 
@@ -21,15 +21,15 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	dev-libs/gobject-introspection[cairo(+)]
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-common
 	x11-libs/gtk+:3
 "
 BDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
+		dev-python/pkgconfig[${PYTHON_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	dev-util/itstool
@@ -39,10 +39,10 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pylast-1.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
 	')
 	media-libs/gst-plugins-base:1.0[introspection]
 "
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index f643b34105a8..4098e58934c5 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg
 
@@ -21,15 +21,15 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	dev-libs/gobject-introspection[cairo(+)]
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-common
 	x11-libs/gtk+:3
 "
 BDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
+		dev-python/pkgconfig[${PYTHON_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	dev-util/itstool
@@ -39,10 +39,10 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
-		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 	')
 	gui-libs/libhandy:1
 	media-libs/gst-plugins-base:1.0[introspection]
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 0ccc0495f10e..038221ff9112 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,6 +2,6 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
-EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
-EBUILD moc-2.6_alpha3-r3.ebuild 2438 BLAKE2B 50bbaaff6f02794b7eb77a56caebc58dd13c19fec125e29a4011b030e03325c4452ed156f1d5d2368665f30af5d81e89f51f9c5a94e273c5d7b76c7b62878633 SHA512 5feca35ca9a9a21ff77558b3dd46d29a0e451e789ce696554eebfa2e9fcbde56d61d72954c6262276762c25702dc1e697467ca47b996c664cc3b8bce004229c3
+EBUILD moc-2.5.2-r2.ebuild 2111 BLAKE2B 1313e13157bcc9d222d9809d80596996a77358866cb7e114153b83833f688482c971cc8e8f32b237f553df1d4cd90bcef82cd4b66812818c913eb65d2a7ed722 SHA512 ab5560f47571e66ee6736915292152ea721fd3d0b541b174653673d1a12c807321b73d4df7d9689a172ff3a4af41499e922565a395c570c0e13473a00e227e48
+EBUILD moc-2.6_alpha3-r4.ebuild 2440 BLAKE2B 7c3b03c5c4e35090af1db15ecef82b8b746f9c2fee53316ce03a77a83414c2205ade1fcab97b4c5de4899ff6b4ee1d1947b62c73ddd51a526e79839b98fd40ef SHA512 b900f9a2fe1838b9973f71d9f6fb99b83d7ad1ff7b7074aa129c96fcc0446d2d56fb121b318dbb50bbc7dd27da0f6afe6fdfec07b460e9bac5734e1d3641aa67
 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
diff --git a/media-sound/moc/moc-2.5.2-r1.ebuild b/media-sound/moc/moc-2.5.2-r1.ebuild
deleted file mode 100644
index c3a79d27a2c9..000000000000
--- a/media-sound/moc/moc-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/_/-}
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="https://moc.daper.net"
-SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
-
-RDEPEND=">=dev-libs/libltdl-2:0
-	sys-libs/ncurses:0=[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cache? ( >=sys-libs/db-4:= )
-	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
-	magic? ( sys-apps/file )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-sound/musepack-tools media-libs/taglib )
-	sid? ( >=media-libs/libsidplay-2 )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex )
-	timidity? ( media-libs/libtimidity media-sound/timidity++ )
-	vorbis? (
-		media-libs/libogg
-		tremor? ( media-libs/tremor )
-		!tremor? ( media-libs/libvorbis )
-	)
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable cache)
-		$(use_with oss)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with magic)
-		$(use_with unicode ncursesw)
-		$(use_with libsamplerate samplerate)
-		$(use_with aac)
-		$(use_with ffmpeg)
-		$(use_with flac)
-		$(use_with modplug)
-		$(use_with mad mp3)
-		--without-rcc
-		$(use_with musepack)
-		$(use_with sid sidplay2)
-		$(use_with sndfile)
-		$(use_with speex)
-		$(use_with timidity)
-		$(use_with vorbis vorbis $(usex tremor tremor ""))
-		$(use_with wavpack)
-		$(use_with curl)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/moc/moc-2.5.2-r2.ebuild b/media-sound/moc/moc-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..107d1a0337ad
--- /dev/null
+++ b/media-sound/moc/moc-2.5.2-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/_/-}
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="https://moc.daper.net"
+SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
+
+RDEPEND=">=dev-libs/libltdl-2:0
+	sys-libs/ncurses:=[unicode(+)?]
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cache? ( >=sys-libs/db-4:= )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	magic? ( sys-apps/file )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-sound/musepack-tools media-libs/taglib )
+	sid? ( >=media-libs/libsidplay-2 )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	vorbis? (
+		media-libs/libogg
+		tremor? ( media-libs/tremor )
+		!tremor? ( media-libs/libvorbis )
+	)
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		--without-rcc
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-sound/moc/moc-2.6_alpha3-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
deleted file mode 100644
index 7bad54ab70ab..000000000000
--- a/media-sound/moc/moc-2.6_alpha3-r3.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
-
-inherit autotools
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="https://moc.daper.net"
-SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-	oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
-
-RDEPEND="
-	>=dev-libs/libltdl-2:0
-	dev-libs/popt
-	sys-libs/ncurses:0=[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	cache? ( >=sys-libs/db-4.1:= )
-	curl? ( >=net-misc/curl-7.15.1 )
-	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	jack? ( virtual/jack )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
-	mad? (
-		media-libs/libmad
-		sys-libs/zlib
-		media-libs/libid3tag
-	)
-	magic? ( sys-apps/file )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	musepack? (
-		media-sound/musepack-tools
-		>=media-libs/taglib-1.5
-	)
-	sid? ( >=media-libs/libsidplay-2.1.1 )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sndio? ( media-sound/sndio )
-	speex? ( >=media-libs/speex-1.0.0 )
-	timidity? (
-		>=media-libs/libtimidity-0.1.0
-		media-sound/timidity++
-	)
-	vorbis? (
-		>=media-libs/libogg-1.0
-		tremor? ( media-libs/tremor )
-		!tremor? ( >=media-libs/libvorbis-1.0 )
-	)
-	wavpack? ( >=media-sound/wavpack-4.31 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=(
-	"${FILESDIR}/ffmpeg4.patch"
-	"${FILESDIR}/${P}-stdint_uint_types.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--without-rcc
-		$(use_enable debug)
-		$(use_enable cache)
-		$(use_with oss)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with sndio)
-		$(use_with magic)
-		$(use_with unicode ncursesw)
-		$(use_with libsamplerate samplerate)
-		$(use_with aac)
-		$(use_with ffmpeg)
-		$(use_with flac)
-		$(use_with modplug)
-		$(use_with mad mp3)
-		$(use_with musepack)
-		$(use_with sid sidplay2)
-		$(use_with sndfile)
-		$(use_with speex)
-		$(use_with timidity)
-		$(use_with vorbis vorbis $(usex tremor tremor ""))
-		$(use_with wavpack)
-		$(use_with curl)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/moc/moc-2.6_alpha3-r4.ebuild b/media-sound/moc/moc-2.6_alpha3-r4.ebuild
new file mode 100644
index 000000000000..82c189dc290c
--- /dev/null
+++ b/media-sound/moc/moc-2.6_alpha3-r4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="https://moc.daper.net"
+SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+	oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
+
+RDEPEND="
+	>=dev-libs/libltdl-2:0
+	dev-libs/popt
+	sys-libs/ncurses:=[unicode(+)?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	cache? ( >=sys-libs/db-4.1:= )
+	curl? ( >=net-misc/curl-7.15.1 )
+	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
+	flac? ( >=media-libs/flac-1.1.3 )
+	jack? ( virtual/jack )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
+	mad? (
+		media-libs/libmad
+		sys-libs/zlib
+		media-libs/libid3tag
+	)
+	magic? ( sys-apps/file )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	musepack? (
+		media-sound/musepack-tools
+		>=media-libs/taglib-1.5
+	)
+	sid? ( >=media-libs/libsidplay-2.1.1 )
+	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	sndio? ( media-sound/sndio )
+	speex? ( >=media-libs/speex-1.0.0 )
+	timidity? (
+		>=media-libs/libtimidity-0.1.0
+		media-sound/timidity++
+	)
+	vorbis? (
+		>=media-libs/libogg-1.0
+		tremor? ( media-libs/tremor )
+		!tremor? ( >=media-libs/libvorbis-1.0 )
+	)
+	wavpack? ( >=media-sound/wavpack-4.31 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${P}-stdint_uint_types.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--without-rcc
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with sndio)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 0deae611edc3..d3094224533e 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,5 +1,5 @@
 AUX mpfc-1.3.8.1-fix-underlinking.patch 960 BLAKE2B 5eee0cea45c470b6837120cd89fd9dc180a5f295c5fcaa08a640009c51b37c3397e0f2f9755dc1baf7ac1af0f6003895368a333f1b8304b5fa096bb7a99a5e84 SHA512 117c49a7893c95b8b7e592aba76afd4f05f076b88db303a4fcb0efdaad351008bd91d88d06f278586920907c54801df49c7101c8dc2e41475038244cefd6a480
 AUX mpfc-1.3.8.1-qa-implicit-declarations.patch 4938 BLAKE2B 117d2f5aa9290aa49b65bd8cf085fe30068ccdd558a8c18a5e6b94ebd27eeb07924aeb2f0735499cce7d520b5fa86cc69f6f49580d197979162837b4c906f107 SHA512 afd61c08964b237124316a7cad4cecef29d8c269c6e2d0c645d81272167e9f7de2b3c1ef33e2877e1b5f2c0a4021bf2e548a04976142c22e889a6cf769807233
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
-EBUILD mpfc-1.3.8.1-r2.ebuild 1173 BLAKE2B 9337f49219eeea0cc1084cd025076ad5656a9921ecf3b89b7c253cfb0b036952a165ca9c8ad786522cc30de00fb05f008b782f3aa0afad5b685b339fa18c32b7 SHA512 a378f57a19825b2898de853b1396429c1dfff1ec3894353a835783e71b222ede8918361e587f910f48942b5b124426c02ceeef0fa1a7838de3fc8d607c3c46e9
+EBUILD mpfc-1.3.8.1-r3.ebuild 1172 BLAKE2B 20c0f9ac49b8f71b994b41254cfa298f15001679616904d8154e72e1e3c27613f5c0be7d4197a72c8c7acf515d123175048013248a2d52227a06c952a82a7037 SHA512 7b47de96cdf26536c184543e8c97f1ed10b93e34ecdac39ef242d7139727480ad4a2d5a90b124339a55e35ad624d010d4b6b47e39c95b01dbbd60cf894a2034d
 MISC metadata.xml 413 BLAKE2B 5ce36b2246ccdaa78683c2964ffb56a1f88956ef6bba4d5582840febeae3d55612a2ec1291b43d6016983763daf23aa7ae325b0a923080a469e520b258d74a1b SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
deleted file mode 100644
index 0d64bd78bc89..000000000000
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	flac? ( media-libs/flac )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	mad? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis )
-	sys-libs/ncurses:0=[unicode]
-	dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-underlinking.patch"
-	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable cdda audiocd) \
-		$(use_enable flac) \
-		$(use_enable gpm) \
-		$(use_enable mad mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable static-libs static) \
-		$(use_enable vorbis ogg) \
-		$(use_enable wav)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins mpfcrc
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r3.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r3.ebuild
new file mode 100644
index 000000000000..92522b3fda8d
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	flac? ( media-libs/flac )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )
+	sys-libs/ncurses:=[unicode(+)]
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-underlinking.patch"
+	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable cdda audiocd) \
+		$(use_enable flac) \
+		$(use_enable gpm) \
+		$(use_enable mad mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable static-libs static) \
+		$(use_enable vorbis ogg) \
+		$(use_enable wav)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mpfcrc
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index e8249dd856da..6e8161c0fac6 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,3 @@
 DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
-EBUILD ncmpc-0.39.ebuild 2019 BLAKE2B 1a942892c29244a1ac0fa6122410f37627b49db4e34f82d1822851edb75878c90ec084f082692051c9db4941881975142c123c8daa849a641869d4c327c22774 SHA512 8e62f13dbf38b8c50fe10e6d27a35871e703f6ffbb386d6213d1802516e153223c2cd4269792d61d2d4271fc6dc71d853b8e2448a9a154ac27aa33dfde523b86
+EBUILD ncmpc-0.39-r1.ebuild 2021 BLAKE2B c0ac007d43d06172db4f2bc577dd8e8acd20517b68c63fd207fdcbc92ad83ccfd3c6c952ba0087ad343c9a7dc68672e9394c04962bd16c0210ef0b63fddb9372 SHA512 7737148d61219a7e9cdc9785f3223ab5f0f7b43a0bb85fa38ddad689ffbd5c9d81b58e610f73b831a128eed9f602157f57a4960f62fabdd43c7e86e05970f64f
 MISC metadata.xml 947 BLAKE2B 5f5c24100750fd5a31a9728bebfee746e2a928ba1b5282de5d22775f3e29d882ed326f052898d3d30589eea298ec8160570486b90d3538b3cc5a582c55653d74 SHA512 c06d78db424871c5f3ad42afc476b1c3ccb9cc6621edfe5d496b7e259a973452b9695b07bd52352093d9e315bad95c556be05d2996d761e27ebddad3e43fba67
diff --git a/media-sound/ncmpc/ncmpc-0.39-r1.ebuild b/media-sound/ncmpc/ncmpc-0.39-r1.ebuild
new file mode 100644
index 000000000000..e20c6b48d5a3
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.39-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+RDEPEND="
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:=[unicode(+)]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.62
+"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/ncmpc/ncmpc-0.39.ebuild b/media-sound/ncmpc/ncmpc-0.39.ebuild
deleted file mode 100644
index 41a4ef29b2bf..000000000000
--- a/media-sound/ncmpc/ncmpc-0.39.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 meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-"
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 7fc7abb527d9..e69b41186c77 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,4 +1,4 @@
 DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
-EBUILD ncmpcpp-0.9.2-r1.ebuild 1463 BLAKE2B f17750f2337e72bd9fc036df9c02af29a10c025536002c1d91028adc35efffbf6544c5ffc8ba1550729b83a8e30e815930d020e82fe677f659d620707e6f8d41 SHA512 c68019b5c801a55d71ac8282ec3ba4d87d55ca704bcfd8af84c0e755fce8aae16e7c5fca0e6db62e56f8e19556da207e387afb704709195e92ca46ec09ea37b3
-EBUILD ncmpcpp-9999.ebuild 1435 BLAKE2B 2a66a9a4af9a42a8b7721d9826fbd723dcace03d955ea9237bf4052239521f74b7df49ecb1083abd57a6e500822c0f235b3853c00ba789a43b3bd9fdbd0a37eb SHA512 7a5de29eaf7ea34a4b335a10605760759391a2c3479f5bded4ee83ba1cfbc740f08a6cbbf464947071b73338e6d81ab1dbbf97c02de81197fed2e92d5e5e956c
+EBUILD ncmpcpp-0.9.2-r2.ebuild 1466 BLAKE2B 93b3370036e014ae19c9817bdd254656163beb878082ddfa0663d481baa8f7125aa6eb2d084650bb278d8bc664902d361087a0c13f6ecb0047b21c02f99d7936 SHA512 702cb99da9e7ab62a40a76a84c719f7d23f4dd5c9193e5b55cff0148d62c641e4b0591236340794ee009aceb26802a45c40e3128d45de730d8803b3064c1eb8e
+EBUILD ncmpcpp-9999.ebuild 1438 BLAKE2B 3a0ad5a34a4ecccc795caaf6a3d13354f83cac438270b3cf4d5d23191e6e1c24b93de018af55ef77c3d5c0721d39bcf9dbde34b17dc7843f715598d08c507b1a SHA512 7221353d0dd221054147d2619a29cb59b3b60f970f50c1738dd2d39db471e26c69c691d3e93e369912fc48f1e88c5b5ea10e1236915498a05eb1337cf10e3862
 MISC metadata.xml 1154 BLAKE2B 9ff9271cd1c5345641c83009c7db03a381c9653f3bfcecd4b7018029d9f89795297cf1138ce0e04632f9adeb68eb01281e04d5559cf0780b3b416330b2551cc2 SHA512 7021e28e39780017c7b4bf58a4ddd94f7142120a68c36ff7e1656698a0f4135204a50a43e108601a51d86c4eed22fdde5a9498884dcd89ffe2547090a7581c9b
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r1.ebuild
deleted file mode 100644
index 0e795bc998c7..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r1.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
-
-inherit flag-o-matic
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="clock lto outputs taglib visualizer"
-
-RDEPEND="
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads(+)]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:=
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	filter-flags '-flto*'
-
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with lto) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..a24cab355e66
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+IUSE="clock lto outputs taglib visualizer"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu,nls,threads(+)]
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	filter-flags '-flto*'
+
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with lto) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw)
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${EROOT}/usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 51f91e31a802..9076b2c0e372 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/boost:=[icu,nls,threads(+)]
 	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 52c081fd9d96..0aaa39d28309 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -3,6 +3,6 @@ AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f4391
 AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
 AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
-EBUILD pamix-1.6-r1.ebuild 1115 BLAKE2B 73596bfae44aa4e79d48800c20e314f02a0cad69ebaf585443956cde44a6434a9c37b655befe52e1560e351e6f141d93842a17bbe6acd2121bbfda8db1e7788e SHA512 79e244a374f346f5496321eba4ce35a7f244f6b8190b68e87631b2b4da8cac4819fd10f49ae80672ab98281a98e1692f679e9123a483ebe6eb550c859d7f8af4
-EBUILD pamix-9999.ebuild 927 BLAKE2B d8d49375ae2f78a08d47bb82656da43d2d7922bb3aaed738871142d26a15dee6149be0d1b21bb45c4bba145e38573ca0f9bd9cd765dfdb3372a811a119b2b1cf SHA512 f083f2a75297e6b9e7f344404f2d8b1d7233fe029dd89066568593343d5c73e403af732c03141ed1dea7c8ff952f47fbe44064c4723e3ccba48810e2bed939c5
+EBUILD pamix-1.6-r2.ebuild 1117 BLAKE2B 9652a02b76a0ca664220efd8f237f6a66d9f42d42d3eb62f65058f2e7d508ae4d2e3b2f632f3a9eba97040c26d6dcceec0f1234ee493b7e9e070a5a190446433 SHA512 c512eaab37042e5372316feb118e5b316f356d91c8bf59c0bebba350c9dfb7c7d7e66153e8b14a41eb5519e35c6c28535e29d1b15188d8d1c119d631b7fa72ab
+EBUILD pamix-9999.ebuild 929 BLAKE2B a9e978ab8768699329eebe4c312051251c66874d405f9abd171c4b2cc0f7496c5ebce85d1bee0e1e7f14c057d6e24510dcb73c9e805afd7a231ffa94119c9d9f SHA512 d5fa8e724910a62c18fec7f8901dec1254ac88ea2da31ad3d32d19c0665646919f566ad94a26d8db3eadeaa4e997505c14cd212f9f58470db3b15f90e412f7c6
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r1.ebuild
deleted file mode 100644
index 1d436b930237..000000000000
--- a/media-sound/pamix/pamix-1.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/PAmix-${PV}"
-fi
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-RDEPEND="
-	media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
-	"${FILESDIR}/${P}-xdgconfigdir.patch"
-	"${FILESDIR}/${P}-fix-output-scrolling.patch"
-	"${FILESDIR}/${P}-fix-ncurses-freezing.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	if [[ ${PV} != 9999 ]] ; then
-		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_UNICODE="$(usex unicode)"
-	)
-	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
-	cmake_src_configure
-}
diff --git a/media-sound/pamix/pamix-1.6-r2.ebuild b/media-sound/pamix/pamix-1.6-r2.ebuild
new file mode 100644
index 000000000000..d0c727991818
--- /dev/null
+++ b/media-sound/pamix/pamix-1.6-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 cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+RDEPEND="
+	media-sound/pulseaudio
+	sys-libs/ncurses:=[unicode(+)?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
+	"${FILESDIR}/${P}-xdgconfigdir.patch"
+	"${FILESDIR}/${P}-fix-output-scrolling.patch"
+	"${FILESDIR}/${P}-fix-ncurses-freezing.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_UNICODE="$(usex unicode)"
+	)
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
+	cmake_src_configure
+}
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index aac3dbb67cf9..a8baa4c57b38 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="+unicode"
 
 RDEPEND="
 	media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index b1d3fda587a8..3827a879d5d8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225
-EBUILD picard-2.6.2.ebuild 1672 BLAKE2B 5de4147997d5b24cd1b4e68b5c4dbcb045c86ce0d8e0dc9d1345f9875bdf12ccc19ce858312dfa0a03e7bc2bfdef77ddc196b679c4bff8f6308536d17a41b03a SHA512 8338bdaad722e5e1ea204fe194bd836230abab39e8bde5ec0ff5142ecf5fce46e7ed0eaac768dfc207b92c912b5fcb98915ebb31ec35cfec513cd593b7aa29a5
-EBUILD picard-9999.ebuild 1627 BLAKE2B 4472b2464100cc9493cb7e2abaef8d679d114d25be7ccd6beb6ca5e1a0f59c1e5ee908ba879e3bb71456a96db4e670a48eb1362a85b07d7d5ed531fc2e0119b4 SHA512 7e5e7198a0a4364e9d475f614be644718c5fef09213eb14131f6e544186b4aeda8f4c0156659ddd3962c3fd4ed24052d35e83228f43c98e8f44df8a60ed6392d
+EBUILD picard-2.6.2.ebuild 1652 BLAKE2B 77a92058a85fba2fa76637a7df2caa92937b29d83663212813a670d47045b3b84b363b7f48d2f3f0147bc12965708f451cb7ce3e6167864524cee37a35633d68 SHA512 7868878920aa000779f26bbf97b30123179bda3dec0aa62e998e0b9272009c8f4ac5713414fa78f6c3900a1d99fa9877d5654044d7fee252b7e302702c10e555
+EBUILD picard-9999.ebuild 1613 BLAKE2B 4ff23b9d59442edc13fe54d2ee7458784cde55dbf26c0f6c7d9ecd4112645e012e638a1e01de6228f558a8fa8cdc1241bb7ff23b179d4f3770c719b3a7eee043 SHA512 ecf0a0ddeee0af56497477bfe47fba323e21b07cce0210f84eac335f6b87ff970347af96bebfdbf1ea9de577c15bcdf4d4cb6c8cf2244ca2ff62325102fe8c52
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
index d04919b37454..69225481a3ad 100644
--- a/media-sound/picard/picard-2.6.2.ebuild
+++ b/media-sound/picard/picard-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 inherit distutils-r1 xdg
@@ -29,9 +29,9 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtgui:5
 	media-libs/mutagen
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index d95b1702956b..7592c9ab3a2e 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 inherit distutils-r1 xdg
@@ -29,8 +29,8 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtgui:5
 	media-libs/mutagen
diff --git a/media-sound/pms/Manifest b/media-sound/pms/Manifest
index 81daab6356c1..4000797fdafe 100644
--- a/media-sound/pms/Manifest
+++ b/media-sound/pms/Manifest
@@ -1,4 +1,4 @@
 DIST pms-0.42_p20170508.tar.gz 140157 BLAKE2B c4c3ff916a9aa36522f48636cca97f22069219ebfc25e219d4aff3d0ca5bf20d80d343d224996db82fb6e8fb13cd9f38f7fc860683bc574124aaf0315d3f2dcb SHA512 686a5e265ebad418a153b9888cc213bbf8cca5aa2d398206848823105edac16e298431c288dc0a74adb23d327c75845cdec1680a6a2a2ae40bc7b41c55ca163c
-EBUILD pms-0.42_p20170508.ebuild 749 BLAKE2B 325998faf7d0881c250168b421f751c7781867310019012233537f155b68d34c7b05e554716bacb85423008ab6185d3923bee7dd5f14fe625e58242291220335 SHA512 11659f220e1253e23b02d760ef77959e0cfbd770831ac14628d24087582794ad448462a181ece145702d12b55e857b480c836ef6e56f09b576919b941ff66566
-EBUILD pms-9999.ebuild 713 BLAKE2B eadbbca9f443e79c5c6bacfa846b98c7764cdbd36de972dcc673f147521ff895eae5916a8f90a4f707ac575f3115f1b4aa721097f41b7b9732cd535053c256c0 SHA512 b2be07fb6ef262c353727df6a4fb87f2bc78b7bfb39c31bf9cc2ff34e9b27b16a8fe6f97e4c2b1cf4cbb9641fe128bd1e7b29c1672208cae97cf1a82ed837b47
+EBUILD pms-0.42_p20170508-r1.ebuild 751 BLAKE2B e14ec3a1e8b554617f67e9420a2dcfeadb5f307f6ab4bde827ac5da35005d4c4a39af0a25a64466f734dd06e3cbe33d6a4e62ecb05a6dfb5cf4ce7259ae40370 SHA512 ef2a2c3938d541f4d4128235df7c9888fc38629854e17702e85c217a42ce59f5ed3abac918f8e51cb9a09d4757c2353ceb0f248c3659e62651e305f15714cfdd
+EBUILD pms-9999.ebuild 715 BLAKE2B 15cf04f0719ace386e49cd6e3849640739da21f6f3b004d590988e191f2348bd7f8b7684e9fbfc7b69bd7026cad04b2b3ed7e768f8a1aac76c12aa9a1f82edc4 SHA512 916e8be3e74d785c3b814edd8477b1cf90a0c6fd3bfae523e3d6b0027a549a85dd405f3d093c0093b14d6e2f69d9da45337719f13f831670fa06fa0e63856586
 MISC metadata.xml 326 BLAKE2B 46ebd520822a0ddd4ac8dafee3358ce36fee3c07654ab135a36713172eb1978c7320e8f86538175a840e3c46d4c30148e105f1d8d7d83ee360dd414f868bd4e4 SHA512 7aa51dedca6dc6308866e597aa169a5714559e3c25c13c40ad11356ee0dcc13042ddc4a3388d4a7687a43a7847cd8f37b36f1a8ed3ee3c4b4e125a8f4d0abf48
diff --git a/media-sound/pms/pms-0.42_p20170508-r1.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
new file mode 100644
index 000000000000..9f0546f7b158
--- /dev/null
+++ b/media-sound/pms/pms-0.42_p20170508-r1.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 vcs-snapshot
+
+REF="8c8918488a4a22924ee04442dc5e5216783d51ff"
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="https://ambientsound.github.io/pms"
+SRC_URI="https://github.com/ambientsound/${PN}/archive/${REF}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+regex doc"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+"
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)]
+	media-libs/libmpdclient
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_REGEX=$(usex regex)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/pms/pms-0.42_p20170508.ebuild b/media-sound/pms/pms-0.42_p20170508.ebuild
deleted file mode 100644
index 5fff6b4dc85c..000000000000
--- a/media-sound/pms/pms-0.42_p20170508.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 vcs-snapshot
-
-REF="8c8918488a4a22924ee04442dc5e5216783d51ff"
-DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
-HOMEPAGE="https://ambientsound.github.io/pms"
-SRC_URI="https://github.com/ambientsound/${PN}/archive/${REF}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+regex doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-	media-libs/libmpdclient
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_REGEX=$(usex regex)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
index 4260a7d72b3a..c1e5c9adb459 100644
--- a/media-sound/pms/pms-9999.ebuild
+++ b/media-sound/pms/pms-9999.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 	doc? ( app-text/pandoc )
 "
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	media-libs/libmpdclient
 "
 DEPEND="${RDEPEND}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index e5556c25e67f..d6e2f8d6db42 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,5 +1,5 @@
+AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-5.0.4.tar.gz 2070799 BLAKE2B f059926672b690cce71ac2a26a8cb2e3e1b97e99b462418494516de54e33906d52a40ccf807d50fb133500270ae6468d1a4ab9c12b4bf2b15348752a7622c8d4 SHA512 db40291351e6da79d87d372b06734e0129df7640da90ccf3cb3564f58130c9d8d35cbb854d53878773c37811649f17141e2a40b2ba670fdaf1b2e12138f694a6
+EBUILD pulseeffects-4.8.5-r1.ebuild 2224 BLAKE2B 558ade35e7e7f58891a1a2fb1814b052089a2b5c9c3bedf5c869ed6b0d45b29ad7f424053e20b855e87fa073aec96b9aca904b43e0a42512d2280c904745f8d6 SHA512 9de12241a62ce26c3e229b2b5f08171ae47a6b09a785f16fd4211e5ed1724148a515b74824ebe414159c0d7dc5c984bd0a0b268f4b33f00cc6faaf0b6b794e59
 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
+MISC metadata.xml 1263 BLAKE2B aba139ad030533b2d9c6fa8046ab69c2719a9aae6eacd7ead3761661332b6459fa8ebe591b338cd6048f244ed313a7c457043ab6f1f4f535142716dd8722a2cf SHA512 41cb031e5240fc6db96e04cfb16b303c1e63340fac00957056a360a890fae00fc59526056e8d13be8844d30ca2303c8e27ca5f6a3b43fc6a1a9dce82a35546ae
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
new file mode 100644
index 000000000000..2ad89e629771
--- /dev/null
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '4.8.5',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['system','filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index 9f7e8c81b246..bf9b9deed237 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -10,9 +10,14 @@
 		<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>
+		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
+		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<longdescription lang="en">
 		GUI to manage audio effects for Pulseaudio applications, giving full control over the effects order to the user.
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
new file mode 100644
index 000000000000..2e1e07edfc11
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
@@ -0,0 +1,84 @@
+# 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/easyeffects/tree/pulseaudio-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pulseaudio-legacy"
+else
+	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 rnnoise rubberband webrtc zamaudio"
+
+DEPEND=">=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
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	media-sound/pulseaudio
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	rnnoise? ( media-libs/rnnoise )"
+RDEPEND="!media-sound/easyeffects
+	${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=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
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.5-meson_no_automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+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-5.0.4.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
deleted file mode 100644
index 749f06d01a61..000000000000
--- a/media-sound/pulseeffects/pulseeffects-5.0.4.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/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/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"
-# 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/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index f496c2f2a7d6..d45ed48012ec 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3328 BLAKE2B beb9f8c12afd9435bb73288146c13e4044cff9a93dd7061dbbbb73567c150b3c047c14e0aeed00f803543de87c35bab582d511244b724cb4ad98538f4d0821ac SHA512 fde8d2f9ff81c606e06dade8af2b00abc0f7f8207c80eeb96fa3ed24b760f1abc80df362f9f95501a28b47e05a229b9964cb348489e9f133e2d83703d638b40c
+EBUILD rhythmbox-3.4.4.ebuild 3322 BLAKE2B a175033a5d2bf703671b4bf8414e8771810fe11629f63898788336e8ee2da73dc5cf872207cf9b91689c080511e46c97ec2d1fcbad0afd3702d9f038808083ad SHA512 c4350649c225a42413ab6c400998145df0500d87f5d9d1f724206b7cc99c8ff5f3685eb219bc88c80d87c7aaa1e40624e2b2ef229429bb5ff6eb111975eff89c
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 7f44193b8aea..817f3a7425e4 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 multilib virtualx
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 		')
 	)
 	udev? (
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 26f56ecf7731..e68f03fcc042 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
+DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
 DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
+EBUILD rosegarden-21.06.1.ebuild 1135 BLAKE2B 350774d8cd0f82e86e09db77fb81eb338cfafdad02b74afcd8cca5677bd65eb517bce08f8fdc1389836d0bddf75ce412cfcacd318281dfa7f3a5837c79a00159 SHA512 06d439b37e18cb255f3c0d591e71fab48e3646ff645ff01630c9a6e509bb7baf70dd1012da4c19251ef999f922b3a2dea7d01da0104a4ce1cfcad404fba66cd7
 EBUILD rosegarden-21.06.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-21.06.1.ebuild b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
new file mode 100644
index 000000000000..6cc3ac2b875d
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 6b15047bbbdc..dd2b15d9093f 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,5 +4,5 @@ AUX solfege-3.23.4-itstool.patch 6767 BLAKE2B 0f0fe564fea7ab8396fb597257bccf90ca
 AUX solfege-3.23.4-no-xmllint.patch 448 BLAKE2B bbc9b1247f68f36ab2a426972255dee4fa6c2531919df090133c9daf59e964eb6be93bac04f99e88c0d1184f10429b2b3d63b8b7a6eeb8acb089628f25295832 SHA512 3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d
 AUX solfege-3.23.4-topdocs-encodings.patch 1347 BLAKE2B 40211d4dada0e2d3d9185f299ab2ad7e8b4e3afeab24a6c35d9c5bdd8685f35bea157d3f6ab916aa6a347c96f5a35495c7e61682b118513e3a2a35833334a712 SHA512 550f1ad9a01fb27e3d3a5e6b8b99a2126b8607cf72bcaef2d8f039c28c77e0f11e0e41da3f01907f4fdc430cb97b114135b9c1a64317fdbff106d9377cfeed8d
 DIST solfege-3.23.4.tar.gz 5148412 BLAKE2B 8543aaa659f753af87f7b911401ee38713aa51afcf3dc33d4bfacbc880c8088aff78a81ce03369ba0b58d14a4b6965d78d97486ac2c3481f066591db0f29743d SHA512 e489dec514b4f387ebac7627d83d1a7766718d10a26c3ec6257d3f4b27a082501df16a27c8a16023b34a06cd4832fabaa1c73bcded52c502fc68ab57b303eeea
-EBUILD solfege-3.23.4.ebuild 1743 BLAKE2B e24c8702ddaf919d6b19b22ecaa067f6ba29e5ff328610d3de9b8b2e7f2067f44226d2f62547554c00077f1a69aacc22fb94d50de00929c1c1872ab52a9e8f8d SHA512 07ddc4fc3541c0cb72061e90b1017ee65aa31e83714459e763164c4f424c8eb4eaa5c780c8a2d9359873046146746cf2d72268c048b9efc086987ba495e65cb0
+EBUILD solfege-3.23.4.ebuild 1731 BLAKE2B a88a6776a852a028bc0f545cedfb98b9aa2c75becc311547dce745a2c6326217d288b484a6d067980eab171851c33e3cbd30c0e00e768c548f689bb4bcf3d616 SHA512 654d0189d6b8ff3997841b3728a15deaa3683ccf92c9a53f7375736c3014634b204ceb2d50793b82f4c45abe8f380ac28fc8f5e47e5f55a58c3cf6861817975d
 MISC metadata.xml 330 BLAKE2B 7b72c052aeabd90cb225ca7ccc8ba50caceacccc2d2265dfbcc9c99e535753c5413cc6428b159c62b7bc7aeae0107e8f583371a8f813190f7085c16a43936bb4 SHA512 8b9ec04258e5d3437339d00e9ce5e565b865b7f80230d78bd39cafcea569a4d5f413d0f251899842adbfc7583c77041aaa50e9ee101f2a0496b01393b0740c86
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index afac9800dc52..71a32e160ee9 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 inherit autotools python-single-r1
 
@@ -30,8 +30,8 @@ BDEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3
 	alsa? ( dev-python/pyalsa )
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index cd3fcb3c7f49..4c91d244b35b 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,5 @@
 DIST sonata-1.7.0.tar.gz 2258617 BLAKE2B 704f673737095351f88f64bc858db465b26d8e0fdb34cbb4d3917abe65ec276ec3e6419edd41d9e8b193a886c8dfd178b5fc94daa4a178aae817c2d3024c266b SHA512 c60c16b6cca439c2063069ceea62afdb9f09c9735d36ba42e2b5b1caf07506f15d722d75c68e355db4615b937a728679aeae1619527ac8267feec111635c27f5
 DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
-EBUILD sonata-1.7.0.ebuild 965 BLAKE2B 282eea69d9b7877c70eabfa84f163721ba65e40c445854efe240074dec06e695e207d2e44db6249fd3475f27958346e07270c42ebb7225c675864b12afd987ef SHA512 68e023e450cd7293a0c126d3a4cc9abcabd76d95be1a381ac6d4365a18bea5a5eb9c33c4eafc7f92e7cca141724fc0bbf20e32a6e8679b4c0fb33507c99d8e31
-EBUILD sonata-1.7_beta1_p20200212.ebuild 1031 BLAKE2B 8bd11ba89b430e07e3d4cba805cf6d6b17ddc68acbffcbdb570bb261a58a2ef3f614ea16fd81e93a90882f903c62f112d3560dc38457feb77ad6d46f5fe72a42 SHA512 2ca3fc5410eaff075649921b472d19e354d509f3d4c0594a857edf779f1e4fe84fd430fa2d925abfd9ed2ade3f3f0168e927c1a9932a19a64336ada4596f3c86
+EBUILD sonata-1.7.0.ebuild 941 BLAKE2B 532c451b552ec687b9ba102c8da6ad41272ad12313a7f0dd664f11bfdc8cb4dcb450e320ca2465caf74082eb12d322d098bbf5b2bae2ff804838f53372ce1084 SHA512 646bbb618a5bd8e377d3bcdffbd5ca1b4fa8727b3274204f1f8f2aa5e6347c1bebfa430141c1eb1c542467f6f385afcd78023ed490c5b21824fb45fb4f6b8f0e
+EBUILD sonata-1.7_beta1_p20200212.ebuild 1007 BLAKE2B d1faef4d6484419399278b7994fa46e153308a616f9aec55003a2eb41f059d5202136ebe00698ee45300cc9b3da3217a7ecee3f93f534b35daa42a0c314a39dd SHA512 07adc1677a39c9c35b2343b616282c037bbc404620e7e859af41e7404fa1bdc345a90283ce240385686f8020b37e5abc7d5381cde9b0f8e6a11a0188a16e8b20
 MISC metadata.xml 478 BLAKE2B f93c58977de74be7b3fcbaa3d2ca22e2d8394b6899d6c07072270418380cc50ce99f426ce3668e5a663939769eb7e6a4871d1a7c96afb81c5c89d0aebc1c3ad2 SHA512 5c7dc2feb0594f52ebcf8e579a9292e157b673e358ea80cf8111cb72a62bb2551725d4f3f738daec430ae4f66ff80e48330b0d8aa23a3ac508a0c202f209170a
diff --git a/media-sound/sonata/sonata-1.7.0.ebuild b/media-sound/sonata/sonata-1.7.0.ebuild
index f655eca0a200..ec586b8a631b 100644
--- a/media-sound/sonata/sonata-1.7.0.ebuild
+++ b/media-sound/sonata/sonata-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit desktop distutils-r1 xdg
@@ -21,10 +21,10 @@ BDEPEND="
 	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
index 2c394b59693c..5a0ee03e22ac 100644
--- a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
+++ b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 COMMIT=0c807e593f7571a654ad055cb126652d7f3a698d
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit desktop distutils-r1
@@ -22,10 +22,10 @@ BDEPEND="
 	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 44ad704733a1..260928d69c8b 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
-EBUILD soundconverter-3.0.2-r1.ebuild 1833 BLAKE2B 4400c68cd041783e68fc65cff37a0a88cade077bda96c172b1eba24f69f7a9d780cc3d5aff2621dad52c944eff357d3bd15cc1838afd3ebe2dc7c72ed6d8da51 SHA512 c036a073ffdfb53610b4c27e41dd99f3c9b10212f1e12ef21ec5152cbdcaf1e9f160729097f468e5ea27cf5f7112eb0df110fdb78c7e1d4181daa87188058378
+EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
index cfb00ad24e9e..dceecba8d9c3 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome2 python-single-r1
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
 	x11-libs/pango[introspection]
 	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
 	')
 	libnotify? ( x11-libs/libnotify[introspection] )
 
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index 3f4eed5e3081..d278e6f66553 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1,5 +1,5 @@
 AUX subsonic.confd 420 BLAKE2B e7e1b0b6bd33ec62924a015036f3197581749ed74e07359f8ceca68fb6aceb8c63b80e0d195e28345f1f22ff84c826cc5ed362dec75c5c6c36f97fb6de036279 SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be
 AUX subsonic.initd 1194 BLAKE2B 018257ead2e8c620715404b3ba91ecce53913b7aa554670d1af495b2e1d17abf4ef5b140c62ada2eba0f01589bb43d08320c81c6c93f55f5510b8bcefb02dcff SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b
 DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
-EBUILD subsonic-bin-5.2.1-r2.ebuild 1424 BLAKE2B 0894f8cd433ed48a9b69e72fec36de291b570bb85089396b24bfcbacff54106613ba0aac76172dc43948c4aa5f75100cdd594506d446bcf2bd763fc81551ede9 SHA512 2a45bb020927858a549d76d8ff798dc4c500cd0b6783a01c403abbaf0212a153c5d457d4d0fa3dd706a4cf36c47783189476a4d92b20161ab30911b9da100f9a
+EBUILD subsonic-bin-5.2.1-r3.ebuild 1250 BLAKE2B 02fa4ed7389c08b4cec83c223223d76840ae7e57a6434572ab964eb10c887a86cb7b22db8de8adeb59273d5a0ef33c6d9453aa577c9167dcbaee335a32a3240f SHA512 0be6bc89617df7056cedaf4468a773a93ae21ccbeca9a41449c1ebbabae41207a730ea033de7e597bb405d57292e14c7ac317a7f8aaa106f9cee2f64c29facf3
 MISC metadata.xml 325 BLAKE2B 031eefbb5a58dcfdeca52016a4db3ffee06a097db0604cf95079f00e5897f13f25b12d6e9d5cb7d6e25bda3a41a230fa98d40d18c6a4acc5eaffe69423d25529 SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
deleted file mode 100644
index 8aee2ef491d5..000000000000
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit wrapper user
-
-MY_PN="${PN//-bin}"
-
-DESCRIPTION="Subsonic is a complete, personal media streaming solution"
-HOMEPAGE="http://www.subsonic.org/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg lame selinux"
-
-DEPEND=""
-RDEPEND="virtual/jre
-	lame? ( media-sound/lame )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-subsonic )"
-
-S="${WORKDIR}/"
-SUBSONIC_HOME="/var/lib/${MY_PN}"
-USER_GROUP="subsonic"
-
-pkg_setup() {
-	enewgroup "${USER_GROUP}"
-	enewuser "${USER_GROUP}" -1 -1 ${SUBSONIC_HOME} "${USER_GROUP}"
-}
-
-src_install() {
-	local dir="/usr/libexec/${MY_PN}"
-
-	dodoc README.TXT "Getting Started.html"
-
-	insinto ${dir}
-	doins subsonic-booter-jar-with-dependencies.jar subsonic.war
-
-	exeinto ${dir}
-	doexe subsonic.sh
-
-	keepdir ${SUBSONIC_HOME}
-	fowners ${USER_GROUP}:${USER_GROUP} ${SUBSONIC_HOME}
-
-	newinitd "${FILESDIR}/subsonic.initd" subsonic
-	newconfd "${FILESDIR}/subsonic.confd" subsonic
-
-	make_wrapper ${MY_PN} "${dir}/subsonic.sh"
-
-	if use ffmpeg; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
-	fi
-
-	if use lame; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
-	fi
-}
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r3.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r3.ebuild
new file mode 100644
index 000000000000..4aaf33bdd807
--- /dev/null
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit wrapper
+
+MY_PN="${PN//-bin}"
+
+DESCRIPTION="Subsonic is a complete, personal media streaming solution"
+HOMEPAGE="http://www.subsonic.org/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
+S="${WORKDIR}/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg lame selinux"
+
+RDEPEND="
+	acct-group/subsonic
+	acct-user/subsonic
+	virtual/jre
+	lame? ( media-sound/lame )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-subsonic )
+"
+
+src_install() {
+	local dir="/usr/libexec/${MY_PN}"
+
+	dodoc README.TXT "Getting Started.html"
+
+	insinto ${dir}
+	doins subsonic-booter-jar-with-dependencies.jar subsonic.war
+
+	exeinto ${dir}
+	doexe subsonic.sh
+
+	newinitd "${FILESDIR}/subsonic.initd" subsonic
+	newconfd "${FILESDIR}/subsonic.confd" subsonic
+
+	make_wrapper ${MY_PN} "${dir}/subsonic.sh"
+
+	if use ffmpeg; then
+		keepdir /var/lib/subsonic/transcode
+		dosym ../../../../../usr/bin/ffmpeg /var/lib/subsonic/transcode/transcode/ffmpeg
+	fi
+
+	if use lame; then
+		keepdir /var/lib/subsonic/transcode/transcode
+		dosym ../../../../../usr/bin/lame /var/lib/subsonic/transcode/transcode/lame
+	fi
+}
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index 7752ca3993dd..44fc4923f042 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1,7 +1,3 @@
-AUX volwheel-0.2.8-desktop-QA.patch 183 BLAKE2B 59e4701d0ddeaa73b27407c49948685a04d5e39b826de4239a3f9307f8373a5093b0f24712332fe9f1f9954ac49cf096f9cd66965d661d49e54d4bd1c9a9c845 SHA512 924a95990df5780981bc416c4af3f5f743148df4e695414f699606cafdf80022d232a3f3577d031f69044a12e6202c363807e1245d296e5ad3d76a9e6e8741f5
-AUX volwheel-0.2.8-perl516.patch 1090 BLAKE2B f4ebc18d9635e66e021e6dfb941405cedcb6136a8c4b9267056d29351d3186b454ddb0c1af00323d8307e472010b43437f02ec28fe18c718a011082f057963bf SHA512 4867253ec1bd5f8efe3bd1833298d9bf1db6825df539496f7e6ef957c4a850a6cc9b640499617537702c192b25073ad2025626aed423500aa117067d703a18a4
-DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
 DIST volwheel-0.2.9.tar.gz 43921 BLAKE2B 9f555d8666373127de8a02cb4f83b12a2f6dab4c78087c3cef711fc6c59343d69af2f36e68a9354390bd820aff5ea41405b5cf5eef8d196da010efaf5d878b80 SHA512 9a16a9813953d2acfe7bae25c366094f244f34b6031e8d75761468590e76d63005580c26b0f27f26ac6e6537a179d15fdaa4348d94c84d0bb1fb7ec97e092e5d
-EBUILD volwheel-0.2.8-r1.ebuild 632 BLAKE2B d296fd1cf6111518f69f095e1fbf3392ef80792a7e67939b8abc1b795d1f8cae6e2248effa6b4797d2d6e5e12408851d2d3724c68f00878bcebd36de28b103bd SHA512 b4d9c921cd7612121a89a884ff020ac990a790e75dbb7542e1d9ab530a1733264788f761a466b9ac2da9820ed27ec35ffc7582f10e179f970a87adcdfb79580e
-EBUILD volwheel-0.2.9.ebuild 579 BLAKE2B 929abad87ae5d00300c6133cca6e2120884247e4d73dd9f3c38bc4b8909a223baf5332c0ebc1627806fc06755b95a432b01c0313a1f4ae931982d641f182fe99 SHA512 0a95f2452a8e2ddee6074187ed8119770151f2fff436109eca10433d5ff2b7a353cf5a78b6691fd1dcb97d339601cef08d658f52ca911ad6f2d4f9ef749ca2a1
+EBUILD volwheel-0.2.9.ebuild 577 BLAKE2B 6968ce0f280257663d35b576435e39803c6725dd32cc6249f2b605a19a0f818acc6c13ebc219619e1c169ce0a2c650b5ffad8142befdb5b921e487a43014a9f8 SHA512 95033efa4415be8723ec244d0ecc0d38806d4e14856e51538fbd4fb42ab474d3859bfef0e5846602177dacea7fc1029206e6693fc28b6505835c82567a748bf2
 MISC metadata.xml 331 BLAKE2B 3524bb7c1202728614805cd0c286d8417387cf15d871f108da38f0fb015811600a05a275e2685e47f0225d7bdd684e4c7bbca4a5e4d71074084830d606582b49 SHA512 4a10f6540d114212e21102d1daca1e58043e637300573475be33369de01373e64041be84cecea9138bf2cebb39a5c26242a05820bfa58673e90698a4dca45fea
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
deleted file mode 100644
index 11af8697af6a..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/volwheel.desktop
-+++ b/volwheel.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=VolWheel
- GenericName=VolWheel
- Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
deleted file mode 100644
index 4a801cf5192f..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://code.google.com/p/olwtools/issues/detail?id=8
-
---- a/install.pl
-+++ b/install.pl
-@@ -2,7 +2,6 @@
- 
- use strict;
- use warnings;
--use Shell qw(install cp);
- 
- my $package = "volwheel";
- 
-@@ -33,17 +32,17 @@
- 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
- }
- 
--my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
-+my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
- print $output;
--$output = install ("-v -m755 volwheel $bindir");
-+$output = qx|install -v -m755 volwheel $bindir|;
- print $output;
--$output = install ("-v -m644 lib/* $libdir");
-+$output = qx|install -v -m644 lib/* $libdir|;
- print $output;
--$output = cp      ("-v -r icons $datadir/");
-+$output = qx|cp -v -r icons $datadir/|;
- print $output;
--$output = install ("-v -m644 icons/volwheel.svg $hicolor");
-+$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
- print $output;
--$output = install ("-v -m644 volwheel.desktop $desktop");
-+$output = qx|install -v -m644 volwheel.desktop $desktop|;
- 
- print "\nVolWheel has been succesfully installed.\n\n";
- 
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
deleted file mode 100644
index 49e02ece502f..000000000000
--- a/media-sound/volwheel/volwheel-0.2.8-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
-
-inherit xdg
-
-DESCRIPTION="A volume control trayicon with mouse wheel support"
-HOMEPAGE="https://oliwer.net/b/volwheel.html"
-SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="alsa"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Gtk2
-	alsa? ( media-sound/alsa-utils )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-perl516.patch
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_install() {
-	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
-	einstalldocs
-}
diff --git a/media-sound/volwheel/volwheel-0.2.9.ebuild b/media-sound/volwheel/volwheel-0.2.9.ebuild
index ceb00500135f..128246afb82c 100644
--- a/media-sound/volwheel/volwheel-0.2.9.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oliwer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="alsa"
 
 DEPEND="dev-lang/perl"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 12d29aaeff8a..e3491c51d358 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index e2e214584f8d..b167debf12df 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,8 +7,8 @@ DIST kodi-19.1.tar.gz 52323919 BLAKE2B 6aa82632d2d70e5f84340c572b586e903e7dbc50c
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-19.0.ebuild 10842 BLAKE2B cc6463edea0f1e9f473a9edf4f756ae22010ac8cf39a7c58ee45de52287cf02240276dd6f7da8413760bd9c4bb56548937f8c60c61f28744ed7073f8220246aa SHA512 464262da1d8f081eb172ad1c670e6283728fe482144ea65b020df2b15943ea7926d3ab7a5a9e68e0f64a99b0ea070fb6a945f407acfb32e604b44453dfce1a41
-EBUILD kodi-19.1.ebuild 10865 BLAKE2B 49394ce9302779adb33304374bd8bdb8fc7329ba6b1b3c180b0b44551a83f3c7743e85a9e52fa5eca386f55eaa13f5c267423840f1c8a77b0038397eac376e4e SHA512 edcc6a6768b9fcc5f53ef73ebd8f68b6c1bda70ca3a1f441aec036240398eac4bb81ac658cff1a84e2eab8f9178609f8a955471b231fa27cc2dd0597429af603
-EBUILD kodi-19.9999.ebuild 10820 BLAKE2B 1383c72c46e268cfcb0e6e140ee5625824155ce7656eae7d702346798f3594da546f3c0e0fc52a79ac3f97c07fd7fd28775993ba66d648bd6d00ac7ab927967a SHA512 625b501a8a817c02a454b3ead006d5ca1d5dc170124b44d4763682cebe4ff8863c1535a57169fabd9169522285fc0052f0da851fdc11a46f71d1144fb70567a8
-EBUILD kodi-9999.ebuild 10897 BLAKE2B c24337d42e960fb2e485b72c6ef4461730fafa8170c819ffb00ae277894564c49945cea1823c69a93e4555c19244acca98a13fc8ac48ec264b27a68a7af7bf6f SHA512 3ff06ced5e2575d4b8492875544b6561e2c01f20dd7aabdf7126bbde778cab933566dee8d03d184eba4f5cd5a8478ce77d82d34380ad2b79637e33ae3a39b3d7
+EBUILD kodi-19.0.ebuild 10826 BLAKE2B a01747c2e2dea401db8d4bce2e56e99a50649e8a8569bf312313ae87c16118ff6e87f099ee3b58e2a43eb00d6e85f2de8a16746b7612e3982814a9a36f30cc2e SHA512 30778f1f101c9a2394228018d37a49e9df673a1a45f87451509d01640120468a64921e783027dc56cce9e82c88b66cbfdba461d585867f8778134a6519d809ac
+EBUILD kodi-19.1.ebuild 10849 BLAKE2B e495f6d993b1eac98b46474796c8853af7e5f2a2c6d9dd9507192d0e6f2f23df7535e29a85f495f1f2aab21b6c51912510ea79da3145eacc3769820870b60875 SHA512 7bb755853d435c92309cf5ec173aa441a2b01e0fb72b362633f66d4033a61780d7eac5429f0a832239e1bfe6bcf267025b6f98ad974f24c7a8b37532d0788241
+EBUILD kodi-19.9999.ebuild 10804 BLAKE2B d77a7bb3afad0c675a17def818d899b3e8f81d4c0f94fb0d45dd0c90bb5152febe6efc645d39e4441a6facef3b381883cee2e549c2339f05849391cbfa49cd52 SHA512 9a640b98b70c05cc62d63619d05714b05526f049653dbe5daa5ca9d0015ca04eaff4207bf1c8c837a9938df075536a53027960c5865bf2cc3763ef010b115519
+EBUILD kodi-9999.ebuild 10881 BLAKE2B ac81af72568656ec7cfb9fa37479dea50b9f453301364798a57e8c2e34f3c1cc8ebdedb0218b5d600a8d90f015250f3ab23cef58c53305508afc370f94485609 SHA512 eb3138cb3263949b535d280c11df07ab975cae88832c089a33e329f002d4fa2204719d1aecadea2244e24581ae5e35087f58b23314b3ad3407a44dd104aab5ef
 MISC metadata.xml 2762 BLAKE2B bfb7136dd5d2314362f94da7d51340b57aa8176e4e081027c89e08db03e32fa14213a3301c44a89a5d172c71331b9d9da53665e077398dac9a84948fec08d707 SHA512 916c7c7696f704b24d534414f0d79bbd66268d88cee3b2365e95cdf8d2cd0a90f01db8ffb855b49badfab3dd0b1c8efee78aac3e4b4b1208d1a8b21d8ad336c8
diff --git a/media-tv/kodi/kodi-19.0.ebuild b/media-tv/kodi/kodi-19.0.ebuild
index f4b7bb4f4d11..b1dc70eadc94 100644
--- a/media-tv/kodi/kodi-19.0.ebuild
+++ b/media-tv/kodi/kodi-19.0.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -84,8 +84,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	')
 	>=dev-libs/libcdio-2.1.0[cxx]
 	>=dev-libs/libfmt-6.1.2
diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.1.ebuild
index d8e43ce073b2..319dcfe5a38d 100644
--- a/media-tv/kodi/kodi-19.1.ebuild
+++ b/media-tv/kodi/kodi-19.1.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.2"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -88,8 +88,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	')
 	>=dev-libs/libcdio-2.1.0[cxx]
 	>=dev-libs/libfmt-6.1.2
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 11329e6f4706..1b09af3315ff 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.2"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -84,8 +84,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	')
 	>=dev-libs/libcdio-2.1.0[cxx]
 	>=dev-libs/libfmt-6.1.2
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 1d0692f7deee..730828b235fc 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.4"
 CODENAME="N"
 FFMPEG_KODI_VERSION="Alpha1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -83,8 +83,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	')
 	>=dev-libs/libcdio-2.1.0[cxx]
 	>=dev-libs/libfmt-6.1.2
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index dccfeb863165..680c72b79c94 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 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.3.4707-ebb5fe9f3_amd64.deb 81474702 BLAKE2B 8e12a9c39bea8f44e6fa4fa495556cafc9865682b27c64b06072470367d7e9a64eca3147197ddef0b277fbd28970f85b388fc812f3532890d45506c49432324e SHA512 c30e19e1895eeaa699effb1d3d282fbf1f3657aff2d41af61f30f398fc501bac12e8d178abc12c818f52c52c0bc1bf803ad74985521e37f5db6baf60ecc959ab
-DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_i386.deb 74842010 BLAKE2B 36967187241afdd7294ac46e03b5f55c1b22f5f7e2ba974ea322a369c41768cd6b7fd44d82ebf0afae1a98f5178161740e1d40d5f2c17faffa5b4ccb1d811eed SHA512 4625ea0b195fad305679656728c98ba8b15b38b86cbc9a95fbc6b617fb45e7e41b24f2c1ef2bc9736207d888c295d4e423a3d00fe654036ca1865782d88790ac
 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
+DIST plexmediaserver_1.23.5.4841-549599676_amd64.deb 81750100 BLAKE2B 2b8e110c6e4728607b9cdb033da97e71a124e19a0e05a14ef5053195a23d621efb4a7774a332899aaef471fd7bdc5ee88e958affdc11e268c907cfc0d845d830 SHA512 3c3ef651e512405f57ec8c794955937a9b571d5251efe66024dbccd982eeacf5417562037d9b970fdb9ac9f68fc3963b525537b9d42dc3d673b109a6ef18e370
+DIST plexmediaserver_1.23.5.4841-549599676_i386.deb 75095044 BLAKE2B 724a8f0c9d29c591759de8b2208ddcf1f6ec81aee0535939f95a11b2927c1c47545eb85de26ee41dd0e9ca021eeda00bde45fb6efe8bfc6c11e021f2fdd86eff SHA512 29ce137e93223b83960ac439314aec1f4c4ad78d392f48376faa3912023f4fd866005b14380b91eeacb1a3673f8b8ea464cd9ceff3ece2592190c32d24c9c8e8
 EBUILD plex-media-server-1.23.4.4805.ebuild 1897 BLAKE2B 63ce0a48bf86ba1d5f4872ec3185d16eaa99253947e658fc82d9124eae6622592330409e8efc1a447088ce8e1b3d527022e4dca59f66e6348fc69c1912039553 SHA512 af3741ea319bf7f2cf2e661f1c8f435ae667dcd09a5f2967bd28b2a46c1d29cf73d05ccf4c66a6180379889572fcb2bba3e66a1b868f788f8ee44b3a392c41ac
-MISC metadata.xml 746 BLAKE2B 32ddcdfc95a50cd336dec02a232ed50eeeca7d74d410cd327068da50fa55ac2090338854cff3fbc1da5c5c7027f0114db9c007cdb4ffc4426bf69ee8a5bdba59 SHA512 0f95894ecb5a28aaa0254435ad9b29552623e33340a23358ed3287c8e23d6a98e3cde838916f279970990ccc0113bd662a0c9d32259be3a50fec70fcd1ae2530
+EBUILD plex-media-server-1.23.5.4841.ebuild 1897 BLAKE2B 7b06fd697dde210dee0e11d41517e05eb93ebd540a90b058e35105586c2b643d68e1b9b20fc7a38b6601493c8f056298e0d70c31a85fff110ae4237782ee74bd SHA512 b0c71fc246653aa7ad99ced412cb8a6683b00bb9e00f3ad8ce8999680048bc3c2b8834561443433f785fe332c5e71152627d6d626493829666a855fccd4f942b
+MISC metadata.xml 597 BLAKE2B ccb49cc2f1115157ace237440b8c59e4466eb96a4f3c274c13e275fa6564b5bb0506bc3e3d9bdee4d2385d151e1f1bf9e3e3b70c7e0400d884aa1fcb3f0a1522 SHA512 d33bfd6ff84128622666b9452b975879840b3b6d24e555536cb8daf98f41411000ea26754df7fb31a639749c9f9b4aca64ed7524fb48d918a74d30a003a19d04
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 39729e116b91..66e76ce6294a 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -13,7 +13,4 @@
 		<changelog>http://forums.plex.tv/discussion/62832/plex-media-server#latest</changelog>
 		<doc>https://support.plex.tv/hc/en-us/categories/200007268-Getting-Started</doc>
 	</upstream>
-	<use>
-		<flag name="system-openssl">Use system copy of <pkg>dev-libs/openssl</pkg> instead of the bundled one. Unsupported upstream.</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.3.4707.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.3.4707.ebuild
deleted file mode 100644
index 0ca85f3300a0..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.3.4707.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}-ebb5fe9f3"
-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.5.4841.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild
new file mode 100644
index 000000000000..d4e54c130d2c
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.23.5.4841.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}-549599676"
+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 da17c265deff..4ce199282049 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index fd7bd7c9cfe1..f07c476a6214 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,5 @@
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
 DIST openshot-2.5.1_p20210228.tar.gz 64780534 BLAKE2B c31bd2531df28ce9bed688fbc34dc383018024ffe9364699e45c08135f5c0692d97f601bc578ba07fd44e2f8f58f0b27c5bc10bb3af48c8cf0be17a45b966116 SHA512 b5ce39d31bc1b997d272b3817ccdcef4749126755e329a278700f6735a1484b0c2b917e04a5f1b9826ee0e5ea983a624be59af16bf79f038be44a29763cc68b5
-EBUILD openshot-2.5.1-r1.ebuild 1244 BLAKE2B 72ebe9eabc129ce50d31f4b508b5587e1859ceca5f2e82bf96fdcafcf594aa69ed99e32a45135a2a726d8a3afa793ec8d29e509acb4bcfc0401e1c123cfc6d49 SHA512 93e3a66e3f25f83535598335a6b044dd056a5ab6d9f8e5149eb09ee8848dc6da2a0dc7907cebd3a8a99c639007af5322e3d469839082ab4e9d0f760d31f41842
-EBUILD openshot-2.5.1_p20210228.ebuild 1335 BLAKE2B fa1de51206b4c92add5075a218df9b5efba55bfd392c1c1f3593b2eca0103f60d2a0aee659452a26db6da305202e584a11c7240d5a606758f4c2fbce08443c9f SHA512 9de80c57c34ab236d24cfef7b1afb24f4f7aee5b5d9c9ed14c751b9e97e116dd283bca0c0d675781cb5efbc7b01c0873ab0685320d16f16072a11c07b051290f
+EBUILD openshot-2.5.1-r1.ebuild 1212 BLAKE2B 115cdee1e2387d7aef578e93aee8c14287bd586fcd5610caaa9b2d30dd7bcfe427d5e48d9b0a8c192f5478addba460ebe3be404a34bd49b951ab6e5638bc110b SHA512 4f959d3c043c62832fd78af6f69b619b49dfc2679a165ce08367567b262f52c20bc26185f00c3e5e89ac377af2a8c1f53b9e8d11c324ad0bb53ae0dec4e536d1
+EBUILD openshot-2.5.1_p20210228.ebuild 1297 BLAKE2B a73294a019877143fef1dd33c1aa15ad5571239954f60e9d249ff33e6ac0b0a18eea9cbb04bf1219be0cbd68a262a3fc4541cca5ae01fb019b57fd154c0766d3 SHA512 c75338d63a32d903ac6754de4f0557e90af0288b24638b10e70ddd17c42fb495e335f53d8e7cbee84d6059ce6f1f4263cf1b7e3a016309577eb875f11dbb3166
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1-r1.ebuild b/media-video/openshot/openshot-2.5.1-r1.ebuild
index 42798adc92f3..5bdad6fff912 100644
--- a/media-video/openshot/openshot-2.5.1-r1.ebuild
+++ b/media-video/openshot/openshot-2.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
@@ -22,16 +22,16 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit(-),widgets]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit(-),widgets]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-video/openshot/openshot-2.5.1_p20210228.ebuild b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
index 7eb405299fe5..16b6035f8946 100644
--- a/media-video/openshot/openshot-2.5.1_p20210228.ebuild
+++ b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
@@ -23,17 +23,17 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,widgets]
-		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 1786062e4d25..3c49aa49dfe9 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -15,13 +15,15 @@ DIST pipewire-0.3.28.tar.gz 1474219 BLAKE2B d20b39c8ed49cd44f2109aab6453aac547ff
 DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B fe3984ec4b02fe91683d382e3891e174748b52c5e2f609dc838837f1ac0fea736e06395a022b8ec152fe015cca24c54d4c1896acde3a2ac66eb700dc2336fe4f SHA512 bc163ad3e2d7696295fd3720e8f9cc4d478a55c0694c0faa03a40333e3b65fcbff27e4e296eb9dd0191ca2782e04934915c46e04a2444b458491cd2905823ddd
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.31.tar.gz 1594284 BLAKE2B 0ff358c53ea4357a72ac58ee45ccac792161d3ddd7a9dbcd6933be88e0ddc5d9c49468a3b1eb0cdf9ea81ec4272ad53078f6cae1fd20358bbeed108139e217ce SHA512 ff21e281bb3e5f6da1001e0c64b33368e96d31f0ec2d395cdfcfac105b0442d8fedd2225e6e5d1c93fdbd5e0108accecebbb7c294c55803a4ea853f1efa0c069
+DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
 EBUILD pipewire-0.3.22.ebuild 3177 BLAKE2B 712e773c42b0a89d482a1c38f1d5b2ad73bd9790173093813f257378e5bcda3aaaeedb2d215812637d14dccc4c57cb25ba3d4574d579821f7c09f8a110cac8ac SHA512 89583f0495c8a12598c829de80d2b515a1a37aecf51b4cb54c4988f0fc3aff2f5d9b7f4d23621678d5f1b2e67f145d941eacc0d9eca0281d9cf202ff109a7195
-EBUILD pipewire-0.3.25.ebuild 8586 BLAKE2B b1e467d7e9352a510239d1aee632e4fe6704811cf89d8add118757b6d38240bc0b44f1501db416c1f2c693846667a953826cef6bec8e32bf9362b9c07b804138 SHA512 f16b4f5b1dbfea605f628941edb3931c315854f99a242f63ec6d1b7b1bd2754bb27e417215d02e57b1a7980db8660616cf54dcf4aa12b077a847c9136c73c735
-EBUILD pipewire-0.3.26.ebuild 8737 BLAKE2B d739d6931d1a2b4a12b011abefcac40d9cf81a363ad1897967cf12c33c346ca0b7c217d5ce8e2433b601fd698f74361a5719d667aa6bc45253d8003f14b5076d SHA512 e782ffc242bb437d8a5f465321ece26c86bfc40e65b7beb9ad4ff89fb4edbb1c7458dbe9ea6ce1568ae092747c56226adab568b694c176cea1bf99b137647ee5
-EBUILD pipewire-0.3.27-r1.ebuild 9298 BLAKE2B 92e91609706d83720cd6aefd0afa5d3f06a543d98c783ccf92e562eeb7f4bd07e3de54c6834116f62952c6d83b0dc19a759ec14712d076dc327999aecbfd2f18 SHA512 0584ba24a57f4227b550943a09793846192820f898a7ff71ddd391447059bda83b250aa209efa74d6482dd7055617f815a35960a625c5bdb05151548106507be
-EBUILD pipewire-0.3.28.ebuild 9370 BLAKE2B 305b012d603420eb7c6c8bd70747889a89b2321649f43d3108eb21cf8046ddc64b7884045656793a9787bcd45973698aa61351c0930d4181cdecc34ebcda3388 SHA512 904e6c09d47ee6198bfcb6c3a8d3f1edf9eb69af5676f6401e1e54509ac8d510c33d62d146c3104e5c7ff571e08db50bfc6568e8cf269b654c4fefef3330019b
-EBUILD pipewire-0.3.29.ebuild 9389 BLAKE2B 3809e908b15e24a41137880a37c2e4eec2fbbb8c03387131bf3b7a57dbde220980480156843565134f29c9ae0d21a038dd9be55c681a92b689e1d6e12210f070 SHA512 822b0134c90bdb01b7019b94b5676e149fb8d6801a47ddfee831288a6e6139334308302b5654b49469dee07f1f52701a3b021aebf40d4c49acc6278955c82bf8
-EBUILD pipewire-0.3.30-r1.ebuild 9672 BLAKE2B 7ce9271b57e764142166d4a527d2bdf19152d940bcb06761d4e3da38451c356f246186f82a2448f3b9d35b71e6ea3abb5c0acfbddbf39b0fb32258899cceddf2 SHA512 50a032216f076ed6341ac10b4ccf13565047cb28da54d2f32d4e7d7b87e2a0915ac0ccb8601f9f1cbab3f023f4f2dea5a18c5a494a6813f40c79da44870cac97
-EBUILD pipewire-0.3.31.ebuild 9676 BLAKE2B 9629c2dd52835484d9dc6ea149213ba832a76f03344a6098a4207a2e501d5066b2872c6adcde9d0f1dd937f7dafa1f37fba85a974d72b69777f720d15be9b02b SHA512 29f4cdb87ca7f3acf8474c4b86b30ed1db065d5071eb50aafb5f48d490180e8875b8008d168ec8e6f03ed465a90fbb79d9bfc81159c3650ea7d5d305baa7a485
-EBUILD pipewire-9999.ebuild 9676 BLAKE2B 9629c2dd52835484d9dc6ea149213ba832a76f03344a6098a4207a2e501d5066b2872c6adcde9d0f1dd937f7dafa1f37fba85a974d72b69777f720d15be9b02b SHA512 29f4cdb87ca7f3acf8474c4b86b30ed1db065d5071eb50aafb5f48d490180e8875b8008d168ec8e6f03ed465a90fbb79d9bfc81159c3650ea7d5d305baa7a485
+EBUILD pipewire-0.3.25-r1.ebuild 8591 BLAKE2B 4ed730cd42404fc94e7665c6ee07e9548e1d5e363f74af0a52ff488e005d6f582081f6ceef383f84e8c378c833f2406646c7b3b84e50074a9519ffeb49912b8a SHA512 5541d51a4888f753f0c463fb54009b5aabe45047df2b7b53c6016abc2481be589067bb0ecf4ee79c64a1ae2d4b06254e6b61f210a9737ee57a159da332bc3820
+EBUILD pipewire-0.3.26-r1.ebuild 8742 BLAKE2B 112df615c5e4549c2d3d44e19f45d48eb1787d4570c6e4ec5041775b3e67c2c010586ffdcccd29a8a8fd521a1b73303ab3086aaa3c5d7b6a11b4db67063fba71 SHA512 20d607009548c323e704cd33b07e0437b9ad9d1ec8a7eff895b558d1825b596550c78a956dbf7ddb9bd7e8aa312271f04c7969577180151d00e27b5128f62317
+EBUILD pipewire-0.3.27-r2.ebuild 9303 BLAKE2B 692ca1e00160f1c07f9962e1b9c22ba6185e4d97298084ef295b5688b79fa1d9b573f675c7d2a25e28001cd0ca6becba2da4e71243354dfdd41b3f97d364bc18 SHA512 128349b662a3f25159f072d998f14291db8185e3d39dfd1c5f081eb54b55bb96204cb34ad478e6f4568df3ea86b0ad68f1fd4673ab776dd49a85351bfa4cb7f4
+EBUILD pipewire-0.3.28-r1.ebuild 9375 BLAKE2B 8c48d0a74514ffb887696a078c20f8c52f583b7ad376b8493b796a5a173bf179c2927f7c04ada6a37a1e8708e3137680b958779652b475b43ae26e56d8adf98f SHA512 7961c80768d42f41a18c814cac91b36504a68f21940b30795e3eaf26b49039f43a64a30855b1789cd35f04fe89ed337fa0828f68dad68e1a9b5d67ec7c3bc1fd
+EBUILD pipewire-0.3.29-r1.ebuild 9394 BLAKE2B f14cffd0a50e2405795c56ad277c53e52e1b2b0121f4c0c207246b69f0a3029c67632b664438f15c34cc2f71681d9f8083e2a420d2c2018198d3b61eb127cc43 SHA512 b32f48d64b899a99a6fef1c7fd8045ffda792588950607c568ad14df18ae52731f001bc96c88c6da66e7c8d3ec3615a15f3da4136fc166e2958633514fdbe9aa
+EBUILD pipewire-0.3.30-r2.ebuild 9677 BLAKE2B 62e6ec28bf67661acc51f067e298f451ec6331a445ff8963307ea85c08b87dbb596ae16432405d5273bf561f2ed3afe87164070a5ec36dfd7cb16e0d1b6f3c4d SHA512 5075db1140d524776ae7e8503298c10eaea0bf3e5b8bf81dd9c7f34a142072d7c294363eb67f21481697c6487ebaeb6c45882bb25f9d73b7ff363a50cfc46711
+EBUILD pipewire-0.3.31-r1.ebuild 9681 BLAKE2B 539e8528f06605c1874194f9e01d92e6a1e35550c9f177964010a5b39a80ffb027adba89b2aa6ca8a2f59c419e0ed383c96102e62368fa1a9402dfa55a70dabf SHA512 595f83d2f06fc36d5fe83cbc054da9c20f555a28eb443ae40d0b49ba07ad73b0608abfa638285b015117c09d0024760b6493a6c7b2dc435e17412d8326dfbdd8
+EBUILD pipewire-0.3.32.ebuild 9594 BLAKE2B 3e0195e9aeb8e4c2d8c9258d3597c575eb4e7d4a6812fc5479ffd8007bf3eaf8faccd58013fa3e59ba23d7843094e2ab72feb89ce2c4ced6f24ac8e1b887ab2d SHA512 829cbdde885e5d0a72f2a30f2d69058308bdee8ac79c0b001775d36efcbf616c347c0c7b555c5966883fd5fdc4a60303d0ff6ba42f0026eaeabde509a4fc6ba7
+EBUILD pipewire-9999.ebuild 9594 BLAKE2B 3e0195e9aeb8e4c2d8c9258d3597c575eb4e7d4a6812fc5479ffd8007bf3eaf8faccd58013fa3e59ba23d7843094e2ab72feb89ce2c4ced6f24ac8e1b887ab2d SHA512 829cbdde885e5d0a72f2a30f2d69058308bdee8ac79c0b001775d36efcbf616c347c0c7b555c5966883fd5fdc4a60303d0ff6ba42f0026eaeabde509a4fc6ba7
 MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/pipewire-0.3.25-r1.ebuild b/media-video/pipewire/pipewire-0.3.25-r1.ebuild
new file mode 100644
index 000000000000..83afc679686b
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.25-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+#	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	ldac? ( bluetooth )
+"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libudev
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-fix-docdir-path.patch
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_feature doc docs)
+		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
+		-Dmedia-session=enabled
+		-Dman=enabled
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature gstreamer)
+		$(meson_feature gstreamer gstreamer-device-provider)
+		$(meson_feature systemd) # Also covers logind integration
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_feature bluetooth bluez5)
+		$(meson_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_feature bluetooth bluez5-backend-ofono)
+		$(meson_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_feature aac bluez5-codec-aac)
+		$(meson_feature aptx bluez5-codec-aptx)
+		$(meson_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		1000:60000	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+}
+
+pkg_postinst() {
+	if ! use pipewire-alsa; then
+		elog "Contrary to what some online resources may suggest, avoid setting"
+		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+		elog
+	fi
+
+	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+	elog "alternative libraries have been installed to a non-default location."
+	elog "To use them, put pw-jack <application> before every JACK application."
+	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+	elog "provider is still needed to compile the JACK applications themselves."
+	elog
+
+	if use systemd; then
+		elog "Per Gentoo policy installed systemd units must be manually enabled:"
+		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "Rebooting is strongly recommended to avoid surprises from"
+		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog
+		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
+		ewarn "systemctl --user enable pipewire-media-session.service"
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog "autospawn = no"
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf"
+		elog "by commenting out the relevant command near the end of the file:"
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
+		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
+	fi
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.25.ebuild b/media-video/pipewire/pipewire-0.3.25.ebuild
deleted file mode 100644
index 92606ca61dec..000000000000
--- a/media-video/pipewire/pipewire-0.3.25.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-#	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	aac? ( bluetooth )
-	aptx? ( bluetooth )
-	ldac? ( bluetooth )
-"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	media-libs/alsa-lib
-	sys-apps/dbus
-	sys-libs/ncurses[unicode]
-	virtual/libudev
-	bluetooth? (
-		aac? ( media-libs/fdk-aac )
-		aptx? ( media-libs/libopenaptx )
-		ldac? ( media-libs/libldac )
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-fix-docdir-path.patch
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_feature doc docs)
-		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
-		-Dmedia-session=enabled
-		-Dman=enabled
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_feature gstreamer)
-		$(meson_feature gstreamer gstreamer-device-provider)
-		$(meson_feature systemd) # Also covers logind integration
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_feature bluetooth bluez5)
-		$(meson_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_feature bluetooth bluez5-backend-ofono)
-		$(meson_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_feature aac bluez5-codec-aac)
-		$(meson_feature aptx bluez5-codec-aptx)
-		$(meson_feature ldac bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		1000:60000	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-}
-
-pkg_postinst() {
-	if ! use pipewire-alsa; then
-		elog "Contrary to what some online resources may suggest, avoid setting"
-		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
-		elog
-	fi
-
-	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-	elog "alternative libraries have been installed to a non-default location."
-	elog "To use them, put pw-jack <application> before every JACK application."
-	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-	elog "provider is still needed to compile the JACK applications themselves."
-	elog
-
-	if use systemd; then
-		elog "Per Gentoo policy installed systemd units must be manually enabled:"
-		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog "Rebooting is strongly recommended to avoid surprises from"
-		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
-		elog
-		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
-		ewarn "systemctl --user enable pipewire-media-session.service"
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog "autospawn = no"
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf"
-		elog "by commenting out the relevant command near the end of the file:"
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
-		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
-	fi
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.26-r1.ebuild b/media-video/pipewire/pipewire-0.3.26-r1.ebuild
new file mode 100644
index 000000000000..56accd5f5077
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.26-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+#	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	ldac? ( bluetooth )
+"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libudev
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_feature doc docs)
+		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
+		-Dmedia-session=enabled
+		-Dman=enabled
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature gstreamer)
+		$(meson_feature gstreamer gstreamer-device-provider)
+		$(meson_feature systemd) # Also covers logind integration
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_feature bluetooth bluez5)
+		$(meson_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_feature bluetooth bluez5-backend-ofono)
+		$(meson_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_feature aac bluez5-codec-aac)
+		$(meson_feature aptx bluez5-codec-aptx)
+		$(meson_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		1000:60000	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	if ! use pipewire-alsa; then
+		elog "Contrary to what some online resources may suggest, avoid setting"
+		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+		elog
+	fi
+
+	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+	elog "alternative libraries have been installed to a non-default location."
+	elog "To use them, put pw-jack <application> before every JACK application."
+	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+	elog "provider is still needed to compile the JACK applications themselves."
+	elog
+
+	if use systemd; then
+		elog "Per Gentoo policy installed systemd units must be manually enabled:"
+		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "Rebooting is strongly recommended to avoid surprises from"
+		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog
+		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
+		ewarn "systemctl --user enable pipewire-media-session.service"
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog "autospawn = no"
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf"
+		elog "by commenting out the relevant command near the end of the file:"
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
+		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
+	fi
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.26.ebuild b/media-video/pipewire/pipewire-0.3.26.ebuild
deleted file mode 100644
index 932a2e4cc0b6..000000000000
--- a/media-video/pipewire/pipewire-0.3.26.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-#	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	aac? ( bluetooth )
-	aptx? ( bluetooth )
-	ldac? ( bluetooth )
-"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	media-libs/alsa-lib
-	sys-apps/dbus
-	sys-libs/ncurses[unicode]
-	virtual/libudev
-	bluetooth? (
-		aac? ( media-libs/fdk-aac )
-		aptx? ( media-libs/libopenaptx )
-		ldac? ( media-libs/libldac )
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_feature doc docs)
-		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
-		-Dmedia-session=enabled
-		-Dman=enabled
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_feature gstreamer)
-		$(meson_feature gstreamer gstreamer-device-provider)
-		$(meson_feature systemd) # Also covers logind integration
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_feature bluetooth bluez5)
-		$(meson_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_feature bluetooth bluez5-backend-ofono)
-		$(meson_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_feature aac bluez5-codec-aac)
-		$(meson_feature aptx bluez5-codec-aptx)
-		$(meson_feature ldac bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		1000:60000	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	if ! use pipewire-alsa; then
-		elog "Contrary to what some online resources may suggest, avoid setting"
-		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
-		elog
-	fi
-
-	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-	elog "alternative libraries have been installed to a non-default location."
-	elog "To use them, put pw-jack <application> before every JACK application."
-	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-	elog "provider is still needed to compile the JACK applications themselves."
-	elog
-
-	if use systemd; then
-		elog "Per Gentoo policy installed systemd units must be manually enabled:"
-		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog "Rebooting is strongly recommended to avoid surprises from"
-		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
-		elog
-		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
-		ewarn "systemctl --user enable pipewire-media-session.service"
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog "autospawn = no"
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf"
-		elog "by commenting out the relevant command near the end of the file:"
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
-		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
-	fi
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.27-r1.ebuild b/media-video/pipewire/pipewire-0.3.27-r1.ebuild
deleted file mode 100644
index b3b112d4c875..000000000000
--- a/media-video/pipewire/pipewire-0.3.27-r1.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 meson-multilib optfeature udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	aac? ( bluetooth )
-	aptx? ( bluetooth )
-	jack-sdk? ( !jack-client )
-	ldac? ( bluetooth )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		aac? ( media-libs/fdk-aac )
-		aptx? ( media-libs/libopenaptx )
-		ldac? ( media-libs/libldac )
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature aac bluez5-codec-aac)
-		$(meson_native_use_feature aptx bluez5-codec-aptx)
-		$(meson_native_use_feature ldac bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.27-r2.ebuild b/media-video/pipewire/pipewire-0.3.27-r2.ebuild
new file mode 100644
index 000000000000..990c290d7d21
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.27-r2.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson-multilib optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
+	ldac? ( bluetooth )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.28-r1.ebuild b/media-video/pipewire/pipewire-0.3.28-r1.ebuild
new file mode 100644
index 000000000000..e45f023b6a0e
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.28-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson-multilib optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
+	ldac? ( bluetooth )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.28.ebuild b/media-video/pipewire/pipewire-0.3.28.ebuild
deleted file mode 100644
index af219402bdc9..000000000000
--- a/media-video/pipewire/pipewire-0.3.28.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit meson-multilib optfeature udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	aac? ( bluetooth )
-	aptx? ( bluetooth )
-	jack-sdk? ( !jack-client )
-	ldac? ( bluetooth )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		aac? ( media-libs/fdk-aac )
-		aptx? ( media-libs/libopenaptx )
-		ldac? ( media-libs/libldac )
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature aac bluez5-codec-aac)
-		$(meson_native_use_feature aptx bluez5-codec-aptx)
-		$(meson_native_use_feature ldac bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.29-r1.ebuild b/media-video/pipewire/pipewire-0.3.29-r1.ebuild
new file mode 100644
index 000000000000..94c7194ef130
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.29-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson-multilib optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
+	ldac? ( bluetooth )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.29.ebuild b/media-video/pipewire/pipewire-0.3.29.ebuild
deleted file mode 100644
index 80f6797bd0b5..000000000000
--- a/media-video/pipewire/pipewire-0.3.29.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit meson-multilib optfeature udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	aac? ( bluetooth )
-	aptx? ( bluetooth )
-	jack-sdk? ( !jack-client )
-	ldac? ( bluetooth )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		aac? ( media-libs/fdk-aac )
-		aptx? ( media-libs/libopenaptx )
-		ldac? ( media-libs/libldac )
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature aac bluez5-codec-aac)
-		$(meson_native_use_feature aptx bluez5-codec-aptx)
-		$(meson_native_use_feature ldac bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.30-r1.ebuild b/media-video/pipewire/pipewire-0.3.30-r1.ebuild
deleted file mode 100644
index cd67e12343ca..000000000000
--- a/media-video/pipewire/pipewire-0.3.30-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
new file mode 100644
index 000000000000..4017b4dbc693
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson-multilib optfeature python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libopenaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.31-r1.ebuild b/media-video/pipewire/pipewire-0.3.31-r1.ebuild
new file mode 100644
index 000000000000..a4448bb20cdc
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.31-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson-multilib optfeature python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libopenaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.31.ebuild b/media-video/pipewire/pipewire-0.3.31.ebuild
deleted file mode 100644
index 29da21cf2dc0..000000000000
--- a/media-video/pipewire/pipewire-0.3.31.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.32.ebuild b/media-video/pipewire/pipewire-0.3.32.ebuild
new file mode 100644
index 000000000000..ca8a33f0f304
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.32.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson-multilib optfeature python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libopenaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 29da21cf2dc0..ca8a33f0f304 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
 	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
 	virtual/libudev[${MULTILIB_USEDEP}]
 	bluetooth? (
@@ -236,8 +236,6 @@ pkg_postinst() {
 		elog
 		elog "  systemctl --user enable pipewire-media-session.service"
 		elog
-		elog "NOTE: This is not required when using PipeWire only for screencasting."
-		elog
 	else
 		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
 		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index a9a9a816ed29..61735101a725 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -2,5 +2,5 @@ AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
 AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.999-r4.ebuild 2736 BLAKE2B 981f15775c3c8e973e770cab8c0c6782d091bf437044dd2d71a74f0761bc3d0d1df3839b3cd613cbbec24665eba7b0b3ee7f1fe1746b95e6ea7d5fb3ea5cdf7f SHA512 0d9386f3f48bcbba95ab5f44807e4d6b02ee406e9a7c2f81985dbdfa95d7b998f186a8c68ebece39ef38de813769e62a6343d9c23ffc95f1d259988ae72529f8
+EBUILD pitivi-0.999-r4.ebuild 2694 BLAKE2B 08f404a53c6904808629d7c794fa6095695aff57135e318cc3d7ba900db27e8ee6e2874afb55b0ac90d2ed066622f0d53ba5a5fd161b90814202cdcded83d66d SHA512 de1911d77b966949d6e3d4c23085706dfe1f673f1dac7d0042a20eadb36ada5275068569f2c344e5cb1513dadbf601d76eb52c5d1b3e697e87605a8e737edc11
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild
index 7347dd1ee0a5..b7c61e6d521f 100644
--- a/media-video/pitivi/pitivi-0.999-r4.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r4.ebuild
@@ -27,7 +27,7 @@ GST_VER="1.14.2"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
 	')
 	>=x11-libs/cairo-1.10
 
@@ -39,11 +39,11 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=dev-libs/gobject-introspection-1.34:=
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
 	')
 
 	gnome-base/librsvg:=
@@ -73,7 +73,7 @@ BDEPEND="
 	virtual/pkgconfig
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose2[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 36ac71652cab..e35ad69b0618 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,6 +1,6 @@
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 DIST totem-3.38.0.tar.xz 2235672 BLAKE2B 31a69bce69316e06b6ba1b1c98bfc5b87cae0b30e682bb1b32bbac713fb2ff262084e76c19690eb78495969a67c2be484bc45adcd1b432a3de7a33c3dc04109c SHA512 231aca873bb53f23f81a7981177761d0bf7768baa845309b0dc0821db58377d692cf7e8a65135090dac14e856aa3e1dc0c1f11c55a7b25d694822019bfa9eecf
 DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
-EBUILD totem-3.38.0.ebuild 2788 BLAKE2B a510d93af942297fe1dde5835caad6a2cd5dc04f90d7314f3d02dae0b64c3fb6fec45894034e0b958e3d6d6968852a0bae5b9b8609a9bd456d8c8b98e9d35fd2 SHA512 ddd5ea038d0e5158689ecf67998b32ad0989ea3f2fe69dc4b1bdc0a0fd6f43de7a21d2bfe65ce095e5678b576bc35d1c630ad3c69801f11d32f949e56011b944
-EBUILD totem-3.38.1.ebuild 2789 BLAKE2B 4975efdc14dc1b63768362b46e38c786e31f5416d6141e79e1dc3a78ddf32086bb293927404ca528ff53b98480c7fd51f9a630d5bbd7ecdd7af8056fc9080cd3 SHA512 de28952209a464fb3fd7574c119c8133dd41ed7b5e883e2c9ef650577f4de40acd768ce5c6afcc42c2b252776ce4863ce082bd597cd76e2f79e5c444ea912e03
+EBUILD totem-3.38.0.ebuild 2776 BLAKE2B c0fc60233bebdde5825fbb4be16138f5ffaee529f23b992fa44652d3d325c7fc7217137bf61b350982a0f8ec631b55de5e252095bc02e8db37dc0798cad29426 SHA512 f34e74f68fe799af78f19d4c9f66a5b6a0d7b354a8239f86230f0ccc5d4370dd866a251b236646824a214481419ab88022968afc95f2c62899121bd85819fc03
+EBUILD totem-3.38.1.ebuild 2777 BLAKE2B 682bad8bd9eac4408b33e285306d137be365625b7621bc60f13ac57d994293e79fb818dc47548046564f523b9998e33a5d414e6f94bbd9114670b9e74e0c8760 SHA512 31a9d00ea794d3dac208df22d0c5ae4a1fb92db79c063e122f4d84c474c141fd0adab40e5b7c43b8bf11fa37349edc0b6781a13c45401015f9c6f815ba86fe79
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/totem-3.38.0.ebuild b/media-video/totem/totem-3.38.0.ebuild
index 8370cbd704d1..bc6d6ecbc9ee 100644
--- a/media-video/totem/totem-3.38.0.ebuild
+++ b/media-video/totem/totem-3.38.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
@@ -42,7 +42,7 @@ DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 		x11-libs/pango[introspection]
 		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/media-video/totem/totem-3.38.1.ebuild b/media-video/totem/totem-3.38.1.ebuild
index 6ff2876c06d0..4f5cac066acb 100644
--- a/media-video/totem/totem-3.38.1.ebuild
+++ b/media-video/totem/totem-3.38.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
@@ -42,7 +42,7 @@ DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 		x11-libs/pango[introspection]
 		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 145f59e97a0a..29b0283ae910 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,11 +12,11 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.12.1-r101.ebuild 13750 BLAKE2B dafda1492a0556f1c3814e0288089f173614498500d9261ba2aebdf2d44ca798306ac0e711c6d6c13430421f7fd82336a84cbf05130929006b7028ac9d043fb7 SHA512 5ffea7c509a35063cdd962972d144662982263d6590aa4b02490e7b573ad3532d1aea5e1053393019b320fec69bda3f67c32676084a9d555d0863dcc18a965e9
-EBUILD vlc-3.0.14-r3.ebuild 13731 BLAKE2B 8b940703166dca421cbdb8c8df71833944a4c5fec6fa8169a90e2276ac58cff96518bb6eab78bf182491667b1fd9fe99897f05c7f8ae3e0d33c48da802f35df9 SHA512 233aa75c5235735b7bccd4fcbd69495c44e9a83a10ebefbdaee564f6d74c8b48cd210f6f88c84f2dff6c9655b9738f552d12e175f329bcf6ffe1e8daedfeb456
-EBUILD vlc-3.0.14-r4.ebuild 13805 BLAKE2B 7e183db7fec8c91a296b82cbd50ebd4aeb00df76e7ea34d714d20854570f8b4f9effaf513a48db5dfeb9fd625214665339556957b244b86349f0ef3313e196f5 SHA512 df42ae8252ce8fbdf82cd44c8a8832f58fb3c45b6e14c68c3d7089b4da8f63257d3e4d5ece8f8d4db82f71d740bafa23f08cea45fe4b103214b1eb3c0ee194b7
-EBUILD vlc-3.0.16-r3.ebuild 13796 BLAKE2B 7fdd61825face14cd3eaf2472f3041c0a43912210df95d89526b241e2d03a702e6301a504875ee1d69c4dac33d39082964a7c73fa192d0184821dee08390e51d SHA512 3ababa58b946caa024486c07403f16437141d204d296a28880cc85df226d616cd203030953325a409e90914e5e1ea01ad399bd194ace4d2f0533f9a0c7c8734b
-EBUILD vlc-3.0.16-r4.ebuild 13865 BLAKE2B 21f555ed8794adeadee592006f27cdd8b93f68fa304be1ce44ab5a7aab44145a3d384ce8387b9aa410e12b8a0b5f62aba10d136940bd855721a10e48333f7788 SHA512 be174077080f84f5d5ea02bb993acc72c204684a3432a54e7c828c6c05a5d1e0e8b0894436ee94916b4c34f411e5ff29159827701e82e3a83a3f602afb323f3d
-EBUILD vlc-3.0.9999.ebuild 13473 BLAKE2B 886d92e5c06430a20669972d7365022a24a4bce2b269695ad19ecbefaa6bc688becb8dac11b7cf18be82889a2eab8741fd70b9626980ae91a3f4244a0d1a60fb SHA512 3fff63891cd40b4052361033d13812ba20114e89fcd3f4d124a93ef4d73a6d727ed6305e3d522c48e1a6390ed092f0e76286fd46d641f8e68a7bf72431b98c16
-EBUILD vlc-9999.ebuild 13494 BLAKE2B e1cd64d270f7fa817cf080094216e037561b117b7e6944d2a90bb4311547b0851425a8aa98543b5f4d03c13f54cbedb5d56338c94c389d65b68e2837ccadb364 SHA512 de2bdff689ae0976d3fc1a2d3895d6bfeaad37626f5eb2c4499df1334dee68673b456077e32a1e4c88b68b95d3bb5935c508e6fe1ce0c3566670e6b2cce2c781
+EBUILD vlc-3.0.12.1-r102.ebuild 13752 BLAKE2B 74446fb058d6ed5d09be30495edaeeded8b23fb421602712d594165736a13c817c87497ad74ea48bc856802de5233bdbb741eb50e76af4027c99307fe881eae0 SHA512 3d07f4802b011ab0f7a9698331fe20e59177a56653500e853ff8971f0ea0e57ab7fae19996b70e9afdb013fe15476d5f93e700fdfe3c1c381b477bc9e9665a94
+EBUILD vlc-3.0.14-r5.ebuild 13733 BLAKE2B 3143974d5b761a9feb0715ce5b7d6a7b855a5812210f6d79d025c580a136e77efbf7a5242e02c8fc0a39643722d758834ad09888f4de10952e052295416ff9a9 SHA512 317d443c824233441cf41d5917c85a9bac3fae158ca4dbda3bdf10e1b1cf4fef119c7b6f1c1934df026ff4c8c546aa5bec88829dc3006fec26f95c22bbe60b1b
+EBUILD vlc-3.0.14-r6.ebuild 13807 BLAKE2B 08cb1ee444cc1287ffba97c5fd595135c4a77f6195c65cf8fffeef37b98bad5500d151378dbe56accb18b9a804b29e046b5ad5dbf5abec73907e5aebf09fbc3b SHA512 4e4bf7ccbb09c16db596fe8ff1539d71b3be9e285339c0b61382bb82d01e3631cd48ceb1e3af65c91d733662853e94688e2039302d741b3a87606e5e5c7a2f00
+EBUILD vlc-3.0.16-r5.ebuild 13798 BLAKE2B 4edba2ab308353f279529117a8dae90e1ce1f1a19321ad92558cc36ffb167b2445048bce0c878724c575827fe635b745401a7ba6b15fc67fffae966f3db614b7 SHA512 edae0b3ebb10a164566cb57234fccd70dee408c720c9dde04166dd10670ecb82304764cb8b355625035d80c515a657e51648669ec0f501dc0c62a162fd70b1c6
+EBUILD vlc-3.0.16-r6.ebuild 13867 BLAKE2B 775a9d4d3e53d03328e1eb63ba3dc1cf51faed7f70789b6382e68a415ff49b9a3b2cf522d768c8a16eabc293983d27568831c11e7bdaf69f77622ba47a58e581 SHA512 80d98b3b3359224a4f81b0b3c15ab05abf1533d6dec069e81e81132354b267e72b0da0f5281d25065c1ff251b64bef36ecf358168f5026e3adcf2fdb370cabb6
+EBUILD vlc-3.0.9999.ebuild 13475 BLAKE2B 528764a390e3e0e859efb50a2e9db5366ba87a86f01483787a4e3fe2fdb36de18448a95746e58ba5705793b53a4534dd3184efcf24e1576de9f57b7e0fff59e4 SHA512 90f884b1419bb717174dd386c5dc3b99dea13f496c49ebaa89970b5910b730852c109d3942a944531449c1557c6a1ab72a0a7e67c550e50a3ed21af09b561bb0
+EBUILD vlc-9999.ebuild 13496 BLAKE2B 46b7e92d8a69a19156d259e9739871f4dc10c3dc2e4e0de0f427be000ed069e7af0959f30cb5346b03c09468289cf606261db3675a07ac92bf39bb12347f688b SHA512 57ad9586d3b9f65cd78738a0e7c8716371525112e8dbdc0533ea3bb965cc31f05bf5da1097a331ff0c9e0e323f7e330cdaf875d4d952e85bd03a5f35f857fa92
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.12.1-r101.ebuild b/media-video/vlc/vlc-3.0.12.1-r101.ebuild
deleted file mode 100644
index 5f2d00639f10..000000000000
--- a/media-video/vlc/vlc-3.0.12.1-r101.ebuild
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( media-libs/libbluray:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-4.9:0=
-		>=media-libs/libdvdread-4.9:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.3.6:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.12.1-limits-p{1,2}.patch # bug 767796
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.12.1-r102.ebuild b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
new file mode 100644
index 000000000000..95d8346aece2
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
@@ -0,0 +1,513 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.3.6:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.12.1-limits-p{1,2}.patch # bug 767796
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.14-r3.ebuild b/media-video/vlc/vlc-3.0.14-r3.ebuild
deleted file mode 100644
index fb0fb903ecab..000000000000
--- a/media-video/vlc/vlc-3.0.14-r3.ebuild
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( <media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.14-r4.ebuild b/media-video/vlc/vlc-3.0.14-r4.ebuild
deleted file mode 100644
index e0d547fa43fb..000000000000
--- a/media-video/vlc/vlc-3.0.14-r4.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.14-r5.ebuild b/media-video/vlc/vlc-3.0.14-r5.ebuild
new file mode 100644
index 000000000000..2e16e99f153e
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.14-r5.ebuild
@@ -0,0 +1,513 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( <media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r6.ebuild
new file mode 100644
index 000000000000..08c473c7b881
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.14-r6.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( >=media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.16-r3.ebuild b/media-video/vlc/vlc-3.0.16-r3.ebuild
deleted file mode 100644
index 9b318671ab20..000000000000
--- a/media-video/vlc/vlc-3.0.16-r3.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
-	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( <media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.16-r4.ebuild b/media-video/vlc/vlc-3.0.16-r4.ebuild
deleted file mode 100644
index 579e5c2d81e5..000000000000
--- a/media-video/vlc/vlc-3.0.16-r4.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
-	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.16-r5.ebuild b/media-video/vlc/vlc-3.0.16-r5.ebuild
new file mode 100644
index 000000000000..8c556b36dcbb
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.16-r5.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
+	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( <media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
new file mode 100644
index 000000000000..3cb51b38ba34
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -0,0 +1,515 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
+	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( >=media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 1a10ae10a4af..9de5769c7062 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:= )
 	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
 	opus? ( >=media-libs/opus-1.0.3 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index cdbff0a84948..7313dc1dcb86 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -160,7 +160,7 @@ RDEPEND="
 	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:= )
 	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
 	opus? ( >=media-libs/opus-1.0.3 )
diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest
index a0f504d09ab7..59d8f89b8146 100644
--- a/media-video/xvid4conf/Manifest
+++ b/media-video/xvid4conf/Manifest
@@ -1,3 +1,3 @@
 DIST xvid4conf-1.12.tar.gz 133494 BLAKE2B cafe728bd85d2f34ba382d672d38b60378e632358ea7a03b9e3599c8a415517c6a84678a04383fbb2480e3ef35890a134c8fb6aa98eeeea8aac2fe9566282fc9 SHA512 277b081563b3e9ec2e3c78cf0ea7c504acf0585c0184ee359d0174be38c4c32b931360ce543193df3b323083d21a58d2ff94380647773c71eebed6928c857f57
-EBUILD xvid4conf-1.12.ebuild 428 BLAKE2B eaee613fed7a00cfa6e776225261da5866ac132095fb930b82986a2a84ad31472a5cd543330a060eea4dabe34cdd512bcc771217f179172e419d27d68286d81c SHA512 ce0c1c23c80317b82f3e2ca59f1beba4fdebb8adcd410fa551ce4286d817cc4733b6f97d32961b74c959a43fb7354d017fd916418488bb9a7413b702f097435f
+EBUILD xvid4conf-1.12.ebuild 429 BLAKE2B 70d5fa25d37f06ed47c9a552935beb46151593d6008ac39c7099ef604ce3039ff2b5831045165bdcf60687b689f9f5a0ec75478975ca72505e12487857b66fff SHA512 6a4fcb03f0458cf8894f5ce0f086bf6d3d7344cb4de99ca622376a5cd7ce46a086b2f3a5a480bc04f82561a28f6dde27272adbeca2d7f0e459e01e8e3c71eee2
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12.ebuild
index 04e927f01a98..1abd32b45fc1 100644
--- a/media-video/xvid4conf/xvid4conf-1.12.ebuild
+++ b/media-video/xvid4conf/xvid4conf-1.12.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
 
 DESCRIPTION="GTK2-configuration dialog for xvid4"
 HOMEPAGE="http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/"
@@ -10,8 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.2.4:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 00e566269885..7c91258de478 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 598a38ee3e84..33f7bb267cb6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jul 2021 17:39:07 +0000
+Sat, 24 Jul 2021 00:38:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index dae4120315e4..233040c09ae1 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 515403 BLAKE2B 2c3efe7a5a7d2ab8e90e9b1bd7118eceae943d57d96054bc9b9f1f28ce3625d956a0ef4b37dc99a8f53983d4cb1c230b5d63cdaf2310372c379209c8703ec67f SHA512 3314ee13046d68813f7a4f6d648d5b31496fb976d5d8456229403081e0e0f9369fa83c271c4d6eb3dbe296b3a72758271782ca5d805b74a5deaa07e14742bafb
-TIMESTAMP 2021-07-17T17:39:10Z
+MANIFEST Manifest.files.gz 517009 BLAKE2B 7dfe2c6f0d3c02fd13a4ff92c8b43527ed90bc991cb77cf23a6b6f4d95a096baf241470cf7a0758af0ac5a10a8c455ea6117a88ca56d9619752cbe7f94a48887 SHA512 a547d3f7e4ce6646a0fd7f1bbc0c170ce1ad5c251ff3df4af3717aeb9fe49d0376f58f7a94715f226b5ed2e9b7f27692afb69b78d807ec8b830b728935a0bcbd
+TIMESTAMP 2021-07-24T00:39:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD7YSZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-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
+klC5Mw/9GsZ9wpwdz+PbVdusr4HHAV59IT+qhg3/55VhmeVfPaFMIsfVpxbhZPtj
+EjaHeBD/iOblkKhN7ctyFMe3Vf/r63bMmhT6ERpV3mKu8h43LsHN5qcjQ4TlvCvD
+kT+IJiMI3LfxdRlYQMGr572aclA/xd194LiPJyUj4j0p2slbrbtzp3OEKTO+BI/a
+6ZVULgMrMowWbAZTeqqusOK1RC5z4URqhAHun+7piyBmtc3tph3KcpQKRpBon2Kv
++6ONA1LzmHrbvEJnjsuTSx1irS1b5prQgU8CPJ6h9Y6QObDDxjmut4JHfC0MBXeI
+RUaIQHxgqfcetTh+WwjY9mGVxVS2NlgCeOUQU5pgKZJ40mWQDbFId2BYs4ih8WzU
+YFl5zbzie3mxyFoo5ssc8/Q/HOoOU+sG6Ld8M8Wu9BwP1us7GE8dRaVrW+xSKkDc
+7Fj09YZbKpD7HiQZOyjf3xK3D6W80ZPs5VujslWE+YPuV/V4sy516hJ2QmYJlFvI
+mrjk3mwocKx/Zyhm45z+g5AkRCA8g2leHNX5SwF38+ZkOXTtIiQdbrO2IT6MoO/Q
+/ticUcLzITIDwfsN5fXUSO1hOAXl3FzDLsUvKw+yPmbIhXIK5bwgHPk5QE/ACdpo
+j0PRo+XX2V1BYzJg1n3aU4M8nVuYaKEah7vp3GhvPiLKxMB9msg=
+=EP+w
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 0db27d5d926b..7f2ba8300b23 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202107-41.xml b/metadata/glsa/glsa-202107-41.xml
new file mode 100644
index 000000000000..2e01572b2113
--- /dev/null
+++ b/metadata/glsa/glsa-202107-41.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-41">
+  <title>Dovecot: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Dovecot, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">dovecot</product>
+  <announced>2021-07-18</announced>
+  <revised count="2">2021-07-18</revised>
+  <bug>797349</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-mail/dovecot" auto="yes" arch="*">
+      <unaffected range="ge">2.3.14.1</unaffected>
+      <vulnerable range="lt">2.3.14.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Dovecot is an open source IMAP and POP3 email server.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Dovecot. 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 Dovecot users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-mail/dovecot-2.3.14.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29157">CVE-2021-29157</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33515">CVE-2021-33515</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-17T16:37:03Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-18T03:45:21Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-42.xml b/metadata/glsa/glsa-202107-42.xml
new file mode 100644
index 000000000000..8b6fc8a9b409
--- /dev/null
+++ b/metadata/glsa/glsa-202107-42.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-42">
+  <title>PJSIP: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in PJSIP, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">pjproject</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>775359</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/pjproject" auto="yes" arch="*">
+      <unaffected range="ge">2.10-r1</unaffected>
+      <vulnerable range="lt">2.10-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PJSIP is a free and open source multimedia communication library written
+      in C language implementing standard based protocols such as SIP, SDP,
+      RTP, STUN, TURN, and ICE.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in PJSIP. 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 PJSIP users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-libs/pjproject-2.10-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15260">CVE-2020-15260</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-21375">CVE-2021-21375</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-16T02:16:25Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T03:48:47Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-43.xml b/metadata/glsa/glsa-202107-43.xml
new file mode 100644
index 000000000000..aa7e48b71929
--- /dev/null
+++ b/metadata/glsa/glsa-202107-43.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-43">
+  <title>RPM: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in RPM, the worst of which
+    could result in remote code execution.
+  </synopsis>
+  <product type="ebuild">rpm</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>778533</bug>
+  <bug>787944</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-arch/rpm" auto="yes" arch="*">
+      <unaffected range="ge">4.16.1.3</unaffected>
+      <vulnerable range="lt">4.16.1.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Red Hat Package Manager (RPM) is a command line driven package
+      management system capable of installing, uninstalling, verifying,
+      querying, and updating computer software packages.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in RPM. 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 RPM users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-arch/rpm-4.16.1.3"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20266">CVE-2021-20266</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20271">CVE-2021-20271</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3421">CVE-2021-3421</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-16T01:57:38Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T04:06:54Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-44.xml b/metadata/glsa/glsa-202107-44.xml
new file mode 100644
index 000000000000..30a974dc968c
--- /dev/null
+++ b/metadata/glsa/glsa-202107-44.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-44">
+  <title>libslirp: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libslirp, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">libslirp</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>796347</bug>
+  <access>local</access>
+  <affected>
+    <package name="net-libs/libslirp" auto="yes" arch="*">
+      <unaffected range="ge">4.6.0</unaffected>
+      <vulnerable range="lt">4.6.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libslirp is a TCP/IP emulator used to provide virtual networking
+      services.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libslirp. 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 libslirp users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-libs/libslirp-4.6.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3592">CVE-2021-3592</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3593">CVE-2021-3593</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3594">CVE-2021-3594</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3595">CVE-2021-3595</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-10T00:29:05Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T04:11:18Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-45.xml b/metadata/glsa/glsa-202107-45.xml
new file mode 100644
index 000000000000..253cc37b6db7
--- /dev/null
+++ b/metadata/glsa/glsa-202107-45.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-45">
+  <title>PyCharm Community, Professional: Remote code execution</title>
+  <synopsis>A vulnerability has been found in PyCharm Community and
+    Professional, potentially resulting in arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">pycharm</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>797892</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-util/pycharm-community" auto="yes" arch="*">
+      <unaffected range="ge">2021.1.2</unaffected>
+      <vulnerable range="lt">2021.1.2</vulnerable>
+    </package>
+    <package name="dev-util/pycharm-professional" auto="yes" arch="*">
+      <unaffected range="ge">2021.1.2</unaffected>
+      <vulnerable range="lt">2021.1.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PyCharm is the Python IDE for professional developers.</p>
+  </background>
+  <description>
+    <p>Insufficient validation exists within PyCharm’s checks for fetching
+      projects from VCS.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>If a victim can be enticed into fetching a VCS project via PyCharm, a
+      remote attacker could achieve remote code execution.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All PyCharm Community users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=dev-util/pycharm-community-2021.1.2"
+    </code>
+    
+    <p>All PyCharm Professional users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=dev-util/pycharm-professional-2021.1.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30005">CVE-2021-30005</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-16T02:00:34Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T04:13:01Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-46.xml b/metadata/glsa/glsa-202107-46.xml
new file mode 100644
index 000000000000..2c4b4415bdd9
--- /dev/null
+++ b/metadata/glsa/glsa-202107-46.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-46">
+  <title>mpv: Format string vulnerability</title>
+  <synopsis>A format string vulnerability was found in mpv, potentially
+    resulting in arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">mpv</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>780474</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-video/mpv" auto="yes" arch="*">
+      <unaffected range="ge">0.33.1</unaffected>
+      <vulnerable range="lt">0.33.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Video player based on MPlayer/mplayer2.</p>
+  </background>
+  <description>
+    <p>mpv uses untrusted input within format strings.</p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted m3u
+      playlist file using mpv, 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 mpv users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-video/mpv-0.33.1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30145">CVE-2021-30145</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-16T02:03:07Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T04:16:47Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-47.xml b/metadata/glsa/glsa-202107-47.xml
new file mode 100644
index 000000000000..39653c3ca06c
--- /dev/null
+++ b/metadata/glsa/glsa-202107-47.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-47">
+  <title>libpano13: Format string vulnerability</title>
+  <synopsis>A format string vulnerability has been found in libpano13,
+    potentially resulting in arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">libpano13</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>780486</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/libpano13" auto="yes" arch="*">
+      <unaffected range="ge">2.9.20</unaffected>
+      <vulnerable range="lt">2.9.20</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libpano13 is Helmut Dersch’s panorama toolbox library.</p>
+  </background>
+  <description>
+    <p>A format string issue exists within panoFileOutputNamesCreate() where
+      unvalidated input is passed directly into the formatter.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted file
+      using libpano13, 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 libpano13 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/libpano13-2.9.20"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20307">CVE-2021-20307</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-16T01:54:06Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T04:19:22Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-48.xml b/metadata/glsa/glsa-202107-48.xml
new file mode 100644
index 000000000000..93798cdc8b89
--- /dev/null
+++ b/metadata/glsa/glsa-202107-48.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-48">
+  <title>systemd: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in systemd, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">systemd</product>
+  <announced>2021-07-20</announced>
+  <revised count="1">2021-07-20</revised>
+  <bug>789399</bug>
+  <bug>803041</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="sys-apps/systemd" auto="yes" arch="*">
+      <unaffected range="ge">248.5</unaffected>
+      <vulnerable range="lt">248.5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A system and service manager.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in systemd. 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 systemd users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-apps/systemd-248.5"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-13529">CVE-2020-13529</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33910">CVE-2021-33910</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-20T18:35:40Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-20T19:14:28Z">ajak</metadata>
+</glsa>
+
diff --git a/metadata/glsa/glsa-202107-49.xml b/metadata/glsa/glsa-202107-49.xml
new file mode 100644
index 000000000000..66db2e9ee5f0
--- /dev/null
+++ b/metadata/glsa/glsa-202107-49.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-49">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">chromium, google-chrome</product>
+  <announced>2021-07-22</announced>
+  <revised count="2">2021-07-22</revised>
+  <bug>802540</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">91.0.4472.164</unaffected>
+      <vulnerable range="lt">91.0.4472.164</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">91.0.4472.164</unaffected>
+      <vulnerable range="lt">91.0.4472.164</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in chromium, and
+      google-chrome. Please review the CVE identifiers referenced below for
+      details.
+    </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 Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-91.0.4472.164"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-91.0.4472.164"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30541">CVE-2021-30541</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30559">CVE-2021-30559</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30560">CVE-2021-30560</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30561">CVE-2021-30561</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30562">CVE-2021-30562</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30563">CVE-2021-30563</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30564">CVE-2021-30564</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-19T02:47:55Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-22T04:51:59Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-50.xml b/metadata/glsa/glsa-202107-50.xml
new file mode 100644
index 000000000000..147944a9d215
--- /dev/null
+++ b/metadata/glsa/glsa-202107-50.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-50">
+  <title>Singularity: Remote code execution</title>
+  <synopsis>A vulnerability in Singularity could result in remote code
+    execution.
+  </synopsis>
+  <product type="ebuild">singularity</product>
+  <announced>2021-07-22</announced>
+  <revised count="1">2021-07-22</revised>
+  <bug>792465</bug>
+  <access>remote</access>
+  <affected>
+    <package name="sys-cluster/singularity" auto="yes" arch="*">
+      <unaffected range="ge">3.7.4</unaffected>
+      <vulnerable range="lt">3.7.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Singularity is the container platform for performance sensitive
+      workloads.
+    </p>
+  </background>
+  <description>
+    <p>Singularity always uses the default remote endpoint,
+      ‘cloud.syslabs.io’, for action commands using the ‘library://’
+      URI rather than the configured remote endpoint.
+    </p>
+  </description>
+  <impact type="high">
+    <p>An attacker that that can push a malicious container to the default
+      remote endpoint could execute code on hosts that fetch the container.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Singularity users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-cluster/singularity-3.7.4"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32635">CVE-2021-32635</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-19T02:57:15Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-22T04:54:09Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 598a38ee3e84..33f7bb267cb6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jul 2021 17:39:07 +0000
+Sat, 24 Jul 2021 00:38:58 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 4a0f4bdf44a0..5a39cf9d5775 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-8869d4a8d53cf7ba0e777627877b7a395ba645d6 1626498718 2021-07-17T05:11:58+00:00
+b771364599953f210f7a780b5aacba265c26034b 1626929656 2021-07-22T04:54:16+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5588deb52f39..b5d18a2fb85a 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 6b5bc2a6436f..76cbf804c074 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/redsocks-0 b/metadata/md5-cache/acct-group/redsocks-0
deleted file mode 100644
index db1851ca655a..000000000000
--- a/metadata/md5-cache/acct-group/redsocks-0
+++ /dev/null
@@ -1,7 +0,0 @@
-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/redsocks-0-r1 b/metadata/md5-cache/acct-group/redsocks-0-r1
new file mode 100644
index 000000000000..f0c9602ab6ed
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redsocks-0-r1
@@ -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_=2c7476d51a14d3aea7b28564647cfe3c
diff --git a/metadata/md5-cache/acct-group/speech-0 b/metadata/md5-cache/acct-group/speech-0
deleted file mode 100644
index fedcd321da62..000000000000
--- a/metadata/md5-cache/acct-group/speech-0
+++ /dev/null
@@ -1,7 +0,0 @@
-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-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 92c5656c296e..9f2a2ec7e44b 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/axtls-0 b/metadata/md5-cache/acct-user/axtls-0
new file mode 100644
index 000000000000..f5f8216c1f37
--- /dev/null
+++ b/metadata/md5-cache/acct-user/axtls-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/axtls
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=44cedc1e0721ae08d51b1514e8f287af
diff --git a/metadata/md5-cache/acct-user/beanstalk-0 b/metadata/md5-cache/acct-user/beanstalk-0
new file mode 100644
index 000000000000..bbed386961f5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/beanstalk-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/beanstalk
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d428bab06befd35f4b2de7c601ee0f53
diff --git a/metadata/md5-cache/acct-user/bitflu-0 b/metadata/md5-cache/acct-user/bitflu-0
new file mode 100644
index 000000000000..394853d10dc7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitflu-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/bitflu
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ddb48332cd63899e18c3712a4de7e9f1
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0 b/metadata/md5-cache/acct-user/burrow_exporter-0
new file mode 100644
index 000000000000..f74b70cb1ab9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/burrow_exporter-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/burrow_exporter
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=622376bf956b6f6191f9a4123148d48f
diff --git a/metadata/md5-cache/acct-user/cron-0 b/metadata/md5-cache/acct-user/cron-0
new file mode 100644
index 000000000000..714f7dbf2d19
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cron-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/cron
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=c2819ca285608b93f49f335b68e466db
diff --git a/metadata/md5-cache/acct-user/dbskkd-0 b/metadata/md5-cache/acct-user/dbskkd-0
new file mode 100644
index 000000000000..ed2d7ef61ecc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dbskkd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/dbskkd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=0d63b9757f7a8cfd70a9101d007cc477
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0
new file mode 100644
index 000000000000..6a86de84aa0e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/elasticsearch_exporter-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/elasticsearch_exporter
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=763f09c625c4daf28c5eb37ba3b7e92c
diff --git a/metadata/md5-cache/acct-user/fluentd-0 b/metadata/md5-cache/acct-user/fluentd-0
new file mode 100644
index 000000000000..6c5c43c2e707
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fluentd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/fluentd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=27a030b3f9f8bd1c20cb192db1e1a7dd
diff --git a/metadata/md5-cache/acct-user/foldingathome-0 b/metadata/md5-cache/acct-user/foldingathome-0
new file mode 100644
index 000000000000..f37850092d8c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/foldingathome-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/foldingathome acct-group/video
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=15354c7a83738a10ac4cf490281d3c3c
diff --git a/metadata/md5-cache/acct-user/ftp-0-r1 b/metadata/md5-cache/acct-user/ftp-0-r1
deleted file mode 100644
index 25ccec022f0e..000000000000
--- a/metadata/md5-cache/acct-user/ftp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=File Transfer Protocol server user
-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/ftp
-SLOT=0
-_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c150a949dec5fda9e200a3714241e1a8
diff --git a/metadata/md5-cache/acct-user/ftp-0-r2 b/metadata/md5-cache/acct-user/ftp-0-r2
new file mode 100644
index 000000000000..a621c7c56ed8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ftp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=File Transfer Protocol (FTP) server user
+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/ftp
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b30cd98f638410794bf799c6d4336c70
diff --git a/metadata/md5-cache/acct-user/gauth-0 b/metadata/md5-cache/acct-user/gauth-0
new file mode 100644
index 000000000000..5646db47cdd8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gauth-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/gauth
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ace589234d55c74382bfbe3ddedc998d
diff --git a/metadata/md5-cache/acct-user/gopherd-0 b/metadata/md5-cache/acct-user/gopherd-0
new file mode 100644
index 000000000000..03bcff52f496
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gopherd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/gopherd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5e858a349a9de4d5c926f028264698a4
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0 b/metadata/md5-cache/acct-user/grok_exporter-0
new file mode 100644
index 000000000000..3c4c8c56e101
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grok_exporter-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/grok_exporter
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ba5327500a75647a6757e628d2a2843f
diff --git a/metadata/md5-cache/acct-user/h2o-0 b/metadata/md5-cache/acct-user/h2o-0
new file mode 100644
index 000000000000..d317eb503b2f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/h2o-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/h2o
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=84d34875c5c2b0d96294b7c7a6e76243
diff --git a/metadata/md5-cache/acct-user/hacluster-0 b/metadata/md5-cache/acct-user/hacluster-0
new file mode 100644
index 000000000000..1320ef1eb837
--- /dev/null
+++ b/metadata/md5-cache/acct-user/hacluster-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/haclient
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=a4785e58af07bbb098c8dfceab3e8550
diff --git a/metadata/md5-cache/acct-user/icecast-0 b/metadata/md5-cache/acct-user/icecast-0
new file mode 100644
index 000000000000..6ece2fffc0f1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecast-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/icecast
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=738823659241bc06f5909906818561cd
diff --git a/metadata/md5-cache/acct-user/icecream-0 b/metadata/md5-cache/acct-user/icecream-0
new file mode 100644
index 000000000000..183ffd9dfc4b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecream-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/icecream
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=3db4fae16a7e1bff79225ffc82a794ed
diff --git a/metadata/md5-cache/acct-user/monkeyd-0 b/metadata/md5-cache/acct-user/monkeyd-0
new file mode 100644
index 000000000000..5d069679ae10
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeyd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/monkeyd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=94b756967fe12cbb5adaaa57eafb487d
diff --git a/metadata/md5-cache/acct-user/munge-0 b/metadata/md5-cache/acct-user/munge-0
new file mode 100644
index 000000000000..6d2117070c26
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munge-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/munge
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=e95e51d8ee577c03505c085f675dbf41
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0 b/metadata/md5-cache/acct-user/nm-openconnect-0
new file mode 100644
index 000000000000..03055db17cdc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openconnect-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/nm-openconnect
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=63065cf78508e8ec5e09aab52f51685f
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0 b/metadata/md5-cache/acct-user/nm-openvpn-0
new file mode 100644
index 000000000000..4d233563de21
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openvpn-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/nm-openvpn
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4927ffdf1a2a6f32a90e602952917260
diff --git a/metadata/md5-cache/acct-user/pushgateway-0 b/metadata/md5-cache/acct-user/pushgateway-0
new file mode 100644
index 000000000000..211b80231de0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pushgateway-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/pushgateway
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=bc6d33f7e01abe59db15140d536e13ef
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0 b/metadata/md5-cache/acct-user/rabbitmq-0
new file mode 100644
index 000000000000..5f97dececf09
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rabbitmq-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/rabbitmq
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d467de7a64836dda882d58be82960873
diff --git a/metadata/md5-cache/acct-user/rbot-0 b/metadata/md5-cache/acct-user/rbot-0
new file mode 100644
index 000000000000..4532bed48347
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rbot-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/rbot
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=23149f84d3c38f70ad5235003d69a3ca
diff --git a/metadata/md5-cache/acct-user/redsocks-0 b/metadata/md5-cache/acct-user/redsocks-0
deleted file mode 100644
index 754feffcaa15..000000000000
--- a/metadata/md5-cache/acct-user/redsocks-0
+++ /dev/null
@@ -1,8 +0,0 @@
-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/redsocks-0-r1 b/metadata/md5-cache/acct-user/redsocks-0-r1
new file mode 100644
index 000000000000..70a3a46f4444
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redsocks-0-r1
@@ -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_=e3e374c71c79aa536ae22b49212576de
diff --git a/metadata/md5-cache/acct-user/reg-0 b/metadata/md5-cache/acct-user/reg-0
new file mode 100644
index 000000000000..b08d2451d8b9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/reg-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/reg
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=685b4bfe8851f46cb43c66ebd4ac6f96
diff --git a/metadata/md5-cache/acct-user/registry-0 b/metadata/md5-cache/acct-user/registry-0
new file mode 100644
index 000000000000..ae89f0fc6509
--- /dev/null
+++ b/metadata/md5-cache/acct-user/registry-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/registry
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4e13e74f2fd2ec7fb59ab3058ccb9062
diff --git a/metadata/md5-cache/acct-user/ros-0 b/metadata/md5-cache/acct-user/ros-0
new file mode 100644
index 000000000000..d42817e9aebd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ros-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/ros
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ebdfff3b9efedc72e356ccd4beff34d9
diff --git a/metadata/md5-cache/acct-user/subsonic-0 b/metadata/md5-cache/acct-user/subsonic-0
new file mode 100644
index 000000000000..1dbc1879502d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/subsonic-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/subsonic
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7550a1290bc8990ee9e9349fa9cc5aac
diff --git a/metadata/md5-cache/acct-user/thttpd-0 b/metadata/md5-cache/acct-user/thttpd-0
new file mode 100644
index 000000000000..5d3b63eb6563
--- /dev/null
+++ b/metadata/md5-cache/acct-user/thttpd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/thttpd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=9c500ca5a145e084bac10369aeb83b26
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0 b/metadata/md5-cache/acct-user/uwsgi_exporter-0
new file mode 100644
index 000000000000..690ac2139502
--- /dev/null
+++ b/metadata/md5-cache/acct-user/uwsgi_exporter-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/uwsgi_exporter
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=bce237357cc3aea7b4e44bfbdb78fc67
diff --git a/metadata/md5-cache/acct-user/vacation-0 b/metadata/md5-cache/acct-user/vacation-0
new file mode 100644
index 000000000000..cbd4239c4361
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vacation-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user 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
+RDEPEND=acct-group/vacation
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=93d1164c3c05d824a1e108903f829977
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index e5214821f88a..e1c0b5273c39 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/orca-40.0 b/metadata/md5-cache/app-accessibility/orca-40.0
index 92a9de1ba8b5..4106bcb5d35c 100644
--- a/metadata/md5-cache/app-accessibility/orca-40.0
+++ b/metadata/md5-cache/app-accessibility/orca-40.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/40/orca-40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7ecafc9cb7f38cea1c0e3754245b8175
+_md5_=57f99b35d9f203e717b447d72131de40
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ec65923a956a..c66c65cf741e 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/abrt-2.14.2 b/metadata/md5-cache/app-admin/abrt-2.14.2
index 28b3e74bd5ce..a5002b13f53b 100644
--- a/metadata/md5-cache/app-admin/abrt-2.14.2
+++ b/metadata/md5-cache/app-admin/abrt-2.14.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abrt/abrt/archive/2.14.2.tar.gz -> abrt-2.14.2.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=10bdaa17961eb8240fb54509d5dc7e40
+_md5_=917df29dc4ff06b3de4208b78803c23b
diff --git a/metadata/md5-cache/app-admin/abrt-2.14.5 b/metadata/md5-cache/app-admin/abrt-2.14.5
index 51fbd8594610..3836b1817eaf 100644
--- a/metadata/md5-cache/app-admin/abrt-2.14.5
+++ b/metadata/md5-cache/app-admin/abrt-2.14.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abrt/abrt/archive/2.14.5.tar.gz -> abrt-2.14.5.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=10bdaa17961eb8240fb54509d5dc7e40
+_md5_=917df29dc4ff06b3de4208b78803c23b
diff --git a/metadata/md5-cache/app-admin/ansible-4.3.0 b/metadata/md5-cache/app-admin/ansible-4.3.0
new file mode 100644
index 000000000000..cf89d4c95915
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-4.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=>=app-admin/ansible-base-2.11.1 <app-admin/ansible-base-2.12 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-4.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_=aec7f52840eacde43b68f8f2aedbe407
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.3 b/metadata/md5-cache/app-admin/ansible-base-2.11.3
new file mode 100644
index 000000000000..4db68d4b1a9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.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_=638dff5cc980e0d7f39906f2249b45d4
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.2 b/metadata/md5-cache/app-admin/awscli-1.20.2
new file mode 100644
index 000000000000..9006da7303d2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.2
@@ -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.2[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.2[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.2.tar.gz -> awscli-1.20.2.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.3 b/metadata/md5-cache/app-admin/awscli-1.20.3
new file mode 100644
index 000000000000..726b829718c1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.3
@@ -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.3[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.3[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.3.tar.gz -> awscli-1.20.3.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.4 b/metadata/md5-cache/app-admin/awscli-1.20.4
new file mode 100644
index 000000000000..5550edae1d16
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.4
@@ -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.4[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.4[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.4.tar.gz -> awscli-1.20.4.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.5 b/metadata/md5-cache/app-admin/awscli-1.20.5
new file mode 100644
index 000000000000..602cef24da85
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.5
@@ -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.5[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.5[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.5.tar.gz -> awscli-1.20.5.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/calamares-3.2.32.1 b/metadata/md5-cache/app-admin/calamares-3.2.32.1
index 0f790610c3cf..d07fd2e43b37 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.32.1
+++ b/metadata/md5-cache/app-admin/calamares-3.2.32.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.32.1/calamares-3.2.32.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04010c3f9aba29e9700ad29a49e9c828
+_md5_=cfafe9444b77d2602e3ba90d86fba7df
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.2 b/metadata/md5-cache/app-admin/fluentd-1.4.2
index 29ddfc1ea148..7804ee12618a 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=1e0e2ea87c4b6f798c734b2178d1067d
diff --git a/metadata/md5-cache/app-admin/fluentd-1.9.0 b/metadata/md5-cache/app-admin/fluentd-1.9.0
index aee9981aaf61..f324d60efa43 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.9.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=58de2647fdcee221e1fbd2ca12994654
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 953b5d7e4fa5..a48d65acd3c8 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 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	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
+_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=406875fb84f27958d876388a05d78b87
diff --git a/metadata/md5-cache/app-admin/lnav-0.8.5 b/metadata/md5-cache/app-admin/lnav-0.8.5
deleted file mode 100644
index 4391837a2283..000000000000
--- a/metadata/md5-cache/app-admin/lnav-0.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/bzip2:0= dev-db/sqlite:3 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 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.8.5/lnav-0.8.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ec8c1021ac84de0c04a71bca4153184
diff --git a/metadata/md5-cache/app-admin/lnav-0.8.5-r1 b/metadata/md5-cache/app-admin/lnav-0.8.5-r1
new file mode 100644
index 000000000000..b9e00b03ad9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lnav-0.8.5-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 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[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 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= sys-libs/zlib:0=
+SLOT=0
+SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.5/lnav-0.8.5.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3c4020f6ceacf36d8a458934c9a3e4a2
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0 b/metadata/md5-cache/app-admin/lnav-0.9.0
deleted file mode 100644
index dac6d9fe9f56..000000000000
--- a/metadata/md5-cache/app-admin/lnav-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=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_=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
deleted file mode 100644
index 269147e0da89..000000000000
--- a/metadata/md5-cache/app-admin/lnav-0.9.0-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
-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/lnav-0.9.0-r2 b/metadata/md5-cache/app-admin/lnav-0.9.0-r2
new file mode 100644
index 000000000000..9408cbc52ac5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lnav-0.9.0-r2
@@ -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:=[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:=[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_=2dcf502f884118e30ea5dd7776255bdb
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0-r3 b/metadata/md5-cache/app-admin/lnav-0.9.0-r3
new file mode 100644
index 000000000000..daf2730f312a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lnav-0.9.0-r3
@@ -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:=[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:=[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_=c7db8364f18767d37d2c5b5f1cc4f01c
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.1 b/metadata/md5-cache/app-admin/logrotate-3.18.1
index 5ef512a6e0c7..58d651ae4d5d 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.18.1
+++ b/metadata/md5-cache/app-admin/logrotate-3.18.1
@@ -5,10 +5,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=7
 HOMEPAGE=https://github.com/logrotate/logrotate
 IUSE=acl +cron selinux
-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=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.1/logrotate-3.18.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5e22ac0d7b8f402c8818de4fb4303a0
+_md5_=6f100695d578c26d661fee7455005e49
diff --git a/metadata/md5-cache/app-admin/mcelog-178 b/metadata/md5-cache/app-admin/mcelog-178
new file mode 100644
index 000000000000..3c0080dc7602
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-178
@@ -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/v178.tar.gz -> mcelog-178.tar.gz
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a82a9ddfbe364ddbc9f4435bde36523d
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.4 b/metadata/md5-cache/app-admin/mcollective-2.12.4
index c2d65aeefd52..dbc8b9ecaf3d 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.4
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.4.tar.gz -> mcollective-2.12.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f24a50802ecc41c21621cde2fafeb51
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.5 b/metadata/md5-cache/app-admin/mcollective-2.12.5
index eafac8dc9d0f..6a916fd5e613 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.5
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.5.tar.gz -> mcollective-2.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f5d04eace347dfb69b36620c689bcda1
diff --git a/metadata/md5-cache/app-admin/openrc-settingsd-1.1.0 b/metadata/md5-cache/app-admin/openrc-settingsd-1.1.0
new file mode 100644
index 000000000000..9880ab50c2c7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/openrc-settingsd-1.1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen 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 prepare
+DEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon:0= sys-apps/dbus sys-apps/openrc:= sys-auth/polkit
+DESCRIPTION=System settings D-Bus service for OpenRC
+EAPI=7
+HOMEPAGE=https://gitlab.com/postmarketOS/openrc-settingsd/
+IUSE=systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon:0= sys-apps/dbus sys-apps/openrc:= sys-auth/polkit systemd? ( >=sys-apps/systemd-197 ) !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
+SLOT=0
+SRC_URI=https://gitlab.com/postmarketOS/openrc-settingsd/-/archive/v1.1.0/openrc-settingsd-v1.1.0.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd3d76f5b245127f55ab3ac71e1ea95e
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22 b/metadata/md5-cache/app-admin/puppet-5.5.22
index f6b45ead66ad..4f212ff2f4b2 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.22
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4c31d6d737e7901c2f5568bd4d81a10
diff --git a/metadata/md5-cache/app-admin/puppet-7.8.0 b/metadata/md5-cache/app-admin/puppet-7.8.0
index 7743a99521f8..aca3bc264bd3 100644
--- a/metadata/md5-cache/app-admin/puppet-7.8.0
+++ b/metadata/md5-cache/app-admin/puppet-7.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f5ad801dd7098c84e862a5ac5cb0ccf2
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.4.2 b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
index e5fe17897caa..6d8f40236ff9 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.4.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ad076030990dfbd9925c1c1433a6df8
diff --git a/metadata/md5-cache/app-admin/r10k-3.7.0-r2 b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
index cea30cb3a27b..a072b064914b 100644
--- a/metadata/md5-cache/app-admin/r10k-3.7.0-r2
+++ b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/r10k-3.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28d282c583357a835e9da1bb55a6134f
diff --git a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1 b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
deleted file mode 100644
index a02f043d151c..000000000000
--- a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=app-admin/sagan-rules[lognorm?] dev-libs/libpcre geoip? ( dev-libs/geoip ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp ) snort? ( >=net-analyzer/snortsam-2.50 )
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=7
-HOMEPAGE=http://sagan.quadrantsec.com/
-IUSE=geoip +libdnet +lognorm mysql +pcap smtp snort
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/sagan-rules[lognorm?] dev-libs/libpcre geoip? ( dev-libs/geoip ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp ) snort? ( >=net-analyzer/snortsam-2.50 ) mysql? ( net-analyzer/barnyard2[mysql] )
-REQUIRED_USE=mysql? ( libdnet )
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4859d0d62ec1e8842a7f4ff2d5b0b32f
diff --git a/metadata/md5-cache/app-admin/sagan-2.0.1-r4 b/metadata/md5-cache/app-admin/sagan-2.0.1-r4
deleted file mode 100644
index 1e9a26ca79de..000000000000
--- a/metadata/md5-cache/app-admin/sagan-2.0.1-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acct-group/sagan acct-user/sagan app-admin/sagan-rules[lognorm?] dev-libs/libpcre dev-libs/libyaml geoip? ( dev-libs/geoip ) lognorm? ( dev-libs/liblognorm dev-libs/libfastjson:= dev-libs/libestr ) redis? ( dev-libs/hiredis ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp )
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=7
-HOMEPAGE=https://sagan.quadrantsec.com/
-IUSE=geoip +libdnet +lognorm mysql redis +pcap smtp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/sagan acct-user/sagan app-admin/sagan-rules[lognorm?] dev-libs/libpcre dev-libs/libyaml geoip? ( dev-libs/geoip ) lognorm? ( dev-libs/liblognorm dev-libs/libfastjson:= dev-libs/libestr ) redis? ( dev-libs/hiredis ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp ) mysql? ( net-analyzer/barnyard2[mysql] ) virtual/tmpfiles
-REQUIRED_USE=mysql? ( libdnet )
-SLOT=0
-SRC_URI=https://sagan.quadrantsec.com/download/sagan-2.0.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c0b4ce82d2f37785b2cd0e6adc3ef394
diff --git a/metadata/md5-cache/app-admin/sagan-2.0.1-r5 b/metadata/md5-cache/app-admin/sagan-2.0.1-r5
new file mode 100644
index 000000000000..6731f4e38b91
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sagan-2.0.1-r5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=acct-group/sagan acct-user/sagan app-admin/sagan-rules dev-libs/libestr dev-libs/libfastjson:= dev-libs/liblognorm dev-libs/libpcre dev-libs/libyaml geoip? ( dev-libs/geoip ) redis? ( dev-libs/hiredis ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp )
+DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
+EAPI=7
+HOMEPAGE=https://sagan.quadrantsec.com/
+IUSE=geoip +libdnet mysql redis +pcap smtp
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=acct-group/sagan acct-user/sagan app-admin/sagan-rules dev-libs/libestr dev-libs/libfastjson:= dev-libs/liblognorm dev-libs/libpcre dev-libs/libyaml geoip? ( dev-libs/geoip ) redis? ( dev-libs/hiredis ) pcap? ( net-libs/libpcap ) smtp? ( net-libs/libesmtp ) mysql? ( net-analyzer/barnyard2[mysql] ) virtual/tmpfiles
+REQUIRED_USE=mysql? ( libdnet )
+SLOT=0
+SRC_URI=https://sagan.quadrantsec.com/download/sagan-2.0.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c763a7357488fc484e2c96fb7f54277e
diff --git a/metadata/md5-cache/app-admin/sagan-rules-20140617 b/metadata/md5-cache/app-admin/sagan-rules-20140617
deleted file mode 100644
index af6b41f83334..000000000000
--- a/metadata/md5-cache/app-admin/sagan-rules-20140617
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Rules for Sagan log analyzer
-EAPI=6
-HOMEPAGE=http://sagan.softwink.com/
-IUSE=+lognorm
-KEYWORDS=amd64 x86
-LICENSE=BSD
-PDEPEND=app-admin/sagan
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz
-_md5_=552208e92e20bbe31a86a3bd57c50ba8
diff --git a/metadata/md5-cache/app-admin/sagan-rules-20210208 b/metadata/md5-cache/app-admin/sagan-rules-20210208
index c0088ee2b6d1..90c45af5d84a 100644
--- a/metadata/md5-cache/app-admin/sagan-rules-20210208
+++ b/metadata/md5-cache/app-admin/sagan-rules-20210208
@@ -2,10 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Rules for Sagan log analyzer
 EAPI=7
 HOMEPAGE=https://quadrantsec.com/sagan_log_analysis_engine/
-IUSE=+lognorm
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 PDEPEND=app-admin/sagan
 SLOT=0
 SRC_URI=https://quadrantsec.com/rules/sagan-rules-20210208.tar.gz
-_md5_=4d8ba8281e73324dcf471896defb4a9a
+_md5_=87d5939d9c0fb6af9b398ac3cf8098e3
diff --git a/metadata/md5-cache/app-admin/sagan-rules-99999999 b/metadata/md5-cache/app-admin/sagan-rules-99999999
index 096fefc83789..0632c28f1b6f 100644
--- a/metadata/md5-cache/app-admin/sagan-rules-99999999
+++ b/metadata/md5-cache/app-admin/sagan-rules-99999999
@@ -3,10 +3,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Rules for Sagan log analyzer
 EAPI=7
 HOMEPAGE=http://sagan.softwink.com/
-IUSE=+lognorm
 LICENSE=BSD
 PDEPEND=app-admin/sagan
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=bb96b71870612834b92de2445fc6b592
+_md5_=0f03a9c151d74b18b576d2a99b364796
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1 b/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1
index 4178d20df76e..ee8d33f311e5 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.7p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.7p1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d351ca5c151722ce3ea551fbd1f60fbe
+_md5_=8f87dcab15c1b21c4cdaa48b106c34fa
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 59b807911c92..adaa46e7f35d 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb93b7578e13050afe69b081bdc16d5e
+_md5_=7d26e85f3464eeedd2fb35f4d1fcbe63
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.15 b/metadata/md5-cache/app-admin/system-config-printer-1.5.15
index 348655c0ad2c..8a5cb940d769 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.15
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.15
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/v1.5.15/system-config-printer-1.5.15.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=71d59fb29a482a70bfa53056ac439d16
+_md5_=60dcd4030352045c0a589aacda6529b9
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index fcc10fe112f3..d0fdbff1fc78 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
index 834571196c78..8826a3ab85ab 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=7
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml
-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=GPL-2
 RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) dev-libs/openssl:0= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
 REQUIRED_USE=libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a708cd319a2b2e6645444105e479f9f1
+_md5_=bba42423cd774f93c0a0f21796dbc4b5
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9f254cc8f1f9..f3fff8d58326 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/lrzip-0.631_p20190619 b/metadata/md5-cache/app-arch/lrzip-0.631_p20190619
deleted file mode 100644
index 069ccf0358b2..000000000000
--- a/metadata/md5-cache/app-arch/lrzip-0.631_p20190619
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib:= x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=7
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://github.com/ckolivas/lrzip/archive/b9220181288c5c9920ff00f00005b31a9e40e387.tar.gz -> lrzip-0.631_p20190619.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b35ba635d393c6f1840536a3ada1f487
diff --git a/metadata/md5-cache/app-arch/lrzip-0.641 b/metadata/md5-cache/app-arch/lrzip-0.641
deleted file mode 100644
index 8554ee2e44d5..000000000000
--- a/metadata/md5-cache/app-arch/lrzip-0.641
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 dev-libs/lzo app-arch/lz4 sys-libs/zlib virtual/perl-Pod-Parser x86? ( dev-lang/nasm )
-DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
-EAPI=7
-HOMEPAGE=https://github.com/ckolivas/lrzip
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/lzo app-arch/lz4 sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/ckolivas/lrzip/archive/v0.641.tar.gz -> lrzip-0.641.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07c1531628e058b65aad8cc6e4df5204
diff --git a/metadata/md5-cache/app-arch/lrzip-0.641-r1 b/metadata/md5-cache/app-arch/lrzip-0.641-r1
new file mode 100644
index 000000000000..3cdfd3f1cb27
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lrzip-0.641-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 install prepare
+DEPEND=app-arch/bzip2 dev-libs/lzo app-arch/lz4 sys-libs/zlib dev-perl/Pod-Parser x86? ( dev-lang/nasm )
+DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
+EAPI=7
+HOMEPAGE=https://github.com/ckolivas/lrzip
+IUSE=static-libs
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/lzo app-arch/lz4 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/ckolivas/lrzip/archive/v0.641.tar.gz -> lrzip-0.641.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fe04a621b27fb56db538a2d0d21b68c5
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.7.3 b/metadata/md5-cache/app-arch/par2cmdline-0.7.3
deleted file mode 100644
index 15759d882b15..000000000000
--- a/metadata/md5-cache/app-arch/par2cmdline-0.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-IUSE=openmp
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.3/par2cmdline-0.7.3.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8a07c57f99641f6da64a4ea20cb5a6d
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.7.4 b/metadata/md5-cache/app-arch/par2cmdline-0.7.4
deleted file mode 100644
index 5abf03306089..000000000000
--- a/metadata/md5-cache/app-arch/par2cmdline-0.7.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend setup test
-DESCRIPTION=A PAR-2.0 file verification and repair tool
-EAPI=6
-HOMEPAGE=https://github.com/Parchive/par2cmdline
-IUSE=openmp
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.4/par2cmdline-0.7.4.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7127893d1a1a1400e3974e8c0eb6030
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.1 b/metadata/md5-cache/app-arch/par2cmdline-0.8.1
new file mode 100644
index 000000000000..78ddccd78634
--- /dev/null
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.8.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=pretend setup test
+DESCRIPTION=A PAR-2.0 file verification and repair tool
+EAPI=7
+HOMEPAGE=https://github.com/Parchive/par2cmdline
+IUSE=openmp
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.1/par2cmdline-0.8.1.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a1a6812937459c2f4fc6d4f37ff4813c
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.0 b/metadata/md5-cache/app-arch/zstd-1.5.0
index af628bf31d0b..b3240ee5587f 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.0
+++ b/metadata/md5-cache/app-arch/zstd-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.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_=f967128b0669517f074370f436085440
+_md5_=47bbec7d9f257181ce6e3ee4b7ff8cfe
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index fb0cff6ca03c..21fe69658014 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/backintime-1.2.1 b/metadata/md5-cache/app-backup/backintime-1.2.1
index 903fff599766..09086db09e96 100644
--- a/metadata/md5-cache/app-backup/backintime-1.2.1
+++ b/metadata/md5-cache/app-backup/backintime-1.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/bit-team/backintime/releases/download/v1.2.1/backintime-1.2.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5c3448766c90d5429152051081e69c0
+_md5_=1173a91616900c5d7f86bed5e42ee1e0
diff --git a/metadata/md5-cache/app-backup/backintime-9999 b/metadata/md5-cache/app-backup/backintime-9999
index 5e8bf1aac9f0..c86648d3d070 100644
--- a/metadata/md5-cache/app-backup/backintime-9999
+++ b/metadata/md5-cache/app-backup/backintime-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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7c8e06f88fa977cd4894ca0c43c331a5
+_md5_=8af7992d62576d1176b22adfb7061faa
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.17 b/metadata/md5-cache/app-backup/borgbackup-1.1.17
index b0c1a9f5c51c..1e3dd128e8e4 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.17
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.17
@@ -5,11 +5,11 @@ DESCRIPTION=Deduplicating backup program with compression and authenticated encr
 EAPI=7
 HOMEPAGE=https://borgbackup.readthedocs.io/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.17.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a3644624cb00287998f94d3815089475
+_md5_=1cb423bdd4c1d451ed11c9bdb994aa8b
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.15 b/metadata/md5-cache/app-backup/borgmatic-1.5.15
index 685fe1ef03e5..fcc284de89e5 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.15
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.15
@@ -4,7 +4,7 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 ~riscv
 LICENSE=GPL-3
 RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.15.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
+_md5_=6a309074f4af1392bdc2600073342731
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 5baded1d0cb0..40c1b0f492f9 100644
--- a/metadata/md5-cache/app-backup/snapper-0.9.0-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=7
 HOMEPAGE=http://snapper.io/
 IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.0.tar.gz -> snapper-0.9.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31c8980576dcc15fe6acb0d73e5409b2
+_md5_=07d28f347a2d4372a2ada5bc680af176
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index c49ad634e91a..3b996568af2b 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 12403d471483..7584d6fdf617 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.4
@@ -11,4 +11,4 @@ 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	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
+_md5_=984de6e146b1e60afb3b86bbce7efbde
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.5 b/metadata/md5-cache/app-cdr/cdemu-3.2.5
index 34f2497f1d6f..2755c88da3d7 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.5
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.5
@@ -11,4 +11,4 @@ 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	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
+_md5_=d37fb68a8870126c837f09c0e7863d59
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
deleted file mode 100644
index 50188cd675c5..000000000000
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
-DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
-EAPI=7
-HOMEPAGE=http://cdw.sourceforge.net
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b15ea88942aa9d61f9cbcaf53ea4bb7
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1-r2 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r2
new file mode 100644
index 000000000000..f2feec1c9701
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
+EAPI=7
+HOMEPAGE=http://cdw.sourceforge.net
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2+
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0d0ff2aa274a109844d32ff8bafc85a9
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index a87010be28d5..433bea24a763 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -1,12 +1,12 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
 DEFINED_PHASES=configure prepare unpack
-DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:=[unicode(+)]
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=7
 HOMEPAGE=http://cdw.sourceforge.net
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cvs	8f8740beb4ce1deaae8393cfc28d2ed1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=944dee03a4b236fc1d384fa20789983f
+_md5_=fa0baa4d13975c554e5ba41cd8e9cef5
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.4 b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
index 59dcd0fea8bc..58f9d6e1acf7 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.4.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	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_=7773d9859ee6ebdda9a306c77bda7561
+_md5_=542108337f8ee00adfa86f4c382508ac
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.5 b/metadata/md5-cache/app-cdr/gcdemu-3.2.5
index d39256b2fae8..7a8b939e4111 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.5
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.5
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	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_=07b90bb3afa576a2e914781be8ade49a
+_md5_=fccb5b8992a347e373ef0a112d943926
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e43fa5e114f8..0961535ea267 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/libmd-1.0.3 b/metadata/md5-cache/app-crypt/libmd-1.0.3
index 60fb6988009f..b3ef7026ec67 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Message Digest functions from BSD systems
 EAPI=7
 HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 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 BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
-_md5_=b93255a7ecc0f42845a49f2b3aa66759
+_md5_=1d2405586c1ea98268c9de3de7f1d07a
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3-r1 b/metadata/md5-cache/app-crypt/libmd-1.0.3-r1
index 56053aa0e1ff..92d34ea201fa 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3-r1
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3-r1
@@ -3,9 +3,9 @@ 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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
+_md5_=36232bfaa0d8a3e8e003cdf3bb28671a
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.21 b/metadata/md5-cache/app-crypt/libscrypt-1.21
index 40342e3f222e..625aa379e308 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.21
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile setup
 DESCRIPTION=Shared library to impliment the scrypt algorithm
 EAPI=6
 HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2729a2b007a876f4948fede0c7c4fbd1
+_md5_=fa46025dd482ec9f0e07fce60889cc2b
diff --git a/metadata/md5-cache/app-crypt/nwipe-0.31 b/metadata/md5-cache/app-crypt/nwipe-0.31
new file mode 100644
index 000000000000..411693d2bd7f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nwipe-0.31
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=prepare
+DEPEND=sys-block/parted sys-libs/ncurses:=
+DESCRIPTION=Securely erase disks using a variety of recognized methods
+EAPI=8
+HOMEPAGE=https://github.com/martijnvanbrummelen/nwipe/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-block/parted sys-libs/ncurses:=
+SLOT=0
+SRC_URI=https://github.com/martijnvanbrummelen/nwipe/archive/v0.31.tar.gz -> nwipe-0.31.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba6cf2e7364182a17c588f629b28bd91
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
index 72d6d3144da8..274ac7dc211a 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.1.5.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=252e3edd91381c54603692fa2a6ebd99
+_md5_=b300f6d58d694d83a67d3e34f0cdce87
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
index 00bfad6d0cd8..305a54a1fc27 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.2.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=89ff177d8dfcd93f7a2f8dbde8674da3
+_md5_=1e5e1eb949a3ed39c89c62dd1c91e9de
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index baeb7eb2b793..14cc94ea32b0 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/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 6cd3b68f0dbf..a1626d90b244 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bd17095789e877f00c2839e3293870f
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
index e08f3514f228..5db88783e544 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cdict-big5-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=9cb5a4cc39685b2ac07094ebed4b689f
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
index 985d861e33a9..15cbfca5831e 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cdict-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=feadab5829a32c0fb69d767740918465
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
index 5b9ec44abcc2..bc1f296c67d0 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cedict-big5-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=4671bbe01a9d3b0754bc99186f374457
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
index 2d0555a54d5f..a4232d3a8a5f 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cedict-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=bbe34db76e352667489b6e289448bd24
diff --git a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2 b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
index 89a846590c74..c590af2eaf46 100644
--- a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary for Dictd.org's Devil's Dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/dict.org/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.dict.org_devils-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=159b6d827455a100a4dc41a01498e639
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
index e44a9e5d6cfd..a91d9a5bb61c 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to German
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-deu-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=876e26696845f4a72b0e8aa5b65d236c
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
index 653d9a550852..b15f63fca0c2 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to French
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-fra-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=cdb588590ac4875600558d3b44212c9b
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
index a7fd766c5343..b2feedb061ff 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Italian
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-ita-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=f1aaf8c4c128595cc57a405593206bf2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
index ce570a8b04a4..91bf1ef394ad 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Latin
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-lat-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=1661f6642ffae327a5d7a326a9859e86
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
index 50c385d166ae..ef1be5ff144a 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Russian
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-rus-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=4102c748dafbf47f7a3494d0a93c52b4
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
index 67c0845d3037..10ec30492dbf 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Spanish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-spa-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=c0d457e45bb7947be8a5a64172bfb231
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
index bb2c45cbc38d..a44ca9083c82 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Swedish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-swe-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=5f642b4885d8740aefd457f53ad66555
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
index 462d672bc5ea..85510e73c781 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Turkish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-eng-tur-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=9983db4d08d80e1fb610a126c0f62f19
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
index c1b384dbba02..e58f5ee41348 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Turkish to German
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-deu-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=f51e28aa5de0950b52d3d606ed799a80
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
index cff6d142490f..41626f0c2547 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Turkish to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-eng-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=28b76e571bb294ed50495c332af0f2fa
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
index d1d8c41075f6..959272615754 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Japanese
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/ja/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GDLS
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-en-ja-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=33f6c2ab21332eec3a8f44320baa7d2d
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
index 2062e4d6c718..7c4d5d9948e5 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Japanese to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/ja/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GDLS
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-ja-en-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=ccfbbb2319155df05a1614fbba476927
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
index 78f6d266f62b..631b9f1479e8 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=c3e2cc94b07ed20a752793054ab8b650
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
index 308bb4766c80..85791711149d 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~ppc sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=18bdce15e22fe4332c99a33150352653
diff --git a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2 b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
index 364fdfb66c26..30d5d4b5e21a 100644
--- a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary for Mova.org's Smiley Dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/mova.org/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.mova.org_smiley-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=d18fe45d53cce2c7dfde86e1b2840d31
diff --git a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
index 879e42c70af4..a37704ca91c0 100644
--- a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-oxford-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=372a9e45f7f5fb494cdb0f4987c92768
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
index 360434481386..f45c40a3b4ef 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Japanese Romaji
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_eng-jpn-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=99fb02e4d891eecd33f3530466e444b1
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
index 5246a76d2bb3..35f390e6257b 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Japanese Romaji to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_jpn-eng-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=d55e395f4c4fd1127f69723ec9f15f40
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
index 24495460d8ef..6922c027c672 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Quick but still useful Russian to English dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_rus-eng-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=b2e29d5eb386fd36c4ca5263ec4c10e1
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
index f93307e51655..fdeba7a992d3 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=5e2212480e9344a1926cd757033668d2
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
index 595ede2cf8b2..b84939a64fc3 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=b51389cda9fb30da817a05aea7a8c32a
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
index b560a48d1e5b..87746c1c3fa8 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=83156da90f3c820263f32bdd3c3a6110
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
index 8233ba9bb6dd..26c30e459e5a 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) zlib? ( app-arch/gzip app-text/dictd )
 DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
-IUSE=gzip
+IUSE=+zlib
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
-_eclasses_=stardict	b7e384ed331f1fbaf160ae1633e93398
+_eclasses_=stardict	79e5bfe5aa1045dcced8e85032fcc790
 _md5_=6baacac9abf61b87ac91bf5050376e4e
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.3 b/metadata/md5-cache/app-dicts/ydpdict-1.0.3
deleted file mode 100644
index e7559c308db1..000000000000
--- a/metadata/md5-cache/app-dicts/ydpdict-1.0.3
+++ /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
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-dicts/libydpdict sys-libs/ncurses[unicode] ao? ( media-libs/libao )
-DESCRIPTION=Interface for the Collins Dictionary
-EAPI=7
-HOMEPAGE=https://github.com/wojtekka/ydpdict
-IUSE=ao
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-dicts/libydpdict sys-libs/ncurses[unicode] ao? ( media-libs/libao )
-SLOT=0
-SRC_URI=https://github.com/wojtekka/ydpdict/archive/1.0.3.tar.gz -> ydpdict-1.0.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c4cf68ec56ff0f9a75c92a2b8a27cda
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1 b/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
new file mode 100644
index 000000000000..47fa299f7ae1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-dicts/libydpdict sys-libs/ncurses:=[unicode(+)] ao? ( media-libs/libao )
+DESCRIPTION=Interface for the Collins Dictionary
+EAPI=7
+HOMEPAGE=https://github.com/wojtekka/ydpdict
+IUSE=ao
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-dicts/libydpdict sys-libs/ncurses:=[unicode(+)] ao? ( media-libs/libao )
+SLOT=0
+SRC_URI=https://github.com/wojtekka/ydpdict/archive/1.0.3.tar.gz -> ydpdict-1.0.3.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c400284d90aaa1e06ebd3a81d558fe16
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 0572c17dab13..25c6c3393855 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/cppman-0.5.1 b/metadata/md5-cache/app-doc/cppman-0.5.1
index c776fa244bf2..5d8cdb363421 100644
--- a/metadata/md5-cache/app-doc/cppman-0.5.1
+++ b/metadata/md5-cache/app-doc/cppman-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/aitjcize/cppman/archive/0.5.1.tar.gz -> cppman-0.5.1.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_=f5186d3e34f95afdd3783aa014966e60
+_md5_=c1fa377ea563da7c473b789a725a5ca1
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 7ec23fa24e41..cd03a03a8121 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index 81e660871380..4ee161ae348e 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f45beb9be7a40380eb406afe664f0d52
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4-r1 b/metadata/md5-cache/app-editors/diakonos-0.9.4-r1
new file mode 100644
index 000000000000..c2a229c361df
--- /dev/null
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/curses[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/curses[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/curses[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/bacon[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/bacon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) test? ( dev-ruby/bacon[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 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 )
+DESCRIPTION=A Linux editor for the masses
+EAPI=7
+HOMEPAGE=http://diakonos.pist0s.ca
+IUSE=doc test test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/curses[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/curses[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/curses[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e1ec28b5e5029fb3cc81d1749f93da77
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r13 b/metadata/md5-cache/app-editors/emacs-18.59-r13
deleted file mode 100644
index b30ec122b095..000000000000
--- a/metadata/md5-cache/app-editors/emacs-18.59-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) gui? ( x11-base/xorg-proto x11-misc/xbitmaps )
-DESCRIPTION=The extensible self-documenting text editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=abi_x86_x32 gui
-KEYWORDS=amd64 x86
-LICENSE=GPL-1+ GPL-2+ BSD HPND
-RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) app-eselect/eselect-emacs
-SLOT=18
-SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-13.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc62f984947a76994b68f4c15b8dbc7c
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r14 b/metadata/md5-cache/app-editors/emacs-18.59-r14
new file mode 100644
index 000000000000..59e0a9067b6d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r14
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) gui? ( x11-base/xorg-proto x11-misc/xbitmaps )
+DESCRIPTION=The extensible self-documenting text editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+IUSE=abi_x86_x32 gui
+KEYWORDS=amd64 x86
+LICENSE=GPL-1+ GPL-2+ BSD HPND
+RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) app-eselect/eselect-emacs
+SLOT=18
+SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-13.tar.xz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c81038dbea3830f52f781aa7e14e3584
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r20 b/metadata/md5-cache/app-editors/emacs-23.4-r20
deleted file mode 100644
index 1eb29834d52d..000000000000
--- a/metadata/md5-cache/app-editors/emacs-23.4-r20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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 preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) 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 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) 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 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=23
-SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d17a0e00792adf39360e5062a35bea75
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r21 b/metadata/md5-cache/app-editors/emacs-23.4-r21
new file mode 100644
index 000000000000..122b5991d666
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r21
@@ -0,0 +1,15 @@
+BDEPEND=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=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) 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 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext 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=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) 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 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=23
+SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae02fe88c10db19053acc6b39fed4fa8
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r10 b/metadata/md5-cache/app-editors/emacs-24.5-r10
deleted file mode 100644
index f9011d27f278..000000000000
--- a/metadata/md5-cache/app-editors/emacs-24.5-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs 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
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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-eselect/eselect-emacs
-SLOT=24
-SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a423288854a459a8bdb6a99b68994a8
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r11 b/metadata/md5-cache/app-editors/emacs-24.5-r11
new file mode 100644
index 000000000000..5a5d203b4ffa
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r11
@@ -0,0 +1,15 @@
+BDEPEND=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=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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 dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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-eselect/eselect-emacs
+SLOT=24
+SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c1657c71a61023d9f07e3c76fbd295c2
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r10 b/metadata/md5-cache/app-editors/emacs-25.3-r10
new file mode 100644
index 000000000000..708b79e86747
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r10
@@ -0,0 +1,15 @@
+BDEPEND=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=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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 gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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-eselect/eselect-emacs
+SLOT=25
+SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dcabfad91b45830461e90470fab19c88
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r9 b/metadata/md5-cache/app-editors/emacs-25.3-r9
deleted file mode 100644
index cbdd90450cfe..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.3-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs 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
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !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-eselect/eselect-emacs
-SLOT=25
-SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df1954ff18af06a06141d3dbd99ff627
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r4 b/metadata/md5-cache/app-editors/emacs-26.3-r4
deleted file mode 100644
index 986a0d379d02..000000000000
--- a/metadata/md5-cache/app-editors/emacs-26.3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs 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
-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 ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) 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 ) 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
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg 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 ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) 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 ) 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-26.3 app-eselect/eselect-emacs
-SLOT=26
-SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5cf1c43941413d77d6ba472338bd8daf
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r5 b/metadata/md5-cache/app-editors/emacs-26.3-r5
new file mode 100644
index 000000000000..77cf858034a9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r5
@@ -0,0 +1,15 @@
+BDEPEND=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 ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) 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 ) 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 gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg 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 ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) 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 ) 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-eselect/eselect-emacs
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.3.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_=e085be17ea99b563c10daef9e00ff245
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r2 b/metadata/md5-cache/app-editors/emacs-27.2-r2
deleted file mode 100644
index a7532b3d194a..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-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=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk 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	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=90f1cb95862da6f5b84c62b957ef6b12
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r3 b/metadata/md5-cache/app-editors/emacs-27.2-r3
index e67b82a961c9..efd3880bf9f5 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r3
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r3
@@ -6,11 +6,11 @@ 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
+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
+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-eselect/eselect-emacs !app-editors/emacs-vcs:27
 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
+_md5_=3a17f939a7694833241739badfc47c4f
diff --git a/metadata/md5-cache/app-editors/emacs-27.2.9999 b/metadata/md5-cache/app-editors/emacs-27.2.9999
index cae5f91dddef..1a839b19508b 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2.9999
+++ b/metadata/md5-cache/app-editors/emacs-27.2.9999
@@ -8,8 +8,8 @@ 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
+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-eselect/eselect-emacs !app-editors/emacs-vcs:27
 RESTRICT=test
 SLOT=27-vcs
 _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
+_md5_=2786a2824026f127a2c2fd5dcd13142d
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 35c563e57a94..a3f3cb1faaa4 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -12,4 +12,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=28-vcs
 _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
+_md5_=a2a1f3ac7ec19c8aace714283a5b6983
diff --git a/metadata/md5-cache/app-editors/featherpad-0.18.0 b/metadata/md5-cache/app-editors/featherpad-0.18.0
new file mode 100644
index 000000000000..508cd097a878
--- /dev/null
+++ b/metadata/md5-cache/app-editors/featherpad-0.18.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
+EAPI=7
+HOMEPAGE=https://github.com/tsujan/FeatherPad
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/tsujan/FeatherPad/archive/V0.18.0.tar.gz -> featherpad-0.18.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f5e7458b4789e560bc39ad315e1ad92c
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-40.1 b/metadata/md5-cache/app-editors/gedit-plugins-40.1
index 8eed3fba56bc..86f8ece9b246 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-40.1
+++ b/metadata/md5-cache/app-editors/gedit-plugins-40.1
@@ -12,4 +12,4 @@ REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_ta
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit-plugins/40/gedit-plugins-40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a706346dbb6958401058ca5850db6386
+_md5_=327d771e79d5534e73a55b25576df17c
diff --git a/metadata/md5-cache/app-editors/gummi-0.8.1 b/metadata/md5-cache/app-editors/gummi-0.8.1
deleted file mode 100644
index 41bf99ba2eda..000000000000
--- a/metadata/md5-cache/app-editors/gummi-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm
-DEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
-DESCRIPTION=Simple LaTeX editor for GTK+ users
-EAPI=7
-HOMEPAGE=https://github.com/alexandervdm/gummi
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/alexandervdm/gummi/releases/download/0.8.1/gummi-0.8.1.tar.gz
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f091ca8db1bb5ca702b8e775393dd053
diff --git a/metadata/md5-cache/app-editors/gummi-0.8.2 b/metadata/md5-cache/app-editors/gummi-0.8.2
index 4b764786a6bb..1301b8584eec 100644
--- a/metadata/md5-cache/app-editors/gummi-0.8.2
+++ b/metadata/md5-cache/app-editors/gummi-0.8.2
@@ -4,10 +4,10 @@ DEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/t
 DESCRIPTION=Simple LaTeX editor for GTK+ users
 EAPI=7
 HOMEPAGE=https://github.com/alexandervdm/gummi
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/alexandervdm/gummi/releases/download/0.8.2/gummi-0.8.2.tar.gz
 _eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=874ce54e47250a92fcdac22205257340
+_md5_=3785034917f94f9d48345a9f3a76bc18
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601 b/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601
deleted file mode 100644
index d01db6191d85..000000000000
--- a/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Modal editor inspired by vim
-EAPI=7
-HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Unlicense
-RDEPEND=sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://github.com/mawww/kakoune/archive/6fa26b8dd2ac0931fe688370728c47086277d883.tar.gz -> kakoune-2020.01.16_p20200601.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1501afe3c5c36a48482a4e423f052010
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1 b/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1
new file mode 100644
index 000000000000..430b370b442e
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Modal editor inspired by vim
+EAPI=7
+HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://github.com/mawww/kakoune/archive/6fa26b8dd2ac0931fe688370728c47086277d883.tar.gz -> kakoune-2020.01.16_p20200601.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=011171b5fba48aa686a4107059d6f1b3
diff --git a/metadata/md5-cache/app-editors/nano-5.6.1 b/metadata/md5-cache/app-editors/nano-5.6.1
deleted file mode 100644
index 13f1d4ca393d..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bd20eccaa88a084e8829ff279585e7a
diff --git a/metadata/md5-cache/app-editors/nano-5.6.1-r2 b/metadata/md5-cache/app-editors/nano-5.6.1-r2
new file mode 100644
index 000000000000..b7c136fa7862
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-5.6.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
+REQUIRED_USE=magic? ( !minimal )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.6.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a863d05a3c5b0dac8fc5ae80be4dd5a6
diff --git a/metadata/md5-cache/app-editors/nano-5.7 b/metadata/md5-cache/app-editors/nano-5.7
deleted file mode 100644
index 576aff9bf2a7..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=266ae1743ec51e3bad8fc968c417430a
diff --git a/metadata/md5-cache/app-editors/nano-5.7-r2 b/metadata/md5-cache/app-editors/nano-5.7-r2
new file mode 100644
index 000000000000..efb3ae936caf
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-5.7-r2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
+REQUIRED_USE=magic? ( !minimal )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.7.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=20498f592b00b3dafaa219c9ebe700ba
diff --git a/metadata/md5-cache/app-editors/nano-5.8 b/metadata/md5-cache/app-editors/nano-5.8
deleted file mode 100644
index 26c65c3433d5..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=266ae1743ec51e3bad8fc968c417430a
diff --git a/metadata/md5-cache/app-editors/nano-5.8-r2 b/metadata/md5-cache/app-editors/nano-5.8-r2
new file mode 100644
index 000000000000..420c5fe435dd
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-5.8-r2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
+REQUIRED_USE=magic? ( !minimal )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.8.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=20498f592b00b3dafaa219c9ebe700ba
diff --git a/metadata/md5-cache/app-editors/nano-9999 b/metadata/md5-cache/app-editors/nano-9999
index fb5d7851ff82..9fdf4c5e76e4 100644
--- a/metadata/md5-cache/app-editors/nano-9999
+++ b/metadata/md5-cache/app-editors/nano-9999
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
 DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=7
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
 REQUIRED_USE=magic? ( !minimal )
 SLOT=0
 _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_=266ae1743ec51e3bad8fc968c417430a
+_md5_=20498f592b00b3dafaa219c9ebe700ba
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 33edc739d190..905c3dfbbd46 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/apel-10.8_p20201106 b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
new file mode 100644
index 000000000000..032b9ad45d8c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/apel
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/apel/archive/4e3269b6e702db2dba48cf560563ac883e81e3bf.tar.gz -> apel-10.8_p20201106.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=9295542c92af73815614f84e1d36c8fe
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
new file mode 100644
index 000000000000..3859f1cdf75f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8
+DESCRIPTION=A library to provide basic features about message representation or encoding
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/flim
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/flim/archive/02735dede6603987e8309a76d0bc7a9ff9a5a227.tar.gz -> flim-1.14.9_p20210529.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=458f7f0be03bc4c3e153153415ad0f99
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
new file mode 100644
index 000000000000..d500e2163ee2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9
+DESCRIPTION=A library to provide MIME feature for GNU Emacs
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/semi
+IUSE=l10n_ja
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/semi/archive/509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f.tar.gz -> semi-1.14.7_p20210613.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=ecfd53265c8f733a781321d090b8db8b
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
deleted file mode 100644
index 1d20021667c5..000000000000
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
-DESCRIPTION=Yet Another Message Interface on Emacsen
-EAPI=6
-HOMEPAGE=https://github.com/wanderlust/wanderlust
-IUSE=bbdb ssl l10n_ja
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=3b273324dfe9f52d5f05814ce7376cf3
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
new file mode 100644
index 000000000000..be6d6316a448
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb )
+DESCRIPTION=Yet Another Message Interface on Emacsen
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/wanderlust
+IUSE=bbdb ssl l10n_ja
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/wanderlust/archive/769699d60aa033049804083b459ee562b82db77e.tar.gz -> wanderlust-2.15.9_p20210629.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=2e23bedb3326db8309d758ee7cd2f0f0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 55521deb618f..cd219c1946a5 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/aqemu-0.9.2 b/metadata/md5-cache/app-emulation/aqemu-0.9.2
deleted file mode 100644
index 9bed0e0a043b..000000000000
--- a/metadata/md5-cache/app-emulation/aqemu-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
-DESCRIPTION=Graphical interface for QEMU and KVM emulators, using Qt5
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/aqemu
-IUSE=vnc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
-SLOT=0
-SRC_URI=https://github.com/tobimensch/aqemu/archive/v0.9.2.tar.gz -> aqemu-0.9.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_=a12046682954f639f66094487055a32d
diff --git a/metadata/md5-cache/app-emulation/aqemu-0.9.2-r1 b/metadata/md5-cache/app-emulation/aqemu-0.9.2-r1
new file mode 100644
index 000000000000..d9317714780e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/aqemu-0.9.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
+DESCRIPTION=Graphical interface for QEMU and KVM emulators, using Qt5
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/aqemu
+IUSE=vnc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
+SLOT=0
+SRC_URI=https://github.com/tobimensch/aqemu/archive/v0.9.2.tar.gz -> aqemu-0.9.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_=ce8f0f49f6e4437c397ef76ddb237db2
diff --git a/metadata/md5-cache/app-emulation/containerd-1.4.8 b/metadata/md5-cache/app-emulation/containerd-1.4.8
new file mode 100644
index 000000000000..b0af5cc42364
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.4.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig test? ( btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0 ) >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=7
+HOMEPAGE=https://containerd.io/
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0
+RESTRICT=strip strip test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.4.8.tar.gz -> containerd-1.4.8.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=787170963c6d5909141127bdf4e1cff9
diff --git a/metadata/md5-cache/app-emulation/containerd-1.5.4 b/metadata/md5-cache/app-emulation/containerd-1.5.4
new file mode 100644
index 000000000000..38c903db15dc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.5.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=7
+HOMEPAGE=https://containerd.io/
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0
+RESTRICT=strip strip test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.5.4.tar.gz -> containerd-1.5.4.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3119933dc2a5bcc6acfa7018964b5951
diff --git a/metadata/md5-cache/app-emulation/crun-0.19.1 b/metadata/md5-cache/app-emulation/crun-0.19.1
index 0b359660331d..88c060bb3850 100644
--- a/metadata/md5-cache/app-emulation/crun-0.19.1
+++ b/metadata/md5-cache/app-emulation/crun-0.19.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written
 EAPI=7
 HOMEPAGE=https://github.com/containers/crun
 IUSE=+bpf +caps criu +seccomp systemd static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ppc64
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/crun/releases/download/0.19.1/crun-0.19.1.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_=6b0d04aed4be5366a903ad28131dda19
+_md5_=f9bf89df768f8173524f5a9ce05d5408
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 7879d80e4244..ff372a7038d0 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
@@ -5,7 +5,7 @@ DESCRIPTION=Multi-container orchestration for Docker
 EAPI=7
 HOMEPAGE=https://github.com/docker/compose
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/websocket-client-0.32.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 )
@@ -13,4 +13,4 @@ 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	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
+_md5_=6a88eb902592ff87142c7501180bdfc6
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.1 b/metadata/md5-cache/app-emulation/docker-registry-2.7.1
deleted file mode 100644
index 1f5ce65f5e7c..000000000000
--- a/metadata/md5-cache/app-emulation/docker-registry-2.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Docker Registry 2.0
-EAPI=6
-HOMEPAGE=https://github.com/docker/distribution
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/docker/distribution/archive/v2.7.1.tar.gz -> docker-registry-2.7.1.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=4352cd067311cda72e0b2e6afd146e45
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.1-r1 b/metadata/md5-cache/app-emulation/docker-registry-2.7.1-r1
new file mode 100644
index 000000000000..f0ddcd4d281d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.7.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=acct-group/registry acct-user/registry
+DESCRIPTION=Docker Registry 2.0
+EAPI=7
+HOMEPAGE=https://github.com/docker/distribution
+KEYWORDS=amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB
+RDEPEND=acct-group/registry acct-user/registry
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/docker/distribution/archive/v2.7.1.tar.gz -> docker-registry-2.7.1.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a88a08b73c066ac9b52495de4735165
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
index ee69f3923ae2..b1a515673311 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://fs-uae.net/stable/3.0.5/fs-uae-launcher-3.0.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b097081ff2fb9bcca0717c189c0eb50
+_md5_=55e7c239b87d625ba822895cc6e96907
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7
deleted file mode 100644
index 25e7f6f24097..000000000000
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7
+++ /dev/null
@@ -1,14 +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 postinst prepare test
-DEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
-DESCRIPTION=A standalone version of the WINE parts of Gallium Nine
-EAPI=7
-HOMEPAGE=https://github.com/iXit/wine-nine-standalone
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.7.tar.gz -> gallium-nine-standalone-0.7.tar.gz
-_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_=93bc8599f018cb8b7792822b6613be48
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7-r1 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7-r1
new file mode 100644
index 000000000000..7f0ebf18cf5f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
+DESCRIPTION=A standalone version of the WINE parts of Gallium Nine
+EAPI=7
+HOMEPAGE=https://github.com/iXit/wine-nine-standalone
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.7.tar.gz -> gallium-nine-standalone-0.7.tar.gz
+_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_=ec7364502a958af555a42fb695dd0473
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8
deleted file mode 100644
index 15302ea6b090..000000000000
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8
+++ /dev/null
@@ -1,14 +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 prepare test
-DEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
-DESCRIPTION=A standalone version of the WINE parts of Gallium Nine
-EAPI=7
-HOMEPAGE=https://github.com/iXit/wine-nine-standalone
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.8.tar.gz -> gallium-nine-standalone-0.8.tar.gz
-_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_=12e8977527541dadabafa0a75e817e20
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8-r1 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8-r1
new file mode 100644
index 000000000000..44a85c006fc9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.8-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
+DESCRIPTION=A standalone version of the WINE parts of Gallium Nine
+EAPI=7
+HOMEPAGE=https://github.com/iXit/wine-nine-standalone
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.8.tar.gz -> gallium-nine-standalone-0.8.tar.gz
+_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_=341cd6135943d8a05d0738278ec99365
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
index 9101f477b46b..129686549cea 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=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 prepare test unpack
-DEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
+DEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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 virtual/wine[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/meson-0.50.1
 DESCRIPTION=A standalone version of the WINE parts of Gallium Nine
 EAPI=7
 HOMEPAGE=https://github.com/iXit/wine-nine-standalone
 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=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=media-libs/mesa[d3d9,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	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_=12e8977527541dadabafa0a75e817e20
+_md5_=341cd6135943d8a05d0738278ec99365
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.10 b/metadata/md5-cache/app-emulation/lxc-4.0.10
new file mode 100644
index 000000000000..ce7b7e9327f7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.10
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) man? ( app-text/docbook-sgml-utils ) 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=configure install postinst prepare setup unpack
+DEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= ) >=sys-kernel/linux-headers-4 apparmor? ( sys-apps/apparmor )
+DESCRIPTION=A userspace interface for the Linux kernel containment features
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
+IUSE=apparmor +caps doc man pam seccomp selinux +ssl +tools verify-sig kernel_linux verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz.asc )
+_eclasses_=autotools	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_=efe2d3d53779f21a91ad8a0f3a8bdc8d
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.6 b/metadata/md5-cache/app-emulation/lxc-4.0.6
deleted file mode 100644
index 12e628496ad5..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-4.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) man? ( app-text/docbook-sgml-utils ) 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=configure install postinst prepare setup unpack
-DEPEND=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= ) >=sys-kernel/linux-headers-4 apparmor? ( sys-apps/apparmor )
-DESCRIPTION=A userspace interface for the Linux kernel containment features
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
-IUSE=apparmor +caps doc examples man pam selinux +ssl +tools verify-sig kernel_linux verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-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	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/lxd-4.0.5 b/metadata/md5-cache/app-emulation/lxd-4.0.5
deleted file mode 100644
index b89573eaf6ab..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-4.0.5
+++ /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.5.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.5.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_=b972eac46fcae382786968506af627f7
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7 b/metadata/md5-cache/app-emulation/lxd-4.0.7
new file mode 100644
index 000000000000..e80833af84fc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.7
@@ -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[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?]
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
+IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
+_eclasses_=autotools	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_=0e0cf9c4a82d660b7b5731f95b2c5c81
diff --git a/metadata/md5-cache/app-emulation/nemu-2.2.1 b/metadata/md5-cache/app-emulation/nemu-2.2.1
deleted file mode 100644
index 0ec97729e798..000000000000
--- a/metadata/md5-cache/app-emulation/nemu-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] virtual/libusb:1 virtual/libudev:= network-map? ( media-gfx/graphviz ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
-DESCRIPTION=ncurses interface for QEMU
-EAPI=7
-HOMEPAGE=https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/
-IUSE=debug network-map +ovf savevm spice +vnc-client kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] virtual/libusb:1 virtual/libudev:= network-map? ( media-gfx/graphviz ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
-SLOT=0
-SRC_URI=https://lib.void.so/src/nemu-2.2.1.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	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_=83f9b4345078c47ac7de9ef061a7e658
diff --git a/metadata/md5-cache/app-emulation/nemu-2.5.0 b/metadata/md5-cache/app-emulation/nemu-2.5.0
deleted file mode 100644
index 155fac1bae6e..000000000000
--- a/metadata/md5-cache/app-emulation/nemu-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive ) spice? ( app-emulation/virt-viewer ) vnc-client? ( net-misc/tigervnc )
-DESCRIPTION=ncurses interface for QEMU
-EAPI=7
-HOMEPAGE=https://github.com/nemuTUI/nemu
-IUSE=dbus network-map +ovf +savevm spice +vnc-client kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive ) spice? ( app-emulation/virt-viewer ) vnc-client? ( net-misc/tigervnc )
-SLOT=0
-SRC_URI=https://github.com/nemuTUI/nemu/archive/v2.5.0.tar.gz -> nemu-2.5.0.tar.gz
-_eclasses_=cmake	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_=6553f98687afa5b298a5c9efab2951d4
diff --git a/metadata/md5-cache/app-emulation/nemu-2.5.0-r1 b/metadata/md5-cache/app-emulation/nemu-2.5.0-r1
new file mode 100644
index 000000000000..ff5b6e42cd8c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/nemu-2.5.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:=[unicode(+)] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive:= ) spice? ( app-emulation/virt-viewer ) vnc-client? ( net-misc/tigervnc )
+DESCRIPTION=ncurses interface for QEMU
+EAPI=7
+HOMEPAGE=https://github.com/nemuTUI/nemu
+IUSE=dbus network-map +ovf +savevm spice +vnc-client kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=BSD-2
+RDEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:=[unicode(+)] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive:= ) spice? ( app-emulation/virt-viewer ) vnc-client? ( net-misc/tigervnc )
+SLOT=0
+SRC_URI=https://github.com/nemuTUI/nemu/archive/v2.5.0.tar.gz -> nemu-2.5.0.tar.gz
+_eclasses_=cmake	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_=0abf9eaecddd24633249bcbde550c056
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.5.0 b/metadata/md5-cache/app-emulation/protontricks-1.5.0
deleted file mode 100644
index 9ba4c0ef7b61..000000000000
--- a/metadata/md5-cache/app-emulation/protontricks-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( 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/pytest-4.5.0[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_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(-)] )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-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
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Matoking/protontricks/archive/1.5.0.tar.gz -> protontricks-1.5.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_=94567ea1a521ba952b6c4eeb57535652
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0 b/metadata/md5-cache/app-emulation/qemu-6.0.0
deleted file mode 100644
index 96d86c6fcdd8..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=7
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	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-r2 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r2
new file mode 100644
index 000000000000..290fc54e51c7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0-r2
@@ -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/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=7
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	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_=976b50056243320d1dd70800a3c5d748
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0-r50 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r50
deleted file mode 100644
index 45a3f5d9b919..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0-r50
+++ /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/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=7
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	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-6.0.0-r52 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r52
new file mode 100644
index 000000000000..4ebf031004ab
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0-r52
@@ -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/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=7
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	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_=734ebd046475cfc0a80b6b4bc9f718c7
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 82cfdf17c32e..774a7d67d176 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,15 +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/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test unpack
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
 PROPERTIES=live
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) 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	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
+_md5_=77cd2cc41db50b3fd447963bec0416a5
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0 b/metadata/md5-cache/app-emulation/runc-1.0.0
new file mode 100644
index 000000000000..89336a5794ae
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man test? ( seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) ) >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=runc container cli tools
+EAPI=7
+HOMEPAGE=http://runc.io
+IUSE=apparmor hardened +kmem +seccomp test kernel_linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 BSD MIT
+RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0.tar.gz -> runc-1.0.0.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=196e5cb279951af7ffb05aea88dbf93e
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 3553c4731a9d..16635ce8ddd0 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 29e5335071e0..72ffab988383 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a83c665ce1731beda4ac8a4b1901aa30
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
index 3c29e91d79b5..2744c912ef86 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0944aba08786f30938bfdfa9c65b1be4
+_md5_=0f08ab3a92c4eef2f203544e3c04ab27
diff --git a/metadata/md5-cache/app-emulation/virt-manager-3.1.0 b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
index a73e94bd4bca..167cedc11446 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-3.1.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-3.1.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4a4853c42631f3efc7cba69a0561d199
+_md5_=80fc2f6c8ad825092a5ffe325b507344
diff --git a/metadata/md5-cache/app-emulation/virt-manager-3.2.0 b/metadata/md5-cache/app-emulation/virt-manager-3.2.0
index 7ddf770dbad7..a3b3c3512292 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-3.2.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-3.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8a11b368e88fe15b9ea96012e78a6e9
+_md5_=046fb4d748b2c585bce82dce8046dc59
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 21b5c2beee57..e18bf94338d7 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e24f423f90b78cd04b8c0730dfc3af2
+_md5_=28a716395be1a990af45f093d2951cbc
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-10.0 b/metadata/md5-cache/app-emulation/virt-viewer-10.0
new file mode 100644
index 000000000000..512b0a553896
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-viewer-10.0
@@ -0,0 +1,15 @@
+BDEPEND=>=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/libxml2-2.6 x11-libs/gtk+:3 libvirt? ( >=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib ) spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] ) dev-lang/perl >=dev-util/intltool-0.35.0 virtual/pkgconfig spice? ( >=app-emulation/spice-protocol-0.12.10 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical console client for connecting to virtual machines
+EAPI=7
+HOMEPAGE=https://virt-manager.org/
+IUSE=+libvirt sasl +spice +vnc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.6 x11-libs/gtk+:3 libvirt? ( >=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib ) spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )
+REQUIRED_USE=|| ( spice vnc )
+SLOT=0
+SRC_URI=https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a871683403ee493592a7226b01f0d857
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-6.1.18
deleted file mode 100644
index 4ca66141d5ce..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.18 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_single_target_python3_8
-KEYWORDS=amd64
-LICENSE=GPL-2 dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.18 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-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	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
deleted file mode 100644
index 9bdb3a6cf49c..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
+++ /dev/null
@@ -1,15 +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] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend 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] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64
-LICENSE=GPL-2 dtrace? ( CDDL )
-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-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.20 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-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	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 0e1f956ed006..fcb3eb5d447b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
@@ -5,11 +5,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 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-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 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	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
+_md5_=1224462583c468ce9abc056c64c3dcf2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
new file mode 100644
index 000000000000..e8d05837ff3f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend 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] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+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-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	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/virtualbox-additions-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.18
deleted file mode 100644
index 9619409ea7cb..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.18/VBoxGuestAdditions_6.1.18.iso
-_md5_=6f23e298f9ab8601d56e84810d9fcfa2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.20
deleted file mode 100644
index 15e4f078cbc6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VBoxGuestAdditions_6.1.20.iso
-_md5_=6f23e298f9ab8601d56e84810d9fcfa2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22
index 19e79ff1e395..bc69867da123 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VBoxGuestAdditions_6.1.22.iso
-_md5_=80f9f8c9f0b5bc3f0d6b48d7ee475909
+_md5_=6f23e298f9ab8601d56e84810d9fcfa2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
new file mode 100644
index 000000000000..4d299e6bb927
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VBoxGuestAdditions_6.1.24.iso
+_md5_=b37f764c5c2bf5615fd5e21626dab41e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
deleted file mode 100644
index 08e7d3fdb95a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL
-RDEPEND==app-emulation/virtualbox-6.1.18*
-RESTRICT=bindist mirror strip
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.18/Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b60ac2290951628b381f8f53b447e44
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896
deleted file mode 100644
index e13c165dba55..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL
-RDEPEND==app-emulation/virtualbox-6.1.20*
-RESTRICT=bindist mirror strip
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b60ac2290951628b381f8f53b447e44
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080
index dd420aab5ee3..5cf0381635bf 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PUEL
 RDEPEND==app-emulation/virtualbox-6.1.22*
 RESTRICT=bindist mirror strip
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=270809ce3a3573669395beeece58dbce
+_md5_=3b60ac2290951628b381f8f53b447e44
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
new file mode 100644
index 000000000000..377a9c4f841e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL
+RDEPEND==app-emulation/virtualbox-6.1.24*
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/Oracle_VM_VirtualBox_Extension_Pack-6.1.24.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz
+_md5_=b6de3102051de498175db036d04dc144
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.18-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.18-r1
deleted file mode 100644
index ecab1dae5e0f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.18-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
index 64659fbd75a4..bc429ae25f7e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
@@ -5,11 +5,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a4ebba934a79712629084ad6317d591
+_md5_=85b58b1b74775adf82cf2f925dcfce04
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
new file mode 100644
index 000000000000..3f52ebb847f7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9a4ebba934a79712629084ad6317d591
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
deleted file mode 100644
index 295897572837..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 Modules for Virtualbox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db1e6b917021544fa3ac3a1849124945
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20
deleted file mode 100644
index 70fd561fb780..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 Modules for Virtualbox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.20.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
index 735085883612..3c1cb114380b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.22.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70dced3490aa85e1aff06e9590f7e46f
+_md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
new file mode 100644
index 000000000000..af7a19773d3c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare 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 Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.24.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=70dced3490aa85e1aff06e9590f7e46f
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.13 b/metadata/md5-cache/app-emulation/wine-staging-6.13
new file mode 100644
index 000000000000..bfc22e6a7509
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.13
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.13.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.13.tar.gz -> wine-staging-6.13.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	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f4b52e9fed9bfa9413e6ec84fc7f03db
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.9 b/metadata/md5-cache/app-emulation/wine-staging-6.9
deleted file mode 100644
index d714f3452ddc..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.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	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-vanilla-6.13 b/metadata/md5-cache/app-emulation/wine-vanilla-6.13
new file mode 100644
index 000000000000..a23b2ab248de
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.13
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.13.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	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
deleted file mode 100644
index ed5283e418d5..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.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	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/xen-tools-4.14.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
index ef5588d51d6b..91d4f6c88351 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
@@ -12,4 +12,4 @@ 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	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
+_md5_=c31ac92b8118ee111fffcb9c7bd99a09
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
index 5e17cdabf505..ee1dd2ef10f1 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
@@ -12,4 +12,4 @@ 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
+_md5_=8367925bd4205dc1d3bbd8e930afa1b8
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 5eab7203be3f..2e24b107859a 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.1 b/metadata/md5-cache/app-eselect/eselect-blas-0.1
index 98efa01719a6..d24c511bd4e2 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS module for eselect
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=5202a1d9cd6d0bffef84661c416d2a24
+_md5_=b3470497b61920dc6f2eaf9ebdb106e1
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.0 b/metadata/md5-cache/app-eselect/eselect-java-0.4.0
deleted file mode 100644
index d4ea1fc5f567..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-java-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A set of eselect modules for Java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!app-eselect/eselect-ecj !app-eselect/eselect-maven !<dev-java/java-config-2.2 app-admin/eselect
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.0.tar.xz
-_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_=2e2749de86ddd3fd10a9f3f099e4702d
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.2 b/metadata/md5-cache/app-eselect/eselect-java-0.4.2
index 00ff48207a87..eac7199e535d 100644
--- a/metadata/md5-cache/app-eselect/eselect-java-0.4.2
+++ b/metadata/md5-cache/app-eselect/eselect-java-0.4.2
@@ -3,10 +3,10 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=A set of eselect modules for Java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!app-eselect/eselect-ecj !app-eselect/eselect-maven !<dev-java/java-config-2.2 app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8bd65b4cf712470c7b6cd2d9ff58a16
+_md5_=0a7484b13c95bbd79b685c542679167e
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-10 b/metadata/md5-cache/app-eselect/eselect-repository-10
index 75fb53e3680b..acd1051825b7 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-10
+++ b/metadata/md5-cache/app-eselect/eselect-repository-10
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v10.tar.gz -> eselect-repository-10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=697ee66d0238958436f24cca4fe54a07
+_md5_=863a0fe917ef0da991296e6935ceafdd
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20201225 b/metadata/md5-cache/app-eselect/eselect-ruby-20201225
index abfef7f936fe..8e7d1381b473 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20201225
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20201225
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Ruby
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20201225.xz
-_md5_=f0ffb13ed942f6345e9531d8bdd7e4e2
+_md5_=51bcbe3e351e997971cdeda1cf1428cf
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 6abb98f6bb55..849f3cfce3bf 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/aflplusplus-3.13c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
index b5c3a42b6f0f..6b5430e00dd8 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
 EAPI=7
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 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-devel/llvm-10:= || ( sys-devel/clang:10 sys-devel/clang:11 sys-devel/clang:12 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.13c.tar.gz -> aflplusplus-3.13c.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2106260b82d820ffc0169191f0e622bb
+_md5_=d27f18918395a0992fcf4db55176692b
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
new file mode 100644
index 000000000000..9b6100da0de9
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=sys-devel/llvm-10:= || ( sys-devel/clang:10 sys-devel/clang:11 sys-devel/clang:12 sys-devel/clang:13 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
+DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
+EAPI=7
+HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+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-devel/llvm-10:= || ( sys-devel/clang:10 sys-devel/clang:11 sys-devel/clang:12 sys-devel/clang:13 ) !app-forensics/afl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.14c.tar.gz -> aflplusplus-3.14c.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2c3fdb0fbbce3de4a90f2c767d0389f3
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index ce9e980a7f1b..086c0420d17e 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/dbskkd-cdb-2.00 b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
deleted file mode 100644
index ab85ac098a46..000000000000
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
-DESCRIPTION=SKK dictionary server based on cdb
-EAPI=6
-HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD-2
-RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/dbskkd-cdb/dbskkd-cdb-2.00.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_=e855c03ba4bf338b018530648f20b196
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1 b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1
new file mode 100644
index 000000000000..50e77357c7c1
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
+DESCRIPTION=SKK dictionary server based on cdb
+EAPI=7
+HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
+KEYWORDS=amd64 ppc x86
+LICENSE=BSD-2
+RDEPEND=acct-group/dbskkd acct-user/dbskkd app-i18n/skk-jisyo[cdb] sys-apps/xinetd
+SLOT=0
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/dbskkd-cdb/dbskkd-cdb-2.00.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5dcd4310ceded5fc1153292eae28075c
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00 b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
deleted file mode 100644
index bceb962cb8a9..000000000000
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
-DESCRIPTION=SKK dictionary server based on cdb
-EAPI=6
-HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
-SLOT=0
-SRC_URI=https://github.com/jj1bdx/dbskkd-cdb/archive/3.00.tar.gz -> dbskkd-cdb-3.00.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_=b78b4eefe4c09f690822a4396355b7ad
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1 b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
new file mode 100644
index 000000000000..0cfc216a388d
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
+DESCRIPTION=SKK dictionary server based on cdb
+EAPI=7
+HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=acct-group/dbskkd acct-user/dbskkd app-i18n/skk-jisyo[cdb] sys-apps/xinetd
+SLOT=0
+SRC_URI=https://github.com/jj1bdx/dbskkd-cdb/archive/3.00.tar.gz -> dbskkd-cdb-3.00.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4a335904ba6d62e62467ab467a037b9d
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
index ad18a782279b..b90b5ee5cc77 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.10/ibus-anthy-1.5.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=71a6ce568e59596c42b2f69e9c7cd4f0
+_md5_=a7acb409f81859c6889849a9e2dc3065
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
index 1714fd2cd942..1aa2a8ce474b 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.11/ibus-anthy-1.5.11.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=01b0e0f274c1f5dd455f317c84960c4b
+_md5_=bb24b3d6a0625eff49f7ff5251a0efb3
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
index bc324fb435a7..f4483fba0674 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.3/ibus-hangul-1.5.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e651a5b13a2addbb281db25241bb12a
+_md5_=3c6a5afc0b097bb7c984b1d479418084
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
index 8c616cde4b07..72e7b265631c 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6d1f2a1660d605640ef20d614be232b0
+_md5_=9c939c025ff7cda02897225a073f7cc9
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
index cffb34a48f09..b7ab6fa826a8 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.11.92.tar.gz -> ibus-libpinyin-1.11.92.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b05a7bcd88e1cacc7714c1c9ca82aeb
+_md5_=ff1d439962a7c6ffba3834b3ac08add3
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
index 50bdce7674a4..2eec9afb677e 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=198926e6111408300f1c3c31995f4141
+_md5_=633eea1c34ad80167b345fcbdceea9c3
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
index 24541d7690aa..d48033f38565 100644
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03ec75813e88776a828a22a05b4fc15c
+_md5_=62f015746ed8955b1182b6419c7812d3
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.12.4 b/metadata/md5-cache/app-i18n/ibus-table-1.12.4
index e79cd0b87ede..649c909aefef 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.12.4
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.12.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.12.4/ibus-table-1.12.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8cad2dc678d4728f526ad4b728975ee0
+_md5_=f01702679fef5ff589cdcb962fed4e23
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.13.3 b/metadata/md5-cache/app-i18n/ibus-table-1.13.3
index ae86e18da650..525263d867ae 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.13.3
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.13.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.13.3/ibus-table-1.13.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=311d88879e96552099dbfad912ac11b0
+_md5_=5282be0289c91995d3ef330d1f53d32d
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.5 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.5
index b217d12480be..e4cc3e774be5 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.5
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.5/ibus-typing-booster-2.10.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1312299875dd399c3bf9995636481447
+_md5_=7682e1612c09a3d88af0ade47c3fcd5c
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.11.5 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.11.5
index bf5e9c6881a6..4b2647a0975c 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.11.5
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.11.5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.11.5/ibus-typing-booster-2.11.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90d740004db077abe3b3ed103cfacab1
+_md5_=7a00b3a96070fd1e07bb4d622c98762e
diff --git a/metadata/md5-cache/app-i18n/libchewing-0.5.1 b/metadata/md5-cache/app-i18n/libchewing-0.5.1
deleted file mode 100644
index 537b8c46c06f..000000000000
--- a/metadata/md5-cache/app-i18n/libchewing-0.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode] )
-DESCRIPTION=Intelligent phonetic (Zhuyin/Bopomofo) input method library
-EAPI=7
-HOMEPAGE=http://chewing.im/ https://github.com/chewing/libchewing
-IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/chewing/libchewing/releases/download/v0.5.1/libchewing-0.5.1.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fdc09beadecc0b17491370dd6f00cb5
diff --git a/metadata/md5-cache/app-i18n/libchewing-0.5.1-r1 b/metadata/md5-cache/app-i18n/libchewing-0.5.1-r1
new file mode 100644
index 000000000000..2d88f156d1d3
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libchewing-0.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode(+)] )
+DESCRIPTION=Intelligent phonetic (Zhuyin/Bopomofo) input method library
+EAPI=7
+HOMEPAGE=http://chewing.im/ https://github.com/chewing/libchewing
+IUSE=static-libs test
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/chewing/libchewing/releases/download/v0.5.1/libchewing-0.5.1.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7f147f56340c1436f19d7d5a54129432
diff --git a/metadata/md5-cache/app-i18n/libchewing-9999 b/metadata/md5-cache/app-i18n/libchewing-9999
index 1928fe48a7fb..f5d7fab43008 100644
--- a/metadata/md5-cache/app-i18n/libchewing-9999
+++ b/metadata/md5-cache/app-i18n/libchewing-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode] )
+DEPEND=dev-db/sqlite:3 test? ( sys-libs/ncurses[unicode(+)] )
 DESCRIPTION=Intelligent phonetic (Zhuyin/Bopomofo) input method library
 EAPI=7
 HOMEPAGE=http://chewing.im/ https://github.com/chewing/libchewing
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=71a6f75f8e7c495712dd01513d97719a
+_md5_=10c39ff8b7b092914a72becf62ac12ab
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-5.06 b/metadata/md5-cache/app-i18n/man-pages-it-5.06
deleted file mode 100644
index 028af2556161..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-it-5.06
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
-EAPI=7
-HOMEPAGE=http://it.tldp.org/man/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-5.06.tar.xz
-_md5_=6d7d62324a848c6c6a4156806cd836ea
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-5.06-r1 b/metadata/md5-cache/app-i18n/man-pages-it-5.06-r1
new file mode 100644
index 000000000000..7bd2a21abd0d
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-it-5.06-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
+EAPI=7
+HOMEPAGE=http://it.tldp.org/man/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-3+
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-5.06.tar.xz
+_md5_=425ea8abb06ed445b68a753b6936a868
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20171215 b/metadata/md5-cache/app-i18n/man-pages-ja-20171215
deleted file mode 100644
index da3ce08cd72e..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20171215
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A collection of manual pages translated into Japanese
-EAPI=6
-HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20171215.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=77ffaa22cd145be4680a0802ea338044
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20171215-r1 b/metadata/md5-cache/app-i18n/man-pages-ja-20171215-r1
new file mode 100644
index 000000000000..1083f7776353
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-ja-20171215-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=A collection of manual pages translated into Japanese
+EAPI=6
+HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20171215.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
+_md5_=f1b7ca2ebfb3ef94b32cc7fe272ab10b
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20180315 b/metadata/md5-cache/app-i18n/man-pages-ja-20180315
deleted file mode 100644
index 8da9c8e6ef66..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20180315
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A collection of manual pages translated into Japanese
-EAPI=6
-HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20180315.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=c8550830b977cd617809fee454213981
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1 b/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1
new file mode 100644
index 000000000000..9f34c301ea85
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=A collection of manual pages translated into Japanese
+EAPI=6
+HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20180315.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
+_md5_=d27574a16b70d028948b6b7f87e9f7b7
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
new file mode 100644
index 000000000000..e9f2f11452f7
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
@@ -0,0 +1,13 @@
+BDEPEND=app-text/po4a dev-lang/perl
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A somewhat comprehensive collection of man page translations
+EAPI=7
+HOMEPAGE=https://manpages-l10n-team.pages.debian.net/manpages-l10n/
+IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_nl l10n_pl l10n_pt-BR l10n_ro
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) l10n_it? ( !app-i18n/man-pages-it ) l10n_nl? ( !app-i18n/man-pages-nl ) l10n_pl? ( !app-i18n/man-pages-pl )
+REQUIRED_USE=|| ( l10n_de l10n_es l10n_fr l10n_it l10n_nl l10n_pl l10n_pt-BR l10n_ro )
+SLOT=0
+SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v4.10.0/manpages-l10n-v4.10.0.tar.bz2
+_md5_=75c11d3f6e979b548f2fb9ec9cd12411
diff --git a/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017 b/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017
deleted file mode 100644
index a88df899b7af..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of Russian translations of Linux manual pages
-EAPI=7
-HOMEPAGE=http://man-pages-ru.sourceforge.net/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=https://download.sourceforge.net/man-pages-ru/source-tar/man-pages-ru_5.03-2390-2390-20191017.tar.bz2
-_md5_=f375ae4080ca0d46217c56f75ffe1abb
diff --git a/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 b/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
new file mode 100644
index 000000000000..49ec199301f5
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A collection of Russian translations of Linux manual pages
+EAPI=7
+HOMEPAGE=http://man-pages-ru.sourceforge.net/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=https://download.sourceforge.net/man-pages-ru/source-tar/man-pages-ru_5.03-2390-2390-20191017.tar.bz2
+_md5_=6de4a976584db3821dc0e9406e46aa73
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 1c7f737889b2..b1d38a660f89 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/pushgateway-1.4.1 b/metadata/md5-cache/app-metrics/pushgateway-1.4.1
deleted file mode 100644
index fb93bd89fd7e..000000000000
--- a/metadata/md5-cache/app-metrics/pushgateway-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DESCRIPTION=Prometheus push acceptor for ephemeral and batch jobs
-EAPI=7
-HOMEPAGE=https://github.com/prometheus/pushgateway
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/pushgateway/archive/v1.4.1.tar.gz -> pushgateway-1.4.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//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/!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/!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.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/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-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/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-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-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/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/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/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/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/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/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/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/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/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.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-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-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-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-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/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/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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/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.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/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.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/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/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.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/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/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/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.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/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.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.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/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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/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/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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.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/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/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%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.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/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/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/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/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/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/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.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/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/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-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.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.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip 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_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.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.19.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.19.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.5.1.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 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/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.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.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/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.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.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/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/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-20200824052919-0d455de96546.zip -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/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/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.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/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/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/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/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.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.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.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.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-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-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-20201208171446-5f87f3452ae9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip 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/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-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-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-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-20200625001655-4c5254603344.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.zip 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/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/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.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-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-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-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-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-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-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-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210309074719-68d13333faf2.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.zip 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/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.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/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-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-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-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-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-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.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.zip 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.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.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/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-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.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.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/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.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.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/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/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.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-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-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//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=fc5f9c1fbdb0eba60bdc54c8dd15be99
diff --git a/metadata/md5-cache/app-metrics/pushgateway-1.4.1-r1 b/metadata/md5-cache/app-metrics/pushgateway-1.4.1-r1
new file mode 100644
index 000000000000..e14abf1e4eab
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/pushgateway-1.4.1-r1
@@ -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=acct-group/pushgateway acct-user/pushgateway
+DESCRIPTION=Prometheus push acceptor for ephemeral and batch jobs
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/pushgateway
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/pushgateway acct-user/pushgateway
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/prometheus/pushgateway/archive/v1.4.1.tar.gz -> pushgateway-1.4.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//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/!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/!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.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/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-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/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-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-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/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/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/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/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/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/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/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/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/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.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-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-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-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-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/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/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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/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.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/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.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/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/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.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/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/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/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.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/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.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.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/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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/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/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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.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/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/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%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.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/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/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/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/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/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/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.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/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/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-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.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.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip 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_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.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.19.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.19.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.5.1.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 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/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.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.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/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.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.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/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/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-20200824052919-0d455de96546.zip -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/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/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.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/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/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/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/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.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.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.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.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-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-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-20201208171446-5f87f3452ae9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip 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/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-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-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-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-20200625001655-4c5254603344.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.zip 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/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/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.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-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-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-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-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-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-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-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210309074719-68d13333faf2.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.zip 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/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.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/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-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-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-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-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-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.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.zip 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.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.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/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-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.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.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/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.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.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/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/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.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-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-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//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.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_=618cf7d25b0855975077c01e9760d767
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
deleted file mode 100644
index 957febc80b74..000000000000
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=uWSGI metrics exporter for prometheus.io
-EAPI=6
-HOMEPAGE=https://github.com/timonwong/uwsgi_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD ISC MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/timonwong/uwsgi_exporter/archive/v0.7.0.tar.gz -> uwsgi_exporter-0.7.0.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_=abf688fcc9fd4b931179faf1637fb89c
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
deleted file mode 100644
index 182c9fb8ff18..000000000000
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu
-DESCRIPTION=uWSGI metrics exporter for prometheus.io
-EAPI=7
-HOMEPAGE=https://github.com/timonwong/uwsgi_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD ISC MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/timonwong/uwsgi_exporter/archive/v0.8.0.tar.gz -> uwsgi_exporter-0.8.0.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_=bf83c4aaba16b54152b146c827298e91
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0-r1 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0-r1
new file mode 100644
index 000000000000..5b2ad16a4d22
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-group/uwsgi_exporter acct-user/uwsgi_exporter dev-util/promu
+DESCRIPTION=uWSGI metrics exporter for prometheus.io
+EAPI=7
+HOMEPAGE=https://github.com/timonwong/uwsgi_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD ISC MIT
+RDEPEND=acct-group/uwsgi_exporter acct-user/uwsgi_exporter
+RESTRICT=strip
+SLOT=0
+SRC_URI=https:///archive/.tar.gz -> uwsgi_exporter-0.8.0.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4637246234f2a41c291f2909f7657406
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index cf0d637108dd..0df8269649be 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/anki-2.1.15-r1 b/metadata/md5-cache/app-misc/anki-2.1.15-r1
index aa185350f538..c489fcbee432 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.15-r1
+++ b/metadata/md5-cache/app-misc/anki-2.1.15-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/archive/anki-2.1.15-source.tgz -> anki-2.1.15.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa629165602598f535618d4d80659b17
+_md5_=0bc9b89658ffe7b3bf8cb4bcdbe952fb
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.10 b/metadata/md5-cache/app-misc/beanstalkd-1.10
deleted file mode 100644
index e91183c52ca3..000000000000
--- a/metadata/md5-cache/app-misc/beanstalkd-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple, fast work queue
-EAPI=5
-HOMEPAGE=http://kr.github.io/beanstalkd/
-KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b97e705b38b35bf228862d10e4d2240e
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.10-r1 b/metadata/md5-cache/app-misc/beanstalkd-1.10-r1
new file mode 100644
index 000000000000..8392eb3a7253
--- /dev/null
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.10-r1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A simple, fast work queue
+EAPI=7
+HOMEPAGE=https://kr.github.io/beanstalkd/
+KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=acct-group/beanstalk acct-user/beanstalk
+SLOT=0
+SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=03c2230dc7428d7e61e3d5bc8b3ad7cd
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.11 b/metadata/md5-cache/app-misc/beanstalkd-1.11
deleted file mode 100644
index abe587d92bfd..000000000000
--- a/metadata/md5-cache/app-misc/beanstalkd-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple, fast work queue
-EAPI=5
-HOMEPAGE=http://kr.github.io/beanstalkd/
-KEYWORDS=~amd64 ~mips ~x86 ~amd64-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/kr/beanstalkd/archive/v1.11.tar.gz -> beanstalkd-1.11.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=f73e922f527879a21e58d5d9282e8888
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.12 b/metadata/md5-cache/app-misc/beanstalkd-1.12
new file mode 100644
index 000000000000..7bdc618fd50e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.12
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A simple, fast work queue
+EAPI=7
+HOMEPAGE=https://kr.github.io/beanstalkd/
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=acct-group/beanstalk acct-user/beanstalk
+SLOT=0
+SRC_URI=https://github.com/kr/beanstalkd/archive/v1.12.tar.gz -> beanstalkd-1.12.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e15af95361415b4101e725376857ca1b
diff --git a/metadata/md5-cache/app-misc/byobu-5.130-r1 b/metadata/md5-cache/app-misc/byobu-5.130-r1
index 33fd59fa53e3..2d560ffe89ad 100644
--- a/metadata/md5-cache/app-misc/byobu-5.130-r1
+++ b/metadata/md5-cache/app-misc/byobu-5.130-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.130/+download/byobu_5.130.orig.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=364f9cf3afbb35079b32118382cb2361
+_md5_=79d37a889541c7332bace567e81281f8
diff --git a/metadata/md5-cache/app-misc/byobu-5.133 b/metadata/md5-cache/app-misc/byobu-5.133
index ea150fac9063..f1696a6009c4 100644
--- a/metadata/md5-cache/app-misc/byobu-5.133
+++ b/metadata/md5-cache/app-misc/byobu-5.133
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.133/+download/byobu_5.133.orig.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=729404026e819975aeca2d734a3d9ec9
+_md5_=95010f6f205d93bf7c4d0a68ce86086f
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.5-r1 b/metadata/md5-cache/app-misc/carbon-c-relay-3.5-r1
deleted file mode 100644
index f37cff4be193..000000000000
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-IUSE=lz4 snappy zlib ssl pcre pcre2 +oniguruma
-KEYWORDS=~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.5/carbon-c-relay-3.5.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=88bc051fc8342c1851731cc47d29dafa
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.6-r1 b/metadata/md5-cache/app-misc/carbon-c-relay-3.6-r1
deleted file mode 100644
index c13cdf4a1187..000000000000
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-IUSE=lz4 snappy zlib ssl pcre pcre2 +oniguruma
-KEYWORDS=~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.6/carbon-c-relay-3.6.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=69fb212d0b85c131c9774dc988caf84a
diff --git a/metadata/md5-cache/app-misc/cmatrix-2.0-r3 b/metadata/md5-cache/app-misc/cmatrix-2.0-r3
deleted file mode 100644
index 1d1cf935f194..000000000000
--- a/metadata/md5-cache/app-misc/cmatrix-2.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-libs/ncurses:0=[unicode?]
-DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
-EAPI=7
-HOMEPAGE=https://www.asty.org/cmatrix/ https://github.com/abishekvashok/cmatrix
-IUSE=+unicode X
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-SLOT=0
-SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1edde73b72d2a4de1e042ad445a99229
diff --git a/metadata/md5-cache/app-misc/cmatrix-2.0-r4 b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
new file mode 100644
index 000000000000..67366e99a247
--- /dev/null
+++ b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
+EAPI=7
+HOMEPAGE=https://www.asty.org/cmatrix/ https://github.com/abishekvashok/cmatrix
+IUSE=+unicode X
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?]
+SLOT=0
+SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e13e6916e5ac17ffa2b2c83b46ea3c12
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r2 b/metadata/md5-cache/app-misc/dvtm-0.15-r2
deleted file mode 100644
index 0281448b889a..000000000000
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=6
-HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode] !>=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c1a1ca773f56e575304dccf7975c8f7
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r3 b/metadata/md5-cache/app-misc/dvtm-0.15-r3
deleted file mode 100644
index 0fddeea0e8b7..000000000000
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=6
-HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
-IUSE=savedconfig
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
-SLOT=0
-SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c9e51b16b907f70327708255ec995d94
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r4 b/metadata/md5-cache/app-misc/dvtm-0.15-r4
new file mode 100644
index 000000000000..0733dd13a5d8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)] virtual/pkgconfig
+DESCRIPTION=Dynamic virtual terminal manager
+EAPI=6
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
+IUSE=savedconfig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:=[unicode(+)] !>=sys-libs/ncurses-6.1
+SLOT=0
+SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0621bbfb520c0ff28e7dcde666cd60fd
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r5 b/metadata/md5-cache/app-misc/dvtm-0.15-r5
new file mode 100644
index 000000000000..dd8f8e200684
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)] virtual/pkgconfig
+DESCRIPTION=Dynamic virtual terminal manager
+EAPI=6
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
+IUSE=savedconfig
+KEYWORDS=amd64 arm x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)]
+SLOT=0
+SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1cce2954a42ffb0162831e6433c29f54
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index ba27e1d08583..7275545c11ff 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Dynamic virtual terminal manager
 EAPI=6
 HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
 IUSE=savedconfig
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
+RDEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)]
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2193516a32065f2fbb2a54ddfdb6dbd8
+_md5_=c6c262745affc976bff29c4ece958f96
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.20 b/metadata/md5-cache/app-misc/hivex-1.3.20
index c4391597dc46..6cdf80176569 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.20
+++ b/metadata/md5-cache/app-misc/hivex-1.3.20
@@ -1,16 +1,16 @@
-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
+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(-)] ) ) ruby_targets_ruby27? ( ruby? ( dev-ruby/rake[ruby_targets_ruby27(-)] virtual/rubygems[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ruby? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) ) 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
+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 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) 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
+IUSE=ocaml readline +perl python test ruby test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 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 ) )
+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_ruby27? ( dev-lang/ruby:2.7 ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ruby? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) dev-lang/perl:=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.20.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_=c2ca25e9621c67d7291b9bdd7b5761c8
+_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	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d07c2b914608904869c0621fdeaa909
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
index 76a1c6cdbb3f..92519d09d747 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=abcde6f4a521dfb9b58145b94fa73bb6
+_md5_=cc55edf93ee3d339dcd47c812bdf61e7
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r2 b/metadata/md5-cache/app-misc/mc-4.8.26-r2
deleted file mode 100644
index acff2cef6a9e..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.26-r2
+++ /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
-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://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	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_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
deleted file mode 100644
index 1221ebb99af3..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.26-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-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-4.8.26-r4 b/metadata/md5-cache/app-misc/mc-4.8.26-r4
new file mode 100644
index 000000000000..1bc282fc487a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.26-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure 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:=[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://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:=[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	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=29f35914eb499490b7e7210c35188cb8
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r5 b/metadata/md5-cache/app-misc/mc-4.8.26-r5
new file mode 100644
index 000000000000..5239c3485544
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.26-r5
@@ -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:=[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:=[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_=dd47f168368d6efcf8a99884f9e9fa27
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index a49a9c1eea54..85f45d695d8f 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 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 )
+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:=[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://midnight-commander.org
 IUSE=+edit gpm nls samba sftp +slang spell test unicode X
 LICENSE=GPL-3
 PROPERTIES=live
-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 )
+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:=[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
 _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_=55b06e09215f17a5d4eb2e784cf981a9
+_md5_=1a5e669fb96edd72f6218fcc773dd318
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.1 b/metadata/md5-cache/app-misc/pax-utils-1.3.1
index bfea3baee154..4095515815c9 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.1
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.3.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.1.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7678d97691e01aad99ea3c1640f1ea45
+_md5_=7092b23906b196f5b0d3fef6a565ce6d
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.2 b/metadata/md5-cache/app-misc/pax-utils-1.3.2
index 579a675d24e8..7a4b0e2b855b 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug kernel_linux python seccomp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9ba96626fe96ae0b28603865bebf1b
+_md5_=b918f01166d923496fdd59f0c7265501
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.3 b/metadata/md5-cache/app-misc/pax-utils-1.3.3
new file mode 100644
index 000000000000..213943695858
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.3
@@ -0,0 +1,15 @@
+BDEPEND=caps? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+IUSE=caps debug kernel_linux python seccomp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d6b8cbe52b31ec711adff3a35414870d
diff --git a/metadata/md5-cache/app-misc/piper-0.5.1-r2 b/metadata/md5-cache/app-misc/piper-0.5.1-r2
index 1a6173c65434..ef74031fbfee 100644
--- a/metadata/md5-cache/app-misc/piper-0.5.1-r2
+++ b/metadata/md5-cache/app-misc/piper-0.5.1-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.5.1.tar.gz -> piper-0.5.1.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	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42e6acf9b5f34bb199216759e8f16a0a
+_md5_=ca47f37d3c817a7f35373412eba4ed7f
diff --git a/metadata/md5-cache/app-misc/radeontop-1.3-r2 b/metadata/md5-cache/app-misc/radeontop-1.3-r2
deleted file mode 100644
index 114fab3d453b..000000000000
--- a/metadata/md5-cache/app-misc/radeontop-1.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:0=[unicode] virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Utility to view Radeon GPU utilization
-EAPI=7
-HOMEPAGE=https://github.com/clbr/radeontop
-IUSE=nls video_cards_amdgpu video_cards_radeon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:0=[unicode] virtual/libintl )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_radeon )
-SLOT=0
-SRC_URI=https://github.com/clbr/radeontop/archive/v1.3.tar.gz -> radeontop-1.3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1096796f741bda711f40860967f9304
diff --git a/metadata/md5-cache/app-misc/radeontop-1.3-r3 b/metadata/md5-cache/app-misc/radeontop-1.3-r3
new file mode 100644
index 000000000000..4fd5783dcab6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/radeontop-1.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:=[unicode(+)] virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Utility to view Radeon GPU utilization
+EAPI=7
+HOMEPAGE=https://github.com/clbr/radeontop
+IUSE=nls video_cards_amdgpu video_cards_radeon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:=[unicode(+)] virtual/libintl )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_radeon )
+SLOT=0
+SRC_URI=https://github.com/clbr/radeontop/archive/v1.3.tar.gz -> radeontop-1.3.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1a5460772d838eaffdaea4b29eb7e012
diff --git a/metadata/md5-cache/app-misc/radeontop-9999 b/metadata/md5-cache/app-misc/radeontop-9999
index 4e3babb7f3bd..dc325a367474 100644
--- a/metadata/md5-cache/app-misc/radeontop-9999
+++ b/metadata/md5-cache/app-misc/radeontop-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure unpack
-DEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:0=[unicode] virtual/libintl ) nls? ( sys-devel/gettext )
+DEPEND=sys-libs/ncurses:= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:=[unicode(+)] virtual/libintl ) nls? ( sys-devel/gettext )
 DESCRIPTION=Utility to view Radeon GPU utilization
 EAPI=7
 HOMEPAGE=https://github.com/clbr/radeontop
 IUSE=nls video_cards_amdgpu video_cards_radeon
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:0=[unicode] virtual/libintl )
+RDEPEND=sys-libs/ncurses:= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:=[unicode(+)] virtual/libintl )
 REQUIRED_USE=|| ( video_cards_amdgpu video_cards_radeon )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72bc5f05916971595f3c592fb4c4f9a2
+_md5_=15f16f6316b5a70dd56a3f87363aeee5
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.3 b/metadata/md5-cache/app-misc/ranger-1.9.3
index 0d4496eb09a8..cc7dbf1857a3 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.3
+++ b/metadata/md5-cache/app-misc/ranger-1.9.3
@@ -5,7 +5,7 @@ DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
 HOMEPAGE=https://ranger.github.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=GPL-3
 RDEPEND=virtual/pager python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.3.tar.gz -> ranger-1.9.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	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f4aa317a1ab22b11c0b7287c61ca4040
+_md5_=c3b9903044ffdb91fd2d90f80ba3592f
diff --git a/metadata/md5-cache/app-misc/rdfind-1.4.1 b/metadata/md5-cache/app-misc/rdfind-1.4.1
new file mode 100644
index 000000000000..880a29ed2a83
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rdfind-1.4.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/nettle
+DESCRIPTION=Find duplicate files based on their content
+EAPI=8
+HOMEPAGE=https://github.com/pauldreik/rdfind
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle
+SLOT=0
+SRC_URI=https://github.com/pauldreik/rdfind/archive/releases/1.4.1.tar.gz -> rdfind-1.4.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b98f4b9e90277f574ecdca5ee1b24296
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.4 b/metadata/md5-cache/app-misc/rpick-0.8.4
index abeecad0b0e6..fd8687caae0c 100644
--- a/metadata/md5-cache/app-misc/rpick-0.8.4
+++ b/metadata/md5-cache/app-misc/rpick-0.8.4
@@ -4,9 +4,9 @@ DESCRIPTION=Helps you pick items from a list by various algorithms
 EAPI=7
 HOMEPAGE=https://github.com/bowlofeggs/rpick
 IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
 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.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.4.0/download -> approx-0.4.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/assert_cmd/1.0.4/download -> assert_cmd-1.0.4.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/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/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/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.4/download -> crossbeam-utils-0.8.4.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-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/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.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/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.1/download -> matrixmultiply-0.3.1.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mockall/0.9.1/download -> mockall-0.9.1.crate https://crates.io/api/v1/crates/mockall_derive/0.9.1/download -> mockall_derive-0.9.1.crate https://crates.io/api/v1/crates/nalgebra/0.26.2/download -> nalgebra-0.26.2.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-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-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/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-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/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_distr/0.4.0/download -> rand_distr-0.4.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/rawpointer/0.2.1/download -> rawpointer-0.2.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_syscall/0.2.8/download -> redox_syscall-0.2.8.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/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.4/download -> rpick-0.8.4.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/ryu/1.0.5/download -> ryu-1.0.5.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_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/simba/0.4.0/download -> simba-0.4.0.crate https://crates.io/api/v1/crates/statrs/0.14.0/download -> statrs-0.14.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.72/download -> syn-1.0.72.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.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.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/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.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/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 https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ae37f5749cc2b1add0a0ba1e3ebc910
+_md5_=e7816185e4c463c2c4deb5aa59c5badc
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.2 b/metadata/md5-cache/app-misc/uptimed-0.4.2
index fdc90d793fa3..bcd905e5783e 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.2
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.2
@@ -5,10 +5,10 @@ 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 ~arm64 ~hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~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.2.tar.gz -> uptimed-0.4.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5c9d9199f82fb4d41825dd9445e6918
+_md5_=96a394cf41d44933aa724bef3c9f44d8
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.3 b/metadata/md5-cache/app-misc/uptimed-0.4.3
index f0f10eab97ed..c8229a8140ce 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.3
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.3
@@ -5,10 +5,10 @@ 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 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.3.tar.gz -> uptimed-0.4.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d44d42acbb58048066acac2b8109f1e5
+_md5_=b8002996c3503ee09663d532767d46e4
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.2 b/metadata/md5-cache/app-misc/wcd-6.0.2
deleted file mode 100644
index 0507c61585d1..000000000000
--- a/metadata/md5-cache/app-misc/wcd-6.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring:= ) app-text/ghostscript-gpl virtual/pkgconfig
-DESCRIPTION=Wherever Change Directory
-EAPI=6
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring:= )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07bef47755d4ff51db198ec6e533654c
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.2-r1 b/metadata/md5-cache/app-misc/wcd-6.0.2-r1
new file mode 100644
index 000000000000..ca36b12b8db0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wcd-6.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)?] unicode? ( dev-libs/libunistring:= ) app-text/ghostscript-gpl virtual/pkgconfig
+DESCRIPTION=Wherever Change Directory
+EAPI=6
+HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
+IUSE=nls unicode
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] unicode? ( dev-libs/libunistring:= )
+SLOT=0
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.2.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=300ef97ffb6f1a6a1d44e19a4ada3812
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.3 b/metadata/md5-cache/app-misc/wcd-6.0.3
deleted file mode 100644
index 82a4f6f92ba9..000000000000
--- a/metadata/md5-cache/app-misc/wcd-6.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/ghostscript-gpl virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring:= )
-DESCRIPTION=Wherever Change Directory
-EAPI=7
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring:= )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e20c18f453f63ace22c591fd14dd056d
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.3-r1 b/metadata/md5-cache/app-misc/wcd-6.0.3-r1
new file mode 100644
index 000000000000..eb37526ef64f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wcd-6.0.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-text/ghostscript-gpl virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)?] unicode? ( dev-libs/libunistring:= )
+DESCRIPTION=Wherever Change Directory
+EAPI=7
+HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
+IUSE=nls unicode
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] unicode? ( dev-libs/libunistring:= )
+SLOT=0
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.3.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7b459d7d0073750364b801e53addcb7e
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index fdbfb26f1128..5d5711d86243 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/scrcpy-1.18 b/metadata/md5-cache/app-mobilephone/scrcpy-1.18
index 42a43f69adfc..8ac0f076371d 100644
--- a/metadata/md5-cache/app-mobilephone/scrcpy-1.18
+++ b/metadata/md5-cache/app-mobilephone/scrcpy-1.18
@@ -4,10 +4,10 @@ DEPEND=media-libs/libsdl2[X] media-video/ffmpeg
 DESCRIPTION=Display and control your Android device
 EAPI=7
 HOMEPAGE=https://github.com/Genymobile/scrcpy
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=media-libs/libsdl2[X] media-video/ffmpeg
 SLOT=0
 SRC_URI=https://github.com/Genymobile/scrcpy/archive/v1.18.tar.gz -> scrcpy-1.18.tar.gz https://github.com/Genymobile/scrcpy/releases/download/v1.18/scrcpy-server-v1.18
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=85f1b0615666213b60ec1d92f1a2d4df
+_md5_=1293536245395b24ba50198a582cea21
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index be089dbaae70..02d4339bb5d6 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/calcurse-4.7.0 b/metadata/md5-cache/app-office/calcurse-4.7.0
index c660427b1ba1..c3e3cd2f9b96 100644
--- a/metadata/md5-cache/app-office/calcurse-4.7.0
+++ b/metadata/md5-cache/app-office/calcurse-4.7.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.7.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_=97537664113bf51205e5b3cc35cfb888
+_md5_=4b732c7b1c03fd224a088ef5de99d946
diff --git a/metadata/md5-cache/app-office/calligra-3.2.1-r2 b/metadata/md5-cache/app-office/calligra-3.2.1-r2
deleted file mode 100644
index bf214cd4dbc4..000000000000
--- a/metadata/md5-cache/app-office/calligra-3.2.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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 pretend setup test unpack
-DEPEND=dev-lang/perl >=dev-qt/designer-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kemoticons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kross-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.15.1:5[widgets] ) gsl? ( sci-libs/gsl:= ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( >=media-libs/phonon-4.11.0 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) dev-libs/boost test? ( >=kde-frameworks/threadweaver-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Office Suite
-EAPI=7
-HOMEPAGE=https://calligra.org/
-IUSE=activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr +pdf phonon spacenav +truetype X calligra_features_karbon calligra_features_sheets calligra_features_stage calligra_features_words debug +handbook test
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=dev-qt/designer-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kemoticons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kross-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.15.1:5[widgets] ) gsl? ( sci-libs/gsl:= ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( >=media-libs/phonon-4.11.0 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) gemini? ( >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.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/calligra/3.2.1/calligra-3.2.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-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_=3d1256eeb996f04e44565cbf2e44125b
diff --git a/metadata/md5-cache/app-office/calligra-3.2.1-r3 b/metadata/md5-cache/app-office/calligra-3.2.1-r3
new file mode 100644
index 000000000000..c0ff2d0fae19
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-3.2.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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 pretend setup test unpack
+DEPEND=dev-lang/perl >=dev-qt/designer-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kemoticons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kross-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.15.1:5[widgets] ) gsl? ( sci-libs/gsl:= ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( >=media-libs/phonon-4.11.0 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) dev-libs/boost test? ( >=kde-frameworks/threadweaver-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Office Suite
+EAPI=7
+HOMEPAGE=https://calligra.org/
+IUSE=activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr +pdf phonon spacenav +truetype X calligra_features_karbon calligra_features_sheets calligra_features_stage calligra_features_words debug +handbook test
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl >=dev-qt/designer-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kemoticons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kross-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.15.1:5[widgets] ) gsl? ( sci-libs/gsl:= ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( >=media-libs/phonon-4.11.0 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) gemini? ( >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.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/calligra/3.2.1/calligra-3.2.1.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-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_=3b1d7f4fdc2c29c981fc50db6c67ee42
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 00dd9294058c..171ef52fb60e 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.3.2
@@ -14,4 +14,4 @@ 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	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
+_md5_=2d3d8bdcd6f5ed997dc07794c9587a57
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 d71e66b18b16..04ebfb3dcbd1 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.4.2
@@ -14,4 +14,4 @@ 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	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
+_md5_=4581ed4b81a90d07a6393175f173f322
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.5.2 b/metadata/md5-cache/app-office/libreoffice-7.1.5.2
new file mode 100644
index 000000000000..c89b3f260b53
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.5.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-7.1*
+RDEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+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.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.5//libreoffice-7.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.5//libreoffice-help-7.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.5.2/src/libreoffice-7.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.5.2/src/libreoffice-help-7.1.5.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	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_=a9cca61b178c5bd3d6f7d1375f5497e0
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.9999 b/metadata/md5-cache/app-office/libreoffice-7.1.9999
index d5f21935c2dd..48b5bd8a3098 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=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-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9
+IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=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-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RDEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 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	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
+_md5_=8d9fb8720104663d061a391e14ac9f3f
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index adac4cf80e5c..525b6226e00f 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=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-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9
+IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=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-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RDEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 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	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
+_md5_=691bf1fa67b006565c6f686836e62938
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.1.5.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.1.5.2
new file mode 100644
index 000000000000..f0d7f76b79eb
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-7.1.5.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.5/rpm/x86_64/LibreOffice_7.1.5_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.5/rpm/x86_64/LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c073c7f0078fb21edfd3b5ac0e53639f
diff --git a/metadata/md5-cache/app-office/scribus-1.5.7 b/metadata/md5-cache/app-office/scribus-1.5.7
index 46a1bc4b1f6b..2ce0be3d91a9 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.7
+++ b/metadata/md5-cache/app-office/scribus-1.5.7
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://pilotfiber.dl.sourceforge.net/project/scribus/scribus-devel/1.5.7/scribus-1.5.7.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b59449001b59fa8d577ba1cbb2e0e63e
+_md5_=c6011cddd17b287568dcb84efd680b09
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 77d3dd0190a8..73f1fc53bba5 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61c7f9df4f470d5373068e62c4410010
+_md5_=8c4bd0c944199aaaa499901dd8e49633
diff --git a/metadata/md5-cache/app-office/texmacs-1.99.11 b/metadata/md5-cache/app-office/texmacs-1.99.11
deleted file mode 100644
index 1df8ac9b8854..000000000000
--- a/metadata/md5-cache/app-office/texmacs-1.99.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[debug?,deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Wysiwyg text processor with high-quality maths
-EAPI=6
-HOMEPAGE=http://www.texmacs.org/
-IUSE=debug jpeg netpbm sqlite svg spell
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[debug?,deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-SLOT=0
-SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.99.11-src.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_=41f9d242aa60124413da28ea04b0666d
diff --git a/metadata/md5-cache/app-office/texmacs-2.1 b/metadata/md5-cache/app-office/texmacs-2.1
new file mode 100644
index 000000000000..b8c4062e81c0
--- /dev/null
+++ b/metadata/md5-cache/app-office/texmacs-2.1
@@ -0,0 +1,14 @@
+BDEPEND=x11-base/xorg-proto dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[debug?,deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+DESCRIPTION=Wysiwyg text processor with high-quality maths
+EAPI=7
+HOMEPAGE=http://www.texmacs.org/
+IUSE=debug jpeg netpbm sqlite svg spell
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[debug?,deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+SLOT=0
+SRC_URI=http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-2.1-src.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_=f3a4e8bb4023cf0eea4848588485f94d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index d27e84098226..d72f7ceacfad 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/elogviewer-3.0-r2 b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
index 3ac74ef92dea..0695f37a9fa3 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.0-r2
+++ b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e77d8186819fc6fceb49c07e57b2e828
+_md5_=929b74ffc4f87c6a51eccef4d9e4ffd7
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.1 b/metadata/md5-cache/app-portage/elogviewer-3.1
index 3eeb4fa38585..655b3c7c5980 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.1
+++ b/metadata/md5-cache/app-portage/elogviewer-3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.1.tar.gz -> elogviewer-3.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b7942767c396757630fe672679b5a02
+_md5_=4be560390fec68f486a6aa2949c2847e
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.2 b/metadata/md5-cache/app-portage/elogviewer-3.2
index 0d36b0d9db47..fe201924a0d0 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.2
+++ b/metadata/md5-cache/app-portage/elogviewer-3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.2.tar.gz -> elogviewer-3.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=370a05942bc68bc099739be94a59626a
+_md5_=d48b4255103e95769b7334e5b07c8784
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 cc7e115c9657..50bdfe86c621 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A smart CLI mangler for package.* files
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/flaggie/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 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
 SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
 _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
+_md5_=4f767b43ca888e09f2b0a672aa20e0db
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-20 b/metadata/md5-cache/app-portage/unsymlink-lib-20
index 33879b1ccee4..63fd074d62b4 100644
--- a/metadata/md5-cache/app-portage/unsymlink-lib-20
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-20
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v20.tar.gz -> unsymlink-lib-20.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d46668a793740284cb0f210f98f029cd
+_md5_=695b9a1a4591d94ce8ba96d629bf3e8c
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index ad60bd151e62..4b243f0cf388 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.11 b/metadata/md5-cache/app-shells/bash-completion-2.11
index 1a78fe088932..fd1df5390e97 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.11
+++ b/metadata/md5-cache/app-shells/bash-completion-2.11
@@ -4,7 +4,7 @@ DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
 IUSE=+eselect 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
+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
 LICENSE=GPL-2+
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc
@@ -12,4 +12,4 @@ 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	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=4479c1359885d4a1323ae5e2d99b0bb5
+_md5_=138b158e517b9521f3e3dffd09963bbc
diff --git a/metadata/md5-cache/app-shells/fish-3.1.2 b/metadata/md5-cache/app-shells/fish-3.1.2
deleted file mode 100644
index 92d4360b5549..000000000000
--- a/metadata/md5-cache/app-shells/fish-3.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode] doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) test? ( dev-tcltk/expect )
-DESCRIPTION=Friendly Interactive SHell
-EAPI=7
-HOMEPAGE=http://fishshell.com/
-IUSE=doc nls test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.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_=31f28f6f2441b13a196f7b3418ef3d76
diff --git a/metadata/md5-cache/app-shells/fish-3.1.2-r1 b/metadata/md5-cache/app-shells/fish-3.1.2-r1
new file mode 100644
index 000000000000..5f98be0c9b67
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fish-3.1.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-libs/ncurses:=[unicode(+)] doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) test? ( dev-tcltk/expect )
+DESCRIPTION=Friendly Interactive SHell
+EAPI=7
+HOMEPAGE=http://fishshell.com/
+IUSE=doc nls test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-libs/ncurses:=[unicode(+)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.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_=4136c460356cb02ad4bf256c7a0a341c
diff --git a/metadata/md5-cache/app-shells/fish-3.2.1 b/metadata/md5-cache/app-shells/fish-3.2.1
deleted file mode 100644
index d22013fc7130..000000000000
--- a/metadata/md5-cache/app-shells/fish-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Friendly Interactive SHell
-EAPI=7
-HOMEPAGE=http://fishshell.com/
-IUSE=+doc nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.2.1/fish-3.2.1.tar.xz
-_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=66646f4718ad53a67185bf5bfe188f6a
diff --git a/metadata/md5-cache/app-shells/fish-3.2.1-r1 b/metadata/md5-cache/app-shells/fish-3.2.1-r1
new file mode 100644
index 000000000000..368acc4a78db
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fish-3.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Friendly Interactive SHell
+EAPI=7
+HOMEPAGE=http://fishshell.com/
+IUSE=+doc nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.2.1/fish-3.2.1.tar.xz
+_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b08085d568ae5e31822082758f7c695f
diff --git a/metadata/md5-cache/app-shells/fish-3.2.2 b/metadata/md5-cache/app-shells/fish-3.2.2
deleted file mode 100644
index 8aded700fccf..000000000000
--- a/metadata/md5-cache/app-shells/fish-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Friendly Interactive SHell
-EAPI=7
-HOMEPAGE=http://fishshell.com/
-IUSE=+doc nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.2.2/fish-3.2.2.tar.xz
-_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=66646f4718ad53a67185bf5bfe188f6a
diff --git a/metadata/md5-cache/app-shells/fish-3.2.2-r1 b/metadata/md5-cache/app-shells/fish-3.2.2-r1
new file mode 100644
index 000000000000..01cffcb0cf0d
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fish-3.2.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Friendly Interactive SHell
+EAPI=7
+HOMEPAGE=http://fishshell.com/
+IUSE=+doc nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.2.2/fish-3.2.2.tar.xz
+_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b08085d568ae5e31822082758f7c695f
diff --git a/metadata/md5-cache/app-shells/fish-3.3.1 b/metadata/md5-cache/app-shells/fish-3.3.1
deleted file mode 100644
index b70ae36d02da..000000000000
--- a/metadata/md5-cache/app-shells/fish-3.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Friendly Interactive SHell
-EAPI=7
-HOMEPAGE=http://fishshell.com/
-IUSE=+doc nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
-_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=490a212ee4a615c6660388b8858bdf33
diff --git a/metadata/md5-cache/app-shells/fish-3.3.1-r1 b/metadata/md5-cache/app-shells/fish-3.3.1-r1
new file mode 100644
index 000000000000..0061e2115243
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fish-3.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Friendly Interactive SHell
+EAPI=7
+HOMEPAGE=http://fishshell.com/
+IUSE=+doc nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
+_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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=33ffa3a155c6664b66f395037749b39c
diff --git a/metadata/md5-cache/app-shells/fish-9999 b/metadata/md5-cache/app-shells/fish-9999
index 854c013596f1..c51675b4e658 100644
--- a/metadata/md5-cache/app-shells/fish-9999
+++ b/metadata/md5-cache/app-shells/fish-9999
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-tcltk/expect || ( ( dev-lang/python:3.9 dev-python/pexpect[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pexpect[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode] doc? ( dev-python/sphinx )
+DEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)] doc? ( dev-python/sphinx )
 DESCRIPTION=Friendly Interactive SHell
 EAPI=7
 HOMEPAGE=http://fishshell.com/
 IUSE=+doc nls test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
+RDEPEND=>=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils sys-libs/ncurses:=[unicode(+)]
 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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=66646f4718ad53a67185bf5bfe188f6a
+_md5_=b08085d568ae5e31822082758f7c695f
diff --git a/metadata/md5-cache/app-shells/fzy-1.0-r1 b/metadata/md5-cache/app-shells/fzy-1.0-r1
index 1856f13fe2f3..5f96a8617a56 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0-r1
+++ b/metadata/md5-cache/app-shells/fzy-1.0-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Fuzzy text selector (interactive grep) for console
 EAPI=6
 HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
-KEYWORDS=amd64 arm arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08990bab88e65de187b15c9b4972ab7e
+_md5_=104f6d7a584a6191ef7015f3ab31aaac
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 66b32005ea76..03a0b066b06d 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2421989c22825cae87a5dfd62ed8879a
+_md5_=582df4bef5f7f052901fbfd57a1435ee
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
index bba5e4d11ac9..58c04a04ef6f 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/
-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
+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
 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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad7b681dda76b5e404bbbcecd4948ac7
+_md5_=d281e7edf08d5a9af9cd050e3eded586
diff --git a/metadata/md5-cache/app-shells/hstr-2.2 b/metadata/md5-cache/app-shells/hstr-2.2
deleted file mode 100644
index 61633f65ee74..000000000000
--- a/metadata/md5-cache/app-shells/hstr-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Shell history suggest box
-EAPI=7
-HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://github.com/dvorka/hstr/archive/2.2.tar.gz -> hstr-2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adf20c1f75255ada1cd8ef00182de5ad
diff --git a/metadata/md5-cache/app-shells/hstr-2.2-r1 b/metadata/md5-cache/app-shells/hstr-2.2-r1
new file mode 100644
index 000000000000..a5ef22ce1611
--- /dev/null
+++ b/metadata/md5-cache/app-shells/hstr-2.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Shell history suggest box
+EAPI=7
+HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://github.com/dvorka/hstr/archive/2.2.tar.gz -> hstr-2.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=deda0e55fe7755a0c25517da2ae4bbeb
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 907384ef87c3..8dff45680e3f 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 88af0448d8f2..799850af6e89 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_=6e253cd0816ef2eac23d5a72e2dc87b3
+_md5_=aa7a32225706951a0dce03271c7b2b9c
diff --git a/metadata/md5-cache/app-text/aspell-0.60.8-r1 b/metadata/md5-cache/app-text/aspell-0.60.8-r1
deleted file mode 100644
index b7f72e1fcd19..000000000000
--- a/metadata/md5-cache/app-text/aspell-0.60.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl )
-DESCRIPTION=Free and Open Source spell checker designed to replace Ispell
-EAPI=7
-HOMEPAGE=http://aspell.net/
-IUSE=nls unicode l10n_af l10n_am l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_csb l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fa l10n_fi l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_grc l10n_gu l10n_gv l10n_he l10n_hi l10n_hil l10n_hr l10n_hsb l10n_hu l10n_hus l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_kn l10n_ku l10n_ky l10n_la l10n_lt l10n_lv l10n_mg l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_nb l10n_nds l10n_nl l10n_nn l10n_no l10n_ny l10n_or l10n_pa l10n_pl l10n_pt-PT l10n_pt-BR l10n_qu l10n_ro l10n_ru l10n_rw l10n_sc l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_tet l10n_tk l10n_tl l10n_tn l10n_tr l10n_uk l10n_uz l10n_vi l10n_wa l10n_yi l10n_zu
-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 ~x86-solaris
-LICENSE=LGPL-2.1
-PDEPEND=l10n_af? ( app-dicts/aspell-af ) l10n_am? ( app-dicts/aspell-am ) l10n_ar? ( app-dicts/aspell-ar ) l10n_ast? ( app-dicts/aspell-ast ) l10n_az? ( app-dicts/aspell-az ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_bn? ( app-dicts/aspell-bn ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_csb? ( app-dicts/aspell-csb ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fa? ( app-dicts/aspell-fa ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_fy? ( app-dicts/aspell-fy ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gd? ( app-dicts/aspell-gd ) l10n_gl? ( app-dicts/aspell-gl ) l10n_grc? ( app-dicts/aspell-grc ) l10n_gu? ( app-dicts/aspell-gu ) l10n_gv? ( app-dicts/aspell-gv ) l10n_he? ( app-dicts/aspell-he ) l10n_hi? ( app-dicts/aspell-hi ) l10n_hil? ( app-dicts/aspell-hil ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hsb? ( app-dicts/aspell-hsb ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hus? ( app-dicts/aspell-hus ) l10n_hy? ( app-dicts/aspell-hy ) l10n_ia? ( app-dicts/aspell-ia ) l10n_id? ( app-dicts/aspell-id ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_kn? ( app-dicts/aspell-kn ) l10n_ku? ( app-dicts/aspell-ku ) l10n_ky? ( app-dicts/aspell-ky ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_lv? ( app-dicts/aspell-lv ) l10n_mg? ( app-dicts/aspell-mg ) l10n_mi? ( app-dicts/aspell-mi ) l10n_mk? ( app-dicts/aspell-mk ) l10n_ml? ( app-dicts/aspell-ml ) l10n_mn? ( app-dicts/aspell-mn ) l10n_mr? ( app-dicts/aspell-mr ) l10n_ms? ( app-dicts/aspell-ms ) l10n_mt? ( app-dicts/aspell-mt ) l10n_nb? ( app-dicts/aspell-nb ) l10n_nds? ( app-dicts/aspell-nds ) l10n_nl? ( app-dicts/aspell-nl ) l10n_nn? ( app-dicts/aspell-nn ) l10n_no? ( app-dicts/aspell-no ) l10n_ny? ( app-dicts/aspell-ny ) l10n_or? ( app-dicts/aspell-or ) l10n_pa? ( app-dicts/aspell-pa ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt-PT? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_qu? ( app-dicts/aspell-qu ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_rw? ( app-dicts/aspell-rw ) l10n_sc? ( app-dicts/aspell-sc ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_sw? ( app-dicts/aspell-sw ) l10n_ta? ( app-dicts/aspell-ta ) l10n_te? ( app-dicts/aspell-te ) l10n_tet? ( app-dicts/aspell-tet ) l10n_tk? ( app-dicts/aspell-tk ) l10n_tl? ( app-dicts/aspell-tl ) l10n_tn? ( app-dicts/aspell-tn ) l10n_tr? ( app-dicts/aspell-tr ) l10n_uk? ( app-dicts/aspell-uk ) l10n_uz? ( app-dicts/aspell-uz ) l10n_vi? ( app-dicts/aspell-vi ) l10n_wa? ( app-dicts/aspell-wa ) l10n_yi? ( app-dicts/aspell-yi ) l10n_zu? ( app-dicts/aspell-zu )
-RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/aspell/aspell-0.60.8.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_=d66754ff6a003a803ff43a3882b753f4
diff --git a/metadata/md5-cache/app-text/aspell-0.60.8-r3 b/metadata/md5-cache/app-text/aspell-0.60.8-r3
new file mode 100644
index 000000000000..5292762c6f47
--- /dev/null
+++ b/metadata/md5-cache/app-text/aspell-0.60.8-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)?] nls? ( virtual/libintl )
+DESCRIPTION=Free and Open Source spell checker designed to replace Ispell
+EAPI=7
+HOMEPAGE=http://aspell.net/
+IUSE=nls unicode l10n_af l10n_am l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_csb l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fa l10n_fi l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_grc l10n_gu l10n_gv l10n_he l10n_hi l10n_hil l10n_hr l10n_hsb l10n_hu l10n_hus l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_kn l10n_ku l10n_ky l10n_la l10n_lt l10n_lv l10n_mg l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_nb l10n_nds l10n_nl l10n_nn l10n_no l10n_ny l10n_or l10n_pa l10n_pl l10n_pt-PT l10n_pt-BR l10n_qu l10n_ro l10n_ru l10n_rw l10n_sc l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_tet l10n_tk l10n_tl l10n_tn l10n_tr l10n_uk l10n_uz l10n_vi l10n_wa l10n_yi l10n_zu
+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 ~x86-solaris
+LICENSE=LGPL-2.1
+PDEPEND=l10n_af? ( app-dicts/aspell-af ) l10n_am? ( app-dicts/aspell-am ) l10n_ar? ( app-dicts/aspell-ar ) l10n_ast? ( app-dicts/aspell-ast ) l10n_az? ( app-dicts/aspell-az ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_bn? ( app-dicts/aspell-bn ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_csb? ( app-dicts/aspell-csb ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fa? ( app-dicts/aspell-fa ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_fy? ( app-dicts/aspell-fy ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gd? ( app-dicts/aspell-gd ) l10n_gl? ( app-dicts/aspell-gl ) l10n_grc? ( app-dicts/aspell-grc ) l10n_gu? ( app-dicts/aspell-gu ) l10n_gv? ( app-dicts/aspell-gv ) l10n_he? ( app-dicts/aspell-he ) l10n_hi? ( app-dicts/aspell-hi ) l10n_hil? ( app-dicts/aspell-hil ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hsb? ( app-dicts/aspell-hsb ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hus? ( app-dicts/aspell-hus ) l10n_hy? ( app-dicts/aspell-hy ) l10n_ia? ( app-dicts/aspell-ia ) l10n_id? ( app-dicts/aspell-id ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_kn? ( app-dicts/aspell-kn ) l10n_ku? ( app-dicts/aspell-ku ) l10n_ky? ( app-dicts/aspell-ky ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_lv? ( app-dicts/aspell-lv ) l10n_mg? ( app-dicts/aspell-mg ) l10n_mi? ( app-dicts/aspell-mi ) l10n_mk? ( app-dicts/aspell-mk ) l10n_ml? ( app-dicts/aspell-ml ) l10n_mn? ( app-dicts/aspell-mn ) l10n_mr? ( app-dicts/aspell-mr ) l10n_ms? ( app-dicts/aspell-ms ) l10n_mt? ( app-dicts/aspell-mt ) l10n_nb? ( app-dicts/aspell-nb ) l10n_nds? ( app-dicts/aspell-nds ) l10n_nl? ( app-dicts/aspell-nl ) l10n_nn? ( app-dicts/aspell-nn ) l10n_no? ( app-dicts/aspell-no ) l10n_ny? ( app-dicts/aspell-ny ) l10n_or? ( app-dicts/aspell-or ) l10n_pa? ( app-dicts/aspell-pa ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt-PT? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_qu? ( app-dicts/aspell-qu ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_rw? ( app-dicts/aspell-rw ) l10n_sc? ( app-dicts/aspell-sc ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_sw? ( app-dicts/aspell-sw ) l10n_ta? ( app-dicts/aspell-ta ) l10n_te? ( app-dicts/aspell-te ) l10n_tet? ( app-dicts/aspell-tet ) l10n_tk? ( app-dicts/aspell-tk ) l10n_tl? ( app-dicts/aspell-tl ) l10n_tn? ( app-dicts/aspell-tn ) l10n_tr? ( app-dicts/aspell-tr ) l10n_uk? ( app-dicts/aspell-uk ) l10n_uz? ( app-dicts/aspell-uz ) l10n_vi? ( app-dicts/aspell-vi ) l10n_wa? ( app-dicts/aspell-wa ) l10n_yi? ( app-dicts/aspell-yi ) l10n_zu? ( app-dicts/aspell-zu )
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/aspell/aspell-0.60.8.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_=6299bb78640943fa439eeb527a6a92e1
diff --git a/metadata/md5-cache/app-text/calibre-5.16.1 b/metadata/md5-cache/app-text/calibre-5.16.1
index f52b6b119d48..468b58084f5a 100644
--- a/metadata/md5-cache/app-text/calibre-5.16.1
+++ b/metadata/md5-cache/app-text/calibre-5.16.1
@@ -11,4 +11,4 @@ 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	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c5b1ed22f8c6bba83a19d083aac7c13
+_md5_=dafda68d44021d8b940fa9e69a0282a5
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
index 3098f8d85625..0501d63e9d26 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook SGML DTD 4.1
 EAPI=7
 HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.1
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
 _eclasses_=sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8
-_md5_=ef4d9d684be1ba475b0dfb6d74fac62d
+_md5_=cb06709c39438d32d5646cd0cf3c44ee
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
index 5e4db3a986ec..acc04b1054db 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
@@ -5,9 +5,9 @@ HOMEPAGE=https://github.com/docbook/wiki/wiki
 IUSE=ruby
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems )
+RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d
-_md5_=2957363b677f6dda362aa92b97d512cf
+_md5_=bc226369be4a3ef9880bc2c3aa7a633c
diff --git a/metadata/md5-cache/app-text/docx2txt-1.4 b/metadata/md5-cache/app-text/docx2txt-1.4
index c3bd5ad6164e..369c55785675 100644
--- a/metadata/md5-cache/app-text/docx2txt-1.4
+++ b/metadata/md5-cache/app-text/docx2txt-1.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Convert MS Office docx files to plain text
 EAPI=7
 HOMEPAGE=http://docx2txt.sourceforge.net/
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-arch/unzip dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/docx2txt/docx2txt-1.4.tgz
-_md5_=c862263e40a4ad005f8e9a233cc4978b
+_md5_=ee25a890fcd42bce995d2fbf6c4440b1
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.11-r1 b/metadata/md5-cache/app-text/dvisvgm-2.11-r1
index 67bd4a8da5a3..1d0d14c15fd2 100644
--- a/metadata/md5-cache/app-text/dvisvgm-2.11-r1
+++ b/metadata/md5-cache/app-text/dvisvgm-2.11-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Converts DVI files to SVG
 EAPI=7
 HOMEPAGE=https://dvisvgm.de/
 IUSE=test
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 RDEPEND=>=app-arch/brotli-1.0.5:= app-text/ghostscript-gpl dev-libs/kpathsea:= dev-libs/openssl:= >=dev-libs/xxhash-0.6.5 >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 >=media-libs/woff2-1.0.2 sys-libs/zlib virtual/tex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.11/dvisvgm-2.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4614ea711c4d2ad6d53a2dc8622c316
+_md5_=62ea1141a1ea613958ac1a53cc21c224
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index 3011777c51f8..c696a89b62de 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) 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 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5b50b73c3b78041f7bfe2d0dd42e58c
diff --git a/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
index 339d110444da..4c7dc0475e80 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
+++ b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.4.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688d46bc2c4365022bb3b4df12ee7c0
diff --git a/metadata/md5-cache/app-text/lesspipe-1.86 b/metadata/md5-cache/app-text/lesspipe-1.86
new file mode 100644
index 000000000000..705fa3f6ed04
--- /dev/null
+++ b/metadata/md5-cache/app-text/lesspipe-1.86
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst
+DEPEND=dev-lang/perl
+DESCRIPTION=a preprocessor for less
+EAPI=8
+HOMEPAGE=https://github.com/wofr06/lesspipe
+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=GPL-2
+RDEPEND=dev-lang/perl !<sys-apps/less-483-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wofr06/lesspipe/archive/1.86.tar.gz -> lesspipe-1.86.tar.gz
+_md5_=399afb2cd9e3aadac9f95dc076731b52
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.5 b/metadata/md5-cache/app-text/libexttextcat-3.4.5
index ee5208a3369a..50d74ac65514 100644
--- a/metadata/md5-cache/app-text/libexttextcat-3.4.5
+++ b/metadata/md5-cache/app-text/libexttextcat-3.4.5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Library implementing N-gram-based text categorization
-EAPI=6
+EAPI=8
 HOMEPAGE=http://software.wise-guys.nl/libtextcat/
 IUSE=static-libs
-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
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.5.tar.xz
-_md5_=f54a1477d04085d772043a548ef16bb9
+_md5_=4de0029ec26e276c1ef7f448c301ce53
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.28 b/metadata/md5-cache/app-text/libpaper-1.1.28
index 00a436386be4..c7562b0ccd96 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_=9d1efd3791421fc9077d1b7b3940e97f
+_md5_=cc9fcd66560ccf3702de0c06a4f944e8
diff --git a/metadata/md5-cache/app-text/msort-8.53 b/metadata/md5-cache/app-text/msort-8.53
index d768c4c11ad9..b5d1cb1a455f 100644
--- a/metadata/md5-cache/app-text/msort-8.53
+++ b/metadata/md5-cache/app-text/msort-8.53
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) li
 SLOT=0
 SRC_URI=https://billposer.org/Software/Downloads/msort-8.53.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1fe848fe9ffad98a67dd3c20e4273d1
+_md5_=4b8c11d932639fafebd6d9d852ac7558
diff --git a/metadata/md5-cache/app-text/multitail-6.4.2 b/metadata/md5-cache/app-text/multitail-6.4.2
deleted file mode 100644
index 1d66d810b13d..000000000000
--- a/metadata/md5-cache/app-text/multitail-6.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?]
-DESCRIPTION=Tail with multiple windows
-EAPI=7
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=741ff8213cd641af839c7920145fc5f9
diff --git a/metadata/md5-cache/app-text/multitail-6.4.2-r1 b/metadata/md5-cache/app-text/multitail-6.4.2-r1
new file mode 100644
index 000000000000..2ff40f31834f
--- /dev/null
+++ b/metadata/md5-cache/app-text/multitail-6.4.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=Tail with multiple windows
+EAPI=7
+HOMEPAGE=http://www.vanheusden.com/multitail/
+IUSE=debug examples unicode
+KEYWORDS=amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fb78bc5723ab7667e8de383fde381520
diff --git a/metadata/md5-cache/app-text/mupdf-1.18.0-r4 b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
index e57cca907c57..415c57cbaf0f 100644
--- a/metadata/md5-cache/app-text/mupdf-1.18.0-r4
+++ b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
@@ -5,11 +5,11 @@ DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=7
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
 IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.18.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz
 _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_=12c39b30043342e725304899b7221746
+_md5_=7f0d5ff69204578c97bc8f46d409ca1a
diff --git a/metadata/md5-cache/app-text/pdftk-3.2.2 b/metadata/md5-cache/app-text/pdftk-3.2.2
index a36b2e2ab947..bba3e0b317f5 100644
--- a/metadata/md5-cache/app-text/pdftk-3.2.2
+++ b/metadata/md5-cache/app-text/pdftk-3.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=gcj-free version of pdftk written in Java
 EAPI=7
 HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.2.2/pdftk-v3.2.2.tar.bz2
 _eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=899e7d40162d7a6fdc4a52d86ba1a80f
+_md5_=26085c75fc81a80a71cc92e0783b3cb0
diff --git a/metadata/md5-cache/app-text/po4a-0.57 b/metadata/md5-cache/app-text/po4a-0.57
deleted file mode 100644
index cc383cbccc00..000000000000
--- a/metadata/md5-cache/app-text/po4a-0.57
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl
-DESCRIPTION=Tools to ease the translation of documentation
-EAPI=7
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.57/po4a-0.57.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=db210f0fa07423c602bb7f95ac8d97f7
diff --git a/metadata/md5-cache/app-text/po4a-0.57-r1 b/metadata/md5-cache/app-text/po4a-0.57-r1
new file mode 100644
index 000000000000..0ceeaa6c9ef6
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.57-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=7
+HOMEPAGE=https://po4a.org/
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.57/po4a-0.57.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
+_md5_=3518f1ea44b86f7b53557dd7789716d8
diff --git a/metadata/md5-cache/app-text/po4a-0.62 b/metadata/md5-cache/app-text/po4a-0.62
deleted file mode 100644
index a455a090e73e..000000000000
--- a/metadata/md5-cache/app-text/po4a-0.62
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl
-DESCRIPTION=Tools to ease the translation of documentation
-EAPI=7
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.62/po4a-0.62.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=ce81453016cf3562cd88c02725861281
diff --git a/metadata/md5-cache/app-text/po4a-0.62-r1 b/metadata/md5-cache/app-text/po4a-0.62-r1
new file mode 100644
index 000000000000..828621646d31
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.62-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=7
+HOMEPAGE=https://po4a.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.62/po4a-0.62.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
+_md5_=a1a06b49332e1990aa620c0dd67a7296
diff --git a/metadata/md5-cache/app-text/po4a-0.63 b/metadata/md5-cache/app-text/po4a-0.63
deleted file mode 100644
index f113a62da0b6..000000000000
--- a/metadata/md5-cache/app-text/po4a-0.63
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl
-DESCRIPTION=Tools to ease the translation of documentation
-EAPI=7
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=ce81453016cf3562cd88c02725861281
diff --git a/metadata/md5-cache/app-text/po4a-0.63-r1 b/metadata/md5-cache/app-text/po4a-0.63-r1
new file mode 100644
index 000000000000..0bab05f915f8
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.63-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=7
+HOMEPAGE=https://po4a.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb
+_md5_=a1a06b49332e1990aa620c0dd67a7296
diff --git a/metadata/md5-cache/app-text/poppler-21.07.0 b/metadata/md5-cache/app-text/poppler-21.07.0
index a1196cdc35fa..c4d969479f52 100644
--- a/metadata/md5-cache/app-text/poppler-21.07.0
+++ b/metadata/md5-cache/app-text/poppler-21.07.0
@@ -5,11 +5,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils
-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=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/111
 SRC_URI=https://poppler.freedesktop.org/poppler-21.07.0.tar.xz
 _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_=86ee9179bfb036b6919a6fd63e2125e0
+_md5_=17664267e4f632e3c044734cb3c64711
diff --git a/metadata/md5-cache/app-text/qpdf-10.3.2 b/metadata/md5-cache/app-text/qpdf-10.3.2
index 488899e8d100..71f01ee1d614 100644
--- a/metadata/md5-cache/app-text/qpdf-10.3.2
+++ b/metadata/md5-cache/app-text/qpdf-10.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
 EAPI=7
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples ssl test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( dev-libs/openssl:0= )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.3.2.tar.gz
-_md5_=cafac98e54a3cd0a633372bd087d2039
+_md5_=bc5d788222a087fa94fd56ebe8f7d6e8
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r4 b/metadata/md5-cache/app-text/ronn-0.7.3-r4
index f61e645de0b5..7d0a907a1f00 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed839b4da20f22ef56384bf787fd22a7
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.1 b/metadata/md5-cache/app-text/scdoc-1.11.1
index fdab4ca349f0..21330d76b797 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz -> scdoc-1.11.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1347d419f45ce808853eace34736697f
+_md5_=3c5f27245b554425b5c3aec4d7277147
diff --git a/metadata/md5-cache/app-text/webgen-1.7.1 b/metadata/md5-cache/app-text/webgen-1.7.1
index f913300303a7..ec86362a33ee 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.1
+++ b/metadata/md5-cache/app-text/webgen-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5209ac189a51dd345f83453e44b6c693
diff --git a/metadata/md5-cache/app-text/webgen-1.7.2 b/metadata/md5-cache/app-text/webgen-1.7.2
index c044a66ad334..f4d401d81ac8 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa9ca4a8d5024df7eb8254a04f1986ae
diff --git a/metadata/md5-cache/app-text/xapers-0.9.0 b/metadata/md5-cache/app-text/xapers-0.9.0
index 8d248814a3d6..cc1bc017c793 100644
--- a/metadata/md5-cache/app-text/xapers-0.9.0
+++ b/metadata/md5-cache/app-text/xapers-0.9.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?] dev-python/pybtex[python_targets_python3_8(-)?] dev-python/pycurl[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] x11-misc/xclip x11-misc/xdg-utils ) 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? ( app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-misc/xclip x11-misc/xdg-utils ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-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=Personal document indexing system
 EAPI=7
 HOMEPAGE=https://finestructure.net/xapers/ https://gitlab.com/jrollins/xapers/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?] dev-python/pybtex[python_targets_python3_8(-)?] dev-python/pycurl[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] x11-misc/xclip x11-misc/xdg-utils 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=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-misc/xclip x11-misc/xdg-utils python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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://gitlab.com/jrollins/xapers/-/archive/0.9.0/xapers-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_=896dcfc0c74013d7fdfc8f8b34d32d8a
+_md5_=54794b0e74a83b167a8c623b73bebbc8
diff --git a/metadata/md5-cache/app-text/xmlformat-1.04 b/metadata/md5-cache/app-text/xmlformat-1.04
index a16cbe7c0287..af33ba87b87a 100644
--- a/metadata/md5-cache/app-text/xmlformat-1.04
+++ b/metadata/md5-cache/app-text/xmlformat-1.04
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install test
-DEPEND=ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+DEPEND=ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 DESCRIPTION=Reformat XML documents to your custom style
 EAPI=7
 HOMEPAGE=http://www.kitebird.com/software/xmlformat/
 IUSE=doc ruby
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xmlformat
-RDEPEND=ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+RDEPEND=ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.kitebird.com/software/xmlformat/xmlformat-1.04.tar.gz
 _eclasses_=ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d
-_md5_=50c1162ed08391ecdbcdd8187328a830
+_md5_=a893d14c619cc204d135f08f03c361ce
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8.2016 b/metadata/md5-cache/app-text/xournal-0.4.8.2016
index df56a823d8ea..2bd5dab0e838 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8.2016
+++ b/metadata/md5-cache/app-text/xournal-0.4.8.2016
@@ -4,10 +4,10 @@ DESCRIPTION=An application for notetaking, sketching, and keeping a journal usin
 EAPI=6
 HOMEPAGE=http://xournal.sourceforge.net/
 IUSE=+pdf vanilla
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.2016.tar.gz
 _eclasses_=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_=f0e0c4e9ab5cf8de9019b251c6074d4f
+_md5_=e04178de02e6dca4245793712e572a3f
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index dc090f10b716..2a0163e7ea8a 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/Vim-Jinja2-Syntax-0.0_pre20210604 b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
index dc1991736fc1..bea4cb7ad67a 100644
--- a/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
+++ b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Glench/Vim-Jinja2-Syntax/archive/5d2496eb5fd4415c7ce062ccbcd53a3f0de93aa3.tar.gz -> Vim-Jinja2-Syntax-0.0_pre20210604.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e41f3fb4712d79d42f430361c4474812
diff --git a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1 b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
index 6770d4028834..9f5ffe088cc1 100644
--- a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
+++ b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=sys-apps/ack || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.tar.gz -> ack.vim-1.0.9.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=2eee2a0b4c475257c75ff912bb592719
diff --git a/metadata/md5-cache/app-vim/airline-0.11 b/metadata/md5-cache/app-vim/airline-0.11
index dca5e18c7546..0c84a9cfd68e 100644
--- a/metadata/md5-cache/app-vim/airline-0.11
+++ b/metadata/md5-cache/app-vim/airline-0.11
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.11.tar.gz -> airline-0.11.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8d8599a1cc3db2f8360c08dfd50f1d1c
diff --git a/metadata/md5-cache/app-vim/airline-9999 b/metadata/md5-cache/app-vim/airline-9999
index 886cc72b4350..365f3642d520 100644
--- a/metadata/md5-cache/app-vim/airline-9999
+++ b/metadata/md5-cache/app-vim/airline-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=308506a5798f6c10999fa648fe52e228
diff --git a/metadata/md5-cache/app-vim/airline-themes-0_pre20181021 b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
index 7847b74f80bb..fe8ec417d889 100644
--- a/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
+++ b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/app-vim/airline-themes/airline-themes-0_pre20181021.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=08b7674d2ca4e57ef813a77c287677ba
diff --git a/metadata/md5-cache/app-vim/airline-themes-9999 b/metadata/md5-cache/app-vim/airline-themes-9999
index facdefa34a84..2e3cc45b3de8 100644
--- a/metadata/md5-cache/app-vim/airline-themes-9999
+++ b/metadata/md5-cache/app-vim/airline-themes-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7c611ae385f5ea9198aa07ba5e035fdf
diff --git a/metadata/md5-cache/app-vim/align-43 b/metadata/md5-cache/app-vim/align-43
index e3f05685bb85..065d02d63810 100644
--- a/metadata/md5-cache/app-vim/align-43
+++ b/metadata/md5-cache/app-vim/align-43
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/align-43.tar.bz2 https://dev.gentoo.org/~radhermit/vim/align-43.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e451778f60ac3b1cc845b34f735e0411
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r2 b/metadata/md5-cache/app-vim/alternate-2.18-r2
index c47937829546..095191f577df 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r2
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -8,5 +8,5 @@ LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=84209f1aab31db4a2a932b8c8140bdc8
diff --git a/metadata/md5-cache/app-vim/ansiesc-12 b/metadata/md5-cache/app-vim/ansiesc-12
index 53e6b914f9a8..1a390e409222 100644
--- a/metadata/md5-cache/app-vim/ansiesc-12
+++ b/metadata/md5-cache/app-vim/ansiesc-12
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ansiesc-12.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ansiesc-12.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=4d0011fa674ddb87a0a7f1d99edfe720
diff --git a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1 b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
index dcaf7b120cc6..c8f5b45f457a 100644
--- a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+++ b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/ant || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ant_menu-0.5.7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ant_menu-0.5.7.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f4bdcd73a74b27106a873e4e8b10a262
diff --git a/metadata/md5-cache/app-vim/autoalign-14 b/metadata/md5-cache/app-vim/autoalign-14
index fac00d84650e..c5ca815f22ac 100644
--- a/metadata/md5-cache/app-vim/autoalign-14
+++ b/metadata/md5-cache/app-vim/autoalign-14
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=app-vim/align-30 >=app-vim/cecutil-4 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/autoalign-14.tar.xz https://dev.gentoo.org/~chutzpah/vim/autoalign-14.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=2528178041187337be05b29c3d37dc96
diff --git a/metadata/md5-cache/app-vim/bash-support-4.2.1 b/metadata/md5-cache/app-vim/bash-support-4.2.1
index 08f4ff417fdb..ae4b362a77ff 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.2.1
+++ b/metadata/md5-cache/app-vim/bash-support-4.2.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c974833191f877d2a586479a5ec02a41
diff --git a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2 b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
index 3b094765c7ce..6ab5e0836c57 100644
--- a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+++ b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e3c8297df8d4d0c855dfc32068dacbfd
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
index 2b74773e2a95..d93f5646eb2f 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5d015045b608d2e805438cb4427d8dcd
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r1 b/metadata/md5-cache/app-vim/breakpts-4.0-r1
index 084f29ed4632..8e7e67560f14 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r1
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=459d8fbd967d3dd31b57747cae2c47d8
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r2 b/metadata/md5-cache/app-vim/breakpts-4.0-r2
index a4cdf5e663e9..50c95ffd5a93 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r2
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=8142 -> breakpts-4.0.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=22eedc9ddb91eace8abede60c7b8cd2a
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.18 b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
index 5a415f7197b5..9c1c0def56f2 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.18
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f331a1983899a0e4aba9b501e7c6ffc4
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.19 b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
index f56364b6789b..9ce6c6afd823 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.19
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.19.tar.gz -> bufexplorer-7.4.19.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e52cf25f9ad650546d0d626a49412acd
diff --git a/metadata/md5-cache/app-vim/bufexplorer-9999 b/metadata/md5-cache/app-vim/bufexplorer-9999
index ca2a6440fe86..e2d50cf881df 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-9999
+++ b/metadata/md5-cache/app-vim/bufexplorer-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3b1a339b61d9f025f7d045e08a350d0e
diff --git a/metadata/md5-cache/app-vim/c-support-6.1.1 b/metadata/md5-cache/app-vim/c-support-6.1.1
index 185e19cc3711..33bfc1fd2821 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=23af1601f091d19cceb35431d7d809f0
diff --git a/metadata/md5-cache/app-vim/calendar-2.9-r1 b/metadata/md5-cache/app-vim/calendar-2.9-r1
index 3aac2f4dfd73..4f0cde9b661a 100644
--- a/metadata/md5-cache/app-vim/calendar-2.9-r1
+++ b/metadata/md5-cache/app-vim/calendar-2.9-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fe64d3177d8f4f9b3795b75eec003ecd
diff --git a/metadata/md5-cache/app-vim/cctree-1.61-r1 b/metadata/md5-cache/app-vim/cctree-1.61-r1
index b8665a2795f8..ffb7c54e6353 100644
--- a/metadata/md5-cache/app-vim/cctree-1.61-r1
+++ b/metadata/md5-cache/app-vim/cctree-1.61-r1
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=608d78a654f35de7b8b36ad920ae90d1
diff --git a/metadata/md5-cache/app-vim/cecutil-17 b/metadata/md5-cache/app-vim/cecutil-17
index 983e3f631708..dd9b2862801b 100644
--- a/metadata/md5-cache/app-vim/cecutil-17
+++ b/metadata/md5-cache/app-vim/cecutil-17
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cecutil-17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cecutil-17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d1c20030f183d5277a170a19245bc162
diff --git a/metadata/md5-cache/app-vim/cfengine-syntax-20141019 b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
index 55996def67b6..c20a12be9a19 100644
--- a/metadata/md5-cache/app-vim/cfengine-syntax-20141019
+++ b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cfengine-syntax-20141019.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cfengine-syntax-20141019.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=458b46ae5e885090aab9734b8a46b10b
diff --git a/metadata/md5-cache/app-vim/checkattach-0.17 b/metadata/md5-cache/app-vim/checkattach-0.17
index 4d263cc622f3..3f34a4cf41df 100644
--- a/metadata/md5-cache/app-vim/checkattach-0.17
+++ b/metadata/md5-cache/app-vim/checkattach-0.17
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/checkattach-0.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/checkattach-0.17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=34fc2ee6c173b3797df52e1050b43497
diff --git a/metadata/md5-cache/app-vim/closetag-0.9.1-r1 b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
index 9cc6fef0246e..3e8a9a04016c 100644
--- a/metadata/md5-cache/app-vim/closetag-0.9.1-r1
+++ b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=222fa03e5ef198542c6b432f8fb7437e
diff --git a/metadata/md5-cache/app-vim/cmdalias-3.0-r1 b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
index 4748ff51343a..7f1e16c7cd27 100644
--- a/metadata/md5-cache/app-vim/cmdalias-3.0-r1
+++ b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8a4db0295dc596c5dfeb5bd9af7fce3f
diff --git a/metadata/md5-cache/app-vim/colorschemes-20140623-r1 b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
index ba814da8e278..4bad90f7736f 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20140623-r1
+++ b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
@@ -8,5 +8,5 @@ LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6ecb0049dc9eb549fbc458c44abe14ad
diff --git a/metadata/md5-cache/app-vim/colorsel-20100406 b/metadata/md5-cache/app-vim/colorsel-20100406
index d343b3778fd5..a47eca1d28bc 100644
--- a/metadata/md5-cache/app-vim/colorsel-20100406
+++ b/metadata/md5-cache/app-vim/colorsel-20100406
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/gvim-7.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=58f0aa1517cd6b27feb700d7271710ee
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.3 b/metadata/md5-cache/app-vim/command-t-5.0.3
index 8eea5e5b1b7b..7a164104a9ec 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=deeff17dabdae1d0bbafd4d9de0a57ea
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.3-r1 b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
index 96560e61fb5a..70cb702ad74b 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3-r1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=31081c81d39e742467c4372c3739ca6d
diff --git a/metadata/md5-cache/app-vim/csound-syntax-0.8.1 b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
index 7ded2818dbb6..1e73943ae1eb 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-0.8.1
+++ b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/luisjure/csound-vim/archive/v0.8.1.tar.gz -> csound-syntax-0.8.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=afed93cb5d7b4ff5fc6fe3786e16cb2b
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804 b/metadata/md5-cache/app-vim/csound-syntax-20160804
index 63e3f235f70a..672cfd454c4b 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-20160804
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f21217d805d5f392f3c51cb25924012c
diff --git a/metadata/md5-cache/app-vim/csscomplete-1.0 b/metadata/md5-cache/app-vim/csscomplete-1.0
index a5e92a208b58..a1b44ebd40c9 100644
--- a/metadata/md5-cache/app-vim/csscomplete-1.0
+++ b/metadata/md5-cache/app-vim/csscomplete-1.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.tar.gz -> csscomplete-1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f21f75e7c53cb7efb3a1e5a8e2778f6b
diff --git a/metadata/md5-cache/app-vim/csv-0.31-r1 b/metadata/md5-cache/app-vim/csv-0.31-r1
index 3648a85f9779..934647dd7040 100644
--- a/metadata/md5-cache/app-vim/csv-0.31-r1
+++ b/metadata/md5-cache/app-vim/csv-0.31-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8ac9f8c51bf6b9f7a5ffd2fe60e18ef6
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80 b/metadata/md5-cache/app-vim/ctrlp-1.80
index c2844a557cc6..dc7081f6ceb4 100644
--- a/metadata/md5-cache/app-vim/ctrlp-1.80
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/1.80.tar.gz -> ctrlp-1.80.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=944019784167acad3e18b68aab6bec1a
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418 b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
index d9786bdda780..40f635a86c18 100644
--- a/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/4b9e7cac612902a25498cca49f13475fe1a821a4.tar.gz -> ctrlp-1.80_p20180418.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=173e6809d113b0e1f56756cd3107c6ac
diff --git a/metadata/md5-cache/app-vim/ctx-1.17-r1 b/metadata/md5-cache/app-vim/ctx-1.17-r1
index 90ce8cbfd778..c58bcd19cc19 100644
--- a/metadata/md5-cache/app-vim/ctx-1.17-r1
+++ b/metadata/md5-cache/app-vim/ctx-1.17-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-vim/enhancedcommentify || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ctx-1.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ctx-1.17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f34576dcadbb01f4b87ca77bba6c36c1
diff --git a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1 b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
index 75a0ffaac1ed..e7b839181842 100644
--- a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+++ b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5360bebb8b8e6f58cc24e5670986653d
diff --git a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1 b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
index 9fd8bea30a80..061563ed161d 100644
--- a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+++ b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=740fdb8d6b5c2499f844e499f5fdd257
diff --git a/metadata/md5-cache/app-vim/dbext-26.00 b/metadata/md5-cache/app-vim/dbext-26.00
index 1fca8b0e6b12..a4c46fd00aa8 100644
--- a/metadata/md5-cache/app-vim/dbext-26.00
+++ b/metadata/md5-cache/app-vim/dbext-26.00
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5622978270657b426327143b95317a91
diff --git a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908 b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
index 11a0044147a8..7c570979fd27 100644
--- a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
+++ b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/detectindent-1.0_p20150908.tar.xz https://dev.gentoo.org/~chutzpah/vim/detectindent-1.0_p20150908.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3dc48ec1212a69b591ff3be266f8fd67
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
index 12417c5acc57..b44897ad1c75 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0d5306e1053857cd8edfb3852616f5db
diff --git a/metadata/md5-cache/app-vim/diffchar-8.2 b/metadata/md5-cache/app-vim/diffchar-8.2
index 7a5bde93527c..70702ee6d742 100644
--- a/metadata/md5-cache/app-vim/diffchar-8.2
+++ b/metadata/md5-cache/app-vim/diffchar-8.2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/837334b268302cf6c597d88485aa8aad6a500b98.tar.gz -> diffchar-8.2.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=efa0af6f5367c544ae3f7acd4cc6f8d0
diff --git a/metadata/md5-cache/app-vim/diffchar-8.6 b/metadata/md5-cache/app-vim/diffchar-8.6
index 8f063fcfd75f..c4ff07ad42ec 100644
--- a/metadata/md5-cache/app-vim/diffchar-8.6
+++ b/metadata/md5-cache/app-vim/diffchar-8.6
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/c889cc133e8c6a1ba9ff089a6b9a6b94bd345cb4.tar.gz -> diffchar-8.6.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8f7d2644fb402ae7e535ec453017aa6b
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1 b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
index f7703ffa0e46..7729bcc3b61b 100644
--- a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d8067b81f1be2badc17438d80e534a3c
diff --git a/metadata/md5-cache/app-vim/easy-align-2.10.0-r1 b/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
index 46e1fc491e32..03a3d4b2d919 100644
--- a/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
+++ b/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=9aaede01a31ad85c6c4fb3eec27d77c1
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
index 856da764d498..7cf5698b22bb 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=40979936c7e730f551b964e94af394e2
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1 b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
index f79d8f433af6..87467bc8fae8 100644
--- a/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2 PSF-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v1.1.1.tar.gz -> editorconfig-vim-1.1.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3cc33f04ddf9bb35530cdfd0c65dbf63
diff --git a/metadata/md5-cache/app-vim/emmet-0.85-r1 b/metadata/md5-cache/app-vim/emmet-0.85-r1
index d4294a8190a6..4f48271074f2 100644
--- a/metadata/md5-cache/app-vim/emmet-0.85-r1
+++ b/metadata/md5-cache/app-vim/emmet-0.85-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d044d845d65724041f93a2f88ce31267
diff --git a/metadata/md5-cache/app-vim/emmet-9999 b/metadata/md5-cache/app-vim/emmet-9999
index 044ee528542b..c0684db82e0b 100644
--- a/metadata/md5-cache/app-vim/emmet-9999
+++ b/metadata/md5-cache/app-vim/emmet-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a7e0fb8e9922aa58df99b1fad811f2dd
diff --git a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1 b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
index 40cf8a62401f..2777aa140a8d 100644
--- a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+++ b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/sed !app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0ed72b08384536d15c2e72bf928336ad
diff --git a/metadata/md5-cache/app-vim/errsign-0.1-r1 b/metadata/md5-cache/app-vim/errsign-0.1-r1
index 5c17857f4deb..0f1cd7be76d2 100644
--- a/metadata/md5-cache/app-vim/errsign-0.1-r1
+++ b/metadata/md5-cache/app-vim/errsign-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=798a826071ed4ccb39c3641c0604057a
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
index a3167edc4b72..b4db0cfe4ae6 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=64aebfea8066d41595b85721a8aee09d
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1 b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
index 5b781da6283b..42d4af1a2f2d 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b26691217651f4d26bc238e80c320db6
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20090310
index 047d4fbaf34c..c3b986995a6d 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20090310
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f77857d5b56964ead1fd59063f6eb9ab
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index fcc1d6ab7b80..b4bab6e60bbe 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -7,5 +7,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=df0558ee58c9818e05a5ab52fb62b57a
diff --git a/metadata/md5-cache/app-vim/extra-syntax-4-r2 b/metadata/md5-cache/app-vim/extra-syntax-4-r2
index e7c82014ced5..1e22097f40c4 100644
--- a/metadata/md5-cache/app-vim/extra-syntax-4-r2
+++ b/metadata/md5-cache/app-vim/extra-syntax-4-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~mips ~ppc ppc64 x86
 LICENSE=metapackage
 RDEPEND=app-vim/bnf-syntax app-vim/brainfuck-syntax app-vim/cfengine-syntax app-vim/dhcpd-syntax app-vim/ebnf-syntax app-vim/eruby-syntax app-vim/fluxbox-syntax app-vim/gentoo-syntax app-vim/gtk-syntax app-vim/help-extra-syntax app-vim/nagios-syntax app-vim/ntp-syntax app-vim/pgn-syntax app-vim/selinux-syntax app-vim/wikipedia-syntax app-vim/xquery-syntax app-vim/xsl-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0589a64d7502ed196f93c183e5d3a915
diff --git a/metadata/md5-cache/app-vim/ferret-4.0 b/metadata/md5-cache/app-vim/ferret-4.0
index 5dd834860467..4f2d9c583a9c 100644
--- a/metadata/md5-cache/app-vim/ferret-4.0
+++ b/metadata/md5-cache/app-vim/ferret-4.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/4.0.tar.gz -> ferret-4.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=41e62ff7c9f7b9e49f06744c2cbcf439
diff --git a/metadata/md5-cache/app-vim/ferret-5.0 b/metadata/md5-cache/app-vim/ferret-5.0
index a5f94c514080..c364138a6307 100644
--- a/metadata/md5-cache/app-vim/ferret-5.0
+++ b/metadata/md5-cache/app-vim/ferret-5.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/5.0.tar.gz -> ferret-5.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c8b6862e4713b3dd0beca4b54e687abd
diff --git a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1 b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
index 77d1663c1833..4ec46c9d4816 100644
--- a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
+++ b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/genindent || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/fluxbox-syntax-1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/fluxbox-syntax-1.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fcc68af51d8c0ee2002f82636a1a54fc
diff --git a/metadata/md5-cache/app-vim/foldutil-3.0-r1 b/metadata/md5-cache/app-vim/foldutil-3.0-r1
index 898508425450..1016fdecc42b 100644
--- a/metadata/md5-cache/app-vim/foldutil-3.0-r1
+++ b/metadata/md5-cache/app-vim/foldutil-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=719478f821598ba4c5572921f61db4a2
diff --git a/metadata/md5-cache/app-vim/frawor-0.2.3 b/metadata/md5-cache/app-vim/frawor-0.2.3
index 6e3392bbf772..4f1037a78269 100644
--- a/metadata/md5-cache/app-vim/frawor-0.2.3
+++ b/metadata/md5-cache/app-vim/frawor-0.2.3
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/ZyX_I/frawor/downloads/frawor-0.2.3.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=1d2114f744e2834704b4d45e137bbfcd
diff --git a/metadata/md5-cache/app-vim/frawor-0.2.3-r1 b/metadata/md5-cache/app-vim/frawor-0.2.3-r1
index 75d60f138df3..52bc02192606 100644
--- a/metadata/md5-cache/app-vim/frawor-0.2.3-r1
+++ b/metadata/md5-cache/app-vim/frawor-0.2.3-r1
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/frawor/archive/0.2.3.tar.gz -> frawor-0.2.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=97e1e3dc7bf8753f464aeb41d36a5af3
diff --git a/metadata/md5-cache/app-vim/fugitive-2.4 b/metadata/md5-cache/app-vim/fugitive-2.4
index c8b6a12b67e3..f162a8013d6d 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.4
+++ b/metadata/md5-cache/app-vim/fugitive-2.4
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.4.tar.gz -> fugitive-2.4.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=aea2817ab56aa2f5478b512532f282a7
diff --git a/metadata/md5-cache/app-vim/fugitive-2.5 b/metadata/md5-cache/app-vim/fugitive-2.5
index 97307e044999..00d7951588fc 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.5
+++ b/metadata/md5-cache/app-vim/fugitive-2.5
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.5.tar.gz -> fugitive-2.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=42a25b5dd48e6b7d272d3b8c87693796
diff --git a/metadata/md5-cache/app-vim/fugitive-3.1 b/metadata/md5-cache/app-vim/fugitive-3.1
index 919b058bbb7a..08f682359b6a 100644
--- a/metadata/md5-cache/app-vim/fugitive-3.1
+++ b/metadata/md5-cache/app-vim/fugitive-3.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.1.tar.gz -> fugitive-3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fugitive-3.2 b/metadata/md5-cache/app-vim/fugitive-3.2
index d1cbfc7bcc2b..020665098f78 100644
--- a/metadata/md5-cache/app-vim/fugitive-3.2
+++ b/metadata/md5-cache/app-vim/fugitive-3.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.2.tar.gz -> fugitive-3.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index 85b0f7655a4c..2a9c317c9e89 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -8,5 +8,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2 b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
index 254c43946f87..de5e565bf81d 100644
--- a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+++ b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-vim/l9 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=aa59555b9fdec197f20950fa94f18668
diff --git a/metadata/md5-cache/app-vim/genindent-1.1-r1 b/metadata/md5-cache/app-vim/genindent-1.1-r1
index e9d087de32a0..a7015ffb0575 100644
--- a/metadata/md5-cache/app-vim/genindent-1.1-r1
+++ b/metadata/md5-cache/app-vim/genindent-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c705f98ccb446ad315d86dedd7d3a6ea
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210428 b/metadata/md5-cache/app-vim/gentoo-syntax-20210428
index f8c7fa1da690..e38ca1cbbd13 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210428
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20210428
@@ -9,5 +9,5 @@ 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-20210428.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3bd59a1b42cf9f21b660e40d90a9c61f
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210716 b/metadata/md5-cache/app-vim/gentoo-syntax-20210716
index 9b68bc01811d..f9b6c3dabec2 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210716
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20210716
@@ -9,5 +9,5 @@ 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
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=efd73e1821001afe173e15eb006d2abe
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-99999999 b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
index b602581bb59d..78f924958d0f 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-99999999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
@@ -8,5 +8,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f2e895e3fe08b5824990dda890ad8fb7
diff --git a/metadata/md5-cache/app-vim/genutils-2.5-r1 b/metadata/md5-cache/app-vim/genutils-2.5-r1
index c222eea7e334..94d79cdf00de 100644
--- a/metadata/md5-cache/app-vim/genutils-2.5-r1
+++ b/metadata/md5-cache/app-vim/genutils-2.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e9ae61156fac980c19c7b34a0c756490
diff --git a/metadata/md5-cache/app-vim/gist-7.3 b/metadata/md5-cache/app-vim/gist-7.3
index 9311539f6d17..b47e890c682c 100644
--- a/metadata/md5-cache/app-vim/gist-7.3
+++ b/metadata/md5-cache/app-vim/gist-7.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=4ad74697a065dd6df3bde149c5bef28e
diff --git a/metadata/md5-cache/app-vim/git-patch-tags-0.2 b/metadata/md5-cache/app-vim/git-patch-tags-0.2
index 6013db90f8a6..7e045c1ed8e9 100644
--- a/metadata/md5-cache/app-vim/git-patch-tags-0.2
+++ b/metadata/md5-cache/app-vim/git-patch-tags-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/git-patch-tags-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/git-patch-tags-0.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d327aeb09778eb60ce4e6fdc928140bd
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180316 b/metadata/md5-cache/app-vim/gitgutter-20180316
index 4cd169ead03b..f9b44b858e15 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20180316
+++ b/metadata/md5-cache/app-vim/gitgutter-20180316
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=31986e7af553048cab18529866d849e3
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180815 b/metadata/md5-cache/app-vim/gitgutter-20180815
index 82f4bec3605c..3e38780478eb 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20180815
+++ b/metadata/md5-cache/app-vim/gitgutter-20180815
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/50a7062909d91a290fae04219887b1b45f3138db.tar.gz -> gitgutter-20180815.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fbf5d90f8b74664705b8e5354d8c8565
diff --git a/metadata/md5-cache/app-vim/gitgutter-99999999 b/metadata/md5-cache/app-vim/gitgutter-99999999
index d6028af6688a..e84722af86c2 100644
--- a/metadata/md5-cache/app-vim/gitgutter-99999999
+++ b/metadata/md5-cache/app-vim/gitgutter-99999999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=47e61422683e4ab568f8314454f44b0e
diff --git a/metadata/md5-cache/app-vim/gitlog-5.1.0 b/metadata/md5-cache/app-vim/gitlog-5.1.0
index 07a00ee2a401..b3134e39d6d7 100644
--- a/metadata/md5-cache/app-vim/gitlog-5.1.0
+++ b/metadata/md5-cache/app-vim/gitlog-5.1.0
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cc3771a210a332a3a19f4fad35e9c445
diff --git a/metadata/md5-cache/app-vim/gitlog-6.0.0 b/metadata/md5-cache/app-vim/gitlog-6.0.0
index 4a8fefa8252a..3c66212ed98f 100644
--- a/metadata/md5-cache/app-vim/gitlog-6.0.0
+++ b/metadata/md5-cache/app-vim/gitlog-6.0.0
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitlog-9999 b/metadata/md5-cache/app-vim/gitlog-9999
index 37f916b0170f..421d844b57e3 100644
--- a/metadata/md5-cache/app-vim/gitlog-9999
+++ b/metadata/md5-cache/app-vim/gitlog-9999
@@ -7,5 +7,5 @@ LICENSE=Artistic
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20111225 b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
index 2474b99347d2..eac75095d122 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20111225
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-syntax-20111225.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=4770a61cd80cc1f941127243924ef64a
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20130306 b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
index 2b458cecae02..b9cd54b02684 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20130306
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmatilai/gitolite.vim/archive/990634e95f209ffca96970da1c117c0f67697d89.tar.gz -> gitolite-syntax-20130306.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6da0a06b02aa2cc50d66d3750344e947
diff --git a/metadata/md5-cache/app-vim/gitv-1.3.1 b/metadata/md5-cache/app-vim/gitv-1.3.1
index e6b448906366..ca634492bafc 100644
--- a/metadata/md5-cache/app-vim/gitv-1.3.1
+++ b/metadata/md5-cache/app-vim/gitv-1.3.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6b03f0c64a92b5da626a68e7747bc26c
diff --git a/metadata/md5-cache/app-vim/gitv-9999 b/metadata/md5-cache/app-vim/gitv-9999
index e30c628a29f7..0576f0b55f7f 100644
--- a/metadata/md5-cache/app-vim/gitv-9999
+++ b/metadata/md5-cache/app-vim/gitv-9999
@@ -7,5 +7,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b52cd7c6207c5e1990dfea4b48677507
diff --git a/metadata/md5-cache/app-vim/gnupg-2.6 b/metadata/md5-cache/app-vim/gnupg-2.6
index fd09fe6f06a0..ecdc6060fecb 100644
--- a/metadata/md5-cache/app-vim/gnupg-2.6
+++ b/metadata/md5-cache/app-vim/gnupg-2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fc9929901bdc803cfdb788e382dfa053
diff --git a/metadata/md5-cache/app-vim/greputils-2.8-r1 b/metadata/md5-cache/app-vim/greputils-2.8-r1
index 95b9ccaba031..21265bace241 100644
--- a/metadata/md5-cache/app-vim/greputils-2.8-r1
+++ b/metadata/md5-cache/app-vim/greputils-2.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c04b1fe875f948a7564a84c84a3b0603
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20130716 b/metadata/md5-cache/app-vim/gtk-syntax-20130716
index 347ef040d0b3..597a284e952c 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20130716
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20130716
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3de6e52e021bc8ed6ac54d9fcfde2afe
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2-r3 b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
index de6ab0cc6700..e8c7261cd916 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.2-r3
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_single_target_python3_8(-)?,python_si
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0815e6fa3b341cdcf9320063ab1777bc
diff --git a/metadata/md5-cache/app-vim/haskellmode-20101118-r1 b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
index db094bbd0b23..e6d935753c37 100644
--- a/metadata/md5-cache/app-vim/haskellmode-20101118-r1
+++ b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ghc[doc] net-misc/wget || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
 SLOT=0
 SRC_URI=http://code.haskell.org/~wwolff/haskellmode/haskellmode-20101118.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f63d0cec323bc2d2a4afaeb5e2065a25
diff --git a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2 b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
index 56ad4bbbd713..278c52a213c6 100644
--- a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
+++ b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/help-extra-syntax-20050106.tar.bz2 https://dev.gentoo.org/~radhermit/vim/help-extra-syntax-20050106.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7ba0e197d29c3af08b62e12746bbd082
diff --git a/metadata/md5-cache/app-vim/increment-1.1-r1 b/metadata/md5-cache/app-vim/increment-1.1-r1
index 7c9a3b308849..f0cfb3375fe1 100644
--- a/metadata/md5-cache/app-vim/increment-1.1-r1
+++ b/metadata/md5-cache/app-vim/increment-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0c5b4fedc8148ff16713be5fd7e2c4d5
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3 b/metadata/md5-cache/app-vim/indentpython-0.3
index ec9c455db04f..56039188f521 100644
--- a/metadata/md5-cache/app-vim/indentpython-0.3
+++ b/metadata/md5-cache/app-vim/indentpython-0.3
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.tar.gz -> indentpython-0.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8d4b57d31ef50b13aecdabd2a3541a5e
diff --git a/metadata/md5-cache/app-vim/info-1.7-r2 b/metadata/md5-cache/app-vim/info-1.7-r2
index e0268ffe3083..126c917315d4 100644
--- a/metadata/md5-cache/app-vim/info-1.7-r2
+++ b/metadata/md5-cache/app-vim/info-1.7-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=78a8d1e9734df55c95480d176e991b77
diff --git a/metadata/md5-cache/app-vim/iris-1.0.0 b/metadata/md5-cache/app-vim/iris-1.0.0
index 7e2f1ce3a718..a0bb51962ebd 100644
--- a/metadata/md5-cache/app-vim/iris-1.0.0
+++ b/metadata/md5-cache/app-vim/iris-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/imapclient python_targets_python3_8? ( dev-lang/python:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/soywod/iris.vim/archive/v1.0.0.tar.gz -> iris-1.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=dbd7ffc40e25fce1a71b7c97002e45fd
diff --git a/metadata/md5-cache/app-vim/jedi-0.10.0 b/metadata/md5-cache/app-vim/jedi-0.10.0
index ea5c4fd35c2c..f08670d90b31 100644
--- a/metadata/md5-cache/app-vim/jedi-0.10.0
+++ b/metadata/md5-cache/app-vim/jedi-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi-vim/archive/0.10.0.tar.gz -> jedi-0.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=dcdd0eada1dfe3062b313fb13c24cdfb
diff --git a/metadata/md5-cache/app-vim/json-20150511 b/metadata/md5-cache/app-vim/json-20150511
index 0eb5a7c267ad..df6ce8be4f99 100644
--- a/metadata/md5-cache/app-vim/json-20150511
+++ b/metadata/md5-cache/app-vim/json-20150511
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/json-20150511.tar.bz2 https://dev.gentoo.org/~radhermit/vim/json-20150511.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=9279712c42c56cf8e93950b3e9cd10a7
diff --git a/metadata/md5-cache/app-vim/l9-1.1 b/metadata/md5-cache/app-vim/l9-1.1
index 7b6f2b525d10..509178799965 100644
--- a/metadata/md5-cache/app-vim/l9-1.1
+++ b/metadata/md5-cache/app-vim/l9-1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13948 -> l9-1.1.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f670b18e574694f779b60f2bd58a8232
diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30
index 26fa1cbbd0a7..bafd05aa6068 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.30
+++ b/metadata/md5-cache/app-vim/languagetool-1.30
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=82360cb097280db05c9c4918babba7f5
diff --git a/metadata/md5-cache/app-vim/lightline-9999 b/metadata/md5-cache/app-vim/lightline-9999
index 1d1d188c3628..c51fa58d5c05 100644
--- a/metadata/md5-cache/app-vim/lightline-9999
+++ b/metadata/md5-cache/app-vim/lightline-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=48459901ef0cf6d075c1aa31ef2d3a5f
diff --git a/metadata/md5-cache/app-vim/locateopen-1.3-r1 b/metadata/md5-cache/app-vim/locateopen-1.3-r1
index 24789d1b7dd3..4474dbc35b44 100644
--- a/metadata/md5-cache/app-vim/locateopen-1.3-r1
+++ b/metadata/md5-cache/app-vim/locateopen-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=sys-apps/mlocate || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/locateopen-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/locateopen-1.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3873545121ea00d3dc1676580df1ddab
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1 b/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
index 3394e3daf960..bb4307a70076 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=07f9a6f76dfb828f91bcff1ff23fb21a
diff --git a/metadata/md5-cache/app-vim/matrix-1.10-r1 b/metadata/md5-cache/app-vim/matrix-1.10-r1
index 0af7e10e3bc0..f2a6f72ea290 100644
--- a/metadata/md5-cache/app-vim/matrix-1.10-r1
+++ b/metadata/md5-cache/app-vim/matrix-1.10-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/matrix-1.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/matrix-1.10.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c09142ba42ab567619e86601beaceeea
diff --git a/metadata/md5-cache/app-vim/mediawiki-20151115 b/metadata/md5-cache/app-vim/mediawiki-20151115
index 787618951892..72ebddf608bb 100644
--- a/metadata/md5-cache/app-vim/mediawiki-20151115
+++ b/metadata/md5-cache/app-vim/mediawiki-20151115
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=!app-vim/wikipedia-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/chikamichi/mediawiki.vim/archive/26e5737264354be41cb11d16d48132779795e168.tar.gz -> mediawiki-20151115.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c247067827f60fc6513e8454f76ca4f2
diff --git a/metadata/md5-cache/app-vim/merginal-2.1.0 b/metadata/md5-cache/app-vim/merginal-2.1.0
index c02fe47a06fe..b3288b83c4bd 100644
--- a/metadata/md5-cache/app-vim/merginal-2.1.0
+++ b/metadata/md5-cache/app-vim/merginal-2.1.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.0.tar.gz -> merginal-2.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c7c8e93377f9d5242523f5846b13c43f
diff --git a/metadata/md5-cache/app-vim/merginal-2.1.2 b/metadata/md5-cache/app-vim/merginal-2.1.2
index be3cb5c3c957..b9e8883aff91 100644
--- a/metadata/md5-cache/app-vim/merginal-2.1.2
+++ b/metadata/md5-cache/app-vim/merginal-2.1.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.2.tar.gz -> merginal-2.1.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5f5b2478e6533fb5c9f177a6fab8595c
diff --git a/metadata/md5-cache/app-vim/merginal-9999 b/metadata/md5-cache/app-vim/merginal-9999
index a34d2b138021..4e538b50dc5a 100644
--- a/metadata/md5-cache/app-vim/merginal-9999
+++ b/metadata/md5-cache/app-vim/merginal-9999
@@ -8,5 +8,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5f5b2478e6533fb5c9f177a6fab8595c
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.5.2 b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
index d383d51130e1..8fd337deb276 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.5.2
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/archive/v6.5.2.tar.gz -> minibufexpl-6.5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f104917f34ae4a4066530a66cb0b8a45
diff --git a/metadata/md5-cache/app-vim/molokai-0.1_p20151115 b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
index e9c962814499..a59770899cc3 100644
--- a/metadata/md5-cache/app-vim/molokai-0.1_p20151115
+++ b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomasr/molokai/archive/c67bdfcdb31415aa0ade7f8c003261700a885476.tar.gz -> molokai-0.1_p20151115.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=38b721b74bea69a106ca909a4071ed8a
diff --git a/metadata/md5-cache/app-vim/multiplesearch-1.3 b/metadata/md5-cache/app-vim/multiplesearch-1.3
index 08b8549024a3..21115dd7f29e 100644
--- a/metadata/md5-cache/app-vim/multiplesearch-1.3
+++ b/metadata/md5-cache/app-vim/multiplesearch-1.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=9276 -> multiplesearch-1.3.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=443a99a1b028769eb8a228dd62b18bb0
diff --git a/metadata/md5-cache/app-vim/multvals-3.10-r1 b/metadata/md5-cache/app-vim/multvals-3.10-r1
index 649dae058158..9f360a4e6cfc 100644
--- a/metadata/md5-cache/app-vim/multvals-3.10-r1
+++ b/metadata/md5-cache/app-vim/multvals-3.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/multvals-3.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/multvals-3.10.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b52535649c6859875b8b05d13a59b8ff
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8 b/metadata/md5-cache/app-vim/nagios-syntax-1.8
index 25549b6eef5e..5b6303de439a 100644
--- a/metadata/md5-cache/app-vim/nagios-syntax-1.8
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a9886a79467448f352f82e44e5e90d84
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1 b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
index 32f85109ebdd..c5a08cb7dcf8 100644
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=08e43b17170724c736b18f29697dbf99
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-2.5.2 b/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
index d6cd9b7998be..99fe0abe7e86 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
+++ b/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.2.tar.gz -> nerdcommenter-2.5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6065a3ef26714b85df56d343c05aab61
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-9999 b/metadata/md5-cache/app-vim/nerdcommenter-9999
index 12edf89620de..542d12a515bc 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-9999
+++ b/metadata/md5-cache/app-vim/nerdcommenter-9999
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fff6c5f34bf428c01725bb7cc5b24653
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1 b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
index d1853b322a7a..8f579506d119 100644
--- a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
+++ b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a9f316d53ff944b35e66d1b4070bf50e
diff --git a/metadata/md5-cache/app-vim/nerdtree-6.4.1 b/metadata/md5-cache/app-vim/nerdtree-6.4.1
index 841bc0719d3b..905875133df2 100644
--- a/metadata/md5-cache/app-vim/nerdtree-6.4.1
+++ b/metadata/md5-cache/app-vim/nerdtree-6.4.1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/6.4.1.tar.gz -> nerdtree-6.4.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a9acd7afd7efbead48b45a47104dc54c
diff --git a/metadata/md5-cache/app-vim/nerdtree-6.4.3 b/metadata/md5-cache/app-vim/nerdtree-6.4.3
index 8cfaf8d8be59..72be33972569 100644
--- a/metadata/md5-cache/app-vim/nerdtree-6.4.3
+++ b/metadata/md5-cache/app-vim/nerdtree-6.4.3
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/6.4.3.tar.gz -> nerdtree-6.4.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=90c2233bf788c851b5279585067e7ed1
diff --git a/metadata/md5-cache/app-vim/nerdtree-9999 b/metadata/md5-cache/app-vim/nerdtree-9999
index 4f7417104124..113a6d467a32 100644
--- a/metadata/md5-cache/app-vim/nerdtree-9999
+++ b/metadata/md5-cache/app-vim/nerdtree-9999
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=90c2233bf788c851b5279585067e7ed1
diff --git a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7 b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
index bc473198cd6f..d477d8104e42 100644
--- a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
+++ b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-vim/nerdtree || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jistr/vim-nerdtree-tabs/archive/v1.4.7.tar.gz -> nerdtree-tabs-1.4.7.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=60df7f1cf3ae77a12a4478fae2b1ed3e
diff --git a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3 b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
index bd61d08434bd..e30d7c27294b 100644
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7b04c2eb8a376b5c8adeca2808890b0d
diff --git a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1 b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
index feecbf6f28f5..51d53c021a39 100644
--- a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
+++ b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ntp.conf syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=778
-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=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ntp-syntax-20031001.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ntp-syntax-20031001.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
-_md5_=7e33d2edca2d677d3e2965b7ade556fe
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=bf86945965c35bc6d3537b66cb546612
diff --git a/metadata/md5-cache/app-vim/omnicppcomplete-0.41 b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
index fc0f04826710..b25cb9d89a45 100644
--- a/metadata/md5-cache/app-vim/omnicppcomplete-0.41
+++ b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=>=dev-util/ctags-5.7 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=7722 -> omnicppcomplete-0.41.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=eb5325b68a5ae8037270e79ee4959cbe
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4-r1 b/metadata/md5-cache/app-vim/pathogen-2.4-r1
index e4d9fe3bf306..f784f076174f 100644
--- a/metadata/md5-cache/app-vim/pathogen-2.4-r1
+++ b/metadata/md5-cache/app-vim/pathogen-2.4-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=02b724c9e1726172fb082e0191d88731
diff --git a/metadata/md5-cache/app-vim/pdv-1.0.1-r1 b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
index a7623d66c5a9..31b04c0f2d6c 100644
--- a/metadata/md5-cache/app-vim/pdv-1.0.1-r1
+++ b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pdv-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pdv-1.0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5d086a19c606a2d289b8537965f3344f
diff --git a/metadata/md5-cache/app-vim/perl-support-5.3.2 b/metadata/md5-cache/app-vim/perl-support-5.3.2
index e58dc5160472..4a5de56a27a5 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.3.2
+++ b/metadata/md5-cache/app-vim/perl-support-5.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-support-5.3.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/perl-support-5.3.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c8566da4b7bfe69c15e96f3105dffce8
diff --git a/metadata/md5-cache/app-vim/perl-support-5.4 b/metadata/md5-cache/app-vim/perl-support-5.4
index 5ae941957152..25acf28ac422 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.4
+++ b/metadata/md5-cache/app-vim/perl-support-5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!ppc? ( dev-perl/Devel-NYTProf ) dev-perl/Perl-Tidy dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/WolfgangMehner/perl-support/archive/version-5.4.tar.gz -> perl-support-5.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3f8d1f9d99d3d35842c8ed20171fbbf4
diff --git a/metadata/md5-cache/app-vim/perlomni-2.5 b/metadata/md5-cache/app-vim/perlomni-2.5
index 2bd05c600c4b..f58775c0c696 100644
--- a/metadata/md5-cache/app-vim/perlomni-2.5
+++ b/metadata/md5-cache/app-vim/perlomni-2.5
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.tar.gz -> perlomni-2.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f4f7e9c9958e5fbd2f1aa468e2ce6d33
diff --git a/metadata/md5-cache/app-vim/pfsyntax-1.3 b/metadata/md5-cache/app-vim/pfsyntax-1.3
index 47d1bd0a9091..c608379b57d8 100644
--- a/metadata/md5-cache/app-vim/pfsyntax-1.3
+++ b/metadata/md5-cache/app-vim/pfsyntax-1.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/pf.vim/archive/1.3.tar.gz -> pfsyntax-1.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=659d0b2d67bc004a2dd1cf0ad75980d1
diff --git a/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1 b/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
index c0a08134f50e..4eee242dcb11 100644
--- a/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
+++ b/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pgn-syntax-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pgn-syntax-1.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=5e06fbf2f07f41e66122edfca69b74c2
diff --git a/metadata/md5-cache/app-vim/phpdocs-0.26-r1 b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
index a86960663598..808a71de6e6b 100644
--- a/metadata/md5-cache/app-vim/phpdocs-0.26-r1
+++ b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/phpdocs-0.26.tar.bz2 https://dev.gentoo.org/~radhermit/vim/phpdocs-0.26.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=66c59936f96f504127ab770c69f214ff
diff --git a/metadata/md5-cache/app-vim/project-1.4.1 b/metadata/md5-cache/app-vim/project-1.4.1
index 0ef50dcf15ff..7cf91872df7e 100644
--- a/metadata/md5-cache/app-vim/project-1.4.1
+++ b/metadata/md5-cache/app-vim/project-1.4.1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=6273 -> project-1.4.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d5d2539082db30998603e56a4ac9e890
diff --git a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1 b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
index 7e5d844aa622..08bf43b0f03d 100644
--- a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
+++ b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 GPL-2
 RDEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tampakrap/tarballs/puppet-syntax-3.0.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b731902f289df8d39a99f90ad6e493ac
diff --git a/metadata/md5-cache/app-vim/pushpop-4.0-r1 b/metadata/md5-cache/app-vim/pushpop-4.0-r1
index 226c2512bfaa..b27d65a36548 100644
--- a/metadata/md5-cache/app-vim/pushpop-4.0-r1
+++ b/metadata/md5-cache/app-vim/pushpop-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pushpop-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pushpop-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ad81a5d2b0f10616dc6a1add65530167
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index fb7e607e01ba..1d610792b0cc 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r2
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || (
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-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	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_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	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cdbd4ab10c2b8efaebe34e3f1809d459
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
index eb3a29776e9a..cb8b5be3d0f9 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
@@ -10,5 +10,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://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e0c0cac61d783747f4e46670a7c5a74d
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0-r1 b/metadata/md5-cache/app-vim/pydoc-2.0-r1
index 99d15146c2ee..5c6c7058536b 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0-r1
+++ b/metadata/md5-cache/app-vim/pydoc-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=12c656089e068200f50d2fcb89eb51fd
diff --git a/metadata/md5-cache/app-vim/pytest-1.1.4 b/metadata/md5-cache/app-vim/pytest-1.1.4
index 751c310bdc0e..7484000e0630 100644
--- a/metadata/md5-cache/app-vim/pytest-1.1.4
+++ b/metadata/md5-cache/app-vim/pytest-1.1.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/pytest || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=18178 -> pytest-1.1.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d03a3b652c5d1e2354aa2ed9a31837b0
diff --git a/metadata/md5-cache/app-vim/rails-5.2 b/metadata/md5-cache/app-vim/rails-5.2
index c6305cce58ce..2d778b6d9448 100644
--- a/metadata/md5-cache/app-vim/rails-5.2
+++ b/metadata/md5-cache/app-vim/rails-5.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.2.tar.gz -> rails-5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3ac7b63ea0177b7965417e0d896b6063
diff --git a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0 b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
index fd2ad96f3de9..c7d2b0b18ff7 100644
--- a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
+++ b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/rainbow_parentheses-1.0.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7900297d4d84fe24a81a8e2beb35530f
diff --git a/metadata/md5-cache/app-vim/recover-0.18 b/metadata/md5-cache/app-vim/recover-0.18
index 1a96cfc83757..7320e2d2ca06 100644
--- a/metadata/md5-cache/app-vim/recover-0.18
+++ b/metadata/md5-cache/app-vim/recover-0.18
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/recover-0.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/recover-0.18.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=bae55b532176a0a413a66603099aa4bc
diff --git a/metadata/md5-cache/app-vim/reload-0.6.17-r1 b/metadata/md5-cache/app-vim/reload-0.6.17-r1
index b456c3109e47..1c25f4f3ed2c 100644
--- a/metadata/md5-cache/app-vim/reload-0.6.17-r1
+++ b/metadata/md5-cache/app-vim/reload-0.6.17-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.8.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-reload/archive/0.6.17.tar.gz -> reload-0.6.17.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=543e2def2809676a2ebe1f0212faa4c7
diff --git a/metadata/md5-cache/app-vim/repeat-1.1 b/metadata/md5-cache/app-vim/repeat-1.1
index 9e8adc8b9428..71527da7c805 100644
--- a/metadata/md5-cache/app-vim/repeat-1.1
+++ b/metadata/md5-cache/app-vim/repeat-1.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-repeat/archive/v1.1.tar.gz -> repeat-1.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=912d256ad60a12a72f72d0678191bb38
diff --git a/metadata/md5-cache/app-vim/ri-browser-1.2-r1 b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
index b416b5f7b4a6..8ac8002092e8 100644
--- a/metadata/md5-cache/app-vim/ri-browser-1.2-r1
+++ b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/ruby || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ri-browser-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ri-browser-1.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ec77108fa505ec00e6811dd0ba23d9cb
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20210215 b/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
index 3d91117eb220..f05b3d845600 100644
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
+++ b/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust.vim/archive/87c745d8d506fc1eecc1d81df15d5bde1658a2fc.tar.gz -> rust-vim-1_pre20210215.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a0d95160f77156632197ef60296a3dc6
diff --git a/metadata/md5-cache/app-vim/salt-vim-20151119 b/metadata/md5-cache/app-vim/salt-vim-20151119
index 41e47a06a7b0..a68bbbd741f3 100644
--- a/metadata/md5-cache/app-vim/salt-vim-20151119
+++ b/metadata/md5-cache/app-vim/salt-vim-20151119
@@ -8,5 +8,5 @@ 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
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=019089f3d2f11e7978329633dfeda493
diff --git a/metadata/md5-cache/app-vim/scala-syntax-1.0-r1 b/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
index 62e0aa19391f..a8d2bacef888 100644
--- a/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
+++ b/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/scala-syntax-1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6940232e46fec0a04e6500997ca6a179
diff --git a/metadata/md5-cache/app-vim/screen-1.5 b/metadata/md5-cache/app-vim/screen-1.5
index d6e6ea5da9c5..d0cf038df416 100644
--- a/metadata/md5-cache/app-vim/screen-1.5
+++ b/metadata/md5-cache/app-vim/screen-1.5
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( app-misc/screen app-misc/tmux ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/Screen-vim---gnu-screentmux/tarball/1.5 -> screen-1.5.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b764e87b00ef1f0fbd72aebcae0b2997
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
index 541fcab7e446..5ab2bef93975 100644
--- a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6aebc1d9c851460ca8e59d421febc458
diff --git a/metadata/md5-cache/app-vim/securemodelines-20140926 b/metadata/md5-cache/app-vim/securemodelines-20140926
index 1c7a22dd1da2..b9f7a55fc5d8 100644
--- a/metadata/md5-cache/app-vim/securemodelines-20140926
+++ b/metadata/md5-cache/app-vim/securemodelines-20140926
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e4a685bce75121b58e5f124dce9eeef5
diff --git a/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1 b/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
index f2be0e2aae35..9311748a771f 100644
--- a/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
+++ b/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/selinux-syntax-20041225.tar.bz2 https://dev.gentoo.org/~radhermit/vim/selinux-syntax-20041225.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3f548828d91fa47f6ba6a225de262c93
diff --git a/metadata/md5-cache/app-vim/session-2.13.1 b/metadata/md5-cache/app-vim/session-2.13.1
index 535b9c9e3f66..8dfd3c5773f5 100644
--- a/metadata/md5-cache/app-vim/session-2.13.1
+++ b/metadata/md5-cache/app-vim/session-2.13.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-session/archive/2.13.1.tar.gz -> session-2.13.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=20204ba956894c7cd7387882c43ba628
diff --git a/metadata/md5-cache/app-vim/showmarks-2.2-r1 b/metadata/md5-cache/app-vim/showmarks-2.2-r1
index 339cdf2eaef1..18ae50205b50 100644
--- a/metadata/md5-cache/app-vim/showmarks-2.2-r1
+++ b/metadata/md5-cache/app-vim/showmarks-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fc62440b7a45f525c9914d78f455e4ec
diff --git a/metadata/md5-cache/app-vim/sleuth-1.1 b/metadata/md5-cache/app-vim/sleuth-1.1
index 11bd2ea8943c..66baa1ed9e8f 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.1
+++ b/metadata/md5-cache/app-vim/sleuth-1.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=94e68688fa1d5a34fb95dc42821635e2
diff --git a/metadata/md5-cache/app-vim/snipmate-0.87-r1 b/metadata/md5-cache/app-vim/snipmate-0.87-r1
index c2c3c328aa1d..8a9d5bc9fac1 100644
--- a/metadata/md5-cache/app-vim/snipmate-0.87-r1
+++ b/metadata/md5-cache/app-vim/snipmate-0.87-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=72e2488b85df63573c057a5fba01de62
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r3 b/metadata/md5-cache/app-vim/splice-1.1.0-r3
index 2e7f8b9c045c..473b8ef9b5f2 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r3
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r3
@@ -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://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f4e0fb96a321e45d9f4421a06cd17835
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r4 b/metadata/md5-cache/app-vim/splice-1.1.0-r4
index a6b2a72eff37..7075adc863dc 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r4
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sjl/splice.vim/archive/v1.1.0.tar.gz -> splice-1.1.0-github.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=9409f6cb31309cbbd886f5c103ce9857
diff --git a/metadata/md5-cache/app-vim/sudoedit-0.21 b/metadata/md5-cache/app-vim/sudoedit-0.21
index 0951d9862cb7..fc4e308c851f 100644
--- a/metadata/md5-cache/app-vim/sudoedit-0.21
+++ b/metadata/md5-cache/app-vim/sudoedit-0.21
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( app-admin/sudo sys-apps/shadow ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sudoedit-0.21.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sudoedit-0.21.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3ffd6819d9880cf432233e945375ce39
diff --git a/metadata/md5-cache/app-vim/supertab-2.1 b/metadata/md5-cache/app-vim/supertab-2.1
index e1386f1b491a..0d062fbc04aa 100644
--- a/metadata/md5-cache/app-vim/supertab-2.1
+++ b/metadata/md5-cache/app-vim/supertab-2.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ervandew/supertab/archive/2.1.tar.gz -> supertab-2.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c01da565336afdb92310a19d1c6c2ced
diff --git a/metadata/md5-cache/app-vim/surround-2.1-r1 b/metadata/md5-cache/app-vim/surround-2.1-r1
index 6baa86b778c3..62b09bf812c2 100644
--- a/metadata/md5-cache/app-vim/surround-2.1-r1
+++ b/metadata/md5-cache/app-vim/surround-2.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/surround-2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/surround-2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=07d590b2853b178af4e87afc9fb72f9d
diff --git a/metadata/md5-cache/app-vim/syntastic-3.9.0 b/metadata/md5-cache/app-vim/syntastic-3.9.0
index f6bb9c83a1c2..c158d8183238 100644
--- a/metadata/md5-cache/app-vim/syntastic-3.9.0
+++ b/metadata/md5-cache/app-vim/syntastic-3.9.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-syntastic/syntastic/archive/3.9.0.tar.gz -> syntastic-3.9.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7b45fb38cc0b4436883dbef9096e3ab5
diff --git a/metadata/md5-cache/app-vim/syntastic-9999 b/metadata/md5-cache/app-vim/syntastic-9999
index 25bbe209bbfd..30bf86634230 100644
--- a/metadata/md5-cache/app-vim/syntastic-9999
+++ b/metadata/md5-cache/app-vim/syntastic-9999
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=02d39f62eb0b4be46eb96de15419a21a
diff --git a/metadata/md5-cache/app-vim/tagbar-2.7 b/metadata/md5-cache/app-vim/tagbar-2.7
index 66daacc9073f..6d3345bfb388 100644
--- a/metadata/md5-cache/app-vim/tagbar-2.7
+++ b/metadata/md5-cache/app-vim/tagbar-2.7
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.7.tar.gz -> tagbar-2.7.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ad1f3c7b4f23601770d87b163fdd851a
diff --git a/metadata/md5-cache/app-vim/taglist-4.6 b/metadata/md5-cache/app-vim/taglist-4.6
index 45527fd868f8..20a068e71fb9 100644
--- a/metadata/md5-cache/app-vim/taglist-4.6
+++ b/metadata/md5-cache/app-vim/taglist-4.6
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=47a939a1eae3787d45b1d1d28423a854
diff --git a/metadata/md5-cache/app-vim/tasklist-1.0.1 b/metadata/md5-cache/app-vim/tasklist-1.0.1
index 429ee244498f..70bf2f957201 100644
--- a/metadata/md5-cache/app-vim/tasklist-1.0.1
+++ b/metadata/md5-cache/app-vim/tasklist-1.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/tasklist.vim/tarball/1.0.1 -> tasklist-1.0.1.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0857fb2ffcf1cd49f312a79140b6a490
diff --git a/metadata/md5-cache/app-vim/tcomment-3.08.1 b/metadata/md5-cache/app-vim/tcomment-3.08.1
index cc205de9a077..56ab00680cfb 100644
--- a/metadata/md5-cache/app-vim/tcomment-3.08.1
+++ b/metadata/md5-cache/app-vim/tcomment-3.08.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tcomment_vim/archive/3.08.1.tar.gz -> tcomment-3.08.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ce167b7ff7a6e8d81217647f9ac4e0f1
diff --git a/metadata/md5-cache/app-vim/tcomment-9999 b/metadata/md5-cache/app-vim/tcomment-9999
index d2ac02b4389f..c6b952882c53 100644
--- a/metadata/md5-cache/app-vim/tcomment-9999
+++ b/metadata/md5-cache/app-vim/tcomment-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=67a9d0e025cefdd6fd8646ed1b9f6847
diff --git a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1 b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
index 5636f818fa95..cc85619807f2 100644
--- a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
+++ b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=bab54303ed2e8c2ed8014f70416fd91f
diff --git a/metadata/md5-cache/app-vim/tlib-1.22 b/metadata/md5-cache/app-vim/tlib-1.22
index d2500c96dc0e..a52c4482c5fe 100644
--- a/metadata/md5-cache/app-vim/tlib-1.22
+++ b/metadata/md5-cache/app-vim/tlib-1.22
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.22.tar.gz -> tlib-1.22.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=df8d9cb0b1beff63c2ffd90ee9e9af35
diff --git a/metadata/md5-cache/app-vim/tlib-1.23 b/metadata/md5-cache/app-vim/tlib-1.23
index c63062a6a050..f51341921f04 100644
--- a/metadata/md5-cache/app-vim/tlib-1.23
+++ b/metadata/md5-cache/app-vim/tlib-1.23
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.23.tar.gz -> tlib-1.23.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d8ad92808353299a63738f97a86ef007
diff --git a/metadata/md5-cache/app-vim/tmpl-0.1-r1 b/metadata/md5-cache/app-vim/tmpl-0.1-r1
index fec3be94367e..0b7e4e13ef5d 100644
--- a/metadata/md5-cache/app-vim/tmpl-0.1-r1
+++ b/metadata/md5-cache/app-vim/tmpl-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ebbdbaa2f2db3f568db8b9b5fffaba52
diff --git a/metadata/md5-cache/app-vim/toggle-0.5-r1 b/metadata/md5-cache/app-vim/toggle-0.5-r1
index 8293e789275d..f5698cc4ea8b 100644
--- a/metadata/md5-cache/app-vim/toggle-0.5-r1
+++ b/metadata/md5-cache/app-vim/toggle-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/toggle-0.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/toggle-0.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=582252076d66381a224c28525ea72059
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
index 5d4f4da481e5..f53dddd8699d 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7ac2de5b898fb0f5d57d31afe313e9ec
diff --git a/metadata/md5-cache/app-vim/txtfmt-2.4-r1 b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
index a4dbb88bc397..0a7e218948a6 100644
--- a/metadata/md5-cache/app-vim/txtfmt-2.4-r1
+++ b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13856 -> txtfmt-2.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cf6c5f72b305054937cc106660ccedd8
diff --git a/metadata/md5-cache/app-vim/txtfmt-3.1 b/metadata/md5-cache/app-vim/txtfmt-3.1
index 07b7eafdf42e..1f8d740357e5 100644
--- a/metadata/md5-cache/app-vim/txtfmt-3.1
+++ b/metadata/md5-cache/app-vim/txtfmt-3.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24489 -> txtfmt-3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=58b0140f5a38d187fda7f862a2260e41
diff --git a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2 b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
index 3e63d43b872f..f5b3678c4bbe 100644
--- a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
+++ b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ea54e516ed09fd342e083b16d667e00e
diff --git a/metadata/md5-cache/app-vim/undotree-6.0 b/metadata/md5-cache/app-vim/undotree-6.0
index 0db621a05f37..14105d594c8f 100644
--- a/metadata/md5-cache/app-vim/undotree-6.0
+++ b/metadata/md5-cache/app-vim/undotree-6.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mbbill/undotree/archive/rel_6.0.tar.gz -> undotree-6.0.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=6b24107152224a9d2b999523a865bd11
diff --git a/metadata/md5-cache/app-vim/undotree-9999 b/metadata/md5-cache/app-vim/undotree-9999
index 49540cdcb985..a9e2a90c08d6 100644
--- a/metadata/md5-cache/app-vim/undotree-9999
+++ b/metadata/md5-cache/app-vim/undotree-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=bc6b5d2995b36f175e7d2eb1667a5b27
diff --git a/metadata/md5-cache/app-vim/unite-4.0-r1 b/metadata/md5-cache/app-vim/unite-4.0-r1
index c041a4ed7cd6..0df7663f8b6d 100644
--- a/metadata/md5-cache/app-vim/unite-4.0-r1
+++ b/metadata/md5-cache/app-vim/unite-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a46e7cbb546406b4d6a2beeb982174f2
diff --git a/metadata/md5-cache/app-vim/unite-4.1 b/metadata/md5-cache/app-vim/unite-4.1
index 7cfd7bc9950d..8410160df785 100644
--- a/metadata/md5-cache/app-vim/unite-4.1
+++ b/metadata/md5-cache/app-vim/unite-4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/unite-4.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c6c6d8eb1404aa65dbc0c3f43e7e7fe3
diff --git a/metadata/md5-cache/app-vim/uptime-1.3-r1 b/metadata/md5-cache/app-vim/uptime-1.3-r1
index c0eaaaca0663..b3305a57d10a 100644
--- a/metadata/md5-cache/app-vim/uptime-1.3-r1
+++ b/metadata/md5-cache/app-vim/uptime-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/uptime-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/uptime-1.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=8075adcbd32a4b9b352574d0d48ec290
diff --git a/metadata/md5-cache/app-vim/vcscommand-1.99.47 b/metadata/md5-cache/app-vim/vcscommand-1.99.47
index 18ef3dd139e7..6ef12edde980 100644
--- a/metadata/md5-cache/app-vim/vcscommand-1.99.47
+++ b/metadata/md5-cache/app-vim/vcscommand-1.99.47
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/cvscommand || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vcscommand-1.99.47.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vcscommand-1.99.47.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=77d4dcd28f5fb459dcd8ac623dfa168f
diff --git a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105 b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
index b3febfadc331..98b3155544cc 100644
--- a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
+++ b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-addon-mw-utils-20121105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-addon-mw-utils-20121105.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=1997865ebae2174555fef0f154ba614c
diff --git a/metadata/md5-cache/app-vim/vim-autoclose-2.0 b/metadata/md5-cache/app-vim/vim-autoclose-2.0
index 2cd46da37291..64d2a54c8175 100644
--- a/metadata/md5-cache/app-vim/vim-autoclose-2.0
+++ b/metadata/md5-cache/app-vim/vim-autoclose-2.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/vim-autoclose-2.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f34db03388c12fcade26361f220b6c45
diff --git a/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506 b/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
index 4d1361ab414d..c1b68e06ddaf 100644
--- a/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
+++ b/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/clang || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rhysd/vim-clang-format/archive/95593b67723f23979cd7344ecfd049f2f917830f.tar.gz -> vim-clang-format-0_pre20200506.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=b951c5c6421154a83ae1ed2668fcd72f
diff --git a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530 b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
index b6524ef551d9..bf10220564ad 100644
--- a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
+++ b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-commentary/archive/7f2127b1dfc57811112785985b46ff2289d72334.tar.gz -> vim-commentary-1.3_p20180530.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=bbbf5e12023dd203cd58d2587a656a66
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.6 b/metadata/md5-cache/app-vim/vim-flake8-1.6
index cbf6c66334c4..359832ee6541 100644
--- a/metadata/md5-cache/app-vim/vim-flake8-1.6
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.tar.gz -> vim-flake8-1.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f9ac2fbf18d73d0c7a5bd51bb810e3f5
diff --git a/metadata/md5-cache/app-vim/vim-go-1.13 b/metadata/md5-cache/app-vim/vim-go-1.13
index eeeb80175836..e5f351f75e89 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.13
+++ b/metadata/md5-cache/app-vim/vim-go-1.13
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.tar.gz -> vim-go-1.13.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=c0a15036e78a3b6e6e88e353af351fff
diff --git a/metadata/md5-cache/app-vim/vim-go-1.19 b/metadata/md5-cache/app-vim/vim-go-1.19
index d5b220644d51..cb4be26fdc67 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.19
+++ b/metadata/md5-cache/app-vim/vim-go-1.19
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.19.tar.gz -> vim-go-1.19.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3650bfe3902e2bbf050f9c5a37d1e2b2
diff --git a/metadata/md5-cache/app-vim/vim-go-1.20 b/metadata/md5-cache/app-vim/vim-go-1.20
index 498af70bfe2f..43beabc0eb29 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.20
+++ b/metadata/md5-cache/app-vim/vim-go-1.20
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.20.tar.gz -> vim-go-1.20.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=687a5934b83845d13219c0261afaa980
diff --git a/metadata/md5-cache/app-vim/vim-hoogle-1.3 b/metadata/md5-cache/app-vim/vim-hoogle-1.3
index fa1f2f97c152..01cfe99a03af 100644
--- a/metadata/md5-cache/app-vim/vim-hoogle-1.3
+++ b/metadata/md5-cache/app-vim/vim-hoogle-1.3
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Twinside/vim-hoogle/archive/31823f830843385f53a3da7a5bfaf678494383c4.tar.gz -> vim-hoogle-1.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fc27d8bf42c1250e323cdb11fae79600
diff --git a/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226 b/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
index 999c3cd5a223..100d4a99c67f 100644
--- a/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
+++ b/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/bfrg/vim-jq/archive/0076ef5424894e17f0ab17f4d025a3b519008134.tar.gz -> vim-jq-0.0_pre20210226.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=27647fcd02b681964e64247def7c7940
diff --git a/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502 b/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
index d13a2fddb8be..8181bc1bd4af 100644
--- a/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
+++ b/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-lang/jsonnet || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/google/vim-jsonnet/archive/824dcfe76568dba38135332fc4729e2b2c4d9b3a.tar.gz -> vim-jsonnet-0_pre20190502.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=714c60d577f0e1e11000b6eb981261e2
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2 b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
index f1267c4b0873..c2a60648815f 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
+++ b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=65e8248990b7abf53094d3ccfcab7b9f
diff --git a/metadata/md5-cache/app-vim/vim-misc-1.17.6 b/metadata/md5-cache/app-vim/vim-misc-1.17.6
index 729a6bc26d07..3e9b8ea78cf9 100644
--- a/metadata/md5-cache/app-vim/vim-misc-1.17.6
+++ b/metadata/md5-cache/app-vim/vim-misc-1.17.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-misc/archive/1.17.6.tar.gz -> vim-misc-1.17.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f75af9a154093ee493d9592c33f72b65
diff --git a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1 b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
index 11d49f34336b..dde444009dbc 100644
--- a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
+++ b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/terryma/vim-multiple-cursors/archive/v2.2.tar.gz -> vim-multiple-cursors-2.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=1462dffe61240751816665abb916ac13
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
index 88ef3d2208ac..b55e47d19887 100644
--- a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
+++ b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nfnty/vim-nftables/archive/01c7b97eff12fd4b624e6efa2c0468163db61ebc.tar.gz -> vim-nftables-0_pre20200224.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=1418fafebe897c138955eaebf9388d29
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
index f2db599e8009..06e1fbbf955c 100644
--- a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
+++ b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nfnty/vim-nftables/archive/26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff.tar.gz -> vim-nftables-0_pre20200629.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7b0f7a6bcffad5e58a5d35bca5aed768
diff --git a/metadata/md5-cache/app-vim/vim-r-1.2.6 b/metadata/md5-cache/app-vim/vim-r-1.2.6
index 0827a9f050c5..bc4d382b3100 100644
--- a/metadata/md5-cache/app-vim/vim-r-1.2.6
+++ b/metadata/md5-cache/app-vim/vim-r-1.2.6
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-r-1.2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.2.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=aaa91dd1dbacd457e7ff2384af88f82a
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
index 1c5f5623b3be..af96a783793f 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=fff42e8716c08800e0f7d3b0ed3bb92c
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index 61ff20a54f59..5027dfa8b3ec 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -8,5 +8,5 @@ LICENSE=public-domain MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=a221028943ddf0a2de349e6d2c6f855b
diff --git a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106 b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
index 9c23cdbe4a3f..e1f64f1998b0 100644
--- a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
+++ b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ghc || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/dag/vim2hs/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vim2hs-0.1_p20171106.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=136d66c3be6e260b9d18e8a72ef71dbc
diff --git a/metadata/md5-cache/app-vim/vimagit-1.7.3 b/metadata/md5-cache/app-vim/vimagit-1.7.3
index 2d6dc62cc136..ae65093c3d6a 100644
--- a/metadata/md5-cache/app-vim/vimagit-1.7.3
+++ b/metadata/md5-cache/app-vim/vimagit-1.7.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.3.tar.gz -> vimagit-1.7.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0b438af6f1c1b734f8cf6c2af9e96774
diff --git a/metadata/md5-cache/app-vim/vimagit-9999 b/metadata/md5-cache/app-vim/vimagit-9999
index 6a9e84b2327a..7a44a5e69739 100644
--- a/metadata/md5-cache/app-vim/vimagit-9999
+++ b/metadata/md5-cache/app-vim/vimagit-9999
@@ -7,5 +7,5 @@ LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=0b438af6f1c1b734f8cf6c2af9e96774
diff --git a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1 b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
index cc88027903d9..f8afeba0dbfc 100644
--- a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
+++ b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.tar.gz -> vimbuddy-0.9.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d850451b30d5a4038caca10fa6319e68
diff --git a/metadata/md5-cache/app-vim/vimcdoc-1.9.0 b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
index e4480e33fd1c..5793e2a5c699 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-1.9.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-1.9.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/metadata/md5-cache/app-vim/vimcdoc-2.1.0 b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
index 167ba686633b..956fd8e01c8a 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-2.1.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-2.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
index d1525ffcc770..e792f2db1244 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.tar.gz -> vimclojure-2.3.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=52ddf6ef97abe630e51850c96ad5c4ed
diff --git a/metadata/md5-cache/app-vim/vimcommander-0.81 b/metadata/md5-cache/app-vim/vimcommander-0.81
index 0431900773ec..b21dac9b6217 100644
--- a/metadata/md5-cache/app-vim/vimcommander-0.81
+++ b/metadata/md5-cache/app-vim/vimcommander-0.81
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimcommander-0.81.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimcommander-0.81.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=584428898c3cd81533ef55afb58e5299
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
index 8547a0d38c89..7dc761856934 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e545d2de961d48ea32d144903b385057
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
index 0ebedd753045..e4a7c498bc33 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
@@ -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/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
-_md5_=8257c24a25707c81f98eb1d827da6706
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=069d8f366e21b60cfc3e4666f18a9bab
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r3 b/metadata/md5-cache/app-vim/vimpython-1.13-r3
index 97c76bd20e30..575a7e93ca1d 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r3
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=3bafd44bbae40a5a65304dbc2aa8c937
diff --git a/metadata/md5-cache/app-vim/vimtex-1.5 b/metadata/md5-cache/app-vim/vimtex-1.5
index 44a6d93a4063..0ecdad3c3d8c 100644
--- a/metadata/md5-cache/app-vim/vimtex-1.5
+++ b/metadata/md5-cache/app-vim/vimtex-1.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/lervag/vimtex/archive/v1.5.tar.gz -> vimtex-1.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=e6f088560ae7d1b2bbe5bc7a6a73eeb6
diff --git a/metadata/md5-cache/app-vim/vimtex-99999999 b/metadata/md5-cache/app-vim/vimtex-99999999
index d10c78567b8b..d421c737ae55 100644
--- a/metadata/md5-cache/app-vim/vimtex-99999999
+++ b/metadata/md5-cache/app-vim/vimtex-99999999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7d792883397e0530e36549189be72672
diff --git a/metadata/md5-cache/app-vim/voom-5.3-r1 b/metadata/md5-cache/app-vim/voom-5.3-r1
index c6f8fe5334f2..c94dd1059636 100644
--- a/metadata/md5-cache/app-vim/voom-5.3-r1
+++ b/metadata/md5-cache/app-vim/voom-5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/vim-voom/VOoM/archive/v5.3.tar.gz -> voom-5.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=f9b159b8fa6d6ed2c8dd5961cf767931
diff --git a/metadata/md5-cache/app-vim/webapi-0.3 b/metadata/md5-cache/app-vim/webapi-0.3
index 1e171f8165ba..fd3a12ec7d9b 100644
--- a/metadata/md5-cache/app-vim/webapi-0.3
+++ b/metadata/md5-cache/app-vim/webapi-0.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=038718e97cc22d60f8717ab5b5c48784
diff --git a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1 b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
index 9424fce0afe4..44b4c6bd72f6 100644
--- a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
+++ b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=98d232f59d43653be7cb67c060441103
diff --git a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2 b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
index 952b93fe985c..7381fa2818bb 100644
--- a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
+++ b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xquery-syntax-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xquery-syntax-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ac61a9472b6cb86b675cc4d254e845f1
diff --git a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2 b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
index 6947cbe0b3ec..a798bf18aba8 100644
--- a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
+++ b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xsl-syntax-0.3.11.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xsl-syntax-0.3.11.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=76b1b8f823159e2ac604102cb837d2a4
diff --git a/metadata/md5-cache/app-vim/yankring-19.0 b/metadata/md5-cache/app-vim/yankring-19.0
index 1c54df677f67..5c8f4f198ff0 100644
--- a/metadata/md5-cache/app-vim/yankring-19.0
+++ b/metadata/md5-cache/app-vim/yankring-19.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=92b8037da5b70b838c848bfbb6e90fe3
diff --git a/metadata/md5-cache/app-vim/yankring-19.0-r1 b/metadata/md5-cache/app-vim/yankring-19.0-r1
index e4ace0735782..120db5cab4c4 100644
--- a/metadata/md5-cache/app-vim/yankring-19.0-r1
+++ b/metadata/md5-cache/app-vim/yankring-19.0-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=ee305b0a601e9ab72e71e074a9e75c12
diff --git a/metadata/md5-cache/app-vim/zenburn-2.25 b/metadata/md5-cache/app-vim/zenburn-2.25
index 62ac989cf5fc..024db2e8dbd0 100644
--- a/metadata/md5-cache/app-vim/zenburn-2.25
+++ b/metadata/md5-cache/app-vim/zenburn-2.25
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.tar.gz -> zenburn-2.25.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=7d545dea0f2efee36138a7f60e737960
diff --git a/metadata/md5-cache/app-vim/zoomwin-24-r1 b/metadata/md5-cache/app-vim/zoomwin-24-r1
index 4a861afb7f28..f42990994da6 100644
--- a/metadata/md5-cache/app-vim/zoomwin-24-r1
+++ b/metadata/md5-cache/app-vim/zoomwin-24-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=d24cde21087aa219ce0c5fe66b690c6c
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 2b9b4ef77fcd..875ddb1a4d52 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/aunit-2021 b/metadata/md5-cache/dev-ada/aunit-2021
index 2add3b387452..2bd9b226a301 100644
--- a/metadata/md5-cache/dev-ada/aunit-2021
+++ b/metadata/md5-cache/dev-ada/aunit-2021
@@ -4,11 +4,11 @@ DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
 IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c8eadafc40c016859e127cd0e82411fcd8f3e749?filename=aunit-2021-20210518-19DC5-src.tar.gz -> aunit-2021-20210518-19DC5-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=eaa9cfcb0779f24e873daa9ce8b2fd84
+_md5_=2a43283da518f389edcf3c8d34aa2a1f
diff --git a/metadata/md5-cache/dev-ada/aws-2021 b/metadata/md5-cache/dev-ada/aws-2021
index 135e810f5ae1..dceb3aa63999 100644
--- a/metadata/md5-cache/dev-ada/aws-2021
+++ b/metadata/md5-cache/dev-ada/aws-2021
@@ -4,11 +4,11 @@ DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared,static-libs]
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/5b0fa09df8ac0c717abdf4ede9e08efe5fd98984?filename=aws-2021-20210518-19F65-src.tar.gz -> aws-2021-20210518-19F65-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=5cb4a512a59cf688a75d0651573ea1ce
+_md5_=570a8b8b447a24f2c6fc29c5c16e7511
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
index 4092f5c252b8..019dec510dee 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
@@ -4,11 +4,11 @@ DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
 IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=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] ) ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz -> gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df380786b640843c43e2aaf08891a45e
+_md5_=a70006b46c03dfb5542d80f3e71b7873
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
index f5ae6afa9a93..5e00cc45c9b9 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared?,static-libs?,static-pic?]
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/425b044d5cb112f096c7ac5ebbafb0d8e5297913?filename=gnatcoll-core-2021-20210518-19ADF-src.tar.gz -> gnatcoll-core-2021-20210518-19ADF-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=04b2284d0ba12de10391fa538a4f4c7d
+_md5_=6f75a7e4c73ebb210be4e583415320f2
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2021 b/metadata/md5-cache/dev-ada/gnatmem-2021
index 2177d444f314..8731be596677 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2021
+++ b/metadata/md5-cache/dev-ada/gnatmem-2021
@@ -5,11 +5,11 @@ DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3ddb98c0c8854dc7631bebd673ac7bc53038d4b7?filename=gnatmem-2021-20210518-19F7B-src.tar.gz -> gnatmem-2021-20210518-19F7B-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e38c0bde03bfc3e4aaa03bbbd3beb84
+_md5_=566a02406edc70b51c651dbe4b0cfe17
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2021 b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
index b9e6287e8272..6f0abac83260 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2021
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
@@ -5,11 +5,11 @@ DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 REQUIRED_USE=^^ ( ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/884f3b229457c995ddebb46a16a7cc50ed837c90?filename=gnatsymbolize-2021-20210518-19D3B-src.tar.gz -> gnatsymbolize-2021-20210518-19D3B-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=686624a1cd26e90ce7398ddf1111ac58
+_md5_=ac7ee22f09df8c7051b863af5a9b6364
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2021-r1 b/metadata/md5-cache/dev-ada/gprbuild-2021-r1
index 5d123b206584..726c987a89e1 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2021-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-2021-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35d9c818d8265d4c2449c83626294ddd
+_md5_=854242f3dea59e277921a09fafa3a26e
diff --git a/metadata/md5-cache/dev-ada/gtkada-2021 b/metadata/md5-cache/dev-ada/gtkada-2021
index 52f392c6cc4f..64e773e3d50a 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2021
+++ b/metadata/md5-cache/dev-ada/gtkada-2021
@@ -5,11 +5,11 @@ DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
 IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
 REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/8f1daefcb56e3ee7feaad67bac66deb0f7c37a82?filename=gtkada-2021-20210518-1A011-src.tar.gz -> gtkada-2021-20210518-1A011-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffa228ba94ea172c19e6526420c31ee0
+_md5_=9e02f1bb63ee67ed1e5dba1078886a6b
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021 b/metadata/md5-cache/dev-ada/libgpr-2021
index 669354dc426f..f89d91213652 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2021
+++ b/metadata/md5-cache/dev-ada/libgpr-2021
@@ -4,11 +4,11 @@ DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)] !net-libs/grpc
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz
 _eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e2991d0abc522832aa9265ccf7ab9e8
+_md5_=9af40a5ebd7888937a8fc2b28afd48ff
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 0368e3fa3c58..a76116478234 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/clucene-2.3.3.4-r6 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
index aa9940b8620d..3c650af285dc 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
@@ -1,13 +1,13 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.4.2 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( >=app-doc/doxygen-1.4.2 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=High-performance, full-featured text search engine based off of lucene in C++
-EAPI=6
+EAPI=7
 HOMEPAGE=http://clucene.sourceforge.net/
 IUSE=debug doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.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_=dbba6f38bdd4bd90d9a57754e5e30618
+_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_=cf6e33f16dfc9d4be338d447c21cb5c0
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 32e954312d5e..4739ad80027a 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
@@ -1,6 +1,6 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake test? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl ) test? ( virtual/fortran )
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl )
 DESCRIPTION=C++ template library for linear algebra
 EAPI=7
 HOMEPAGE=https://eigen.tuxfamily.org/index.php?title=Main_Page
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 a54134db0cfe..1bbca6b8e3aa 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.9
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.9
@@ -1,6 +1,6 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake test? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl ) test? ( virtual/fortran )
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl )
 DESCRIPTION=C++ template library for linear algebra
 EAPI=7
 HOMEPAGE=https://eigen.tuxfamily.org/index.php?title=Main_Page
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index b61004fdf70f..b70e1e5c22f1 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-r2 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
deleted file mode 100644
index 3248625d125c..000000000000
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/junit:0 ) >=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=The leading SQL relational database engine written in Java
-EAPI=5
-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
-LICENSE=BSD GPL-2
-RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	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_=c6e23f7b60b765ee628705a71c0b2c19
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 7cfc133b815d..e0748ceac404 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_=77f3d2543217e4ed5a244019d1ae4a42
+_md5_=e426b1eef8fdc5112e7cbe522af03577
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.26 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.26
new file mode 100644
index 000000000000..6cf68f7642ca
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.26
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MySQL Workbench
+EAPI=7
+HOMEPAGE=https://www.mysql.com/products/workbench/
+IUSE=debug doc python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.26-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
+_eclasses_=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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37fdedf36ede9418e6c1e82abcda383c
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.29-r1 b/metadata/md5-cache/dev-db/pgadmin4-4.29-r1
index 2ddb2fc17322..77e4ff65b0b0 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-4.29-r1
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.29-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.29/source/pgadmin4-4.29.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc51092e20203c8dbe85563130a82889
+_md5_=e3f9d56a4aea9b7842fd80d6af49c7d5
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.30-r1 b/metadata/md5-cache/dev-db/pgadmin4-4.30-r1
index 11d1bcf66e0b..8e9a60e1e774 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-4.30-r1
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.30-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.30/source/pgadmin4-4.30.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d3790ba6fcc53ada8728bef09411544
+_md5_=bfaf5f7378bc91d52c9a5ea16edcf874
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-5.1.1 b/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
index df998de08d4a..de49a549b758 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-7.1[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.1.1
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/5.1.1/phpMyAdmin-5.1.1-all-languages.tar.xz
 _eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=61bc01d4d9b7bf66e9904a0e667b1d30
+_md5_=acfd191367d404ec814e627323267f84
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r2 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
index fa973f97e92c..1253f1c0376b 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) 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 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2633a385ce6403b18ce4d26c8ecee9ee
diff --git a/metadata/md5-cache/dev-db/redis-5.0.13 b/metadata/md5-cache/dev-db/redis-5.0.13
new file mode 100644
index 000000000000..e64443acff3c
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-5.0.13
@@ -0,0 +1,16 @@
+BDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) 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 prepare
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) test? ( dev-lang/tcl:0= )
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=7
+HOMEPAGE=https://redis.io
+IUSE=+jemalloc tcmalloc luajit test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis virtual/tmpfiles
+REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.redis.io/releases/redis-5.0.13.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=89e054dcb9aae2a018ed57f1cd703b09
diff --git a/metadata/md5-cache/dev-db/redis-6.0.15 b/metadata/md5-cache/dev-db/redis-6.0.15
new file mode 100644
index 000000000000..8fc3d185cc0c
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-6.0.15
@@ -0,0 +1,16 @@
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=7
+HOMEPAGE=https://redis.io
+IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-6.0.15.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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5d869673aaf90fe05c5a9fd4510def13
diff --git a/metadata/md5-cache/dev-db/redis-6.2.5 b/metadata/md5-cache/dev-db/redis-6.2.5
new file mode 100644
index 000000000000..8fef87caef97
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-6.2.5
@@ -0,0 +1,16 @@
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=7
+HOMEPAGE=https://redis.io
+IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-6.2.5.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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e0aa66e2fdd506b2a4756e432a713a10
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index d0ce2d049172..18306ca9bd7f 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.0 b/metadata/md5-cache/dev-embedded/esptool-3.0
index 80b40f7d3485..52d50c320978 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.0
+++ b/metadata/md5-cache/dev-embedded/esptool-3.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v3.0.tar.gz -> esptool-3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ffb882ddbd97e99464d3dff7e337665
+_md5_=3d6b675d6a4927e10d8697aeacc8f1f1
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.1 b/metadata/md5-cache/dev-embedded/esptool-3.1
index 097ec664e292..0e724a6a1e89 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.1
+++ b/metadata/md5-cache/dev-embedded/esptool-3.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v3.1.tar.gz -> esptool-3.1.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_=710aa3ea3546e17a41033465999bf440
+_md5_=de2a2993a716c76f42080954e7e4dca4
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.1.1 b/metadata/md5-cache/dev-embedded/platformio-5.1.1
index 992305ddc07a..c2016bbdbf0f 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.1.1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.1.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://pypi/p/platformio/platformio-5.1.1.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_=767bb7e992dd2d1f51739f5343bdd9fc
+_md5_=c596f2a74fa789d0bd55e2bf6eb419a0
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 35a1616b6751..97202a9a87f5 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/cegui-0.8.7-r100 b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
index fb53c6253cc0..6e06e9cea74f 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7-r100
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) lua? ( ^^ ( lua_single_target_lua
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
 _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_=8affaf51a4b75533705e085336756cf2
+_md5_=f449d6c3dca617886c4f1a422b7bc027
diff --git a/metadata/md5-cache/dev-games/freecell-solver-6.2.0-r1 b/metadata/md5-cache/dev-games/freecell-solver-6.2.0-r1
index d29904982521..3aeabf0ca50a 100644
--- a/metadata/md5-cache/dev-games/freecell-solver-6.2.0-r1
+++ b/metadata/md5-cache/dev-games/freecell-solver-6.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-6.2.0.tar.xz
 _eclasses_=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_=4902e2669bcb91ac7c155b3196afc7c0
+_md5_=ec94f9cbcd952d9ebfd85ef117448bc0
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.2-r1 b/metadata/md5-cache/dev-games/physfs-3.0.2-r1
index e70e3da9e4be..02f6ac941350 100644
--- a/metadata/md5-cache/dev-games/physfs-3.0.2-r1
+++ b/metadata/md5-cache/dev-games/physfs-3.0.2-r1
@@ -4,9 +4,9 @@ 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~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
+_md5_=c31cc3b253d176dcf5bbdd2e96fda3c6
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index ace939fad74e..6a870b9345fe 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/binary-0.8.7.0 b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
index c32ae50c4bec..72b5114c723c 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.8.7.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0210dda539e8e9f9596797b3126c060a
+_md5_=901dcaafff82adc947b784327281bb64
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 c16c1e5909c7..34f446b252e3 100644
--- a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
+++ b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=542459d828419f1849235f07b9ba3ffe
+_md5_=a23863a8a85e773d20e328ef7dba6c09
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 2297ee30915b..e50e10e36fc9 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
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af9ae8217872bc2d730592a0c8f2d5f2
+_md5_=85667e997f4473f12a903aeddf03f5ad
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
deleted file mode 100644
index 57972a6994d0..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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:= ) >=dev-haskell/cabal-1.22.2.0
-DESCRIPTION=The command-line interface for Cabal and Hackage
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-IUSE=+native-dns
-KEYWORDS=~amd64 ~x86
-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	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/exceptions-0.10.4 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
index 802e8be98b9d..335e5ee77441 100644
--- a/metadata/md5-cache/dev-haskell/exceptions-0.10.4
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3e986a091589924f0e31246177e1ff9
+_md5_=f8ce2abd6fa1ab75a296769882b03710
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 caa3bb4b5ba6..a4cec6782c0f 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev
 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a570cd0d37f985b48815fb4c1477ab49
+_md5_=a3db38ac5389a826b5ab77644933575f
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 cdbc4152dd57..9f26ac72ffc5 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
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JavaScript parser and pretty-printer library
 EAPI=7
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d0883279ebb9b6a3386c30d894ef659d
+_md5_=ff3d0ea9d061be6aecd9453938315444
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
index f425ceb694e8..f571aa280a73 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.2
@@ -10,4 +10,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=649e9a4fa6e52b5aa54aef737658e1cd
+_md5_=4b1b40612e22793bcb07823bb49e8e99
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 4d8f3d2dd203..463f5b50908e 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdc8ea44225bb7199b82e900379a8ff6
+_md5_=da70394f8992b1458a99718149dbd247
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 de5c769f0c30..ef180ee729e3 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell
 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b34097b793752963c41916a2ba14dfe
+_md5_=647e188660c28e6e22dcf5037329d262
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 fb5f3f9e64c4..464a7d2b34a6 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
@@ -10,4 +10,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a67408a19b2bd20ebb4a1c1bfe64133
+_md5_=bd75ef86d7011421a6b7bfc1b373b1a1
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 5442a1d1fd58..4a421c9b5056 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
@@ -11,4 +11,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d35ee87363462f34fae62fde45522357
+_md5_=d8c818fb0656da48b99c6ebaa632771a
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.1 b/metadata/md5-cache/dev-haskell/text-1.2.4.1
new file mode 100644
index 000000000000..3a5254d80f14
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.8:= hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An efficient packed Unicode text type
+EAPI=7
+HOMEPAGE=https://github.com/haskell/text
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-lang/ghc-8.8:=
+RESTRICT=test
+SLOT=0/1.2.4.1
+SRC_URI=https://hackage.haskell.org/package/text-1.2.4.1/text-1.2.4.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ade0c0843b36d88bd92831f9394f9ee3
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 ba6bdeaf9cd6..77a159ef08c8 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
@@ -10,4 +10,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cb0aa445eed9c60e75062a22737c8d3
+_md5_=c6201be62cd3df3aea1dd96ab7765e29
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 3b6d4a6f3bb7..9a848deb07a2 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
@@ -10,4 +10,4 @@ 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	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=638f2a25460fc40096a9c3d111da677d
+_md5_=c7e853226a404c7b39ce76d01e3d2950
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 328961d047d9..1f1419a7f33c 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/antlr-4.5.3-r1 b/metadata/md5-cache/dev-java/antlr-4.5.3-r1
index 7db5fae66d84..08d470fb1f9a 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.3-r1
+++ b/metadata/md5-cache/dev-java/antlr-4.5.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A parser generator for many languages
 EAPI=7
 HOMEPAGE=https://www.antlr.org/
 IUSE=doc test elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.3.tar.gz -> antlr-4.5.3.tar.gz https://www.antlr.org/download/antlr-4.5.3-complete.jar
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=f22903ccbd6299c7ebf91d1c7cf36eae
+_md5_=995261a8c65ec36982521bef7c96367e
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1 b/metadata/md5-cache/dev-java/commons-collections-4.1
deleted file mode 100644
index c16ef5bbc33a..000000000000
--- a/metadata/md5-cache/dev-java/commons-collections-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/easymock:3.2 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
-EAPI=6
-HOMEPAGE=https://commons.apache.org/collections/
-IUSE=test elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	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_=a9d62eb70f0b5356bb087e6d7cfb9836
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
index a1be4454cd02..b1703d17e11f 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Apache HttpComponents Client
 EAPI=7
 HOMEPAGE=https://hc.apache.org/httpcomponents-client
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~ppc64 x86
+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
+_md5_=6d6cd2a882649567b9d9fdc6335fdbad
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
deleted file mode 100644
index febecfdb75ad..000000000000
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=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=A single API for accessing various different file systems
-EAPI=5
-HOMEPAGE=http://commons.apache.org/vfs/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	b894c6ee57778b79eaa20e56ece53358	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_=8c4145c4a0fe4eec5813f4b0c3d7e143
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
new file mode 100644
index 000000000000..24f546d55aed
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch: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=A single API for accessing various different file systems
+EAPI=7
+HOMEPAGE=http://commons.apache.org/vfs/
+IUSE=elibc_FreeBSD source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
+_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e6a5bb066430a4ee0727b2d72c79e80b
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.24 b/metadata/md5-cache/dev-java/fontbox-2.0.24
new file mode 100644
index 000000000000..cef43e951339
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.24
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=An open source Java library for parsing font files
+EAPI=7
+HOMEPAGE=https://pdfbox.apache.org/
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-logging: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://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf )
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=3cc790247c17998f90447d003066d94c
diff --git a/metadata/md5-cache/dev-java/gson-2.7-r1 b/metadata/md5-cache/dev-java/gson-2.7-r1
deleted file mode 100644
index a204afd0db3a..000000000000
--- a/metadata/md5-cache/dev-java/gson-2.7-r1
+++ /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=Java library to convert JSON to Java objects and vice-versa
-EAPI=7
-HOMEPAGE=https://github.com/google/gson
-IUSE=elibc_FreeBSD doc source
-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 )
-SLOT=2.6
-SRC_URI=https://github.com/google/gson/archive/gson-parent-2.7.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=c5d053ec5ec10b7d3c00979aa411b30d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 44a52578265b..ab9ea7be5c0d 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_=fa3f2b8a50302a067bf585009a1cc912
+_md5_=c9ec8d33e947e48688498d298511b6f6
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
new file mode 100644
index 000000000000..371864158f69
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -0,0 +1,14 @@
+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 ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Advanced Imaging Image I/O Tools API core (standalone)
+EAPI=7
+HOMEPAGE=https://github.com/jai-imageio/jai-imageio-core
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Sun-BSD-no-nuclear-2005
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=6435572179970d8cf966b9b161d0bd1b
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
new file mode 100644
index 000000000000..4911ab63f6db
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jai-imageio-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=JPEG2000 support for Java Advanced Imaging Image I/O Tools API
+EAPI=7
+HOMEPAGE=https://github.com/jai-imageio/jai-imageio-jpeg2000
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Sun-BSD-no-nuclear-2005
+RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=1d11b18b608b70e7240f50950d298289
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
new file mode 100644
index 000000000000..35ceb8662fb2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+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=Library for computing diffs, applying patches, generationg side-by-side view
+EAPI=7
+HOMEPAGE=http://code.google.com/p/java-diff-utils/
+IUSE=elibc_FreeBSD doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=04073ea724d14ccda8fc82609c0b7250
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
new file mode 100644
index 000000000000..07dc3e367a8c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+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 ) test? ( dev-java/junit:4 )
+DESCRIPTION=PDFBox JBIG2 ImageIO plugin
+EAPI=7
+HOMEPAGE=https://pdfbox.apache.org
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=123cf3d6f420c2b5be5a718721aecd1c
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 37251c5ef912..a26b64a64e30 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
@@ -11,4 +11,4 @@ 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=519cb175c385a54b77516b304a773252
+_md5_=752e581cd8e113e472b6a66523c05bf8
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 4a06f543110b..499bf4f59d3e 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
@@ -11,4 +11,4 @@ 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b11acdbab71e4469ba1d6fa528abb635
+_md5_=171804312706eaac2f6a057949b73a6c
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 2f4f704271cd..b08d9f9f3f2d 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-l
 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
+_md5_=671532de55a39656048449ca6cc218a3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
index f3881dc0bcc3..80c60ce79ceb 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.7/src/apache-tomcat-10.0.7-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
+_md5_=011f8552e125fa3a698dd42eb5fba8d2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
index a04c04edecac..b7f0cc019b70 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.48/src/apache-tomcat-9.0.48-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=5c43d891ab52b7fab53f38a55644b1ce
+_md5_=cfc424879061b9ee37b1e58025f535b2
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 960c9c042b2c..8561ca0defcf 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 828a63444007..85f124306fb0 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.4
+++ b/metadata/md5-cache/dev-lang/R-4.0.4
@@ -1,4 +1,4 @@
-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
+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 virtual/fortran
 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-misc/xdg-utils ) virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
@@ -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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 3a31c2763e0c..db2f21b20589 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.5-r1
+++ b/metadata/md5-cache/dev-lang/R-4.0.5-r1
@@ -1,16 +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
+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 virtual/fortran
 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-misc/xdg-utils ) virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=7
 HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack 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
+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-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 ) ) test? ( profile )
 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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f16e09eb670a049fbec4bfe3be100229
diff --git a/metadata/md5-cache/dev-lang/R-4.1.0-r1 b/metadata/md5-cache/dev-lang/R-4.1.0-r1
deleted file mode 100644
index ca968437cd70..000000000000
--- a/metadata/md5-cache/dev-lang/R-4.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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/R-4.1.0-r2 b/metadata/md5-cache/dev-lang/R-4.1.0-r2
new file mode 100644
index 000000000000..e0bc2e429018
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/R-4.1.0-r2
@@ -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 virtual/fortran
+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	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=61fcadb7669eca1c0b1d86e6fa7f1ddf
diff --git a/metadata/md5-cache/dev-lang/cfortran-20110621 b/metadata/md5-cache/dev-lang/cfortran-20110621
new file mode 100644
index 000000000000..4361c82d44ff
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/cfortran-20110621
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 test? ( virtual/fortran )
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Header file allowing to call Fortran routines from C and C++
+EAPI=8
+HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_20110621.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_20110621-1.debian.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff68fae457f4f81ce207bf7077ba39ef
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4
deleted file mode 100644
index 216a7619b7b2..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-DESCRIPTION=The Glasgow Haskell Compiler
-EAPI=7
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
-RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-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	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.4-r1 b/metadata/md5-cache/dev-lang/ghc-8.10.4-r1
new file mode 100644
index 000000000000..ea2d9a443b76
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+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	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_=bd81f0cde59636227fd4ba7528b0937c
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.5 b/metadata/md5-cache/dev-lang/ghc-8.10.5
deleted file mode 100644
index 4e67900fcfe5..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.10.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-DESCRIPTION=The Glasgow Haskell Compiler
-EAPI=7
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
-RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-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	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.10.5-r1 b/metadata/md5-cache/dev-lang/ghc-8.10.5-r1
new file mode 100644
index 000000000000..91ced8b27da9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+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	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_=c73e5c7fec3592c32cace0df5ce0a09e
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4 b/metadata/md5-cache/dev-lang/ghc-8.8.4
deleted file mode 100644
index e21ea2cf0c23..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-DESCRIPTION=The Glasgow Haskell Compiler
-EAPI=7
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
-RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-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	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-8.8.4-r1 b/metadata/md5-cache/dev-lang/ghc-8.8.4-r1
new file mode 100644
index 000000000000..f43b113e180e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+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	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_=c150b2de673091a5959aa61281d6606d
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.1 b/metadata/md5-cache/dev-lang/ghc-9.0.1
deleted file mode 100644
index 684ac80c1952..000000000000
--- a/metadata/md5-cache/dev-lang/ghc-9.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-DESCRIPTION=The Glasgow Haskell Compiler
-EAPI=7
-HOMEPAGE=https://www.haskell.org/ghc/
-IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
-LICENSE=BSD
-PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
-RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
-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	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/ghc-9.0.1-r1 b/metadata/md5-cache/dev-lang/ghc-9.0.1-r1
new file mode 100644
index 000000000000..bc9c776066bb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.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=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+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	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_=457e5356df70827e10692428c1b9afbd
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index 306db0239f61..17f27da992f3 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -1,5 +1,5 @@
 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 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 )
+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 ) sanitize? ( virtual/libcrypt ) >=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/
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 46f0a083a17e..6e36fbe82603 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -1,5 +1,5 @@
 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 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 )
+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= ) sanitize? ( virtual/libcrypt ) >=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/
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 5599854c7706..5ba10af9e3fa 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
@@ -1,5 +1,5 @@
 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 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 )
+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= ) sanitize? ( virtual/libcrypt ) 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/
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 dd2f0e1f1c9d..1de20c2f1513 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 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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 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
+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 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e843473c2c004ecfab6898be720adeb1
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=305f34fec95d5164df881d5c5640bc53
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021 b/metadata/md5-cache/dev-lang/gnat-gpl-2021
index 0e3104079633..08b09b4e6979 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021
@@ -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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 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 zstd
-KEYWORDS=~amd64 ~x86
+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 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e35d639253667a5f7d869d63f9df9e0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2a2fe976b6a350944f6dddf897363262
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
new file mode 100644
index 000000000000..b2b5429c7f7d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -0,0 +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 virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+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 zstd
+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 virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=test
+SLOT=10
+SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cf2ab6dcca7a053bebc95ca33c7f0cd9
diff --git a/metadata/md5-cache/dev-lang/go-1.16.6 b/metadata/md5-cache/dev-lang/go-1.16.6
index 0197eeee1089..303099d517e1 100644
--- a/metadata/md5-cache/dev-lang/go-1.16.6
+++ b/metadata/md5-cache/dev-lang/go-1.16.6
@@ -4,11 +4,11 @@ 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
+KEYWORDS=-* amd64 arm arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.16.6
 SRC_URI=https://storage.googleapis.com/golang/go1.16.6.src.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd06be8466465b16ec7f392b3be3f938
+_md5_=74626c0edbf279724f13559e8d1685c6
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index 4b84d0551b78..1c1398dd0a89 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst test unpack
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
+IUSE=cpu_flags_x86_sse2
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=677d24033b9667a8580209084940181b
+_md5_=9390ab40d7536a01bd5372e5326ca8de
diff --git a/metadata/md5-cache/dev-lang/go-bootstrap-1.16.6 b/metadata/md5-cache/dev-lang/go-bootstrap-1.16.6
new file mode 100644
index 000000000000..f97f2ebc4f18
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-bootstrap-1.16.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Bootstrap package for dev-lang/go
+EAPI=8
+HOMEPAGE=https://golang.org
+IUSE=big-endian
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.16.6.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.16.6.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.16.6.tbz ) ppc64? ( big-endian? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.16.6.tbz ) !big-endian? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.16.6.tbz ) ) riscv? ( https://dev.gentoo.org/~williamh/dist/go-linux-riscv64-bootstrap-1.16.6.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.16.6.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.16.6.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.16.6.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.16.6.tbz )
+_md5_=3d9d85b936b75c735f328ec673c4344d
diff --git a/metadata/md5-cache/dev-lang/janet-1.13.1 b/metadata/md5-cache/dev-lang/janet-1.13.1
deleted file mode 100644
index ac62ec8ec39e..000000000000
--- a/metadata/md5-cache/dev-lang/janet-1.13.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DESCRIPTION=A dynamic Lisp dialect and bytecode vm
-EAPI=7
-HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/janet-lang/janet/archive/v1.13.1.tar.gz -> janet-1.13.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6f3f607aeaae96b4a03e7ab31f0b1fd
diff --git a/metadata/md5-cache/dev-lang/janet-1.16.1 b/metadata/md5-cache/dev-lang/janet-1.16.1
new file mode 100644
index 000000000000..0fa4203942c6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/janet-1.16.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst
+DESCRIPTION=A dynamic Lisp dialect and bytecode vm
+EAPI=7
+HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/janet-lang/janet/archive/v1.16.1.tar.gz -> janet-1.16.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8263ac2907cf6249c435b0817ddafebd
diff --git a/metadata/md5-cache/dev-lang/maude-3.1 b/metadata/md5-cache/dev-lang/maude-3.1
new file mode 100644
index 000000000000..353a82a459a0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/maude-3.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0=[cxx(+)] dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
+DESCRIPTION=High-level specification language for equational and logic programming
+EAPI=8
+HOMEPAGE=https://maude.cs.uiuc.edu/
+IUSE=doc examples
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0=[cxx(+)] dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
+SLOT=0
+SRC_URI=https://maude.cs.illinois.edu/w/images/d/d3/Maude-3.1.tar.gz https://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-3.1.zip doc? ( https://maude.cs.illinois.edu/w/images/6/62/Maude-3.1-manual.pdf ) examples? ( https://maude.cs.illinois.edu/w/images/4/4f/Maude-3.1-manual-book-examples.zip )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3838190acfbe76a720809957bdce36d6
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.3 b/metadata/md5-cache/dev-lang/mujs-1.1.3
index dbd926c83979..618a46867a08 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 ~riscv ~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_=94a2d15555e9d12795ca039afd1b401f
+_md5_=954ac0db1996c31d75e76ea4ee82859a
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0 b/metadata/md5-cache/dev-lang/perl-5.34.0
index 3c9761b19f14..8cb21d6df0d7 100644
--- a/metadata/md5-cache/dev-lang/perl-5.34.0
+++ b/metadata/md5-cache/dev-lang/perl-5.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=7
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
 SLOT=0/5.34
 SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
 _eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=549f2b62fc030640b94f8dfbca980a9b
+_md5_=64ea83941c0a4be563eaaaa84fb6bf24
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r1 b/metadata/md5-cache/dev-lang/perl-5.34.0-r1
new file mode 100644
index 000000000000..8aad38cec64c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/perl-5.34.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+DESCRIPTION=Larry Wall's Practical Extraction and Report Language
+EAPI=7
+HOMEPAGE=https://www.perl.org/
+IUSE=berkdb debug doc gdbm ithreads minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+SLOT=0/5.34
+SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
+_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=353e500b81fc09d1a23d0a7049493578
diff --git a/metadata/md5-cache/dev-lang/php-7.3.29 b/metadata/md5-cache/dev-lang/php-7.3.29
index 1cb2022f1ab5..b258748be210 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_=e7fa18c27beac22ada3b4b11b1fa726d
+_md5_=cb5e203787a23d998cbefb8004aab1fc
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 90308c2e2d1b..71e93703ee9a 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_=ff29179c58e545f603fb9f12d75034c8
+_md5_=50898caf775ddf071f6d5d30580b35ff
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.6-r4 b/metadata/md5-cache/dev-lang/ruby-2.6.6-r4
deleted file mode 100644
index c483a374c0eb..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.6.6-r4
+++ /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_=34f8dcfad1fca415efe2235f6598d76e
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.8 b/metadata/md5-cache/dev-lang/ruby-2.6.8
index 14df093269c1..2ada4fe95ecf 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/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_=5ea9837bbe28917e31d68ffffd43890b
+_md5_=363ea58f4bc1b85cf776049413ba4da9
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.2-r2 b/metadata/md5-cache/dev-lang/ruby-2.7.2-r2
deleted file mode 100644
index ef583e71dacb..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.7.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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-20191222
-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/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
-SLOT=2.7
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.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_=08b9ec35dcddc77cb1de3bb7be0982ac
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.2-r3 b/metadata/md5-cache/dev-lang/ruby-2.7.2-r3
deleted file mode 100644
index 3be318b76ca2..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.7.2-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:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
-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/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
-SLOT=2.7
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.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_=1291048c2a7f812287a6ee51b80566b7
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.4 b/metadata/md5-cache/dev-lang/ruby-2.7.4
index 64a7ff1d87d2..228b0598a582 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.7.4
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.4
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
 SLOT=2.7
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.4.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8b9dad5b3dea5af4c9097f8a6f22295c
+_md5_=018cfd7f502643f477a8e548f825be7f
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.0-r3 b/metadata/md5-cache/dev-lang/ruby-3.0.0-r3
deleted file mode 100644
index b6913ca72458..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.0.0-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:= ) 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-20201225
-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/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) 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-20201225
-SLOT=3.0
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.0.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_=e668f334834af9673d3c09a6b99e9d72
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.0-r4 b/metadata/md5-cache/dev-lang/ruby-3.0.0-r4
deleted file mode 100644
index 4cfef694fd7f..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.0.0-r4
+++ /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-20201225
-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/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) 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-20201225
-SLOT=3.0
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.0.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_=e4b794c3f979890fa4c8ed29cd709e52
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.0-r5 b/metadata/md5-cache/dev-lang/ruby-3.0.0-r5
deleted file mode 100644
index 9b7916bc61d5..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.0.0-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-20201225
-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/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) 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-20201225
-SLOT=3.0
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.0.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_=9b3face30ad63cbe455b5b0274161fa4
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.2 b/metadata/md5-cache/dev-lang/ruby-3.0.2
index fb836edd7277..6dc191a45192 100644
--- a/metadata/md5-cache/dev-lang/ruby-3.0.2
+++ b/metadata/md5-cache/dev-lang/ruby-3.0.2
@@ -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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.2.15[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) 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-20201225
 SLOT=3.0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.2.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_=bc4f63389c65dadca5378e7f4459ba11
+_md5_=4558f3cefddd883337056fb69e3af6ec
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
index 5a50e7f37ad7..49eb031e790e 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 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
+_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	ab9b21d1b0a24b6afdd489885350e82e	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 bc42095bb845..d21711d8f97d 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/aml-0.2.0 b/metadata/md5-cache/dev-libs/aml-0.2.0
index c551b6319386..1f08b82dc382 100644
--- a/metadata/md5-cache/dev-libs/aml-0.2.0
+++ b/metadata/md5-cache/dev-libs/aml-0.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=event timer executor loop
 EAPI=7
 HOMEPAGE=https://github.com/any1/aml/
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/any1/aml/archive/v0.2.0.tar.gz -> aml-0.2.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=028a91eaff859d67422be3df31ae1784
+_md5_=9a324cc909d75ea7adc24bf02097896e
diff --git a/metadata/md5-cache/dev-libs/bglibs-2.04-r2 b/metadata/md5-cache/dev-libs/bglibs-2.04-r2
index 5f5df5152280..c1dc7dd994e4 100644
--- a/metadata/md5-cache/dev-libs/bglibs-2.04-r2
+++ b/metadata/md5-cache/dev-libs/bglibs-2.04-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Bruce Guenter's Libraries Collection
 EAPI=7
 HOMEPAGE=https://untroubled.org/bglibs/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1+
 SLOT=0/2
 SRC_URI=https://untroubled.org/bglibs/archive/bglibs-2.04.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7546c355206aef45292cc2f07d01413b
+_md5_=e9f5a67600c16c0333c2039bbc71b819
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20160131 b/metadata/md5-cache/dev-libs/cdk-5.0.20160131
deleted file mode 100644
index d55b56a4509b..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20160131
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-DESCRIPTION=A library of curses widgets
-EAPI=6
-HOMEPAGE=https://dickey.his.com/cdk/cdk.html
-IUSE=examples static-libs unicode
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-SLOT=0/6
-SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20160131.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d92dfb4aa1020ad64a17d4c122cf509b
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1 b/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1
new file mode 100644
index 000000000000..11d143207f71
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=A library of curses widgets
+EAPI=6
+HOMEPAGE=https://dickey.his.com/cdk/cdk.html
+IUSE=examples static-libs unicode
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:=[unicode(+)?]
+SLOT=0/6
+SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20160131.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=137a1996e6ec1ec6683ff9ffad35a200
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r1 b/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r1
deleted file mode 100644
index b9947540348f..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-DESCRIPTION=A library of curses widgets
-EAPI=7
-HOMEPAGE=https://dickey.his.com/cdk/cdk.html
-IUSE=examples unicode
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-SLOT=0/6
-SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20210324.tgz
-_md5_=4f84b1b3b20b822c867d8e820ddb9997
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2 b/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2
new file mode 100644
index 000000000000..961f21231f8c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=A library of curses widgets
+EAPI=7
+HOMEPAGE=https://dickey.his.com/cdk/cdk.html
+IUSE=examples unicode
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:=[unicode(+)?]
+SLOT=0/6
+SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20210324.tgz
+_md5_=3b50dbcda74c3bbeabe8c555692970ce
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 871a70cd304c..17e7523e27d1 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 ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 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_=21c9daad81a54f066c6f6b38346326ad
+_md5_=61d65bfb41f88323e7a087aea54ad94a
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index 39b7565be007..3bf99be14561 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_=5e5a81a4b012e5f1746c8c897ea27d76
+_md5_=ebf319e2a02802f2ac3989d38d5c8539
diff --git a/metadata/md5-cache/dev-libs/concurrencykit-0.7.1 b/metadata/md5-cache/dev-libs/concurrencykit-0.7.1
index b1cd9b7df01f..325ecac298f2 100644
--- a/metadata/md5-cache/dev-libs/concurrencykit-0.7.1
+++ b/metadata/md5-cache/dev-libs/concurrencykit-0.7.1
@@ -8,4 +8,4 @@ RDEPEND=!sys-cluster/charm
 SLOT=0
 SRC_URI=https://github.com/concurrencykit/ck/archive/0.7.1.tar.gz -> concurrencykit-0.7.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d6021aa7ae655756c130e0f43731034
+_md5_=ef2143946f03dac2bb09741dc8e10884
diff --git a/metadata/md5-cache/dev-libs/dqlite-1.7.0 b/metadata/md5-cache/dev-libs/dqlite-1.7.0
deleted file mode 100644
index 0a50d1662073..000000000000
--- a/metadata/md5-cache/dev-libs/dqlite-1.7.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=configure install prepare
-DEPEND=dev-db/sqlite:3 dev-libs/libuv dev-libs/raft test? ( dev-libs/raft[test] )
-DESCRIPTION=Embeddable, replicated and fault tolerant SQL engine
-EAPI=7
-HOMEPAGE=https://dqlite.io/ https://github.com/canonical/dqlite
-IUSE=test
-KEYWORDS=amd64 ~arm64
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-db/sqlite:3 dev-libs/libuv dev-libs/raft
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/canonical/dqlite/archive/v1.7.0.tar.gz -> dqlite-1.7.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1a32be5a2e7d9d55147068916c895216
diff --git a/metadata/md5-cache/dev-libs/ell-0.41 b/metadata/md5-cache/dev-libs/ell-0.41
index 200c0731dffb..bf4075ae0dd7 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_=bc1c306250acbbc7a8b07255d7bdfc4c
+_md5_=963454474b04276a6b66cb50be0976d1
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.3 b/metadata/md5-cache/dev-libs/folks-0.15.3
new file mode 100644
index 000000000000..0458caaa4d7d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/folks-0.15.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] ) telepathy? ( net-libs/telepathy-glib[vala] ) eds? ( gnome-extra/evolution-data-server[vala] ) test? ( sys-apps/dbus bluetooth? ( || ( ( dev-lang/python:3.10 dev-python/dbusmock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbusmock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbusmock[python_targets_python3_8(-)] ) ) ) ) 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 setup test
+DEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library for aggregating people from multiple sources
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks
+IUSE=bluetooth eds +telepathy test utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) bluetooth? ( >=net-wireless/bluez-5[obex] ) telepathy? ( net-im/telepathy-mission-control )
+REQUIRED_USE=bluetooth? ( eds )
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.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-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=095d241d471e6ed2fa18404e054b507f
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
index 5ead61893472..15037b67f68f 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	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_=f348c53418f887e1a0624879c54f9da7
+_md5_=bb8d5f7b01fc1e8fe2a1b96306973bc5
diff --git a/metadata/md5-cache/dev-libs/gumbo-0.10.1 b/metadata/md5-cache/dev-libs/gumbo-0.10.1
index 7723aaddb4d9..c237e1c63935 100644
--- a/metadata/md5-cache/dev-libs/gumbo-0.10.1
+++ b/metadata/md5-cache/dev-libs/gumbo-0.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=The HTML5 parsing algorithm implemented as a pure C99 library
 EAPI=7
 HOMEPAGE=https://github.com/google/gumbo-parser#readme
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz -> gumbo-0.10.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f027c6f5c58bc8d46ce86b5dc767538f
+_md5_=b95f86a10ba1d11ecd045d44ec167095
diff --git a/metadata/md5-cache/dev-libs/imath-3.0.1 b/metadata/md5-cache/dev-libs/imath-3.0.1
deleted file mode 100644
index db790d62a95e..000000000000
--- a/metadata/md5-cache/dev-libs/imath-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!media-libs/ilmbase sys-libs/zlib python? ( !dev-python/pyilmbase python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-libs/boost:=[python?,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python?,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) )
-DESCRIPTION=Imath basic math package
-EAPI=7
-HOMEPAGE=https://imath.readthedocs.io
-IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!media-libs/ilmbase sys-libs/zlib python? ( !dev-python/pyilmbase python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-libs/boost:=[python?,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python?,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0/27
-SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.0.1.tar.gz -> imath-3.0.1.tar.gz
-_eclasses_=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_=295ee3c53eddabdff63366bd9909d1f3
diff --git a/metadata/md5-cache/dev-libs/imath-3.0.5-r1 b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
new file mode 100644
index 000000000000..50383e8c7fe8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+DESCRIPTION=Imath basic math package
+EAPI=7
+HOMEPAGE=https://imath.readthedocs.io
+IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=3/28
+SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.0.5.tar.gz -> imath-3.0.5.tar.gz
+_eclasses_=cmake	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_=274f55921329181a78a86c9dc3224e5e
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300 b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
index 7505e85de301..e64a06646c87 100644
--- a/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
@@ -5,9 +5,9 @@ DESCRIPTION=A library for registering global keyboard shortcuts
 EAPI=7
 HOMEPAGE=https://github.com/kupferlauncher/keybinder
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
 SLOT=3
 SRC_URI=https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
-_md5_=e9ab7aac8f84da061c44b2cb33b107eb
+_md5_=05c4ee49e910a6f73d52a3096e59df55
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-21.04.3 b/metadata/md5-cache/dev-libs/kopeninghours-21.04.3
index f52c7ca7ce1a..ce3abed05ac8 100644
--- a/metadata/md5-cache/dev-libs/kopeninghours-21.04.3
+++ b/metadata/md5-cache/dev-libs/kopeninghours-21.04.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kopeninghours-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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f6f440d7d81f34cac807b4c886ca4d0e
+_md5_=da6b88cae270e24fe10e7c81f1507a95
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.9.1 b/metadata/md5-cache/dev-libs/libarcus-4.9.1
index fe6037935618..862ef5c68688 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.9.1
+++ b/metadata/md5-cache/dev-libs/libarcus-4.9.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.9.1.tar.gz -> libarcus-4.9.1.tar.gz
 _eclasses_=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_=c29a709beccd32753954ead246409c40
+_md5_=dd8233dbb3368f6f0e57831a792c3b49
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.9.1 b/metadata/md5-cache/dev-libs/libcharon-4.9.1
deleted file mode 100644
index 2438b3baa567..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-4.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst 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] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-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] ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.9.1.tar.gz -> libcharon-4.9.1.tar.gz
-_eclasses_=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_=fd2dfced08802a1d9e1381037b1bcb01
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1 b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
new file mode 100644
index 000000000000..97527ecd5eb6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst 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] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) )
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libCharon
+IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-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] ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.9.1.tar.gz -> libcharon-4.9.1.tar.gz
+_eclasses_=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_=37e9469efcdc7b80441103d609ac9a1f
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.8.0 b/metadata/md5-cache/dev-libs/libfido2-1.8.0
new file mode 100644
index 000000000000..412013731fda
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfido2-1.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:=
+DESCRIPTION=Provides library functionality for FIDO 2.0
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/libfido2
+IUSE=nfc +static-libs kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
+SLOT=0/1
+SRC_URI=https://github.com/Yubico/libfido2/archive/1.8.0.tar.gz -> libfido2-1.8.0.tar.gz
+_eclasses_=cmake	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	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=61946df38d90acbcac9c27c6a78b0e81
diff --git a/metadata/md5-cache/dev-libs/libnest2d-0.4-r1 b/metadata/md5-cache/dev-libs/libnest2d-0.4-r1
deleted file mode 100644
index 8575cd42068b..000000000000
--- a/metadata/md5-cache/dev-libs/libnest2d-0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt test? ( >=dev-cpp/catch-2.9.1 )
-DESCRIPTION=Library and framework for the 2D bin packaging problem
-EAPI=7
-HOMEPAGE=https://github.com/tamasmeszaros/libnest2d
-IUSE=examples static-libs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/tamasmeszaros/libnest2d/archive/0.4.tar.gz -> libnest2d-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_=2475e52d95d3b4ed141ff649e09792e8
diff --git a/metadata/md5-cache/dev-libs/libnest2d-0.4-r2 b/metadata/md5-cache/dev-libs/libnest2d-0.4-r2
new file mode 100644
index 000000000000..a4d7744eacf6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnest2d-0.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt test? ( >=dev-cpp/catch-2.9.1 )
+DESCRIPTION=Library and framework for the 2D bin packaging problem
+EAPI=7
+HOMEPAGE=https://github.com/tamasmeszaros/libnest2d
+IUSE=examples static-libs test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/clipper sci-libs/nlopt
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/tamasmeszaros/libnest2d/archive/0.4.tar.gz -> libnest2d-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_=e1f2ae72ebf90997015943a6b1551f46
diff --git a/metadata/md5-cache/dev-libs/libp11-0.4.11-r1 b/metadata/md5-cache/dev-libs/libp11-0.4.11-r1
index 37f2892323e0..d3b45631ecd8 100644
--- a/metadata/md5-cache/dev-libs/libp11-0.4.11-r1
+++ b/metadata/md5-cache/dev-libs/libp11-0.4.11-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Abstraction layer to simplify PKCS#11 API
 EAPI=7
 HOMEPAGE=https://github.com/opensc/libp11/wiki
 IUSE=bindist doc static-libs
-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
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0=[bindist(-)=]
 SLOT=0
 SRC_URI=https://github.com/OpenSC/libp11/releases/download/libp11-0.4.11/libp11-0.4.11.tar.gz
-_md5_=ad02c6e3ddc782b3d81905be719c92dd
+_md5_=0daa0f28f12c9b746ad85b43679ea4e7
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.30.0 b/metadata/md5-cache/dev-libs/libpeas-1.30.0
index 66fbc81ac233..d17de2294d70 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.30.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.30.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.30/libpeas-1.30.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2e4ca784c95a10fdfc30a6c41a4ce0dd
+_md5_=45806eae47988b473fd897fc922b39fe
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.15 b/metadata/md5-cache/dev-libs/libratbag-0.15
index 116a3b67601d..cf027358aaea 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.15
+++ b/metadata/md5-cache/dev-libs/libratbag-0.15
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.15.tar.gz -> libratbag-0.15.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=77c3e3d078834c5de50fd59dc8d10158
+_md5_=e5fee55373740c7e0c24e90686a58e76
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.16 b/metadata/md5-cache/dev-libs/libratbag-0.16
index 6c4eecfdcad1..f32d95d16124 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.16
+++ b/metadata/md5-cache/dev-libs/libratbag-0.16
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.16.tar.gz -> libratbag-0.16.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=77c3e3d078834c5de50fd59dc8d10158
+_md5_=e5fee55373740c7e0c24e90686a58e76
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.9.1 b/metadata/md5-cache/dev-libs/libsavitar-4.9.1
index 027069beb545..bf7b67c6d056 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.9.1
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.9.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.9.1.tar.gz -> libsavitar-4.9.1.tar.gz
 _eclasses_=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_=86ad631e06540feb86f5452b9508c916
+_md5_=e149451f9dc9bc946d73b85576d54d11
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
deleted file mode 100644
index 8344f04686c6..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=test? ( =app-i18n/unicode-data-12.0* )
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
-EAPI=7
-HOMEPAGE=https://github.com/JuliaStrings/utf8proc
-IUSE=cjk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2.4.0
-SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz -> libutf8proc-2.4.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-12.1.0.xz )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45aac323035986c133e891223753d075
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
deleted file mode 100644
index e98ab3dc4734..000000000000
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) 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=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
-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
-LICENSE=LGPL-2.1
-RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
-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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e59c3f88a20f0b4932aed3d141fe633
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 363e52c23126..438be49edfbb 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_=750f6e4b1110362423fa6280f342b787
+_md5_=50817499eecaf3282c73465caf8e08d4
diff --git a/metadata/md5-cache/dev-libs/openspecfun-0.5.3 b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
index bedd44bf2ccc..ca7ab94faad7 100644
--- a/metadata/md5-cache/dev-libs/openspecfun-0.5.3
+++ b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=compile configure install setup
 DEPEND=sci-libs/openlibm:= virtual/fortran
 DESCRIPTION=A collection of special mathematical functions
@@ -8,5 +9,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e92a4d59deaddaab9300b5e6318b741e
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2u b/metadata/md5-cache/dev-libs/openssl-1.0.2u
deleted file mode 100644
index 27db7d393d1f..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2u
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz )
-_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_=5f211e472c7cb3de8483fcabc2ea2bbc
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2u-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2u-r1
new file mode 100644
index 000000000000..c5358059da8c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2u-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) tls-compression? ( >=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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test tls-compression +tls-heartbeat vanilla 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 ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) tls-compression? ( >=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(-)?] )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz )
+_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_=02fcd676a6b20e99a86cf8ee7a46e5a7
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1k b/metadata/md5-cache/dev-libs/openssl-1.1.1k
deleted file mode 100644
index 51ccc6947a69..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1k
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1k.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
-_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_=5bf2356837635c6c8266012afb4342da
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1
new file mode 100644
index 000000000000..06ec081ec00a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1k-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla 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 ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=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(-)?] ) !<net-misc/openssh-8.0_p1-r3
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1k.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
+_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_=b3f619c41fa6b08d3a81bf12707700a3
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1 b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1
deleted file mode 100644
index 32c6f188923f..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 dev-perl/Text-Template sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test vanilla zlib 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
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.0-beta1.tar.gz
-_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_=a54621f426039f48c1a63e1db365c52c
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1 b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1
new file mode 100644
index 000000000000..cc278671a5fc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta1-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/perl-5 dev-perl/Text-Template sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=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(-)?] )
+DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla 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
+LICENSE=Apache-2.0
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://openssl/source/openssl-3.0.0-beta1.tar.gz
+_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_=039460949327a22ea618bd9be91bf1be
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1 b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1
deleted file mode 100644
index 363c2494b8b2..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8 >=dev-lang/perl-5 test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=openssl
-RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8
-RESTRICT=!bindist? ( bindist ) test
-SLOT=0.9.8
-SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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_=72d69e085b564aec563e123814e826f6
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2 b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
new file mode 100644
index 000000000000..292ea7909754
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tls-compression? ( >=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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8 >=dev-lang/perl-5 test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
+EAPI=6
+HOMEPAGE=https://www.openssl.org/
+IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+LICENSE=openssl
+RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tls-compression? ( >=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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8
+RESTRICT=!bindist? ( bindist ) test
+SLOT=0.9.8
+SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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_=32b770d6f595428e634e704de003456e
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1 b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
deleted file mode 100644
index 175dbca5be1b..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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/openssl-1.0.2*:0 !dev-libs/openssl:1.0.0
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
-LICENSE=openssl
-RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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/openssl-1.0.2*:0 !dev-libs/openssl:1.0.0
-RESTRICT=!bindist? ( bindist ) test
-SLOT=1.0.0
-SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) https://dev.gentoo.org/~whissi/dist/openssl/openssl-compat-1.0.2u-versioned-symbols.patch.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_=f4466dfa3a1fd70d2f51286983a94163
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r2 b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r2
new file mode 100644
index 000000000000..fe7441f7010f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) tls-compression? ( >=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(-)?] ) !=dev-libs/openssl-1.0.2*:0 !dev-libs/openssl:1.0.0
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression 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 ~x86-linux
+LICENSE=openssl
+RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) tls-compression? ( >=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(-)?] ) !=dev-libs/openssl-1.0.2*:0 !dev-libs/openssl:1.0.0
+RESTRICT=!bindist? ( bindist ) test
+SLOT=1.0.0
+SRC_URI=mirror://openssl/source/openssl-1.0.2u.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) https://dev.gentoo.org/~whissi/dist/openssl/openssl-compat-1.0.2u-versioned-symbols.patch.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_=e26c75743962c875223f12c11bf8f4fc
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 4b12f5a2ee4e..c205fb8ab68d 100644
--- a/metadata/md5-cache/dev-libs/papi-6.0.0.1
+++ b/metadata/md5-cache/dev-libs/papi-6.0.0.1
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
 DESCRIPTION=Performance Application Programming Interface
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08b3f51cc2a5e9ef0e12be68ed20696d
diff --git a/metadata/md5-cache/dev-libs/raft-0.10.1 b/metadata/md5-cache/dev-libs/raft-0.10.1
deleted file mode 100644
index 92d9fc11bec9..000000000000
--- a/metadata/md5-cache/dev-libs/raft-0.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libuv
-DESCRIPTION=C implementation of the Raft consensus protocol
-EAPI=7
-HOMEPAGE=https://github.com/canonical/raft
-IUSE=test zfs
-KEYWORDS=amd64 ~arm64
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-libs/libuv
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/canonical/raft/archive/v0.10.1.tar.gz -> raft-0.10.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b9e2a8ee745b147f77425e370057d63
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
index 62e8734f1f28..c15b6633457b 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.10.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-3.10.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocm-device-libs-3.10.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-comgr-3.10.0 >=dev-libs/rocm-device-libs-3.10.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-3.10.0 >=dev-libs/rocclr-3.10.0 >=dev-libs/rocm-
 SLOT=0/3.10
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.10.0.tar.gz -> rocm-opencl-runtime-3.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_=e88e8242d534d36a992e247ccb08d6b2
+_md5_=8b076cbdf3d747456f29ff36edae757f
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
index a1aa69fb6320..4c1b61ac46b4 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-3.8.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-co
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.8.0.tar.gz -> rocm-opencl-runtime-3.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=91f9a58483259de08729e02b5592f708
+_md5_=24f023097bcecfa8eb7d07637106bf6f
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
index 4ccac49b5024..de282bdd07a9 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-3.9.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-co
 SLOT=0/3.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.9.0.tar.gz -> rocm-opencl-runtime-3.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_=792e2e57ee5b94053068f5b6299f6dd7
+_md5_=8131851680c3ebb65445b9ff9bb71a15
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
index 1da8d4d18b59..fd4cc523fe29 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.0.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-4.0.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocm-device-libs-4.0.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-comgr-4.0.0 >=dev-libs/rocm-device-libs-4.0.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-4.0.0 >=dev-libs/rocclr-4.0.0 >=dev-libs/rocm-co
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-4.0.0.tar.gz -> rocm-opencl-runtime-4.0.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f3e8de828ae9a1e640338b1a52a943f8
+_md5_=6766ef3cc74784b326f21cfb06d2384c
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
index 08c7e3fcefd5..c7389e7d1bea 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.1.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-4.1.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocm-device-libs-4.1.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocm-device-libs-4.1.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-4.1.0 >=dev-libs/rocclr-4.1.0 >=dev-libs/rocm-co
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-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	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f3e8de828ae9a1e640338b1a52a943f8
+_md5_=6766ef3cc74784b326f21cfb06d2384c
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
index b412c2d1b3cc..2765f0de8038 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-4.2.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-4.2.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocclr-4.2.0 >=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocm-device-libs-4.2.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DEPEND=>=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocclr-4.2.0 >=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocm-device-libs-4.2.0 >=virtual/opencl-3 media-libs/mesa dev-ml/findlib
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocr-runtime-4.2.0 >=dev-libs/rocclr-4.2.0 >=dev-libs/rocm-co
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-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	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb26c59290f98809f75b99078b357b54
+_md5_=c65f5219a1e148fe21f3be720bc87f77
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 eb2030759283..5d55fbeceb61 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -1,4 +1,4 @@
-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
+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 fortran? ( virtual/fortran )
 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 ) fortran? ( virtual/fortran )
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
@@ -11,5 +11,5 @@ RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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
index 368106e9d725..e1730f1eab1d 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.3.8
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.8
@@ -1,4 +1,4 @@
-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
+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 fortran? ( virtual/fortran )
 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
@@ -11,5 +11,5 @@ RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas )
 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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cea8e8b427a254509c89f01d5cfe8836
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r3 b/metadata/md5-cache/dev-libs/stfl-0.24-r3
deleted file mode 100644
index 46581318bf75..000000000000
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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(-)?] ) perl? ( dev-lang/swig ) python? ( >=dev-lang/swig-1.3.40 ) ruby? ( dev-lang/swig )
-DESCRIPTION=A library which implements a curses-based widget set for text terminals
-EAPI=7
-HOMEPAGE=http://www.clifford.at/stfl/
-IUSE=examples perl python ruby static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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=http://www.clifford.at/stfl/stfl-0.24.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24da50f81897046e40771f54d60467b4
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r4 b/metadata/md5-cache/dev-libs/stfl-0.24-r4
new file mode 100644
index 000000000000..7e54ff82726c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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(-)?] ) perl? ( dev-lang/swig ) python? ( >=dev-lang/swig-1.3.40 ) ruby? ( dev-lang/swig )
+DESCRIPTION=A library which implements a curses-based widget set for text terminals
+EAPI=7
+HOMEPAGE=http://www.clifford.at/stfl/
+IUSE=examples perl python ruby static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=sys-libs/ncurses:=[unicode(+)] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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=http://www.clifford.at/stfl/stfl-0.24.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=658d95506efde1a4cf85425e838180a6
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
index 6fe40b9f8d55..66959cf5c146 100644
--- a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Fast public domain large integer arithmetic library
 EAPI=7
 HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Unlicense
 SLOT=0/1
 SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d162ce755b467a43003a362885d5e1e1
+_md5_=39ffe327a2ca075f5ae816f4cf2aa638
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0 b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
index 548d7076f389..f551c486cb1a 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
@@ -4,9 +4,9 @@ DESCRIPTION=userspace RCU (read-copy-update) library
 EAPI=7
 HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2
-_md5_=4a78481ad94f49fd936fc847fdc0e690
+_md5_=6783f7dd4fd9faf1c3334337f576bcd2
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index c518c8b6536c..6f8556185d5d 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	lua	2afa2308593141ae89672d1c2b96f9e8	lua-utils	a2950af9f524361296ff10564515822c	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	lua	2afa2308593141ae89672d1c2b96f9e8	lua-utils	a2950af9f524361296ff10564515822c	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f99d728c0458f6758c2fb9f70444d83
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 29d603dfdcae..f7252f00eeee 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/sbcl-2.0.10 b/metadata/md5-cache/dev-lisp/sbcl-2.0.10
deleted file mode 100644
index 46a3f5dc96f6..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index 31bd6732ab7f..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index 887622a91a7d..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index 7f5585862650..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index f9efef4b918e..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index 110e30606a22..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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
deleted file mode 100644
index 5a42135350da..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=6
-HOMEPAGE=http://sbcl.sourceforge.net/
-IUSE=debug doc source +threads +unicode zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-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	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.6 b/metadata/md5-cache/dev-lisp/sbcl-2.1.6
new file mode 100644
index 000000000000..8fbd48e1eb24
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/2.1.6
+SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.6-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.6-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	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=08110a0587398973a306877b08023e10
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 333116e267ec..ac01eda8c00e 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/dose3-6.1 b/metadata/md5-cache/dev-ml/dose3-6.1
new file mode 100644
index 000000000000..8f37fa92405a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml] ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://gitlab.com/irill/dose3/-/archive/6.1/dose3-6.1.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=665b0a3a7657b73df98e4c8cd24b0c13
diff --git a/metadata/md5-cache/dev-ml/dune-2.9.0 b/metadata/md5-cache/dev-ml/dune-2.9.0
new file mode 100644
index 000000000000..1d5ff4c34c36
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-2.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/core_bench dev-ml/ppx_bench dev-ml/ppx_expect )
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder
+RESTRICT=!test? ( test )
+SLOT=0/2.9.0
+SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=7ed7dc9998232bd32bcc67f01a3cd2a3
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.0 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
new file mode 100644
index 000000000000..22b03957a99b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-ml/dune-private-libs-2.9.0:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] dev-ml/result:=[ocamlopt=] test? ( dev-ml/core_bench dev-ml/menhir dev-ml/opam dev-ml/ppx_expect ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-ml/dune-private-libs-2.9.0:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] dev-ml/result:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.9.0
+SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=1bc0c754d2c158933ecd1f887bc1c692
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0 b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
new file mode 100644
index 000000000000..d1b7379c7f91
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-ml/dune-2.9.0 test? ( dev-ml/core_bench dev-ml/menhir dev-ml/opam dev-ml/ppx_expect ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4.09:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4.09:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.9.0
+SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=a51ab7500c6555e75f1b14bdf32755f2
diff --git a/metadata/md5-cache/dev-ml/findlib-1.9.1 b/metadata/md5-cache/dev-ml/findlib-1.9.1
new file mode 100644
index 000000000000..01e22de1b236
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/findlib-1.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DESCRIPTION=OCaml tool to find/use non-standard packages
+EAPI=7
+HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
+IUSE=doc +ocamlopt tk
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+SLOT=0
+SRC_URI=http://download.camlcity.org/download/findlib-1.9.1.tar.gz
+_md5_=3691c7b49c669da3cd25384ae8bdd07d
diff --git a/metadata/md5-cache/dev-ml/graphics-5.1.2 b/metadata/md5-cache/dev-ml/graphics-5.1.2
new file mode 100644
index 000000000000..ab37efc2f7c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/graphics-5.1.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09:= x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=The OCaml graphics library
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/graphics
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09:= x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0
+SRC_URI=https://github.com/ocaml/graphics/releases/download/5.1.2/graphics-5.1.2.tbz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=9f2160fc807d3e289b25de6f817d175a
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
index 315d0b82c6a2..496a639512bf 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=5717c4e4571dc61b81766312579e4263
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
index 0db49aa0cd77..a30742b9d49c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=e250b95094bd8fb74dd75eead9e2d48d
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
index 0c7f67770550..8ff253c948ff 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=0a083ccfbf7ad7e67a52b993fcb53c30
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
index 1c82181632bc..26fe5b49edba 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=7511edd7975caf3cc37d7ffdf5de3327
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
index c6cb97136034..92aec6d9683e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=0/13.0.0.9999
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=70455fb3b56abab41b0b30eba95f80ab
diff --git a/metadata/md5-cache/dev-ml/markup-1.0.2 b/metadata/md5-cache/dev-ml/markup-1.0.2
new file mode 100644
index 000000000000..c27157a4e062
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/markup-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/lwt dev-ml/uutf test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Error-recovering streaming HTML5 and XML parsers
+EAPI=7
+HOMEPAGE=https://github.com/aantron/markup.ml
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/lwt dev-ml/uutf >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/1.0.2
+SRC_URI=https://github.com/aantron/markup.ml/archive/1.0.2.tar.gz -> markup-1.0.2.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=eed3e7e84ad76bf3b99780a27b402c41
diff --git a/metadata/md5-cache/dev-ml/menhir-20210419-r1 b/metadata/md5-cache/dev-ml/menhir-20210419-r1
new file mode 100644
index 000000000000..82024f992964
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/menhir-20210419-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=LR(1) parser generator for the OCaml language
+EAPI=7
+HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/20210419
+SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20210419/menhir-20210419.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=abb3126df465272611ff9e21373b6338
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.6 b/metadata/md5-cache/dev-ml/merlin-extend-0.6
new file mode 100644
index 000000000000..357bf0115cfd
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/ocaml:= dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=SDK to extend Merlin
+EAPI=7
+HOMEPAGE=https://github.com/let-def/merlin-extend
+IUSE=ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/ocaml:= dev-lang/ocaml:=[ocamlopt?]
+SLOT=0/0.6
+SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.6.tar.gz -> merlin-extend-0.6.tar.gz
+_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_md5_=08cf4c244c64330a7e92d5ae605d1cbc
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.880.0 b/metadata/md5-cache/dev-perl/App-perlbrew-0.880.0
deleted file mode 100644
index e023290c56c1..000000000000
--- a/metadata/md5-cache/dev-perl/App-perlbrew-0.880.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.860.0 >=dev-perl/CPAN-Perl-Releases-5.201.912.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.800.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=dev-perl/File-Which-1.210.0 >=dev-perl/IO-All-0.510.0 >=dev-perl/Path-Class-0.330.0 >=dev-perl/Test-Exception-0.320.0 >=dev-perl/Test-NoWarnings-1.40.0 >=dev-perl/Test-Output-1.30.0 >=virtual/perl-Test-Simple-1.1.2 >=dev-perl/Test-Spec-0.470.0 >=dev-perl/Test-TempDir-Tiny-0.16.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
-DESCRIPTION=Manage perl installations in your $HOME
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/App-perlbrew
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.860.0 >=dev-perl/CPAN-Perl-Releases-5.201.912.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.800.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0e04dba9f0fd1b2a72467466e17fc28c
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0 b/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0
deleted file mode 100644
index 41dcebb62946..000000000000
--- a/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=dev-perl/CPAN-Perl-Releases-5.202.103.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-2.80.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=dev-perl/File-Which-1.210.0 >=dev-perl/IO-All-0.510.0 >=dev-perl/Path-Class-0.330.0 >=dev-perl/Test-Exception-0.320.0 >=dev-perl/Test-NoWarnings-1.40.0 >=dev-perl/Test-Output-1.30.0 >=virtual/perl-Test-Simple-1.1.2 >=dev-perl/Test-Spec-0.490.0 >=dev-perl/Test-TempDir-Tiny-0.16.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Manage perl installations in your $HOME
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/App-perlbrew
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=dev-perl/CPAN-Perl-Releases-5.202.103.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-2.80.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.92.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=53ee45169221a3f80b1b451ca455a588
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0-r1 b/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0-r1
new file mode 100644
index 000000000000..9f1050bdbac8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/App-perlbrew-0.920.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=dev-perl/CPAN-Perl-Releases-5.202.103.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-2.80.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=dev-perl/Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=dev-perl/File-Which-1.210.0 >=dev-perl/IO-All-0.510.0 >=dev-perl/Path-Class-0.330.0 >=dev-perl/Test-Exception-0.320.0 >=dev-perl/Test-NoWarnings-1.40.0 >=dev-perl/Test-Output-1.30.0 >=virtual/perl-Test-Simple-1.1.2 >=dev-perl/Test-Spec-0.490.0 >=dev-perl/Test-TempDir-Tiny-0.16.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Manage perl installations in your $HOME
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/App-perlbrew
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=dev-perl/CPAN-Perl-Releases-5.202.103.200 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-2.80.0 >=virtual/perl-ExtUtils-MakeMaker-7.220.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=dev-perl/Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.92.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=bd7731798bc98d45c156d40007ea9202
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
index 872404afbb6f..2927e17ba825 100644
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module to implement some of AutoConf macros in pure perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Config-AutoConf
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=809bbdae3d939371216c85e9ad65663c
+_md5_=dd29fedc92369089d4c2db068beb9b21
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0 b/metadata/md5-cache/dev-perl/Curses-1.360.0
deleted file mode 100644
index 2d877a9bc7ba..000000000000
--- a/metadata/md5-cache/dev-perl/Curses-1.360.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Curses interface modules for Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Curses
-IUSE=+unicode test examples
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e0ceff927154a6230f949109db95c113
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0-r1 b/metadata/md5-cache/dev-perl/Curses-1.360.0-r1
new file mode 100644
index 000000000000..a7038e4640e7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Curses-1.360.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=Curses interface modules for Perl
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Curses
+IUSE=+unicode test examples
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=19c6e8d6813bf859157ac2d7381a627b
diff --git a/metadata/md5-cache/dev-perl/Curses-1.370.0 b/metadata/md5-cache/dev-perl/Curses-1.370.0
deleted file mode 100644
index 8e8a89c958a6..000000000000
--- a/metadata/md5-cache/dev-perl/Curses-1.370.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5:0=[unicode?] dev-lang/perl
-DESCRIPTION=Curses interface modules for Perl
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Curses
-IUSE=+unicode test examples
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=82a6495a097e65e76c3b6f290853ecd2
diff --git a/metadata/md5-cache/dev-perl/Curses-1.370.0-r1 b/metadata/md5-cache/dev-perl/Curses-1.370.0-r1
new file mode 100644
index 000000000000..06b2ed38fe83
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Curses-1.370.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] dev-lang/perl
+DESCRIPTION=Curses interface modules for Perl
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Curses
+IUSE=+unicode test examples
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=b3cb741da7dba6f21e22c71650574419
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0 b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
new file mode 100644
index 000000000000..ba6595d6f994
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Check for the presence of a compiler
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/ExtUtils-HasCompiler
+IUSE=test
+KEYWORDS=~amd64 ~riscv ~sparc
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-HasCompiler-0.023.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a5d9e73d52f58f456b51b13c30d5c22f
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.80.0 b/metadata/md5-cache/dev-perl/File-BaseDir-0.80.0
index ea23a2062bae..d976a60f2334 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.80.0
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Use the Freedesktop.org base directory specification
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-BaseDir
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-perl/IPC-System-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c181cf69391e9c80a287993206a430c9
+_md5_=a9b162770d24cc264ac9228d411b767b
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
index 948d39bfe3b0..fa8644671da3 100644
--- a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
@@ -4,11 +4,11 @@ DESCRIPTION=Object to handle .desktop files
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-DesktopEntry
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=dev-perl/File-BaseDir-0.30.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6e1ac5808f308c1451384144026aa27a
+_md5_=468013305a52b8654965d36a1f60f305
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
index 76b828e79e82..c35179bc0b45 100644
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Determine file type
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-MimeInfo
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Encode-Locale virtual/perl-Exporter >=dev-perl/File-BaseDir-0.30.0 >=dev-perl/File-DesktopEntry-0.40.0 x11-misc/shared-mime-info dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f22a11e1f79080760e35b27fb3d70a80
+_md5_=31a8824c09477caf05c9c725b7ca7488
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
index 9ce5d4850e73..8aa28b7ec1fa 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple, sane and efficient module to slurp a file
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Slurper
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp >=virtual/perl-Encode-2.110.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=260c6fcc615169d73739b39a33455dab
+_md5_=9d6cd89fea7e57fa53005421ffc789e0
diff --git a/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0 b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
index e26ba9790e59..4311e003f928 100644
--- a/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
+++ b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Bridge between GooCanvas2 and Cairo types
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GooCanvas2-CairoTypes
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-libs/goocanvas:2.0[introspection] dev-perl/Cairo dev-perl/glib-perl dev-perl/Gtk3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-0.001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3039ef3bbc71ca0aacf373ae1fb5da2c
+_md5_=ee8f7e33fa0283fc99ba93f3b1e24495
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2
deleted file mode 100644
index 1aea0e684216..000000000000
--- a/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy virtual/perl-Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl
-DESCRIPTION=a Gtk2 widget for displaying Plain old Documentation (POD)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Gtk2-Ex-PodViewer
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy virtual/perl-Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/Gtk2-Ex-PodViewer-0.18.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=844ac7f31fcc3ac42b307fbb99fe49e4
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r3 b/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r3
new file mode 100644
index 000000000000..f8fa97525e9a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy dev-perl/Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy dev-perl/Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl
+DESCRIPTION=a Gtk2 widget for displaying Plain old Documentation (POD)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Gtk2-Ex-PodViewer
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy dev-perl/Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/Gtk2-Ex-PodViewer-0.18.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=59d1d34e9f85d662b5392f1e968799a7
diff --git a/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0 b/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
index f9c8a8e5bbad..ddce2f3d4113 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Image viewer widget for Gtk3
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk3-ImageView
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Cairo >=dev-perl/glib-perl-1.210.0 dev-perl/Gtk3 dev-perl/Readonly dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-9.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=1fae059702bccdbb4b3c0933831836b2
+_md5_=c616a3092fb2ce6daa1dbfb56b8af163
diff --git a/metadata/md5-cache/dev-perl/IO-AIO-4.750.0 b/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
index 628751a7c6e5..364e2dfc165a 100644
--- a/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
+++ b/metadata/md5-cache/dev-perl/IO-AIO-4.750.0
@@ -5,11 +5,11 @@ DESCRIPTION=Asynchronous Input/Output
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-AIO
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=399f6d406451b4bf09b721bb9899c5bb
+_md5_=f9974970aed28ea6cd7a3a77c994bd3a
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
index 0716352308cb..89d2ce8a98c5 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils
 IUSE=+xs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.430.0 )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.430.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=57888b0e71c7b9b5f2280f38fd8eb6e9
+_md5_=2a789a927a0e58db89aff36e36209f60
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
index 20470c78fe16..ff0d4a200e59 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiled List::MoreUtils functions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils-XS
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=baaaaae5debd02bef515a3d3502957be
+_md5_=8b807be24ab053a8959b9dfa20a82bf2
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 02d945ace909..4dcc58164be2 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/Module-Starter-1.730.0 b/metadata/md5-cache/dev-perl/Module-Starter-1.730.0
deleted file mode 100644
index c392d1f1788f..000000000000
--- a/metadata/md5-cache/dev-perl/Module-Starter-1.730.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=virtual/perl-Pod-Parser-1.210.0 virtual/perl-parent >=virtual/perl-version-0.770.0 test? ( virtual/perl-Test-Simple >=virtual/perl-Test-Harness-0.210.0 ) dev-lang/perl
-DESCRIPTION=A simple starter kit for any module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Module-Starter
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=virtual/perl-Pod-Parser-1.210.0 virtual/perl-parent >=virtual/perl-version-0.770.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Module-Starter-1.73.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3ccceb369ff5fcf368dbfdc58fd26e6c
diff --git a/metadata/md5-cache/dev-perl/Module-Starter-1.730.0-r1 b/metadata/md5-cache/dev-perl/Module-Starter-1.730.0-r1
new file mode 100644
index 000000000000..4874a320119a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Module-Starter-1.730.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=dev-perl/Pod-Parser-1.210.0 virtual/perl-parent >=virtual/perl-version-0.770.0 test? ( virtual/perl-Test-Simple >=virtual/perl-Test-Harness-0.210.0 ) dev-lang/perl
+DESCRIPTION=A simple starter kit for any module
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Module-Starter
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=dev-perl/Pod-Parser-1.210.0 virtual/perl-parent >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Module-Starter-1.73.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=78bb1393d7812cda1990db079d5e3dfd
diff --git a/metadata/md5-cache/dev-perl/Module-Starter-1.770.0 b/metadata/md5-cache/dev-perl/Module-Starter-1.770.0
deleted file mode 100644
index 060f6bc42888..000000000000
--- a/metadata/md5-cache/dev-perl/Module-Starter-1.770.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=virtual/perl-Pod-Parser-1.210.0 >=dev-perl/Software-License-0.103.5 >=virtual/perl-Test-Harness-0.210.0 >=virtual/perl-Test-Simple-0.940.0 virtual/perl-parent >=virtual/perl-version-0.770.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=A simple starter kit for any module
-EAPI=8
-HOMEPAGE=https://metacpan.org/release/Module-Starter
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=virtual/perl-Pod-Parser-1.210.0 >=dev-perl/Software-License-0.103.5 >=virtual/perl-Test-Harness-0.210.0 >=virtual/perl-Test-Simple-0.940.0 virtual/perl-parent >=virtual/perl-version-0.770.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Module-Starter-1.77.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c06337cf4535f32bba9fb25938dd810f
diff --git a/metadata/md5-cache/dev-perl/Module-Starter-1.770.0-r1 b/metadata/md5-cache/dev-perl/Module-Starter-1.770.0-r1
new file mode 100644
index 000000000000..f80f9652749d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Module-Starter-1.770.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=dev-perl/Pod-Parser-1.210.0 >=dev-perl/Software-License-0.103.5 >=virtual/perl-Test-Harness-0.210.0 >=virtual/perl-Test-Simple-0.940.0 virtual/perl-parent >=virtual/perl-version-0.770.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=A simple starter kit for any module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Module-Starter
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=dev-perl/Pod-Parser-1.210.0 >=dev-perl/Software-License-0.103.5 >=virtual/perl-Test-Harness-0.210.0 >=virtual/perl-Test-Simple-0.940.0 virtual/perl-parent >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Module-Starter-1.77.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1e2b80f0703a3125c37abb00fdf83afd
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.2.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
index cc861d35d2ad..5d9a2d88d136 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=8
 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 ~riscv ~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.2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a72e393e806daaf894ea487d6f23408f
+_md5_=607fe708c66a47088203a61d759d4ae4
diff --git a/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.300.0 b/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.300.0
new file mode 100644
index 000000000000..360a1aba46a2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.300.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/yaz-2.1.50 >=dev-perl/MARC-Record-1.380.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/yaz-2.1.50 >=dev-perl/MARC-Record-1.380.0 dev-lang/perl
+DESCRIPTION=Perl extension for invoking the ZOOM-C API
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Z3950-ZOOM
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-libs/yaz-2.1.50 >=dev-perl/MARC-Record-1.380.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.30.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8cba3e2853cd84035fe0bfe222261812
diff --git a/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0 b/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0
deleted file mode 100644
index 1b31fb1615a2..000000000000
--- a/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Set-IntSpan-1.70.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Manage newsrc files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/News-Newsrc
-KEYWORDS=~alpha amd64 ~hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Set-IntSpan-1.70.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SW/SWMCD/News-Newsrc-1.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=16f850c2826da8b08624aefcf80d6abd
diff --git a/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0-r1 b/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0-r1
new file mode 100644
index 000000000000..7cc42db49a7c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/News-Newsrc-1.110.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Set-IntSpan-1.70.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Manage newsrc files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/News-Newsrc
+IUSE=test
+KEYWORDS=~alpha amd64 ~hppa ~ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Set-IntSpan-1.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SW/SWMCD/News-Newsrc-1.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=7877446f619de6bdde73d2d5946e2e5c
diff --git a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0 b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
deleted file mode 100644
index 4bb7eb12a426..000000000000
--- a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert byte count to human readable format
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Number-Bytes-Human
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=093080af6e1b870eaa5aaccde7c0f031
diff --git a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0-r1 b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0-r1
new file mode 100644
index 000000000000..66e391c5e128
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert byte count to human readable format
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Number-Bytes-Human
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=cefa6a4112fbc15ae19cc804d250ff6f
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
deleted file mode 100644
index e5f3b7735189..000000000000
--- a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Numeric comparisons
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Number-Compare
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.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_=a851dea3f22c77fe27d6708cd96c16c6
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r2 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r2
new file mode 100644
index 000000000000..e30e1a1a5273
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-Compare-0.30.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=Numeric comparisons
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Number-Compare
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e35db8bcf550b841e2bd056571573ba8
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.750.0 b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
deleted file mode 100644
index 4eb25cb11fcb..000000000000
--- a/metadata/md5-cache/dev-perl/Number-Format-1.750.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Package for formatting numbers for display
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Number-Format
-KEYWORDS=amd64 ~ia64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.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_=a7d640b258f9e74c5e0f0db6809fb502
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.750.0-r1 b/metadata/md5-cache/dev-perl/Number-Format-1.750.0-r1
new file mode 100644
index 000000000000..fa6bb85e5cf8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-Format-1.750.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=Package for formatting numbers for display
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Number-Format
+IUSE=test
+KEYWORDS=amd64 ~ia64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=dbee68ff33f6984d98683ac528149589
diff --git a/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4 b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
new file mode 100644
index 000000000000..834817c9c75d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl
+DESCRIPTION=Perl extension to model fractions
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Number-Fraction
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.4.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2eb17bfdf09c3a212a0e5ce72eee269f
diff --git a/metadata/md5-cache/dev-perl/Number-WithError-1.10.0 b/metadata/md5-cache/dev-perl/Number-WithError-1.10.0
deleted file mode 100644
index 5c641b725720..000000000000
--- a/metadata/md5-cache/dev-perl/Number-WithError-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Math-BigInt-1.400.0 >=dev-perl/Params-Util-0.100.0 >=dev-perl/prefork-1.0.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( dev-perl/Test-LectroTest >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Numbers with error propagation and scientific rounding
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Number-WithError
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Math-BigInt-1.400.0 >=dev-perl/Params-Util-0.100.0 >=dev-perl/prefork-1.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=37f4587283d6fb43752dab594b6e69b4
diff --git a/metadata/md5-cache/dev-perl/Number-WithError-1.10.0-r1 b/metadata/md5-cache/dev-perl/Number-WithError-1.10.0-r1
new file mode 100644
index 000000000000..a542d0aa95e7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Number-WithError-1.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Math-BigInt-1.400.0 >=dev-perl/Params-Util-0.100.0 >=dev-perl/prefork-1.0.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( dev-perl/Test-LectroTest >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Numbers with error propagation and scientific rounding
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Number-WithError
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Math-BigInt-1.400.0 >=dev-perl/Params-Util-0.100.0 >=dev-perl/prefork-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=52ff0ae30c5218879492bdaa1d9abe34
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0
deleted file mode 100644
index 796f342c8993..000000000000
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-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 ~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_=3781d54c0e7d43fca41fc546c9b3d279
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
new file mode 100644
index 000000000000..a4533c4eff41
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Class for OLE document interface
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/OLE-Storage_Lite
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b5f8adb6a237f861ab0ce27f1de4fa4e
diff --git a/metadata/md5-cache/dev-perl/OOTools-2.410.0 b/metadata/md5-cache/dev-perl/OOTools-2.410.0
new file mode 100644
index 000000000000..1b791774a2e3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/OOTools-2.410.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Module-Build test? ( dev-perl/CGI ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Pragma to implement lvalue accessors with options
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/OOTools
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SK/SKNPP/OOTools-2.41.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/OOTools/OOTools-2.300.0-patch.tar.bz2
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=10a6a1b95fcbaa064d861ac5d9b8829c
diff --git a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1 b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
deleted file mode 100644
index bd0ae1ccbb33..000000000000
--- a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 test? ( >=dev-perl/Test-Script-1.06 ) dev-lang/perl
-DESCRIPTION=Extremely light weight SQLite-specific ORM
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/ORLite
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-1.98.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ea2c5b7282d3e054290da762c4b8ea47
diff --git a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r2 b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r2
new file mode 100644
index 000000000000..96fc9fb0ea3d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 test? ( >=dev-perl/Test-Script-1.06 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extremely light weight SQLite-specific ORM
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/ORLite
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-1.98.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e4c30d86388f158107f6181e6530fa6a
diff --git a/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r1 b/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r1
deleted file mode 100644
index 694c5e252ca3..000000000000
--- a/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Params-Util-0.370.0 >=dev-perl/IPC-Run3-0.42.0 >=virtual/perl-File-Path-2.04 >=dev-perl/DBD-SQLite-1.210.0 >=dev-perl/ORLite-1.280.0 >=dev-perl/File-pushd-1.0.0 >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/File-Which-1.70.0 >=dev-perl/DBI-1.580.0 dev-lang/perl
-DESCRIPTION=Extremely light weight SQLite-specific schema migration
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/ORLite-Migrate
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Params-Util-0.370.0 >=dev-perl/IPC-Run3-0.42.0 >=virtual/perl-File-Path-2.04 >=dev-perl/DBD-SQLite-1.210.0 >=dev-perl/ORLite-1.280.0 >=dev-perl/File-pushd-1.0.0 >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/File-Which-1.70.0 >=dev-perl/DBI-1.580.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-Migrate-1.10.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=818d7adf1d148a8ceee651b2f14b712a
diff --git a/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r2 b/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r2
new file mode 100644
index 000000000000..6fab0bfa0b87
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ORLite-Migrate-1.100.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Params-Util-0.370.0 >=dev-perl/IPC-Run3-0.42.0 >=virtual/perl-File-Path-2.04 >=dev-perl/DBD-SQLite-1.210.0 >=dev-perl/ORLite-1.280.0 >=dev-perl/File-pushd-1.0.0 >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/File-Which-1.70.0 >=dev-perl/DBI-1.580.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extremely light weight SQLite-specific schema migration
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/ORLite-Migrate
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Params-Util-0.370.0 >=dev-perl/IPC-Run3-0.42.0 >=virtual/perl-File-Path-2.04 >=dev-perl/DBD-SQLite-1.210.0 >=dev-perl/ORLite-1.280.0 >=dev-perl/File-pushd-1.0.0 >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/File-Which-1.70.0 >=dev-perl/DBI-1.580.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-Migrate-1.10.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e96cf12a1d8e78bc8f93063202387464
diff --git a/metadata/md5-cache/dev-perl/Object-Enum-0.75.0 b/metadata/md5-cache/dev-perl/Object-Enum-0.75.0
deleted file mode 100644
index 59d2cf003929..000000000000
--- a/metadata/md5-cache/dev-perl/Object-Enum-0.75.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Sub-Install dev-perl/Sub-Exporter dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Replacement for if ($foo eq 'bar')
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Object-Enum
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Sub-Install dev-perl/Sub-Exporter dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JM/JMMILLS/Object-Enum-0.075.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e04596f83b6c893c36dc844fceaa21f0
diff --git a/metadata/md5-cache/dev-perl/Object-Enum-0.75.0-r1 b/metadata/md5-cache/dev-perl/Object-Enum-0.75.0-r1
new file mode 100644
index 000000000000..0a822bb6fb6d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Object-Enum-0.75.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Sub-Install dev-perl/Sub-Exporter dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor >=virtual/perl-ExtUtils-MakeMaker-6.300.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=Replacement for if ($foo eq 'bar')
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Object-Enum
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Sub-Install dev-perl/Sub-Exporter dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JM/JMMILLS/Object-Enum-0.075.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0563715e9173bf5491348004485f3d1a
diff --git a/metadata/md5-cache/dev-perl/Object-Event-1.230.0 b/metadata/md5-cache/dev-perl/Object-Event-1.230.0
deleted file mode 100644
index b56104a3f48c..000000000000
--- a/metadata/md5-cache/dev-perl/Object-Event-1.230.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/AnyEvent-3.500.0 dev-perl/common-sense virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A class that provides an event callback interface
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Object-Event
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/AnyEvent-3.500.0 dev-perl/common-sense dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EL/ELMEX/Object-Event-1.23.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2f70c97857a28838c9120dbee0e69b11
diff --git a/metadata/md5-cache/dev-perl/Object-Event-1.230.0-r1 b/metadata/md5-cache/dev-perl/Object-Event-1.230.0-r1
new file mode 100644
index 000000000000..50b7e34bd32e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Object-Event-1.230.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/AnyEvent-3.500.0 dev-perl/common-sense 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=A class that provides an event callback interface
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Object-Event
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/AnyEvent-3.500.0 dev-perl/common-sense dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EL/ELMEX/Object-Event-1.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=406f0aafc6f8a0785fa9fa69af8aa4d3
diff --git a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0 b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
deleted file mode 100644
index d9b2ba9d53fd..000000000000
--- a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl Objects as Hash, Array, Scalar, Code and Glob at the same time
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Object-MultiType
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Object-MultiType-0.05.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_=fe9f69c2394ac20eb1df32e3c598c2cd
diff --git a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0-r1 b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0-r1
new file mode 100644
index 000000000000..c6cec5bbe5b3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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 Objects as Hash, Array, Scalar, Code and Glob at the same time
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Object-MultiType
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Object-MultiType-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=cf9704e8a87f33428dcf7b135e2dfeb8
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0
new file mode 100644
index 000000000000..817a41882fac
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.210.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Delayed creation of objects
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Object-Realize-Later
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=eda1256c4f7f8191aa655a4e3fc9b4ad
diff --git a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0 b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0
new file mode 100644
index 000000000000..c1b53a0efbde
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.110.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Inline-0.440.0 dev-perl/Inline-C media-libs/libogg media-libs/libvorbis virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An object-oriented interface to Ogg Vorbis information and comment fields
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Ogg-Vorbis-Header
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2
+RDEPEND=>=dev-perl/Inline-0.440.0 dev-perl/Inline-C media-libs/libogg media-libs/libvorbis dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-0.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ed719c1de41ab9d4d6175ad3dab2cc36
diff --git a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0 b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0
new file mode 100644
index 000000000000..717efb35a6b6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-PurePerl-1.50.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Object-oriented interface to Ogg Vorbis information and comment fields
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Ogg-Vorbis-Header-PurePerl
+IUSE=test examples
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-PurePerl-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=941adbe7129fa615712a6dcdf85d1a25
diff --git a/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0 b/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0
deleted file mode 100644
index dcbcc79ed74c..000000000000
--- a/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Moose >=dev-perl/MooseX-ClassAttribute-0.250.0 dev-perl/namespace-autoclean test? ( dev-perl/List-MoreUtils virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Globally unique timezones abbreviation handling
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Olson-Abbreviations
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Moose >=dev-perl/MooseX-ClassAttribute-0.250.0 dev-perl/namespace-autoclean dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/Olson-Abbreviations-0.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fae1200287ae25ce1fe3f38fdc758749
diff --git a/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0-r1 b/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0-r1
new file mode 100644
index 000000000000..512a3302b7f3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Moose >=dev-perl/MooseX-ClassAttribute-0.250.0 dev-perl/namespace-autoclean test? ( dev-perl/List-MoreUtils virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Globally unique timezones abbreviation handling
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Olson-Abbreviations
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Moose >=dev-perl/MooseX-ClassAttribute-0.250.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/Olson-Abbreviations-0.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1f0779b8efcc0d283b930d2f6b216246
diff --git a/metadata/md5-cache/dev-perl/OpenGL-0.700.0 b/metadata/md5-cache/dev-perl/OpenGL-0.700.0
deleted file mode 100644
index efc36f351547..000000000000
--- a/metadata/md5-cache/dev-perl/OpenGL-0.700.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl
-DESCRIPTION=Perl interface providing graphics display using OpenGL
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/OpenGL
-IUSE=examples
-KEYWORDS=amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=51c9e65c99d915afb3fe522ddf42d602
diff --git a/metadata/md5-cache/dev-perl/OpenGL-0.700.0-r1 b/metadata/md5-cache/dev-perl/OpenGL-0.700.0-r1
new file mode 100644
index 000000000000..f09074c2b242
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/OpenGL-0.700.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl
+DESCRIPTION=Perl interface providing graphics display using OpenGL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/OpenGL
+IUSE=examples test
+KEYWORDS=amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d92ec9e10e0042a3c56293fd2ac2f267
diff --git a/metadata/md5-cache/dev-perl/PAR-1.17.0 b/metadata/md5-cache/dev-perl/PAR-1.17.0
new file mode 100644
index 000000000000..c8437cdf62df
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PAR-1.17.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Archive-Zip-1.0.0 >=virtual/perl-AutoLoader-5.660.200 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-File-Temp-0.50.0 >=virtual/perl-IO-Compress-1.300.0 >=dev-perl/PAR-Dist-0.320.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl Archive Toolkit
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PAR
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Archive-Zip-1.0.0 >=virtual/perl-AutoLoader-5.660.200 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-File-Temp-0.50.0 >=virtual/perl-IO-Compress-1.300.0 >=dev-perl/PAR-Dist-0.320.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-1.017.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e6bbfe19653896653e41bf82bb5c2f15
diff --git a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1 b/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
deleted file mode 100644
index 6ad5c2374cf3..000000000000
--- a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.670.200 dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 virtual/perl-Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) >=virtual/perl-ExtUtils-MakeMaker-6.560.0 dev-perl/Devel-CheckLib fortran? ( >=dev-perl/ExtUtils-F77-1.13 ) test? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-Deep ) dev-lang/perl fortran? ( virtual/fortran )
-DESCRIPTION=Perl Data Language for scientific computing
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PDL
-IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test
-KEYWORDS=amd64 arm ppc x86
-LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
-RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.670.200 dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 virtual/perl-Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl:= fortran? ( virtual/fortran )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHM/PDL-2.017.tar.gz
-_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-2.17.0-r2 b/metadata/md5-cache/dev-perl/PDL-2.17.0-r2
new file mode 100644
index 000000000000..76eed7a33d1e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PDL-2.17.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.670.200 dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) >=virtual/perl-ExtUtils-MakeMaker-6.560.0 dev-perl/Devel-CheckLib fortran? ( >=dev-perl/ExtUtils-F77-1.13 ) test? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple ) fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.670.200 dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl fortran? ( virtual/fortran )
+DESCRIPTION=Perl Data Language for scientific computing
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PDL
+IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test test
+KEYWORDS=amd64 arm ppc x86
+LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
+RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.670.200 dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl:= fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHM/PDL-2.017.tar.gz
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=587c639c37e988be9b3bd45dc06f2044
diff --git a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0 b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
deleted file mode 100644
index 8c806f842a2a..000000000000
--- a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=List all constants declared in a package
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Package-Constants
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-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_=b1f29850dc5aedc7ac92b30eba2480bf
diff --git a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0-r1 b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0-r1
new file mode 100644
index 000000000000..062130d3dcf9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Package-Constants-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=dev-lang/perl
+DESCRIPTION=List all constants declared in a package
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Package-Constants
+IUSE=test
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c19442a982da4631d076f8b963e78fe5
diff --git a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0 b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
deleted file mode 100644
index 265161654d8e..000000000000
--- a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Warnings ) dev-lang/perl
-DESCRIPTION=Manage deprecation warnings for your distribution
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Package-DeprecationManager
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=14fd5e3bdeb4326aa2d87422828df540
diff --git a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0-r1 b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0-r1
new file mode 100644
index 000000000000..32b1ed19ee7f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Manage deprecation warnings for your distribution
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Package-DeprecationManager
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4423e73473b8580a48fc5e8ae0d10409
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
new file mode 100644
index 000000000000..f0d780f21498
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec dev-perl/CPAN-Meta-Check dev-perl/ExtUtils-HasCompiler virtual/perl-Text-ParseWords test? ( virtual/perl-IO dev-perl/Test-Fatal dev-perl/Test-Needs dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Routines for manipulating stashes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Package-Stash
+IUSE=minimal test
+KEYWORDS=~amd64 ~riscv ~sparc
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3e3ed44319a63785aee403d6d3b2c16b
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0
new file mode 100644
index 000000000000..f1e895d49979
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.290.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.310.0 test? ( dev-perl/Test-Fatal dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Faster and more correct implementation of the Package::Stash API
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Package-Stash-XS
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=fd23df429511322b9268629cef073bea
diff --git a/metadata/md5-cache/dev-perl/Package-Variant-1.3.2 b/metadata/md5-cache/dev-perl/Package-Variant-1.3.2
deleted file mode 100644
index e2c4d6bde867..000000000000
--- a/metadata/md5-cache/dev-perl/Package-Variant-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/strictures-2.0.0 >=dev-perl/Module-Runtime-0.13.0 >=dev-perl/Import-Into-1.0.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Fatal ) dev-lang/perl
-DESCRIPTION=Parameterizable packages
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Package-Variant
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/strictures-2.0.0 >=dev-perl/Module-Runtime-0.13.0 >=dev-perl/Import-Into-1.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=daa037fecb22daa0aac0d515630b69d5
diff --git a/metadata/md5-cache/dev-perl/Package-Variant-1.3.2-r1 b/metadata/md5-cache/dev-perl/Package-Variant-1.3.2-r1
new file mode 100644
index 000000000000..2b5cd7cd579c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Package-Variant-1.3.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/strictures-2.0.0 >=dev-perl/Module-Runtime-0.13.0 >=dev-perl/Import-Into-1.0.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Fatal ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parameterizable packages
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Package-Variant
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/strictures-2.0.0 >=dev-perl/Module-Runtime-0.13.0 >=dev-perl/Import-Into-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b99aa530f75c78f8c0e75a3e52ff6a59
diff --git a/metadata/md5-cache/dev-perl/PadWalker-2.500.0 b/metadata/md5-cache/dev-perl/PadWalker-2.500.0
new file mode 100644
index 000000000000..a57815dea0e1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PadWalker-2.500.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=play with other peoples' lexical variables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PadWalker
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=294925e30042cc55d2e69c87024a36f5
diff --git a/metadata/md5-cache/dev-perl/Palm-1.400.0 b/metadata/md5-cache/dev-perl/Palm-1.400.0
deleted file mode 100644
index d5524ef74a99..000000000000
--- a/metadata/md5-cache/dev-perl/Palm-1.400.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Read & write Palm OS databases (both PDB and PRC)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Palm
-IUSE=test examples
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Exporter dev-perl/Palm-PDB dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-1.400.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ddd6d7572442e0ca50742722d465fbb2
diff --git a/metadata/md5-cache/dev-perl/Palm-1.400.0-r1 b/metadata/md5-cache/dev-perl/Palm-1.400.0-r1
new file mode 100644
index 000000000000..7b8d22a15b2f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Palm-1.400.0-r1
@@ -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=Read & write Palm OS databases (both PDB and PRC)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Palm
+IUSE=examples test
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-perl/Palm-PDB dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-1.400.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=bf88f3df0df7b849b946a325a7a9eb16
diff --git a/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0 b/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0
deleted file mode 100644
index 4c618c0cdfe9..000000000000
--- a/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-perl/Palm-1.14.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Parse Palm database files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Palm-PDB
-IUSE=test examples
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!<dev-perl/Palm-1.14.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-PDB-1.400.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e080f2d11d454b5cbbebd30dfcde052e
diff --git a/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0-r1 b/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0-r1
new file mode 100644
index 000000000000..f984f2046aea
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=!<dev-perl/Palm-1.14.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse Palm database files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Palm-PDB
+IUSE=test examples
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/Palm-1.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-PDB-1.400.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a2e1f62e13083094e8e8902f3660543f
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0-r1 b/metadata/md5-cache/dev-perl/Pango-1.227.0-r1
deleted file mode 100644
index 7a86a193b336..000000000000
--- a/metadata/md5-cache/dev-perl/Pango-1.227.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.300.0 >=dev-perl/ExtUtils-PkgConfig-1.30.0 test? ( virtual/perl-Test-Simple !minimal? ( >=dev-perl/Gtk2-1.220.0 x11-base/xorg-server[xvfb] x11-apps/xhost ) ) dev-lang/perl
-DESCRIPTION=Layout and render international text
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Pango
-IUSE=examples test +minimal
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=4f923dce7e184cd728bd90b507cae2bc
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0-r2 b/metadata/md5-cache/dev-perl/Pango-1.227.0-r2
new file mode 100644
index 000000000000..9dd241c2c17b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pango-1.227.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.300.0 >=dev-perl/ExtUtils-PkgConfig-1.30.0 test? ( virtual/perl-Test-Simple !minimal? ( >=dev-perl/Gtk2-1.220.0 x11-base/xorg-server[xvfb] x11-apps/xhost ) ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Layout and render international text
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Pango
+IUSE=test +minimal examples
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=05ff4613b0619afa79b64b836333b9f1
diff --git a/metadata/md5-cache/dev-perl/Panotools-Script-0.290.0 b/metadata/md5-cache/dev-perl/Panotools-Script-0.290.0
new file mode 100644
index 000000000000..e68e0f01d125
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Panotools-Script-0.290.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Spec-0.800.0 >=virtual/perl-File-Temp-0.100.0 >=virtual/perl-Getopt-Long-2.0.0 dev-perl/URI dev-perl/libwww-perl >=dev-perl/Image-Size-2.900.0 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A perl module for reading, writing, and manipulating hugin script files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Panotools-Script
+IUSE=gui test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=virtual/perl-File-Temp-0.100.0 >=virtual/perl-Getopt-Long-2.0.0 dev-perl/URI dev-perl/libwww-perl >=dev-perl/Image-Size-2.900.0 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BP/BPOSTLE/Panotools-Script-0.29.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8d7aca8e3373d9691558f41ef5911fd0
diff --git a/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r2 b/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r2
deleted file mode 100644
index e1e76d4a39af..000000000000
--- a/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Net-DNS >=dev-perl/Danga-Socket-1.61 dev-lang/perl
-DESCRIPTION=a DNS lookup class for the Danga::Socket framework
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/ParaDNS
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Net-DNS >=dev-perl/Danga-Socket-1.61 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSERGEANT/ParaDNS-2.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=06549321b8f19ae28f536481270a8ea6
diff --git a/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r3 b/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r3
new file mode 100644
index 000000000000..523a6728880b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ParaDNS-2.0.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Net-DNS >=dev-perl/Danga-Socket-1.61 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=a DNS lookup class for the Danga::Socket framework
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/ParaDNS
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Net-DNS >=dev-perl/Danga-Socket-1.61 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSERGEANT/ParaDNS-2.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=bd6b182ddf19636d690d79404f9f244c
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0
new file mode 100644
index 000000000000..ba238dd691c2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-2.20.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Moo virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-IO >=virtual/perl-Test-Simple-0.940.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 simple parallel processing fork manager
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Parallel-ForkManager
+IUSE=minimal test examples
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Moo virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3e7c4fb8b28e6e26ac6a2bb3a801d500
diff --git a/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1 b/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1
deleted file mode 100644
index 7ab7f9e6ee79..000000000000
--- a/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-IO virtual/perl-Storable dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Simple parallel execution
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Parallel-Iterator
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-IO virtual/perl-Storable dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/Parallel-Iterator-1.00.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e89fa8d1cdfed76580f7546de5c71434
diff --git a/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r2 b/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r2
new file mode 100644
index 000000000000..47f400e3760b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-IO virtual/perl-Storable 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=Simple parallel execution
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Parallel-Iterator
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/Parallel-Iterator-1.00.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=f342ff3f4feffbcfd596acced07a21fd
diff --git a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0 b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0
deleted file mode 100644
index f21e3d157229..000000000000
--- a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/List-MoreUtils >=dev-perl/Proc-Wait3-0.30.0 dev-perl/Scope-Guard dev-perl/Signal-Mask >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( dev-perl/Test-Requires dev-perl/Test-SharedFork ) dev-lang/perl
-DESCRIPTION=A simple prefork server framework
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Parallel-Prefork
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/List-MoreUtils >=dev-perl/Proc-Wait3-0.30.0 dev-perl/Scope-Guard dev-perl/Signal-Mask dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=12736c6c548b6494d5554240b1cca4a7
diff --git a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0-r1 b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0-r1
new file mode 100644
index 000000000000..1a9e5968bdca
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/List-MoreUtils >=dev-perl/Proc-Wait3-0.30.0 dev-perl/Scope-Guard dev-perl/Signal-Mask >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( dev-perl/Test-Requires dev-perl/Test-SharedFork ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A simple prefork server framework
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Parallel-Prefork
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/List-MoreUtils >=dev-perl/Proc-Wait3-0.30.0 dev-perl/Scope-Guard dev-perl/Signal-Mask dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b263bf99c86068764ea542670dcfe39b
diff --git a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0 b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
deleted file mode 100644
index 29116207020d..000000000000
--- a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-perl/Module-Build >=virtual/perl-ExtUtils-CBuilder-0.150.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Argument type classification
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Params-Classify
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=86f2a9b730154826f2bd1eb28dd7a73b
diff --git a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0-r1 b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0-r1
new file mode 100644
index 000000000000..87ca1efd92f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-perl/Module-Build >=virtual/perl-ExtUtils-CBuilder-0.150.0 >=virtual/perl-ExtUtils-ParseXS-3.300.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=Argument type classification
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Params-Classify
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e6dc6e7f1ae7444f9472395f1668f488
diff --git a/metadata/md5-cache/dev-perl/Params-Util-1.102.0 b/metadata/md5-cache/dev-perl/Params-Util-1.102.0
new file mode 100644
index 000000000000..ff34f9732fbb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Params-Util-1.102.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 >=virtual/perl-XSLoader-0.220.0 >=dev-perl/Config-AutoConf-0.315.0 test? ( virtual/perl-Test-Simple dev-perl/Test-LeakTrace ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Utility functions to aid in parameter checking
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Params-Util
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Params-Util-1.102.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e27c429e66591473f2f7ab7c097be5c3
diff --git a/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0 b/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0
deleted file mode 100644
index 9d6725de19d9..000000000000
--- a/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Class-XSAccessor virtual/perl-File-Spec virtual/perl-Pod-Parser >=dev-perl/Pod-POM-0.270.0 >=virtual/perl-ExtUtils-MakeMaker-6.59 test? ( dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Parse error messages from the perl interpreter
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Parse-ErrorString-Perl
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Class-XSAccessor virtual/perl-File-Spec virtual/perl-Pod-Parser >=dev-perl/Pod-POM-0.270.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Parse-ErrorString-Perl-0.27.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6e1e2398a82331777a34cdbbdff8af62
diff --git a/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0-r1 b/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0-r1
new file mode 100644
index 000000000000..ffcabea09e1c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/Class-XSAccessor virtual/perl-File-Spec dev-perl/Pod-Parser >=dev-perl/Pod-POM-0.270.0 >=virtual/perl-ExtUtils-MakeMaker-6.59 test? ( dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse error messages from the perl interpreter
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Parse-ErrorString-Perl
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-XSAccessor virtual/perl-File-Spec dev-perl/Pod-Parser >=dev-perl/Pod-POM-0.270.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Parse-ErrorString-Perl-0.27.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8998f92b9ad9eec9700e267277a2ce42
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
deleted file mode 100644
index 35b95393490d..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-perl/Module-Build-0.402.400 test? ( dev-perl/Test-Deep !minimal? ( dev-perl/Test-Memory-Cycle ) ) dev-lang/perl
-DESCRIPTION=Critique Perl source code for best-practices
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Critic
-IUSE=test minimal examples emacs
-KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5c16ca0e191ad44195488f5fe993025d
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0-r1
new file mode 100644
index 000000000000..27b7ceda79cd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 dev-perl/Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-perl/Module-Build-0.402.400 test? ( dev-perl/Test-Deep !minimal? ( dev-perl/Test-Memory-Cycle ) ) dev-lang/perl
+DESCRIPTION=Critique Perl source code for best-practices
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Perl-Critic
+IUSE=test minimal examples emacs
+KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 dev-perl/Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=24d2c0a7f820450f81a626226eb23163
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0
deleted file mode 100644
index 77a3d067202a..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.265.0 dev-perl/PPIx-QuoteLike >=dev-perl/PPIx-Regexp-0.80.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.180.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-perl/Module-Build-0.402.400 test? ( dev-perl/Test-Deep !minimal? ( dev-perl/Test-Memory-Cycle ) ) dev-lang/perl
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Critique Perl source code for best-practices
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Perl-Critic
-IUSE=test minimal examples emacs
-KEYWORDS=~amd64 ~ppc ~ppc64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.265.0 dev-perl/PPIx-QuoteLike >=dev-perl/PPIx-Regexp-0.80.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.180.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d13cb01d503963bae9f54fbb096ffab3
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
new file mode 100644
index 000000000000..52ff26c76f5a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.265.0 dev-perl/PPIx-QuoteLike >=dev-perl/PPIx-Regexp-0.80.0 >=dev-perl/PPIx-Utilities-1.1.0 dev-perl/Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.180.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-perl/Module-Build-0.402.400 test? ( dev-perl/Test-Deep !minimal? ( dev-perl/Test-Memory-Cycle ) ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Critique Perl source code for best-practices
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Critic
+IUSE=minimal examples emacs test
+KEYWORDS=~amd64 ~ppc ~ppc64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.265.0 dev-perl/PPIx-QuoteLike >=dev-perl/PPIx-Regexp-0.80.0 >=dev-perl/PPIx-Utilities-1.1.0 dev-perl/Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.180.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=89bccce5a690d09717fdfb934acbcef6
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
index 17d09443bb42..4a103ae09f14 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Fast and correct UTF-8 IO
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/PerlIO-utf8_strict
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b726b4ce74acdb62fefc890fe2fa1960
+_md5_=20f67891d5391dd464d7074c55c334c7
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.400 b/metadata/md5-cache/dev-perl/Plack-1.4.400
deleted file mode 100644
index b5d7b0bdc866..000000000000
--- a/metadata/md5-cache/dev-perl/Plack-1.4.400
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( dev-perl/Authen-Simple-Passwd dev-perl/HTTP-Request-AsCGI dev-perl/HTTP-Server-Simple-PSGI dev-perl/Log-Dispatch-Array dev-perl/LWP-Protocol-http10 dev-perl/MIME-Types >=dev-perl/Test-MockTime-HiRes-0.60.0 ) dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Plack
-IUSE=test minimal examples examples
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0044.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=29e0eb36e2512105c59c66ead7904b84
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.400-r1 b/metadata/md5-cache/dev-perl/Plack-1.4.400-r1
new file mode 100644
index 000000000000..d2a77e0b78fa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Plack-1.4.400-r1
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=dev-perl/Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( dev-perl/Authen-Simple-Passwd dev-perl/HTTP-Request-AsCGI dev-perl/HTTP-Server-Simple-PSGI dev-perl/Log-Dispatch-Array dev-perl/LWP-Protocol-http10 dev-perl/MIME-Types >=dev-perl/Test-MockTime-HiRes-0.60.0 ) dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Plack
+IUSE=minimal examples test examples
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=dev-perl/Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0044.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1e85c56eee15f9541fa475f0858c4bb6
diff --git a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r2 b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r2
deleted file mode 100644
index 49b7c49e927f..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp virtual/perl-Pod-Parser test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Abstract document tree for Perl POD documents
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Pod-Abstract
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp virtual/perl-Pod-Parser dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=40a3efc7c1782f9365130d0056beb603
diff --git a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r3 b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r3
new file mode 100644
index 000000000000..b4f8a5cc0658
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp dev-perl/Pod-Parser 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=Abstract document tree for Perl POD documents
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Abstract
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp dev-perl/Pod-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=20b74a3c38e2c25d552df3fe7186396e
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
deleted file mode 100644
index e364cfb73595..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Checks if the documentation of a module is comprehensive
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Pod-Coverage
-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=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.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_=9e13c80caa87a491c14200dbaf571f64
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r2 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r2
new file mode 100644
index 000000000000..9b420d1c5eac
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Pod-Parser-1.130.0 >=dev-perl/Devel-Symdump-2.10.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=Checks if the documentation of a module is comprehensive
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Coverage
+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=>=dev-perl/Pod-Parser-1.130.0 >=dev-perl/Devel-Symdump-2.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=37be5a260464e4a55d4e2b807720a0f2
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1
deleted file mode 100644
index 192d5890cd1f..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Convert Pod data to formatted LaTeX
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Pod-LaTeX
-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=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b909582112165e307b636abb2932af8a
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2
new file mode 100644
index 000000000000..1b507c04a619
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Pod-Parser virtual/perl-if 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=Convert Pod data to formatted LaTeX
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-LaTeX
+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=dev-perl/Pod-Parser virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d80d038e56089e636c8e0d3e7c2934eb
diff --git a/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0 b/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0
deleted file mode 100644
index 30c8478969e9..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Class-Tiny dev-perl/File-ShareDir dev-perl/Lingua-EN-Inflect dev-perl/Path-Tiny virtual/perl-Pod-Escapes virtual/perl-Pod-Parser virtual/perl-Text-Tabs+Wrap virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Deep virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A formatter for spellchecking Pod
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Pod-Spell
-IUSE=test minimal
-KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Class-Tiny dev-perl/File-ShareDir dev-perl/Lingua-EN-Inflect dev-perl/Path-Tiny virtual/perl-Pod-Escapes virtual/perl-Pod-Parser virtual/perl-Text-Tabs+Wrap virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a1449216cb85cbeba7a8f454a2f5073d
diff --git a/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0-r1 b/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0-r1
new file mode 100644
index 000000000000..fe4334b4d113
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/Class-Tiny dev-perl/File-ShareDir dev-perl/Lingua-EN-Inflect dev-perl/Path-Tiny virtual/perl-Pod-Escapes dev-perl/Pod-Parser virtual/perl-Text-Tabs+Wrap virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Deep virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A formatter for spellchecking Pod
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Spell
+IUSE=minimal test
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-Tiny dev-perl/File-ShareDir dev-perl/Lingua-EN-Inflect dev-perl/Path-Tiny virtual/perl-Pod-Escapes dev-perl/Pod-Parser virtual/perl-Text-Tabs+Wrap virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=6d29f71b6bd39ccd86b082bc5f7ffe61
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index ffc60c388c41..fbfa0fad173d 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -1,14 +1,15 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec ) dev-lang/perl:=[-build(-)]
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec ) dev-lang/perl
 DESCRIPTION=Check for POD errors in files
-EAPI=5
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Pod
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=[-build(-)]
+RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.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_=477b53b3bbae3c475b0877acb82807cb
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2e08309074421fef8f83a948bab39331
diff --git a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2 b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
index 325d55d7d335..7f759d311841 100644
--- a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
+++ b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/libiconv dev-lang/perl
 DESCRIPTION=A Perl interface to the iconv() codeset conversion function
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Text-Iconv
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/libiconv dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1b864911d23895069eb1455b380d4ae9
+_md5_=8f1e99f5078d5a677d151a3e61ee23ea
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
index 6928bbf927bc..a66decda7bf2 100644
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
@@ -4,11 +4,11 @@ DESCRIPTION=Ordered associative arrays for Perl
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Tie-IxHash
 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:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.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_=94e592861d35eb639b281ea34d5dd0b1
+_md5_=238af7450c2a0420849c9f96a2de0865
diff --git a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r2 b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r2
index ab0c84bc96f4..6ac0d7ba1205 100644
--- a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r2
+++ b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Client-side interface to the X11 Protocol
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/X11-Protocol
 IUSE=test examples test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=50893fb2f658532f50c6540ef3a3be88
+_md5_=2ee64d0f0cf0b6ee960670824adb304d
diff --git a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1 b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
index 818894a77d0f..c3b4e79ac024 100644
--- a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-SAX-0.12 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Filter to put all characters() in one event
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/XML-Filter-BufferText
-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-perl/XML-SAX-0.12 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.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_=5c3eeb3fd63db5a8c00b439c450c3170
+_md5_=10bab97a4539a334ceaaf50801ab934f
diff --git a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2 b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
index eb1ee4c22105..cb8bacc2a798 100644
--- a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl
 DESCRIPTION=A Perl module providing a simple API to parsed XML instances
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Handler-YAWriter
-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=GPL-2
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b04a6441a53eb00a9a7c3f4c3c83d478
+_md5_=fa8ee18f3a22889d78b0dab8b0d589a6
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0 b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
index c210fcc22a31..a9fbe17d61ba 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
@@ -4,11 +4,11 @@ DESCRIPTION=SAX2 XML Writer
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-SAX-Writer
 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=>=virtual/perl-Encode-2.120.0 >=dev-perl/XML-Filter-BufferText-1.0.0 >=dev-perl/XML-SAX-Base-1.10.0 >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8e4c3e327f62ca63d00b6d9e8d5ac4ea
+_md5_=4e35e69777f56eb0b9bd30ac5762f6c3
diff --git a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0 b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
index 8c0bb757f303..f9899e454fe0 100644
--- a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
+++ b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
@@ -4,11 +4,11 @@ DESCRIPTION=Process huge XML documents in tree mode
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Twig
 IUSE=nls 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.31 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Encode-2.240.100_rc >=dev-libs/expat-1.95.5 dev-perl/Tie-IxHash dev-perl/XML-XPath >=dev-perl/libwww-perl-6.40.0 >=dev-perl/HTML-Parser-3.690.0 nls? ( >=dev-perl/Text-Iconv-1.2-r1 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a0e10fbb88c288ac8853f2bed901f324
+_md5_=fc8647844dffc9c6308245078c1abf2a
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0 b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
index 14de9a046988..2e72a724e09d 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
@@ -4,11 +4,11 @@ DESCRIPTION=A XPath Perl Module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-XPath
 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=>=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e170e540aa9b53ecf9b118a07bbf3672
+_md5_=00808929471f63ab796720ead3c9a90d
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 dbe5694fea3e..0e7ea746aad4 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_=39beeb5f491375dbd93e66ad3f4f6145
+_md5_=63194c4fa1a6414a2ff9883e3499e8c5
diff --git a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2 b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
index a4bf61481b17..6dbe0a2e1014 100644
--- a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
+++ b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl
 DESCRIPTION=Collection of Perl modules for working with XML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/libxml-perl
-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-perl/XML-Parser-2.29 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5286b1fca9227df73e780533b449daa9
+_md5_=46171caec42c2347d6e0020f6aa47ae9
diff --git a/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0 b/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0
new file mode 100644
index 000000000000..22b15c6c19fe
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/namespace-autoclean-0.290.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Needs ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Keep imports out of your namespace
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/namespace-autoclean
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=19ba4b4641019a101ec8178f681855f1
diff --git a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0 b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
deleted file mode 100644
index 937ceea8a892..000000000000
--- a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Keep imports and functions out of your namespace
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/namespace-clean
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c3557033ac370b7c5dc5ea369e3d7cca
diff --git a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0-r1 b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0-r1
new file mode 100644
index 000000000000..5b4a55b93f05
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 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 prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Keep imports and functions out of your namespace
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/namespace-clean
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=33c618878624365a76edef5ac39b05e3
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 194b91c4ddee..efcf3a1ea359 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14 b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
new file mode 100644
index 000000000000..549e0372f9a8
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Tar file management class
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Archive_Tar
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=dev-php/PEAR-PEAR
+RDEPEND=dev-lang/php:*[bzip2,pcre(+),zlib]
+SLOT=0
+SRC_URI=https://pear.php.net/get/Archive_Tar-1.4.14.tgz
+_md5_=c20925344d74ea545c89cb323785142c
diff --git a/metadata/md5-cache/dev-php/composer-2.1.5 b/metadata/md5-cache/dev-php/composer-2.1.5
new file mode 100644
index 000000000000..feee724d40ff
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-2.1.5
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 >=dev-php/json-schema-5.2.11 >=dev-php/metadata-minifier-1.0 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 >=dev-php/reactphp-promise-2.7 >=dev-php/semver-3.0 >=dev-php/spdx-licenses-1.2 >=dev-php/symfony-console-2.8.52 >=dev-php/symfony-filesystem-2.8.52 >=dev-php/symfony-finder-2.8.52 >=dev-php/symfony-process-2.8.52 >=dev-php/xdebug-handler-2
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/2.1.5.tar.gz -> composer-2.1.5.tar.gz
+_md5_=5f96352db72337049e4508dbaf7bdb84
diff --git a/metadata/md5-cache/dev-php/json-schema-5.2.11 b/metadata/md5-cache/dev-php/json-schema-5.2.11
new file mode 100644
index 000000000000..20f7f22db2e6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/json-schema-5.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
+DESCRIPTION=PHP implementation of JSON schema
+EAPI=7
+HOMEPAGE=https://github.com/justinrainbow/json-schema
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/justinrainbow/json-schema/archive/5.2.11.tar.gz -> json-schema-5.2.11.tar.gz
+_md5_=747562389de341f8695e50db49abb341
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.19 b/metadata/md5-cache/dev-python/GitPython-3.1.19
new file mode 100644
index 000000000000..7de8232f5ff4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.19
@@ -0,0 +1,15 @@
+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/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library used to interact with Git repositories
+EAPI=8
+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.19.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.19.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	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e1899ca098dc568d4ca8915c8b91713a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 56f3010f3ad0..41e87d3a8cca 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/PyQt5-5.15.4-r1 b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
index ab9c78d7641e..a28d67942cae 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro https://pypi.org/project/PyQt5/
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 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-sip-4.19.25:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt5/PyQt5-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_=c5cba2f51785217c82add2e3759af492
+_md5_=f2d83b66a8439458362ac668199e5142
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0 b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
index d3eaf8be867d..453b081d29f4 100644
--- a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
+++ b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=sip extension module for PyQt5
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 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/12
 SRC_URI=mirror://pypi/P/PyQt5-sip/PyQt5_sip-12.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_=af5b9dd6275ee634cdca56fe635fb714
+_md5_=e524f95ca97172c0e5766938b3353656
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
index 15d2f6c9e232..df997b8697c3 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_=4367adfb49125c684c7d736274e880ed
+_md5_=9cb9c8fd58f38088ba6da5e408935da2
diff --git a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5 b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
index 3db71ba0ce7f..120c4965e3f2 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
+++ b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Abstraction layer on top of PyQt5 and PySide2 and additional custom
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtpy/
 IUSE=+pyqt5 pyside2 declarative designer gui help location multimedia network opengl positioning printsupport sensors serialport speech sql svg testlib webchannel webengine websockets widgets x11extras xml xmlpatterns test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=pyqt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[declarative?,designer?,gui?,help?,location?] dev-python/PyQt5[multimedia?,network?,opengl?,positioning?] dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?] dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?] dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?] webengine? ( dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) pyside2? ( python_targets_python3_8? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) python_targets_python3_9? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyside2[designer?,gui?,help?,location?,multimedia?] dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?] dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?] dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?] dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?] declarative? ( dev-python/pyside2[qml,quick] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_10? ( pyqt5 !pyside2 ) || ( 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/Q/QtPy/QtPy-1.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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=7fc0592be33792b300313604a1c9bcae
+_md5_=94b22362e0bf6c728060152b7992f608
diff --git a/metadata/md5-cache/dev-python/adblock-0.5.0 b/metadata/md5-cache/dev-python/adblock-0.5.0
new file mode 100644
index 000000000000..4ab94d700e53
--- /dev/null
+++ b/metadata/md5-cache/dev-python/adblock-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip dev-util/maturin test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Python wrapper for Brave's adblocking library, which is written in Rust
+EAPI=7
+HOMEPAGE=https://github.com/ArniDagur/python-adblock
+IUSE=debug test debug python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ArniDagur/python-adblock/archive/refs/tags/0.5.0.tar.gz -> adblock-0.5.0.tar.gz https://crates.io/api/v1/crates/adblock/0.3.13/download -> adblock-0.3.13.crate https://crates.io/api/v1/crates/addr/0.14.0/download -> addr-0.14.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/inventory/0.1.10/download -> inventory-0.1.10.crate https://crates.io/api/v1/crates/inventory-impl/0.1.10/download -> inventory-impl-0.1.10.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/psl/2.0.18/download -> psl-2.0.18.crate https://crates.io/api/v1/crates/psl-types/2.0.7/download -> psl-types-2.0.7.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rmp/0.8.10/download -> rmp-0.8.10.crate https://crates.io/api/v1/crates/rmp-serde/0.13.7/download -> rmp-serde-0.13.7.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/seahash/3.0.7/download -> seahash-3.0.7.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.69/download -> syn-1.0.69.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/twoway/0.2.1/download -> twoway-0.2.1.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=607f6dc985a4e33cd60290ccc272ea44
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.2 b/metadata/md5-cache/dev-python/aesara-2.1.2
new file mode 100644
index 000000000000..eefa44796db8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.1.2
@@ -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.2.tar.gz -> aesara-rel-2.1.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_=68a4fadb4bfeef3895f4cfefed45df28
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.3 b/metadata/md5-cache/dev-python/amodem-1.15.3
new file mode 100644
index 000000000000..992a46847b4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/amodem-1.15.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Transmit data between two computers using audio
+EAPI=8
+HOMEPAGE=https://github.com/romanz/amodem
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/romanz/amodem/archive/v1.15.3.tar.gz -> amodem-1.15.3.tar.gz mirror://pypi/a/amodem/amodem-1.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_=28b5c011f747da5110c318f2f6aa2c9a
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.4 b/metadata/md5-cache/dev-python/astroid-2.6.4
new file mode 100644
index 000000000000..9e57de4eb9d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.6.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.4.tar.gz -> astroid-2.6.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9c487407c6242f7c3b2de88239d05c23
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.5 b/metadata/md5-cache/dev-python/astroid-2.6.5
new file mode 100644
index 000000000000..d110ae02470e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.6.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.5.tar.gz -> astroid-2.6.5.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9c487407c6242f7c3b2de88239d05c23
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0
new file mode 100644
index 000000000000..dcc6575eed08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.38.0.tar.gz -> aws-sam-translator-1.38.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=89d4339443109b5511fd69ca7e54d30b
diff --git a/metadata/md5-cache/dev-python/bitarray-2.2.3 b/metadata/md5-cache/dev-python/bitarray-2.2.3
new file mode 100644
index 000000000000..94e1b57b5be1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.2.3
@@ -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.3.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/bitstring-3.1.9 b/metadata/md5-cache/dev-python/bitstring-3.1.9
new file mode 100644
index 000000000000..a4ccba8ecfcf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure Python module for creation and analysis of binary data
+EAPI=8
+HOMEPAGE=https://github.com/scott-griffiths/bitstring
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/scott-griffiths/bitstring/archive/bitstring-3.1.9.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c56c9c99c87cb587ea1b728da3826eab
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index 0a42c4ed4f11..7bbd321bdf92 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_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=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~sparc ~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 )
@@ -12,4 +12,4 @@ 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
+_md5_=b6ac5aeb0ddfe7f4a618ed46f19193f7
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.2 b/metadata/md5-cache/dev-python/boto3-1.18.2
new file mode 100644
index 000000000000..dcc2bd3931ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.2
@@ -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.2[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.2[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.2.tar.gz -> boto3-1.18.2.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.3 b/metadata/md5-cache/dev-python/boto3-1.18.3
new file mode 100644
index 000000000000..763ae38816d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.3
@@ -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.3[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.3[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.3.tar.gz -> boto3-1.18.3.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.4 b/metadata/md5-cache/dev-python/boto3-1.18.4
new file mode 100644
index 000000000000..af7b3c692f80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.4
@@ -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.4[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.4[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.4.tar.gz -> boto3-1.18.4.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.5 b/metadata/md5-cache/dev-python/boto3-1.18.5
new file mode 100644
index 000000000000..6d58b07d2119
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.5
@@ -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.5[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.5[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.5.tar.gz -> boto3-1.18.5.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.21.2 b/metadata/md5-cache/dev-python/botocore-1.21.2
new file mode 100644
index 000000000000..1e59dc51b651
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.2
@@ -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.2.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.3 b/metadata/md5-cache/dev-python/botocore-1.21.3
new file mode 100644
index 000000000000..f76a0c5843d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.3
@@ -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.3.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.4 b/metadata/md5-cache/dev-python/botocore-1.21.4
new file mode 100644
index 000000000000..aab29127d8ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.4
@@ -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.4.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.5 b/metadata/md5-cache/dev-python/botocore-1.21.5
new file mode 100644
index 000000000000..d3e1c8cddebd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.5
@@ -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.5.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/bottleneck-1.3.2 b/metadata/md5-cache/dev-python/bottleneck-1.3.2
index a8c2fcf4d445..581efe97bef5 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.2
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=Fast NumPy array functions written in Cython
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Bottleneck/
 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
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.1[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kwgoodman/bottleneck/archive/v1.3.2.tar.gz -> bottleneck-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_=ec4b1582d6dcbe19b019751fb8da2954
+_md5_=dca9ebabf9ecfb1aac51d830560ea6bb
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
index b61f7f69cb8e..6c9d928ea316 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -4,7 +4,7 @@ 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
+KEYWORDS=~amd64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ 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
+_md5_=5e4dbab2b5203e002e2295425d1e994e
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.1 b/metadata/md5-cache/dev-python/clang-python-10.0.1
index d34d8bbbef38..651b0c6900a0 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83171234b2091b77b1e5f1197fdfbb8c
diff --git a/metadata/md5-cache/dev-python/clang-python-11.1.0 b/metadata/md5-cache/dev-python/clang-python-11.1.0
index 4beae6fbe951..d38cf1d8f5a4 100644
--- a/metadata/md5-cache/dev-python/clang-python-11.1.0
+++ b/metadata/md5-cache/dev-python/clang-python-11.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9009cb8ea57148122e0da77b4dfb409
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.0 b/metadata/md5-cache/dev-python/clang-python-12.0.0
index a9eac7a4af30..591ae5c163e1 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9009cb8ea57148122e0da77b4dfb409
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.1 b/metadata/md5-cache/dev-python/clang-python-12.0.1
index ab3b48ad372e..3dd01da2915c 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a328146d67691e7e22fbb8cefe19338
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
index 388c82e111c6..c3db968878e3 100644
--- a/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/clang-13.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/dictdiffer-0.9.0 b/metadata/md5-cache/dev-python/dictdiffer-0.9.0
new file mode 100644
index 000000000000..dac3e87debab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dictdiffer-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[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=Dictdiffer is a library that helps you to diff and patch dictionaries
+EAPI=8
+HOMEPAGE=https://github.com/inveniosoftware/dictdiffer/ https://pypi.org/project/dictdiffer/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dictdiffer/dictdiffer-0.9.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1a55d4781db04632fe5672167e811d84
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0 b/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0
new file mode 100644
index 000000000000..f3275ea81110
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-3.0.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] ) net-nds/openldap[-minimal] ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django LDAP authentication backend
+EAPI=8
+HOMEPAGE=https://github.com/django-auth-ldap/django-auth-ldap https://pypi.org/project/django-auth-ldap/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-ldap-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-3.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cce71667dbc29833d32a6fb495e9c86c
diff --git a/metadata/md5-cache/dev-python/dnspython-2.1.0 b/metadata/md5-cache/dev-python/dnspython-2.1.0
index 3dd657fad25b..8a1e40820de3 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.1.0
+++ b/metadata/md5-cache/dev-python/dnspython-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=DNS toolkit for Python
 EAPI=7
 HOMEPAGE=https://www.dnspython.org/ https://pypi.org/project/dnspython/
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.1[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/rthalley/dnspython/archive/v2.1.0.tar.gz -> dnspython-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_=93b3a93ee24ec04d83709c767f8b1a6c
+_md5_=aa82452378bce92d798912748bf43cd1
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index 92a217854111..dcfaf948c374 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Add flag to ignore unicode literal prefixes in doctests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.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_=950f01273838c800adc2c50ba5b218fe
+_md5_=82c1282d30b1f95a9f734fcbd68254cf
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
deleted file mode 100644
index 647f4244784b..000000000000
--- a/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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-migrate-3.0.1-r2 b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2
new file mode 100644
index 000000000000..389e613a1958
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2
@@ -0,0 +1,15 @@
+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_=023fdc84e4914c28a1d6e022bd82f471
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.14.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.14.0
new file mode 100644
index 000000000000..1a46eec4cd38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.14.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.14.0.tar.gz -> google-api-python-client-2.14.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7d7ae3a03eb72de5ade4d245c457c0ee
diff --git a/metadata/md5-cache/dev-python/google-auth-1.33.1 b/metadata/md5-cache/dev-python/google-auth-1.33.1
new file mode 100644
index 000000000000..1277ee610eba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.33.1
@@ -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.1.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/h11-0.12.0 b/metadata/md5-cache/dev-python/h11-0.12.0
index 8d348eaf02db..7558b71d69eb 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_=1b60fd1f750df857097a01fcb881e739
+_md5_=57a857820e864a4522ae81ecb35be38f
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.3 b/metadata/md5-cache/dev-python/httpcore-0.13.3
index 4846260b1d6d..d2254870e8d8 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_=bd5c74608df28345d3e9d2b4312873d5
+_md5_=cbc0724cc7e5e03960a36748c71f29be
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.3 b/metadata/md5-cache/dev-python/httpretty-1.1.3
index c93465602ee9..ddd3a5faa82d 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_=ab7d59e97ef0e73168a5f3a2da83a647
+_md5_=b6e1711358a1d95abce62bae9c0a55c0
diff --git a/metadata/md5-cache/dev-python/httpx-0.18.1 b/metadata/md5-cache/dev-python/httpx-0.18.1
index e4a3c85a6813..bcf3662ed504 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_=711c0c889ed3c76ff3b3560161c731e6
+_md5_=3954e40f9c0bfa44dde70ee1249f7e29
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.3 b/metadata/md5-cache/dev-python/hypothesis-6.14.3
new file mode 100644
index 000000000000..1d5de117d240
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!dev-python/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.3.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/isodate-0.6.0-r1 b/metadata/md5-cache/dev-python/isodate-0.6.0-r1
deleted file mode 100644
index a708876941d6..000000000000
--- a/metadata/md5-cache/dev-python/isodate-0.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[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=ISO 8601 date/time/duration parser and formatter
-EAPI=7
-HOMEPAGE=https://pypi.org/project/isodate/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/six[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/isodate/isodate-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_=ce572b39cd53c871702430d45daa8982
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0-r2 b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
new file mode 100644
index 000000000000..c3286309a7e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[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=ISO 8601 date/time/duration parser and formatter
+EAPI=8
+HOMEPAGE=https://pypi.org/project/isodate/
+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 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=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/i/isodate/isodate-0.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_=4e3921f1ef7d21461b3b760533caffcc
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.9 b/metadata/md5-cache/dev-python/libarchive-c-2.9
index 5eb461924a4e..c67f39cd90a3 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-2.9
+++ b/metadata/md5-cache/dev-python/libarchive-c-2.9
@@ -4,7 +4,7 @@ DESCRIPTION=A Python interface to libarchive
 EAPI=7
 HOMEPAGE=https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~x86
+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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_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/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_=dcc0ae31573c8c6e59cdccc9d1c2126f
+_md5_=65dea06614fc0ba84a29ff82fa078ea0
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index 46ed6a7237cc..32210f379ead 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c0e6b953776c78466294364e7772ca6
diff --git a/metadata/md5-cache/dev-python/lit-11.1.0 b/metadata/md5-cache/dev-python/lit-11.1.0
index 36adb6e968f1..66f430bb51e2 100644
--- a/metadata/md5-cache/dev-python/lit-11.1.0
+++ b/metadata/md5-cache/dev-python/lit-11.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee4f5cdb01bb3ba49e38903725e3ad88
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0 b/metadata/md5-cache/dev-python/lit-12.0.0
index 925242d2d552..05260f1560a2 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0
+++ b/metadata/md5-cache/dev-python/lit-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a46cc0b8eb1afee2f725ba22bc6361
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1 b/metadata/md5-cache/dev-python/lit-12.0.1
index 54d4e5be56b8..e10020ad7258 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1
+++ b/metadata/md5-cache/dev-python/lit-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26d5a8028365bd3f1219b503572d455a
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0.9999 b/metadata/md5-cache/dev-python/lit-13.0.0.9999
index 9fc5132e75a2..86114ea3293a 100644
--- a/metadata/md5-cache/dev-python/lit-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-13.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 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	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.13.0 b/metadata/md5-cache/dev-python/marshmallow-3.13.0
new file mode 100644
index 000000000000..d69e6a5be5bb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for converting to and from native Python datatypes
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.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_=6c11c88881b537a769efd03ffbe270ec
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.2.2 b/metadata/md5-cache/dev-python/mkdocs-1.2.2
new file mode 100644
index 000000000000..ba184b121cc2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-1.2.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/mdx_gh_links[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mdx_gh_links[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) ) test? ( >=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(-)?] >=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=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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.2.2.tar.gz -> mkdocs-1.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_=188dedcd66efda450c7c0c69f4fd5a4b
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1 b/metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
index 844fe5c58ebe..d10a1fd3e59f 100644
--- a/metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-python/1.2/nautilus-python-1.2.3.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eff957da6091f0f2cd9f866dc99e0bf7
+_md5_=d7daf38e381fa27cca9b8de38b3392ab
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.6 b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
index f11ed693f261..3e635af8463b 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.6
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
@@ -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(-)?]
+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=Jupyter Notebook Tools for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 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 )
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=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_=744fe76a84f02ffee80a34cb3b1e0203
+_md5_=84046f12d5ee12f2137924431170b3c6
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.1 b/metadata/md5-cache/dev-python/networkx-2.6.1
index 6e005843e01c..a470bcedfbab 100644
--- a/metadata/md5-cache/dev-python/networkx-2.6.1
+++ b/metadata/md5-cache/dev-python/networkx-2.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=7
 HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
 IUSE=examples extras xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=d2d08c66805d9a68bae4d7eefd1d6865
+_md5_=c4d316c9535e9233f4d70f849e82fd0a
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.3 b/metadata/md5-cache/dev-python/numexpr-2.7.3
index 68e6482ae42f..f757df5fefb6 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 ~riscv 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_=24aaf51054b79ed75e45ff71bc68a657
+_md5_=854e8bc4cb45bd39d4480c9fbf8fe578
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 386feb4e5ea9..8cbbcf320aa7 100644
--- a/metadata/md5-cache/dev-python/numpy-1.20.2-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.20.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] lapack? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 7c4d2eac50ae..b7593cbcc3cf 100644
--- a/metadata/md5-cache/dev-python/numpy-1.20.3-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.20.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[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(-)?]
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[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(-)?] lapack? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
@@ -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.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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 8025143db0eb..543e02242ed7 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.0
+++ b/metadata/md5-cache/dev-python/numpy-1.21.0
@@ -1,4 +1,4 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[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(-)?]
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[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(-)?] lapack? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/numpy-1.21.1 b/metadata/md5-cache/dev-python/numpy-1.21.1
new file mode 100644
index 000000000000..630c3cb23fa4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.21.1
@@ -0,0 +1,16 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[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(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+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
+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.21.1.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.1.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.1.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.1.pdf )
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=587e58e2d3829b0cdb52c026cf65e308
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
new file mode 100644
index 000000000000..b7e5c572c794
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-0.2.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/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
+EAPI=8
+HOMEPAGE=https://github.com/osrf/osrf_pycommon
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.2.1.tar.gz -> osrf_pycommon-0.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce8ac4c0338eddcbc7b42fc9e5f4e4d
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.0 b/metadata/md5-cache/dev-python/pandas-1.3.0
index 1e07e0afc0a7..c38d42864b8b 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.0
+++ b/metadata/md5-cache/dev-python/pandas-1.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=7
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.17.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2017.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.3.0/pandas-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c92e61941b70ebd050c9e2acd54d856d
+_md5_=50074ebc0cbff78e0d6f43ee63ad5338
diff --git a/metadata/md5-cache/dev-python/pathspec-0.9.0 b/metadata/md5-cache/dev-python/pathspec-0.9.0
new file mode 100644
index 000000000000..32ef44998ac6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pathspec-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility library for gitignore style pattern matching of file paths.
+EAPI=8
+HOMEPAGE=https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/
+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=MPL-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pathspec/pathspec-0.9.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5331561dbe08263200991f4d821a7bb8
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.28 b/metadata/md5-cache/dev-python/phonenumbers-8.12.28
new file mode 100644
index 000000000000..1cada2ab3c69
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.28
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.28.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f70b6d8f0abc35acbb5be565add89672
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.15.1 b/metadata/md5-cache/dev-python/pikepdf-2.15.1
new file mode 100644
index 000000000000..b780d71bbcff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.15.1
@@ -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.1.tar.gz -> pikepdf-2.15.1.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/pillow-8.3.0 b/metadata/md5-cache/dev-python/pillow-8.3.0
index 34e78563dbde..bf90e467b30a 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.0
+++ b/metadata/md5-cache/dev-python/pillow-8.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.0.tar.gz -> pillow-8.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=42d5745d9eb198768411f3659976da49
+_md5_=a92740413d21fec724a771a20877403f
diff --git a/metadata/md5-cache/dev-python/pip-21.1.3 b/metadata/md5-cache/dev-python/pip-21.1.3
index 8b274f2316a9..e2c95ad26950 100644
--- a/metadata/md5-cache/dev-python/pip-21.1.3
+++ b/metadata/md5-cache/dev-python/pip-21.1.3
@@ -10,6 +10,6 @@ RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_p
 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/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 )
+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-57.4.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.11.tar.gz -> virtualenv-16.7.11.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_=aef211d65408fd514728d57dfbaab83d
+_md5_=66525dfc551992232403652cafcd7a39
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.5 b/metadata/md5-cache/dev-python/pkgconfig-1.5.5
new file mode 100644
index 000000000000..3a6a3a9a11f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.5.5
@@ -0,0 +1,15 @@
+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=8
+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.5.tar.gz -> pkgconfig-1.5.5.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0414976ca9c56cca3d5f8f379b4e19e6
diff --git a/metadata/md5-cache/dev-python/pooch-1.2.0 b/metadata/md5-cache/dev-python/pooch-1.2.0
deleted file mode 100644
index 8cc22852c09b..000000000000
--- a/metadata/md5-cache/dev-python/pooch-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/appdirs[python_targets_python3_8(-)?] dev-python/packaging[python_targets_python3_8(-)?] dev-python/requests[python_targets_python3_8(-)?] doc? ( || ( ( 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 ) >=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=manages your Python library's sample data files
-EAPI=7
-HOMEPAGE=https://github.com/fatiando/pooch
-IUSE=doc python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?] dev-python/packaging[python_targets_python3_8(-)?] dev-python/requests[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/fatiando/pooch/archive/v1.2.0.tar.gz -> pooch-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
-_md5_=1962b90967c4d3023eb8eab7b0578d8b
diff --git a/metadata/md5-cache/dev-python/pooch-1.4.0 b/metadata/md5-cache/dev-python/pooch-1.4.0
new file mode 100644
index 000000000000..7ac504b75a7d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pooch-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localftpserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=manages your Python library's sample data files
+EAPI=7
+HOMEPAGE=https://github.com/fatiando/pooch
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pooch/pooch-1.4.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=42d087dff5aed5edfe50cd04b122d23a
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.7 b/metadata/md5-cache/dev-python/pygraphviz-1.7
index 444a49f7bc99..7f417920cf21 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.7
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.7
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
 EAPI=8
 HOMEPAGE=https://pygraphviz.github.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.7.zip
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a54c23729c0a5812dea1a724f33701
+_md5_=3ded29a18e38fb347468b47f2d924233
diff --git a/metadata/md5-cache/dev-python/pyicu-2.7.3 b/metadata/md5-cache/dev-python/pyicu-2.7.3
deleted file mode 100644
index 3ef7a0a19014..000000000000
--- a/metadata/md5-cache/dev-python/pyicu-2.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/icu:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/icu:=
-DESCRIPTION=Python bindings for dev-libs/icu
-EAPI=7
-HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/icu:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.7.3/pyicu-v2.7.3.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_=973c8b8d6df2f558e04d9369bac81873
diff --git a/metadata/md5-cache/dev-python/pyicu-2.7.4 b/metadata/md5-cache/dev-python/pyicu-2.7.4
index 53f1799442f2..ac3f11f957cf 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.7.4
+++ b/metadata/md5-cache/dev-python/pyicu-2.7.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-libs/icu:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-libs/icu:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/icu:=
 DESCRIPTION=Python bindings for dev-libs/icu
-EAPI=7
+EAPI=8
 HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/icu:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.7.4/pyicu-v2.7.4.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_=7dd1c847c43b25e292261abf72653c30
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fced37794efed501d1d869dce92f2f9d
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.6 b/metadata/md5-cache/dev-python/pyilmbase-2.5.6
index 11d56880b418..7575c677bb00 100644
--- a/metadata/md5-cache/dev-python/pyilmbase-2.5.6
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.5.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.6.tar.gz -> pyilmbase-2.5.6.tar.gz
 _eclasses_=cmake	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_=4768e1d0708bcba7bf13f23ff9065064
+_md5_=1e5e4f902ca682713cfa1a523d4da3fe
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.7 b/metadata/md5-cache/dev-python/pyilmbase-2.5.7
index d135b3b58bd8..c396889e199b 100644
--- a/metadata/md5-cache/dev-python/pyilmbase-2.5.7
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.5.7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> pyilmbase-2.5.7.tar.gz
 _eclasses_=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_=1159a7a97c9efe1e145497ecbb5fe1a4
+_md5_=b03cf19d36f247089a2d95a6017ab15d
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.4 b/metadata/md5-cache/dev-python/pylint-2.9.4
new file mode 100644
index 000000000000..d72e7dffec6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.9.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.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[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=Python code static checker
+EAPI=8
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[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=https://github.com/pycqa/pylint/archive/v2.9.4.tar.gz -> pylint-2.9.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_=09450d1f0b100996dc38f2db457c20b1
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.5 b/metadata/md5-cache/dev-python/pylint-2.9.5
new file mode 100644
index 000000000000..7b39b5548910
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.9.5
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.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[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=Python code static checker
+EAPI=8
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[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=https://github.com/pycqa/pylint/archive/v2.9.5.tar.gz -> pylint-2.9.5.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da0e5bbe8ed2e25a28fc8028a9318e30
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0 b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0
deleted file mode 100644
index 8cba0daec72d..000000000000
--- a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-lsp-server[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=Spyder extensions for the python language server
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/pyls-spyder https://pypi.org/project/pyls-spyder/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/python-lsp-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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/spyder-ide/pyls-spyder/archive/v0.4.0.tar.gz -> pyls-spyder-0.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_=d19dcac6ecdc2909885261f10d72b15c
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1 b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
new file mode 100644
index 000000000000..24869359d4b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-lsp-server[all-plugins,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=Spyder extensions for the python language server
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/pyls-spyder https://pypi.org/project/pyls-spyder/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-python/python-lsp-server[all-plugins,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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/spyder-ide/pyls-spyder/archive/v0.4.0.tar.gz -> pyls-spyder-0.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_=72803e4e7606afabfa935f05d2869cc1
diff --git a/metadata/md5-cache/dev-python/pynest2d-4.9.1 b/metadata/md5-cache/dev-python/pynest2d-4.9.1
index 015e817a5743..41eb9583514e 100644
--- a/metadata/md5-cache/dev-python/pynest2d-4.9.1
+++ b/metadata/md5-cache/dev-python/pynest2d-4.9.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/pynest2d/archive/4.9.1.tar.gz -> pynest2d-4.9.1.tar.gz
 _eclasses_=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_=63280cee1327817ccf3d21dc03d494e4
+_md5_=0f667afd4ba0591eba345a650c920af4
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r6 b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
index dcbd79b37335..ab9c051a1c2b 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r6
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/pam-0.64 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
+SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz https://distfiles.gentoo.org/distfiles/ad/PyPAM-0.5.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_=f0f73fe73ab358128a9511e50c16fb03
+_md5_=724b621daeb6ffda391cc4eaa284ba0f
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.2 b/metadata/md5-cache/dev-python/pyside2-5.15.2
index b968dcb0afef..f22b07553666 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.2
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 IUSE=3d charts concurrent datavis designer gles2-only +gui help location multimedia +network positioning printsupport qml quick script scripttools scxml sensors speech sql svg test testlib webchannel webengine websockets +widgets x11extras xml xmlpatterns python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/shiboken2-5.15.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) 3d? ( gui network ) charts? ( widgets ) datavis? ( gui ) designer? ( widgets xml ) gles2-only? ( gui ) help? ( widgets ) location? ( positioning ) multimedia? ( gui network ) printsupport? ( widgets ) qml? ( gui network ) quick? ( qml ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webengine? ( location quick widgets? ( gui network printsupport webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6849803f98eec2fd641c34e2c083a8cb
+_md5_=2ef9a825df314786a0c0468835231e1c
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.2 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
index c92cf59627f8..0d52d8132638 100644
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
+++ b/metadata/md5-cache/dev-python/pyside2-tools-5.15.2
@@ -5,11 +5,11 @@ DESCRIPTION=PySide development tools (pyside2-lupdate with support for Python)
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyside2-5.15.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _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_=e997e0066df27b0005c282b6658231b1
+_md5_=21b3807468e0ddcb6e9254632f121f6a
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
new file mode 100644
index 000000000000..ffc6ad457f0d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyftpdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=A PyTest plugin which provides an FTP fixture for your tests
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-localserver/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pyftpdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-localftpserver/pytest_localftpserver-1.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_=f675d7097081374c3e60bfa0467922c0
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0 b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
index c9ba5b224084..636d204c93b1 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/matplotlib[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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-datadir[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(-)?] ) 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(-)?]
+BDEPEND=test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easy to use fixtures to write regression tests
 EAPI=7
 HOMEPAGE=https://github.com/ESSS/pytest-regressions
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-datadir[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 )
+RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-datadir[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=mirror://pypi/p/pytest-regressions/pytest-regressions-2.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_=8e6940013b0ca725b26fab1068849e43
+_md5_=d9b81764565c069fa20b58ef269ba560
diff --git a/metadata/md5-cache/dev-python/python-caja-1.24.0-r2 b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
index 1478bfcb21fd..b5fc34983544 100644
--- a/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
+++ b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/python-caja-1.24.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c5e586ab78285bd77676f46ca679b29
+_md5_=61ff1e53800e684484e541bb1babf088
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1 b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1
deleted file mode 100644
index 7701121e0402..000000000000
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[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=Python Language Server for the Language Server Protocol
-EAPI=7
-HOMEPAGE=https://github.com/python-lsp/python-lsp-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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[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-lsp-server/python-lsp-server-1.0.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_=ead8b9a8a87f97eecf137467ecb10e8b
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1 b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
new file mode 100644
index 000000000000..80b8d7ef243b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[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=Python Language Server for the Language Server Protocol
+EAPI=7
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server
+IUSE=all-plugins 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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-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-lsp-server/python-lsp-server-1.0.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_=42e5d31742ac0a20c3553ebc4199044c
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0 b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0
deleted file mode 100644
index 99dae40e6ef1..000000000000
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[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=Python Language Server for the Language Server Protocol
-EAPI=7
-HOMEPAGE=https://github.com/python-lsp/python-lsp-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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[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-lsp-server/python-lsp-server-1.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_=6f2780a86cc4a5dd683677f0f7dc00bf
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1 b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
new file mode 100644
index 000000000000..ef2d9c97c7e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[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=Python Language Server for the Language Server Protocol
+EAPI=7
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server
+IUSE=all-plugins 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/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-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-lsp-server/python-lsp-server-1.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_=c288abefef1096801afac2d3b1a2bf08
diff --git a/metadata/md5-cache/dev-python/qrcode-7.2 b/metadata/md5-cache/dev-python/qrcode-7.2
new file mode 100644
index 000000000000..e97581d92c3c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qrcode-7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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=QR Code generator on top of PIL
+EAPI=8
+HOMEPAGE=https://pypi.org/project/qrcode/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_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/q/qrcode/qrcode-7.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7a5a400975d0453b281732e3321131b0
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index 9e9ab93b87ea..59e461fa0f34 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -1,10 +1,10 @@
-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(-)?]
+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/trustme[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
+KEYWORDS=~amd64 ~riscv ~sparc ~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 )
@@ -12,4 +12,4 @@ 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
+_md5_=c9c8f7abfb056d3e1873594f136625d5
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.2 b/metadata/md5-cache/dev-python/requests-cache-0.7.2
new file mode 100644
index 000000000000..df52aa681678
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Persistent cache for requests library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.2.tar.gz -> requests-cache-0.7.2.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ed0f363f4eef42e1476b184181553bf1
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.2 b/metadata/md5-cache/dev-python/scipy-1.6.2
index b986bfee9deb..8914a64fa71a 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.2
+++ b/metadata/md5-cache/dev-python/scipy-1.6.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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(-)?]
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/fortran 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 postinst prepare setup test unpack
 DEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/fortran
 DESCRIPTION=Scientific algorithms library for Python
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 67dd41b5ff48..9403cc560443 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.3
+++ b/metadata/md5-cache/dev-python/scipy-1.6.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.13[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(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.13[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(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 setup test unpack
 DEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/fortran
 DESCRIPTION=Scientific algorithms library for Python
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/setuptools-57.4.0 b/metadata/md5-cache/dev-python/setuptools-57.4.0
new file mode 100644
index 000000000000..c096e2bca470
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-57.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=8
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-57.4.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d26dfaf0caa1d9cd61c11317292d133a
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.1 b/metadata/md5-cache/dev-python/shiboken2-5.15.1
deleted file mode 100644
index 5f5b137f8f92..000000000000
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qttest-5.15:5 ) !!sys-devel/llvm:0
-DESCRIPTION=Python binding generator for C++ libraries
-EAPI=7
-HOMEPAGE=https://wiki.qt.io/PySide2
-IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	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_=99446361dcc34559e5099e7c2023e4bc
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
new file mode 100644
index 000000000000..360d3d455f17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qttest-5.15:5 ) !!sys-devel/llvm:0
+DESCRIPTION=Python binding generator for C++ libraries
+EAPI=7
+HOMEPAGE=https://wiki.qt.io/PySide2
+IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 arm64 x86
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	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_=fec3219acffe2a65d99eeee209b7045c
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2 b/metadata/md5-cache/dev-python/shiboken2-5.15.2
deleted file mode 100644
index 42a84222e9f0..000000000000
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qttest-5.15:5 ) !!sys-devel/llvm:0
-DESCRIPTION=Python binding generator for C++ libraries
-EAPI=7
-HOMEPAGE=https://wiki.qt.io/PySide2
-IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	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_=41dbec7f3cb5a1e33e7e315d71ca55a2
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
new file mode 100644
index 000000000000..883e4c7ca145
--- /dev/null
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qttest-5.15:5 ) !!sys-devel/llvm:0
+DESCRIPTION=Python binding generator for C++ libraries
+EAPI=7
+HOMEPAGE=https://wiki.qt.io/PySide2
+IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	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_=ec61e2c150168e681f41eb13c13d2d99
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
deleted file mode 100644
index ab257758dd62..000000000000
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?] dev-python/nose[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
-EAPI=6
-HOMEPAGE=https://github.com/hickeroar/simplebayes
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.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_=4dd6a3a3bca8921dda424c2f10670704
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.8 b/metadata/md5-cache/dev-python/simplebayes-1.5.8
index f4e1a4c93a6e..c453c832331b 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.8
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.8
@@ -1,16 +1,15 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
 EAPI=7
 HOMEPAGE=https://github.com/hickeroar/simplebayes
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplebayes/simplebayes-1.5.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_=ecac744dc85b594096e1c6e52a3d70b6
+_md5_=3fbc75bb34af4575575536560154365d
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0 b/metadata/md5-cache/dev-python/sniffio-1.2.0
index 92f0f8d83d39..d41728f4a643 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_=544f272b65f74a19a3211d930e1f1438
+_md5_=19655965d72cafb4cd6cc4e5c40a4eda
diff --git a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4 b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
index 064f7ddfdec4..12663cd1443d 100644
--- a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+++ b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx epytext extension
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sphinx-epytext/ https://github.com/jayvdb/sphinx-epytext
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-1.7.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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-epytext/sphinx-epytext-0.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_=fcaa89000adcc809712914023351b6b7
+_md5_=849abfbebb42e4aeb3bbcc2cb1c4ab13
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5-r1 b/metadata/md5-cache/dev-python/spyder-4.2.5-r1
deleted file mode 100644
index f9a85805a860..000000000000
--- a/metadata/md5-cache/dev-python/spyder-4.2.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/qdarkstyle-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/watchdog-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(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[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 postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Scientific Python Development Environment
-EAPI=7
-HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/qdarkstyle-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/watchdog-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? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.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_=1a59d01868de98cfa42688f0d21c01ae
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5-r2 b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
new file mode 100644
index 000000000000..8e3e90b52832
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.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/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/qdarkstyle-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/watchdog-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(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[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 postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.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/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/qdarkstyle-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/watchdog-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? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.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_=7db6cdf630f316464e38a29a31d30c9d
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.5 b/metadata/md5-cache/dev-python/spyder-5.0.5
deleted file mode 100644
index 407a584c435c..000000000000
--- a/metadata/md5-cache/dev-python/spyder-5.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/parso-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[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-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[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 postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Scientific Python Development Environment
-EAPI=7
-HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/parso-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[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/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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.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/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.5.tar.gz -> spyder-5.0.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz -> spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.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_=d19d56e0c00fca7ed4ffb0936d785ed4
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.5-r1 b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
new file mode 100644
index 000000000000..593c22f88180
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.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/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[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-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[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 postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.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/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.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? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.5.tar.gz -> spyder-5.0.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz -> spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.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_=23d75cfb7c283e25b26635827dc21b6f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
new file mode 100644
index 000000000000..dc2f84e00329
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
@@ -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.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2fa4fcfd4e3c775dc85a8c45a07b3444
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0 b/metadata/md5-cache/dev-python/subunit-1.4.0
index 46d43fd9283a..2823822d6a95 100644
--- a/metadata/md5-cache/dev-python/subunit-1.4.0
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=A streaming protocol for test results
 EAPI=7
 HOMEPAGE=https://launchpad.net/subunit https://pypi.org/project/python-subunit/
 IUSE=static-libs test python_targets_pypy3 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
-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=Apache-2.0 BSD
 RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-lang/perl:= python_targets_pypy3? ( >=dev-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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	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_=9cc5dca9ad6e611def2b54ea5581c1af
+_md5_=20de1b9b383270099d8905245227c8d5
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.5.2 b/metadata/md5-cache/dev-python/thunarx-python-0.5.2
index 48fd65a3cd63..15dc49f03ed0 100644
--- a/metadata/md5-cache/dev-python/thunarx-python-0.5.2
+++ b/metadata/md5-cache/dev-python/thunarx-python-0.5.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/bindings/thunarx-python/0.5/thunarx-python-0.5.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdcc827899a1175415359c90cd23a61a
+_md5_=c1e0c4c8be42cf263cf0d2cacff0c08a
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
index 5215952800e6..aa270fe532f5 100644
--- a/metadata/md5-cache/dev-python/tomli-1.0.4
+++ b/metadata/md5-cache/dev-python/tomli-1.0.4
@@ -4,7 +4,7 @@ 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
+KEYWORDS=~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ 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
+_md5_=468bb5cdddc54c0b84891bb5c81623a8
diff --git a/metadata/md5-cache/dev-python/twine-3.4.2 b/metadata/md5-cache/dev-python/twine-3.4.2
new file mode 100644
index 000000000000..a90d24bfc96b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twine-3.4.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/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypiserver[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(-)?] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of utilities for publishing packages on PyPI
+EAPI=8
+HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
+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 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.14[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/pypa/twine/archive/3.4.2.tar.gz -> twine-3.4.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0572c8b0a285debbd0e35c2b973ba6fe
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.14.0 b/metadata/md5-cache/dev-python/uvicorn-0.14.0
index 393b1b1daa26..9aee25ba4ba9 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_=99fc09a69c273b0a2328ce07e57c62c9
+_md5_=7ccc52c59017da3abd1ef12771bae698
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.5 b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.5
new file mode 100644
index 000000000000..620694ab2bea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/virtualenv[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=A script for cloning a non-relocatable virtualenv
+EAPI=8
+HOMEPAGE=https://github.com/edwardgeorge/virtualenv-clone/
+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/edwardgeorge/virtualenv-clone/archive/0.5.5.tar.gz -> virtualenv-clone-0.5.5.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1a8997ee24cb9d844c58d84f5968103c
diff --git a/metadata/md5-cache/dev-python/vncdotool-1.0.0 b/metadata/md5-cache/dev-python/vncdotool-1.0.0
index 4dfc3fe4c40b..3fb96eb648ca 100644
--- a/metadata/md5-cache/dev-python/vncdotool-1.0.0
+++ b/metadata/md5-cache/dev-python/vncdotool-1.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[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(-)?] ) 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
-DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Command line VNC client
 EAPI=7
 HOMEPAGE=https://github.com/sibson/vncdotool
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=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=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_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 )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v1.0.0.tar.gz -> vncdotool-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_=2fb3f6bde7ce9dcd583c5efb70496a45
+_md5_=21fc876d035c98b18a6ec2b3309ee315
diff --git a/metadata/md5-cache/dev-python/websockify-0.10.0 b/metadata/md5-cache/dev-python/websockify-0.10.0
new file mode 100644
index 000000000000..a7abed18eba0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websockify-0.10.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jwcrypto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSockets support for any application/server
+EAPI=8
+HOMEPAGE=https://github.com/novnc/websockify
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/novnc/websockify/archive/v0.10.0.tar.gz -> websockify-0.10.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_=62ee32b88bbb667ad4900c4f9673b439
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index 317270e9a431..77b80b3984f8 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_=459b22f3564c35b024369e94637e8699
+_md5_=50b45025c3eac73f8d25e41b855132d2
diff --git a/metadata/md5-cache/dev-python/wurlitzer-2.1.1 b/metadata/md5-cache/dev-python/wurlitzer-2.1.1
new file mode 100644
index 000000000000..5e7d9b0a5424
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wurlitzer-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Capture C-level stdout/stderr in Python
+EAPI=8
+HOMEPAGE=https://github.com/minrk/wurlitzer/ https://pypi.org/project/wurlitzer/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/wurlitzer/wurlitzer-2.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_=5d781c5e9ab1e8429f369374906ee8e8
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.33.0 b/metadata/md5-cache/dev-python/zeroconf-0.33.0
new file mode 100644
index 000000000000..be97ba2a0264
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.33.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.33.0.tar.gz -> python-zeroconf-0.33.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_=917603d492a586a6c96c04118b573d6c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 6f201dd3d8be..8a616e54a1fa 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/qtdeclarative-5.15.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2
index bf39df360d5f..7b6472e7e357 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64d05f619d9f364bd20f8ad940046055
+_md5_=c7cf6d90582885b3d8d19cdab5217f08
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210421 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210421
deleted file mode 100644
index ae4d811e2f29..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210421
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwebchannel-5.15.2[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/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/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-68.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ~dev-qt/qtwidgets-5.15.2 ) test? ( ~dev-qt/qttest-5.15.2 )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-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
-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/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-68.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ~dev-qt/qtwidgets-5.15.2 )
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20210421.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_=45f402b793473df7c8695cc110924f90
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 c8772b574277..897aef26732f 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_=70b1a2a06b16516f8d30a6c72387dab0
+_md5_=f746640059d9173ce133955c52ede695
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 12a29f5959ff..d4502954591f 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.10 b/metadata/md5-cache/dev-ros/roslaunch-1.15.10
deleted file mode 100644
index 1d9016138064..000000000000
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tool for easily launching multiple ROS nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=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	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=927801d7338283e027fcfc55e2d7c382
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.10-r1 b/metadata/md5-cache/dev-ros/roslaunch-1.15.10-r1
new file mode 100644
index 000000000000..14783510f60c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tool for easily launching multiple ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout acct-group/ros acct-user/ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
+_eclasses_=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	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=87eba313416f3262435dc2c38d0dd06e
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1 b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
deleted file mode 100644
index e6ae53175bf5..000000000000
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tool for easily launching multiple ROS nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=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	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.9 b/metadata/md5-cache/dev-ros/roslaunch-1.15.9
deleted file mode 100644
index e2ef9ebb6c76..000000000000
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tool for easily launching multiple ROS nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=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	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index 5b9afa2a2d9d..6e9c11759695 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
@@ -7,9 +7,9 @@ HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout acct-group/ros acct-user/ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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
-_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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7e8bf6e1b2ed6efeea222e885b0da70
+_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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=87eba313416f3262435dc2c38d0dd06e
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
index 03c43d5c5ebc..c1c1f4c6eb99 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/georuby-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a92386c837e767d8940ea868412e808b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 839c0dbda892..623b13251e17 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index 6335e86b9021..79b73636d760 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b9baf6101e28292cf356a7116fec48a
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
index a00b955fde2d..3951b738b93e 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a9d7de3e148de482f8dc1cf06112156
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.8 b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
index 4dc33dd11421..497cb8b117d4 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.8
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.8.tar.gz -> acme-client-2.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c344858e2252ff458e1aadde599457f0
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.2.6 b/metadata/md5-cache/dev-ruby/actioncable-5.2.6
index 50a882a9a788..1547b228df53 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0db335f19158522ce8188f1be6ad9ff2
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.3.7 b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.7
index a8ee0bb7a07e..d10d0eccc2e9 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.4 b/metadata/md5-cache/dev-ruby/actioncable-6.0.4
index e627c6f4f0ed..b2ad12ae9bda 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.3.2 b/metadata/md5-cache/dev-ruby/actioncable-6.1.3.2
index ea86faf9d247..666d94d30a79 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.4 b/metadata/md5-cache/dev-ruby/actioncable-6.1.4
index cab7e2aaf4b4..d7caeff49446 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eec108fe79d5ef394343e0697ef3b7c8
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
index f77886e4e65a..607923c3a08a 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba304b2c2eb22b23b97c9c6edc5c9fe4
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4
index b735ae35e725..86199fa74ad8 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba304b2c2eb22b23b97c9c6edc5c9fe4
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
index c50c6615afc3..52adb063341c 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4
index 596fb64ecfe6..0b69326aaebf 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.6 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
index 445ce6d4e1d2..5f375e002ad4 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e730121fd6f2c378610cc90e34e43a83
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.7 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.7
index 6725729578af..ae9aecc3ee53 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac007e3640964fbe8035addf1d7bb8e7
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4
index 06a0ea9ea928..60b575b53de6 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac007e3640964fbe8035addf1d7bb8e7
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.2 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.2
index 9acb573c1498..82c49a6fbac0 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.4 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.4
index 46515e5311b2..3c59ffe57784 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.6 b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
index 8c1774e0e581..7c98327b3834 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6fd7a99e23136e386f6662b5178c3896
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.7 b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.7
index cfa75db27271..fe3b09550f7d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1a05e0cd1fea0f5bc87c45dd577e6d8
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.4 b/metadata/md5-cache/dev-ruby/actionpack-6.0.4
index f237561ba7ca..6070e44b70b8 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2993e489d760de24819a848427c2f774
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.3.2 b/metadata/md5-cache/dev-ruby/actionpack-6.1.3.2
index 724d151fe16d..bca85d7e2988 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.4 b/metadata/md5-cache/dev-ruby/actionpack-6.1.4
index 0dc9025595af..dc148cc6b36e 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
index 3d2efe03a259..1892851c7c94 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02c3127f5e9c1d9b62e017ca872df786
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
index b39a3c6e94ac..7f20aba3c160 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=549f041bff35414e8603b1095c230ce1
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
deleted file mode 100644
index c16511518e41..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby25(-)] =dev-ruby/railties-5*:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby26(-)] =dev-ruby/railties-5*:*[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=XML parameters parser for Action Pack (removed from core in Rails 4.0)
-EAPI=6
-HOMEPAGE=https://github.com/rails/actionpack-xml_parser
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby25(-)] =dev-ruby/railties-5*:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby26(-)] =dev-ruby/railties-5*:*[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=2
-SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3cb66be6b7cb05ac6d084b36f01d28e
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
index b759a1b83d99..0d1a94a6e8c9 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aab15262fa34f5adef21259efb46dd9f
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.7 b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.7
index f1ab1326442b..4a8d152cff4a 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a42c808ece0f18df0902081fc4a2ec19
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.4 b/metadata/md5-cache/dev-ruby/actiontext-6.0.4
index d1fff6273cb1..09dcc287fff3 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a42c808ece0f18df0902081fc4a2ec19
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.3.2 b/metadata/md5-cache/dev-ruby/actiontext-6.1.3.2
index 4a1abfb14047..2b2c580879ba 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=970f1ed8db3544781a4759815c24778e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.4 b/metadata/md5-cache/dev-ruby/actiontext-6.1.4
index 45c967b8f194..6eb8ccb7ac09 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=970f1ed8db3544781a4759815c24778e
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.6 b/metadata/md5-cache/dev-ruby/actionview-5.2.6
index ec954f22d231..5b4dc6207aea 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e06d848f5df9096d9556ff23ff8c565e
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.3.7 b/metadata/md5-cache/dev-ruby/actionview-6.0.3.7
index 84cf16f27943..431587717735 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0e209593acd22a7664056959c317cd5
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.4 b/metadata/md5-cache/dev-ruby/actionview-6.0.4
index 1eed61ca1587..3d2f243f88a9 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.4
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0e209593acd22a7664056959c317cd5
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.3.2 b/metadata/md5-cache/dev-ruby/actionview-6.1.3.2
index d6e02338c66e..3336fcfa327e 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.4 b/metadata/md5-cache/dev-ruby/actionview-6.1.4
index 6a7dcbf30561..bb60e8c63962 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.4
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.6 b/metadata/md5-cache/dev-ruby/activejob-5.2.6
index 50ffb47383b3..49319858eb71 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activejob-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b53729fd4312e822a11711e56b9398d
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.3.7 b/metadata/md5-cache/dev-ruby/activejob-6.0.3.7
index f6df0ec68bec..97f873020120 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=702ab20b567a7586bac8e64a01cc4658
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.4 b/metadata/md5-cache/dev-ruby/activejob-6.0.4
index 1e10cedacb23..29b14b1e661e 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=702ab20b567a7586bac8e64a01cc4658
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.3.2 b/metadata/md5-cache/dev-ruby/activejob-6.1.3.2
index 2ad4b2ceb9ad..8992290e51e4 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.4 b/metadata/md5-cache/dev-ruby/activejob-6.1.4
index 03e40417e516..1fb6223f70fe 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.4
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.2.4 b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
index c3d47e42f950..05e5a16d3aee 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-5.2.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/activeldap-5.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=966764b50fa5a29ff4a5040d337f8efa
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.0.4 b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
index 5aaab7c010f0..2782b5638ad5 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7283440d84d2da702ea70c7bed35312d
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.1.0 b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
index 50514490507b..1ea1ef7ca884 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3a6a95240da5348abd9bae1dd007b3e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.6 b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
index 454d124c55e1..319500cb5fc6 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6af5cf9939ef936cdb19bc53e13bdee4
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.7 b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.7
index d32ecb91930a..b9236983f842 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.4 b/metadata/md5-cache/dev-ruby/activemodel-6.0.4
index 6dc3c888e560..aa5c26a43dfc 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.3.2 b/metadata/md5-cache/dev-ruby/activemodel-6.1.3.2
index 0f80de32648a..d02042a8a79b 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.4 b/metadata/md5-cache/dev-ruby/activemodel-6.1.4
index 0ab8c973f0f9..b2b50d129e5d 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
index 2f3f87e23c51..d05183363f79 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fd4d328a40948de0e991b81170d8c84
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.6 b/metadata/md5-cache/dev-ruby/activerecord-5.2.6
index 6dbfe2bb596e..6a6e5127356a 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39394ceded1e006ab138cb7098023786
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.7 b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.7
index ece0b6d2ba4b..652e4eef335b 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=016c68b44249592a59fe243198b78d8b
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.4 b/metadata/md5-cache/dev-ruby/activerecord-6.0.4
index dad2124037a2..21ae22a74b8b 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=016c68b44249592a59fe243198b78d8b
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.3.2 b/metadata/md5-cache/dev-ruby/activerecord-6.1.3.2
index ab9e9f45a646..8dec4e24f520 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ddb330faea3a92eadb8fb17d9d7eb1e
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.4 b/metadata/md5-cache/dev-ruby/activerecord-6.1.4
index 0d40f04b052f..d793ba5f1f2f 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ddb330faea3a92eadb8fb17d9d7eb1e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.6 b/metadata/md5-cache/dev-ruby/activestorage-5.2.6
index ad339b34c504..5ffe0c0b73d5 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6970929ae3e71888b2b54dee32f8c593
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7 b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7
index 78b1f0d752b0..3ad6f0124a7e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=791dbb050d47b5f00b78ff7a0c05a929
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7-r1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7-r1
index 31672fdf32b7..907f57bbbcb3 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7-r1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ea69aa7809722e9fdc8cee96ff3c2b5
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.4 b/metadata/md5-cache/dev-ruby/activestorage-6.0.4
index 87a0ddf0d3d4..3f69a314c58c 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ea69aa7809722e9fdc8cee96ff3c2b5
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.3.2 b/metadata/md5-cache/dev-ruby/activestorage-6.1.3.2
index b87ea8797501..929f5e525c4e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16f5ed62e5c9f4f803ef898fad02b5f6
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.4 b/metadata/md5-cache/dev-ruby/activestorage-6.1.4
index 3c9e9ff6ec86..c9184e74801e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.4
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0c5da959c15ed643ea4fb9400a88cd9
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.6 b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
index f69a200d47ea..93c8a9545505 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=785f0a261d075742cf8bc85ca9ff9365
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.7 b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.7
index c6199e06229b..dd5b2c0b360b 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f558f9d9d0c7cb9ef3b010b4f74738c
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.4 b/metadata/md5-cache/dev-ruby/activesupport-6.0.4
index 3d229607bcf5..1b7cd84844c4 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f558f9d9d0c7cb9ef3b010b4f74738c
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.3.2 b/metadata/md5-cache/dev-ruby/activesupport-6.1.3.2
index 374e47176eda..8d7fc20940e5 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=060a002271459fe3e7fd78c4152a0df7
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.4 b/metadata/md5-cache/dev-ruby/activesupport-6.1.4
index 80202519e856..bd4b92570104 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=060a002271459fe3e7fd78c4152a0df7
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
index 829ae5702d2d..6c62e8333b46 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abe5ca49cf38637bd6395a00bf29267e
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
index c3583111382f..80a1496180d0 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abe5ca49cf38637bd6395a00bf29267e
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
index f64e272ebe79..dde2e1f355f8 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a389d032ff12c09274d47f66525e18b6
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.0 b/metadata/md5-cache/dev-ruby/addressable-2.8.0
index b84fbb3743c9..f7e5e78292e8 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5480889e6c6642024ebfaadca2e4748f
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index a13ba26d433c..be3fd2934dd0 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ae-1.8.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=763d6d63431bb332bf77b6fb26753e4d
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index 12235d69bcc1..831fa83168bb 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cc8bd023e5350dc78aec7424ce25783
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1 b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
index 6f1dbe504186..dc8aa678affc 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6912652af0564c7f206988b451a4903d
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
index 6b4efd958d42..c5838d77f089 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f1122e2655f638f72db2481f19b5479
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index c78e0dc833ec..916394ecdc66 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4f5e11e9325caa91591b8fc5b7014530
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.0 b/metadata/md5-cache/dev-ruby/amatch-0.4.0
index 060b32f1130b..3d9f7cac2881 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0145deb42810fc2f9d5a9ec6cb8032db
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.5 b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
index 8e5a1b71128d..50de57033fcb 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.5
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ammeter-1.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0b96d28372809ba0375a59e8ddf59be
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
index 1e6460cb68ce..b01467678741 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amq-client-1.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7af70b2353af798785bd50f257f8d1b
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
index 14a63d94b514..37f99224966e 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3eda5bb11fd60a2de0a485fa204565b
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
index daa7f6a726f3..7d1acff9f95c 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4fef9270889f70629bef8b20e501374a
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0 b/metadata/md5-cache/dev-ruby/amqp-1.8.0
index 2b09153b749b..5345dd083654 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.8.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=b837b75bd5559fa0ce13e5008d8d9ceb
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index 6dc9ce9c62d6..450b22c6a8f9 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/annoy-0.5.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6664d58eab5497539be2c3087be2332d
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index ce52fa3ca6c0..8d5b70bc95e4 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9cc94850f1859f8cc66c409284e97fb
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1 b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
index ba05c7902254..e6a21cf06f7d 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b739be77664c31368e99ba53dcd4cd2c
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
index d10cd77d3be0..09c1aa6073bb 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> archive-tar-minitar-0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b93cc51785a2359648543e60a660beb
diff --git a/metadata/md5-cache/dev-ruby/arel-9.0.0 b/metadata/md5-cache/dev-ruby/arel-9.0.0
index 7c37bdc7170f..fc3c2a50dd76 100644
--- a/metadata/md5-cache/dev-ruby/arel-9.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-9.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9.0
 SRC_URI=https://github.com/rails/arel/archive/v9.0.0.tar.gz -> arel-9.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=157616a3bb65aff1dc0834f97e08daaa
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
index 318d81fc5568..a61815cc7808 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/arel-helpers-2.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb26f57ad7690ac0de73c316250bd305
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.3 b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
index d81d1aa40973..1611cdfb8c37 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07860a7673186d1562d08cb10fa0f1f7
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.1.0 b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
index ae6adbe844b5..bf21c5325268 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cce87eded96959e38e0ff60d04a30e7
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
index f411cf35a32d..08e5c7374dad 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.10.tar.gz -> asciidoctor-2.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f62175db29670c29eb9272c872d1dc8
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.11 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.11
index 483bec93aa27..38f1e8596549 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.11
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.11.tar.gz -> asciidoctor-2.0.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29e822f4782a8b33b890dc71c19cd566
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
index ff9640d73d15..35c5c65495f9 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.12.tar.gz -> asciidoctor-2.0.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db3cfcfdcdcf80a0b956c23ce553d337
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
index 3c1402b4f184..ee737aba02b7 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.15.tar.gz -> asciidoctor-2.0.15.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db3cfcfdcdcf80a0b956c23ce553d337
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
index 2a7eb204fc07..dc9be93f69a9 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0e33da7516227030d618cedcdfce831
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index 68a44fec51e6..2dbcf7352302 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0bafd90840842d302187198832836dd
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.0 b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
index b537997567f8..300e9c52ee96 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.0
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=73b815922c5fa0720d202457a29132d9
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.1 b/metadata/md5-cache/dev-ruby/asciimath-2.0.1
index 640f0b9f677e..f87a327028c6 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.1
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f8560af9427109153d9127a341533bb
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.2 b/metadata/md5-cache/dev-ruby/asciimath-2.0.2
index 4e10e8382271..f5686d046edd 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.2
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=feccc7da63b9d6a0cfbb6137f1baaace
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.0 b/metadata/md5-cache/dev-ruby/ast-2.4.0
index b07ba44f84e2..970dc4d8d0e1 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ast-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51e1b491567169d021f5886e0965ac4f
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.1 b/metadata/md5-cache/dev-ruby/ast-2.4.1
index b17a62b34e73..937802456695 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.1
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.1.tar.gz -> ast-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39522b4d91884adaeb186ff7f9a62fad
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.2 b/metadata/md5-cache/dev-ruby/ast-2.4.2
index fb91341d8169..455f235e356c 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.2.tar.gz -> ast-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f081b7ca9b3122cd06cf785f0b41492d
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
index 5e48eb09a1ae..dc83d3653473 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b94efc35ff74e45d52120021f82973a2
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101 b/metadata/md5-cache/dev-ruby/atomic-1.1.101
index 82437f02d8c4..103034edfc72 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6caccc08197771c39b4bfa7783a9b79e
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1 b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
index 058f9ff849bf..4a4945cb957e 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e83ff1f7aeb1bbbac9f8388df33c7398
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0
index 40cc2c16daf6..fe658be852ac 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.2.5.0.tar.gz -> autoprefixer-rails-10.2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cdfb8ebf2fa550270b26d801830d47a8
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
index 00da72b2ae99..97ce6c58955c 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.2.5.1.tar.gz -> autoprefixer-rails-10.2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9693e09eb1134119d06529598062a352
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
index 3204587f1245..417ef4e68b84 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12c3e247e33c6eb20ae94a2afe66826f
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
index 600c7f3e945d..ac5577c38384 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c184443b5bdad44f97ca3369abc273b
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
index db0e596f073a..7c02f7d4a7fc 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6687f58965edb68cce41fa749d6da514
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
index 2bad280d23d2..62218841fc82 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.297.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
index 7c17b1efc4c6..e5c0981d1adc 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.298.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
index 6081dee7d822..1820454547a1 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.370.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=449d47795834ca53ed7f616e69c53d58
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 88814939758c..b82975e9175c 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aws-s3-0.6.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a940c09eb4d72f1051b086371d572e6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
index bc10fc369b1d..e82deafb0563 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e112891746cf5589e768608be60634ea
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
index 6cdccd25074c..9aaeb161c522 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27ba17c94e52a7296c5b3e473510979e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0 b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
index 72d7f35f6d79..60d760c61736 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/aws-sdk-core-3.94.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b89bd8bd0611b8fb6906c44b205d90c2
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
index d9e66ae45658..a8e0dee11990 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed4697db5d6fb27328bec27fb7101729
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.2 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.2
index 142d8209aa93..31aa87ef4c99 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.2
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8f609141ca4658e6b0661508e47b1dc
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.4 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.4
index 72586e69e591..7b25abf08d6d 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.4
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6a618ecd3c9d42202a80df4b8235a57
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
index 227983834f02..8f2eaa652f45 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6418bbff212124431dcf3f780f439b90
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index a0ee81ed2102..f63254c5ed34 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/axiom-types-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b99f672ba45b99ac4cd488303388e134
diff --git a/metadata/md5-cache/dev-ruby/backports-3.15.0 b/metadata/md5-cache/dev-ruby/backports-3.15.0
index 694e6072d811..c20e2271cf8f 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.15.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/backports-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41c82e254686ec623d79485fe9c6cfe8
diff --git a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1 b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
index 67684b51f50e..f0cd68d68d7b 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+++ b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.20.2.tar.gz -> backports-3.20.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=672ffee3f2d1b0126a067adfaa4c9bdf
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 7f3202da0804..adc583186309 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6cd0db40ef73830a8a270e2c463214b
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
index a7dcd85f67d9..a315b225eb20 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26fd1a5aaedc60ea9e5a440228c1dde1
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index a14cea2b1bf7..ba2a6978730b 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ca5aa1890a31535de486d464744cb6e
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.2 b/metadata/md5-cache/dev-ruby/base32-0.3.2
index 20dc3fa02e3c..6da0a989dafe 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.2
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08881bc87f897f6fceef1212c25afe96
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4 b/metadata/md5-cache/dev-ruby/base32-0.3.4
index 30566bca0ba4..6993f9e3e0a1 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2ad98d96169e9dd8fe48a448e1a8086
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
index ee0f1d8e428e..5ba7a84d97e5 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b25bcf730a1a7e0277ad6dc64eac23cf
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
index 41471976941d..e69745c55fc2 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a61bf872ef6e650840a90682ab84025
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
index 2ded10d7c0a1..55b54ea16bcb 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cb2c00c52c7f765a05f7aa1c37b957f2
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
index d42ea1dbf8b4..b893ef7ae07e 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=610c3b372f384368c72831c7e290d4e4
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
index a5e43aab6c1c..7da6ab60f491 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.0.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3212ab10a3ee9f4883dc11947b071088
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
index a59468ac8cfc..3b776c84417d 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b74e6b6af04b51857e595cb0bfcb0f97
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
index 0c65c2984b53..c08ec8ee6021 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/best_in_place-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=0b8a87fc7deedaadeed23215137bdf52
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.6 b/metadata/md5-cache/dev-ruby/bindata-2.4.6
index 65a823d877d7..f664aa170cf7 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.6
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d50a1c699414af836de76843450bef5
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.7 b/metadata/md5-cache/dev-ruby/bindata-2.4.7
index 8d5fb7851f5e..2f20c7332ae6 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.7
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d50a1c699414af836de76843450bef5
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.8 b/metadata/md5-cache/dev-ruby/bindata-2.4.8
index c62d02f05501..bf2861756408 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.8
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9278cf851a5159c27cd7b196f3afb86
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1
index ffd335f1068c..608367534bcc 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07870d11e8c437f467ee00646de90bbe
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
index 29db629a8aca..14d22f6e89fe 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36c0767bb2dd6b4de8a6e54a0e71e792
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
index 35474911607c..447a0ff88c9d 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/binding_of_caller-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a021ba52947a797906d593feee4b375
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
index c75b8e2fb7ce..813be4c3cc7e 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c447bb2908bfd9cb2964af2bea3040a
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
index 6d86a86c05a4..31cce142eaf5 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d55eb4e3260031446c3a822a589a5f15
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.16 b/metadata/md5-cache/dev-ruby/bit-struct-0.16
index 4cba6be51709..80d8b36457fa 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.16
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2f38651d88302f3c7429b91143c905a
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.17 b/metadata/md5-cache/dev-ruby/bit-struct-0.17
index 5c0d821dbae3..8c4fbcfc6259 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.17
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a17ca17abc713fbdf65e37418783f3b8
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 07d02c8f2dc7..1c53876611bf 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eed2b20ba98f753e1287ded6d8717aca
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
index 3f6dd3800ce9..50265f6e926d 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dde9543459a96ff5293ce7d2df9a0455
diff --git a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901 b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
index b3a27b8ef9cb..1586b01132f3 100644
--- a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
+++ b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arvydas/blinkstick-ruby/archive/89e3f621132c2571d5f7c636b3962ff1b0a64564.tar.gz -> blinkstick-1.0.1_p20150901.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e8c1a65a1c7b94447ee7b3f6f14cd35
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index 7ae6088217f6..ce37d03f42bb 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bogus-0.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59c595f2f353eb045efdb540dd6c9a3d
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.6.0 b/metadata/md5-cache/dev-ruby/bourne-1.6.0
index f293e90582dc..48c73b6d6ac8 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.6.0
+++ b/metadata/md5-cache/dev-ruby/bourne-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bourne-1.6.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65aace39a2c3ee5bfdf09e13734a5ab9
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index c76787763ba9..9feeacbc575a 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/brass-1.2.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00b40061b8c9ea12f307267def46136a
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.2.3 b/metadata/md5-cache/dev-ruby/brotli-0.2.3
index bf5aa1eec166..14459cb5acae 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.2.3
+++ b/metadata/md5-cache/dev-ruby/brotli-0.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.2.3.tar.gz -> brotli-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688b09b7ffef28c3f2f1eb750bb6a52
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0 b/metadata/md5-cache/dev-ruby/brotli-0.4.0
index 9b671520d0bb..9c1af8b72f85 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688b09b7ffef28c3f2f1eb750bb6a52
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1 b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
index f16dcc1853bc..1c87a87ee3c0 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3099c1bd8897ebe47d506b94cc052cd4
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
index ee4e91f8f89a..92b2fef1b44e 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d97485df9fafbab66275bbc8d902611
diff --git a/metadata/md5-cache/dev-ruby/bson-4.10.0 b/metadata/md5-cache/dev-ruby/bson-4.10.0
index 2c8b7f44de36..5dd5be872ee4 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.10.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.10.0.tar.gz -> bson-4.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79705486afe465ee1180863aaca50841
diff --git a/metadata/md5-cache/dev-ruby/bson-4.12.0 b/metadata/md5-cache/dev-ruby/bson-4.12.0
index 0f5472b8c688..cf65b1d4acf7 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.12.0.tar.gz -> bson-4.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abdd61a9a2a1333860f2db5fedea37a5
diff --git a/metadata/md5-cache/dev-ruby/bson-4.9.4 b/metadata/md5-cache/dev-ruby/bson-4.9.4
index 711870657a71..bcfbbab29218 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.9.4
+++ b/metadata/md5-cache/dev-ruby/bson-4.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.9.4.tar.gz -> bson-4.9.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79705486afe465ee1180863aaca50841
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index 9f4fea1575d4..f6e900ad7712 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/buftok-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7496ecc40a3cfabc1f8f11890721cbcd
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.3.0 b/metadata/md5-cache/dev-ruby/buftok-0.3.0
index ec8b29ff7c60..7d86e68bb456 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.3.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/buftok/archive/v0.3.0.tar.gz -> buftok-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43f7405165ebc6a3c43252ecf62e284b
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.3 b/metadata/md5-cache/dev-ruby/builder-3.2.3
index 4d0a12adacef..9528e1629921 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.3
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=549f843bb87e0ba142b376410f29dd5c
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4 b/metadata/md5-cache/dev-ruby/builder-3.2.4
index cf0f5431b528..b22f5fba0ee3 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4
@@ -5,12 +5,12 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=7
 HOMEPAGE=http://onestepback.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 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 ~riscv ~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 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7b1ea888e79f22b556a7944fdda5153
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae5eeadc1672bd06be284ee286447a4f
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.1.4 b/metadata/md5-cache/dev-ruby/bundler-2.1.4
index 50e120b005af..fc6f7ad70ce6 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.1.4
+++ b/metadata/md5-cache/dev-ruby/bundler-2.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed0691f5beb053e0ceec368550b02e99
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.17 b/metadata/md5-cache/dev-ruby/bundler-2.2.17
index 63eb5263c374..33f833e6cf39 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.17
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.18 b/metadata/md5-cache/dev-ruby/bundler-2.2.18
index 39f3678f7843..5bd830046d14 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.18
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.19 b/metadata/md5-cache/dev-ruby/bundler-2.2.19
index 022e99d933e2..b8c9b044245f 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.19
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.20 b/metadata/md5-cache/dev-ruby/bundler-2.2.20
index b347c23da051..d03edf03430c 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.20
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.21 b/metadata/md5-cache/dev-ruby/bundler-2.2.21
index 1dd24db72e93..d3302d2a5e74 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.21
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.21
@@ -5,12 +5,12 @@ DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=7
 HOMEPAGE=https://github.com/carlhuda/bundler
 IUSE=+doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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? ( 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(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1: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=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.21.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20da7c0bf440cd7987dda03753c57a93
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3f1601f88ea393f7f5390df3632a030a
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.24 b/metadata/md5-cache/dev-ruby/bundler-2.2.24
new file mode 100644
index 000000000000..42710844c5af
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.24
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) ) 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=An easy way to vendor gem dependencies
+EAPI=8
+HOMEPAGE=https://github.com/carlhuda/bundler
+IUSE=+doc test test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/bundler-2.2.24.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
index 387ea03dcd80..3b6942c844c1 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.7.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13ffbcb0e498e46a6bb6a28a33b1d38e
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
index 6d18bae79afc..25a28dee6563 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=049305a657a468961c284607c6b87ade
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.16.1 b/metadata/md5-cache/dev-ruby/bunny-2.16.1
index a589cbd6e975..83adb78ef55d 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.16.1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bunny-2.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=592a6e5085246a75237cc06fbae15048
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.17.0 b/metadata/md5-cache/dev-ruby/bunny-2.17.0
index 3040af576fa9..c1d0802d361f 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.17.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bunny-2.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=592a6e5085246a75237cc06fbae15048
diff --git a/metadata/md5-cache/dev-ruby/c21e-1.2.1 b/metadata/md5-cache/dev-ruby/c21e-1.2.1
index e4fb71cab332..e9aa49a5b955 100644
--- a/metadata/md5-cache/dev-ruby/c21e-1.2.1
+++ b/metadata/md5-cache/dev-ruby/c21e-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/c21e-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9717be0a0a6702534e6caa56c45b5061
diff --git a/metadata/md5-cache/dev-ruby/c21e-2.0.0 b/metadata/md5-cache/dev-ruby/c21e-2.0.0
new file mode 100644
index 000000000000..615cea0dd4ec
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/c21e-2.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=Run cross-platform executables
+EAPI=8
+HOMEPAGE=https://github.com/cucumber/cucumber/blob/master/c21e/ruby
+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=2
+SRC_URI=https://rubygems.org/gems/c21e-2.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0077cde892ca93615f6f62c100cc2d0a
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index d6a5bdc97e4a..f692f215f876 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75e441607bbc56c6c0a2ec8bb75b6fe5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
index def58306ebde..1451820258ca 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
@@ -5,12 +5,12 @@ DESCRIPTION=A distributed application deployment system
 EAPI=7
 HOMEPAGE=https://capistranorb.com/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.0.14:*[ruby_targets_ruby25(-)] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby25(-)] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/net-ssh-gateway-1.1.0:*[ruby_targets_ruby25(-)] >=dev-ruby/highline-1.2.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.0.14:*[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-gateway-1.1.0:*[ruby_targets_ruby26(-)] >=dev-ruby/highline-1.2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/net-ssh-2.0.14:*[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-gateway-1.1.0:*[ruby_targets_ruby27(-)] >=dev-ruby/highline-1.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 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=af711f168175df151d7034be89de906f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ef59e2e06f2c172b9db01405afc85c4
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.13.0 b/metadata/md5-cache/dev-ruby/capistrano-3.13.0
deleted file mode 100644
index d43b414aa24c..000000000000
--- a/metadata/md5-cache/dev-ruby/capistrano-3.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby25(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby25(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby25(-)] dev-ruby/i18n:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26(-)] dev-ruby/i18n:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=A distributed application deployment system
-EAPI=7
-HOMEPAGE=https://capistranorb.com/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby25(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby25(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby25(-)] dev-ruby/i18n:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26(-)] dev-ruby/i18n:*[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=3
-SRC_URI=https://rubygems.org/gems/capistrano-3.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=96410e49954bed13e8581f0fa482f4bf
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.16.0 b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
index 3242793be40f..da48991bb65a 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.16.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7514fdb6dc49300e69eb520d68e09a97
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.32.2 b/metadata/md5-cache/dev-ruby/capybara-3.32.2
index e7db5699f738..c1cbdcb1013b 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.32.2
+++ b/metadata/md5-cache/dev-ruby/capybara-3.32.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.32.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=10c63ce1839bc039a5464da2823808e6
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.33.0 b/metadata/md5-cache/dev-ruby/capybara-3.33.0
index 0c19aaf9321e..bb2746814f2a 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.33.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.33.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.33.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=613694b7b7cd4ebe766562b73f2728d9
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.34.0 b/metadata/md5-cache/dev-ruby/capybara-3.34.0
index 03d330ca11ba..eff5090b2a02 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.34.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.34.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.34.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=e5b91971aae024c219f57dd6e4fbcafd
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.0 b/metadata/md5-cache/dev-ruby/capybara-3.35.0
index 26153c039c8d..251d54644ce1 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=117c408d91ba81cdc1da025b9a80cdf3
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.1 b/metadata/md5-cache/dev-ruby/capybara-3.35.1
index c29d87414962..80900dd4b203 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.1
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=117c408d91ba81cdc1da025b9a80cdf3
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.3 b/metadata/md5-cache/dev-ruby/capybara-3.35.3
index 976ee7360e12..e3be0064c2f4 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.3
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=5355fbd3360433e3d4ffd3a2517dd52b
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
index 8ded20669f40..cda248106322 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.0.0.tar.gz -> certificate_authority-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be0ea14226b463da3de9fd4b1a1f2114
diff --git a/metadata/md5-cache/dev-ruby/certified-1.0.0 b/metadata/md5-cache/dev-ruby/certified-1.0.0
index 74edc0473fa5..5ecc28f98cce 100644
--- a/metadata/md5-cache/dev-ruby/certified-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certified-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/certified-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d663a75cc7195a9315608c3bcd6da354
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
index 8e38458f0428..357d9290b76e 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brianmario/charlock_holmes/archive/v0.7.7.tar.gz -> charlock_holmes-0.7.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=877e26f8c23a863261b475ced20cddb6
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index 4f182c8f5ac8..df2f268190d1 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf55ad83d074f24f1d820cf914047ed0
diff --git a/metadata/md5-cache/dev-ruby/childprocess-3.0.0 b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
index 844cd97a6a3e..c33d972f2c61 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-3.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d079a96b9bd825c31cd4ece7afc3d3ea
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.0.0 b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
index 31bb3f56daba..a652c36fce7e 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b2511c89818a146ce84aa9c27b359ee
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.1.0 b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
index 8de275fd3e4c..f1c5d226262c 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.1.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b2511c89818a146ce84aa9c27b359ee
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 486ccb189d4f..84d5b1626b7a 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9583a86d55f21656782961d34bfa66a
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.14 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
index 9ccdf221d6d0..04b98ea4ecbd 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.3.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95febf380b3039bcfdc60bb639689acc
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.15 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
index c50cd5f13771..09ecef00479b 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.3.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95febf380b3039bcfdc60bb639689acc
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
index 095f4cb5b255..b5c8f6c380db 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1e0ca7ab7fcd96eb88ebed32cddd37a
diff --git a/metadata/md5-cache/dev-ruby/cinch-2.3.4 b/metadata/md5-cache/dev-ruby/cinch-2.3.4
index b6446e4a7a35..d841fd301507 100644
--- a/metadata/md5-cache/dev-ruby/cinch-2.3.4
+++ b/metadata/md5-cache/dev-ruby/cinch-2.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cinch-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61484bc5941103f2c3927e13a9460347
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
index d88ab866e1fe..28f425de5f4f 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.2.0.tar.gz -> classifier-reborn-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0b44f34e45109e87ace7ed1ef7438f8
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.2.0 b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
index 23e16f5f7177..c8d8605603f9 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fee330e349709e77ec8f16c9d84ff05
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index e9ffb050d49a..595ccbc564a2 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cliver-0.3.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a75893d1e360fd7dc5ec1dc2a9eb3573
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1 b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
index 55d21d53cd0b..afad9e8a1a9f 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaauie/cliver/archive/3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b.tar.gz -> cliver-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4a5876eef3d1e8f142e7741263dd672
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.6 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
index a02117ad9dbb..2e936a962a6b 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da6d138d47a4e9a659f6806434c56c04
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
index d94e736102d7..8c9680b45b3a 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=665cc636b8945097714b47fe8237ed54
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index 9cb3b538fe27..2ce822c8a07c 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=480c8b0df3d3f53635db0a1f1caa03b2
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
index 990df9721630..f215a7482630 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93befb65cabd1bd85ee9417faa576f11
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0 b/metadata/md5-cache/dev-ruby/coercible-1.0.0
index e1a2b6eb5191..c0ea53bb3b6e 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coercible-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c53e72b88232e68ae93594658c1d7adb
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0 b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0
deleted file mode 100644
index 2a6790ff3c4c..000000000000
--- a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby25(-)] >dev-ruby/railties-5.2:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby26(-)] >dev-ruby/railties-5.2:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/sprockets-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sprockets-rails[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=Coffee Script adapter for the Rails asset pipeline
-EAPI=6
-HOMEPAGE=https://github.com/rails/coffee-rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby25(-)] >dev-ruby/railties-5.2:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby26(-)] >dev-ruby/railties-5.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=5.0
-SRC_URI=https://github.com/rails/coffee-rails/archive/v5.0.0.tar.gz -> coffee-rails-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=3e412f6989725da8d00cce7e046109ae
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
index 8f22719d183e..05f157126d94 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/coffee-rails/archive/v5.0.0.tar.gz -> coffee-rails-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c732feb8b2181048576bd3bcc517c913
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index a2ee7880af0c..2e4887c1f6b8 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-2.4.1.gem
-_eclasses_=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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cec7fa3009c74f170fec25ed4573e0d
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
index ffebe1cfb378..b2844f231d83 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55823d339c66d9f0a442773b8cae2d48
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
index bf8c5a814e8e..0a2c54d856e9 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b54c0e307b4a898355193e4c8ac5acea
diff --git a/metadata/md5-cache/dev-ruby/color-1.8 b/metadata/md5-cache/dev-ruby/color-1.8
index 9fb7554908c2..b6cea8cc3b93 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8
+++ b/metadata/md5-cache/dev-ruby/color-1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=74f3fe0f7bb124d882cafa34b383c0eb
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0 b/metadata/md5-cache/dev-ruby/colorator-1.1.0
index e396b35a2baf..f51ecc3f41fb 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1744fbb0765ead41a8919bd515d14aa3
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index 72ecaaaf8b0a..520cd0bfbbd7 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored-1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58c15157bff5a76965a8d95cf6e0f17f
diff --git a/metadata/md5-cache/dev-ruby/colored2-3.1.2 b/metadata/md5-cache/dev-ruby/colored2-3.1.2
index b1ce3d8007a1..5c9bc105e00f 100644
--- a/metadata/md5-cache/dev-ruby/colored2-3.1.2
+++ b/metadata/md5-cache/dev-ruby/colored2-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored2-3.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee7ccd2b7b3c1f4935ca038c38732f1f
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
index b51752e9a0aa..070f1a5aeb2a 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colorize-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c5e85a9f47b75358c0bfb4de5962a7e
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 5cd261b74adf..29c56092a0d9 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/columnize-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=495fabdf70145aaed275dd5e7d6d727a
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.0 b/metadata/md5-cache/dev-ruby/combustion-1.3.0
index c634123802d2..c18e95f32fc5 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.0
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db86248cf0ed4a6d90c83745d4637515
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.1 b/metadata/md5-cache/dev-ruby/combustion-1.3.1
index 63353495179b..6a6f046d2da2 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.1
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db86248cf0ed4a6d90c83745d4637515
diff --git a/metadata/md5-cache/dev-ruby/commander-4.5.2 b/metadata/md5-cache/dev-ruby/commander-4.5.2
index 31bf46e1ca68..7c08a013e422 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.5.2
+++ b/metadata/md5-cache/dev-ruby/commander-4.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61e3875443a7d1268a2020cb5c171f7f
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0 b/metadata/md5-cache/dev-ruby/commander-4.6.0
index e67a4e789a11..cf43ffc623d5 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.6.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c0b312de2b01b547bd1ee4490dcc347
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index e962977360d2..69b56fc61215 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/compass-1.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=04101b1da47f3916c993c680ab9f8136
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index 41c67c081677..5b42597549c3 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://rubygems.org/gems/compass-core-1.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08ed453987a510ace56279c3293fce37
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index 26a45442aa84..03ba2aa516a4 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://rubygems.org/gems/compass-import-once-1.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91451128971e8727ff3fb60b16603c3d
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index 1930eed05271..69f02f7c3264 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89956a71aac36ba9dd33e2a165ff292e
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
index 4657d8a8271e..dc8188b50f83 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.7.tar.gz -> concurrent-ruby-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44560f95ec88484df1e9ec57d6b48ac8
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
index 4955f991598b..a1dbe5075dbe 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.8.tar.gz -> concurrent-ruby-1.1.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1ab06871243a4d7b5dd4cfef73a96e0
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
new file mode 100644
index 000000000000..bef17da3bb28
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( 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=Modern concurrency tools including agents, futures, promises, thread pools, more
+EAPI=8
+HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.9.tar.gz -> concurrent-ruby-1.1.9.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b9a2da72ff3ef938a936dcc7398409e5
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
index 6a9a975a8e56..96a447da05bc 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a38ff7e69879bd82e2ae488e457416c8
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.3 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
index 3312dc9348d3..31fd4e4e9452 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.4 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
index e15362754bde..5a1362710edc 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
index bc7cb30caa43..52e4ace930ee 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
index 4465564b5a20..bd921a648d8f 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cef2e60aee1a747a6d74cf22ebbe964b
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.1 b/metadata/md5-cache/dev-ruby/contracts-0.16.1
index 3d85e4c46505..e0baaa344de1 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.1
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0554d2c63d681192569c97c349c6f777
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.17 b/metadata/md5-cache/dev-ruby/contracts-0.17
index 2279edbca034..e449773dddb9 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.17
+++ b/metadata/md5-cache/dev-ruby/contracts-0.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.17
 SRC_URI=https://rubygems.org/gems/contracts-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=840fde2dd81a71073cd85e75fcae0829
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.6.0 b/metadata/md5-cache/dev-ruby/coolio-1.6.0
index 24f5d143af02..9244d44e3490 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.6.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e716147bcafbaff72c9c3969067153e3
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.0 b/metadata/md5-cache/dev-ruby/coolio-1.7.0
index a6e190c6aeeb..eedb402fcf60 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40dc4a547375da0e08a88766b9a1fc0f
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1
index 86ea7ba99a0e..900008bd0348 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3ba86c949826facf6fdc564d9c1090d
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index a4a15fa23058..0086c5d07d91 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/countdownlatch-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a97b1cc7e61c82964ab49888d5396ac
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3-r2 b/metadata/md5-cache/dev-ruby/crack-0.4.3-r2
index d3ef4ce0d8fb..6c03e3ee4c60 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3-r2
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/crack-0.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=707862cdbc1c46ebd00dd8b9854cff26
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4 b/metadata/md5-cache/dev-ruby/crack-0.4.4
index 7558c816c5d2..8ddafec27dce 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de0e071c75c1897df2b622b95afc542b
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6 b/metadata/md5-cache/dev-ruby/crass-1.0.6
index af97dda31177..1fa202faab21 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18372052d68c4d0ea776eab53e8f8ed8
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index 4d366d9f4e14..a79dcf1adeb2 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb56825115b4e3df9fb587c2ba164a06
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1 b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
index 84f1411fa6c0..49ffd35f4656 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d27440a28ff07e4bf4825119976946f5
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.10 b/metadata/md5-cache/dev-ruby/cri-2.15.10
index 61b67d73c3b7..6dba7994ed11 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.10
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59a8acc51518c5b466c25cd9f334a888
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11 b/metadata/md5-cache/dev-ruby/cri-2.15.11
index ee17b0059056..3a94ffbbd24b 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.11
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5883b85ef1c62a9ecfa83dfda164b0c6
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.7.1 b/metadata/md5-cache/dev-ruby/css_parser-1.7.1
index 516f42354e91..e4bd7803385d 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.7.1
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.7.1.tar.gz -> css_parser-1.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=157314cc40e7a95ed2b723b1398a4f65
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.9.0 b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
index 2f1f6e8f2f2b..d29a82d6391c 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.9.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.9.0.tar.gz -> css_parser-1.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28bc29f803016e341023e018e4873d36
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.10 b/metadata/md5-cache/dev-ruby/curb-0.9.10
index 0521ebe2ce22..25e129033c31 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.10
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6769835981f62adc90eb35ce2339b30
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11 b/metadata/md5-cache/dev-ruby/curb-0.9.11
index 973869e4da11..14add3545c18 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3212294dd02233b595fa3ea08471f14b
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1 b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
index 644721cfb259..5472d7faa0fd 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=511432292ff6150f18a5f98b7db1830d
diff --git a/metadata/md5-cache/dev-ruby/curses-1.3.2 b/metadata/md5-cache/dev-ruby/curses-1.3.2
index f81a04ae8cae..540660516c7d 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.3.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=533a158144b50293ec706542d30d0e10
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.0 b/metadata/md5-cache/dev-ruby/curses-1.4.0
index acbef12986c4..8e5d53ea9ef8 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.0
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=533a158144b50293ec706542d30d0e10
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.1 b/metadata/md5-cache/dev-ruby/curses-1.4.1
index 660efbe72683..9943afbd0f49 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.1
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c28af1ddb2f0c4d121ac109860082c3
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.2 b/metadata/md5-cache/dev-ruby/curses-1.4.2
index e0d3f9821126..30be7a851c78 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c28af1ddb2f0c4d121ac109860082c3
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1 b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
index e4736d79080f..36ab338b2996 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/d3_rails-4.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df5b90611e68f0c5e93e466329f9881f
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index 454646ca6022..be43bdd5a336 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/daemon_controller-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ca1a7fd3a12aec5d628b2db6ab75d2d
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
index 0d6403250790..ac710e71023d 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fdc7239f69e4108f1a153f607c9645b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.0 b/metadata/md5-cache/dev-ruby/daemons-1.4.0
index 66e58c121469..1f721000f2d8 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.0
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.0.tar.gz -> daemons-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d3f9a57569fe967ee35d4ec8363ba18
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.11 b/metadata/md5-cache/dev-ruby/dalli-2.7.11
index 98c071c029e3..07fcfba0990c 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.11
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.11.tar.gz -> dalli-2.7.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2c0dedbf25c045b704745edb3c34ef3
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
index 2d0e77876048..450e8822c645 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d48ca7bb15aae4dd66f9b59e09e80a37
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
index 13503e4ab127..2896a060b36a 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=067d4810ce00cbf2ec3bca8dce81cc95
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
index 558307b4016e..44d9d94b8e8d 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-active_record-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0b4d7645afa6e5c1e6354b6c930ad4a
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
index ca1e5a46e12a..db2bab306940 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-core-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19314e48f0b3667f4c731434508a0a72
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.10.0 b/metadata/md5-cache/dev-ruby/date_validator-0.10.0
index a1dcd647a4a2..b87ad0854947 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.10.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cba8c4fd461444138d70599abde451
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.11.0 b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
index 0cf372b9032b..43e0254ef3c1 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.11.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cba8c4fd461444138d70599abde451
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.12.0 b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
new file mode 100644
index 000000000000..9343231662a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-3.0[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-3.0[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[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=Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails
+EAPI=8
+HOMEPAGE=https://github.com/codegram/date_validator
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/date_validator-0.12.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad8c3c8272cf4d73cb595ee0dc23f993
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.2 b/metadata/md5-cache/dev-ruby/dbf-4.1.2
index 47f64659edad..c666cd58497b 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.2
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26681099194ff860dd159f5520b75324
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.3 b/metadata/md5-cache/dev-ruby/dbf-4.1.3
index d52a1c9afd63..096fe9602026 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.3
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcbbefc3e3a24cff5fcf2a3aac54c5d4
diff --git a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0 b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
index 013fe0d11105..44a156ccc3c6 100644
--- a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
+++ b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmemoize-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a833a03c39e1040a2e3015fe07cc84c7
diff --git a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1 b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
index 8eb128143199..17c1f7c772b5 100644
--- a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmetrics-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a239324c443e1f014bf6fcae4dd3a0cf
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
index 5b53fa34956a..296f72e5dadc 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0e5826c351971dbb76e239510a0cb80
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
index 2b1a3e46b195..0e8e019cb8df 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cfdc0110996ccf15677dbec104b381f
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
index fc5f5279622a..e30bec576287 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/debug_inspector-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f4997e4c840f347d12b8bc39ef550a9
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
index 1894630d6e4a..b88900a3d008 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.0.0.tar.gz -> debug_inspector-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9477d6776214fac88a91e2ea6bb32725
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
index 40f029f19928..5412707304d2 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.1.0.tar.gz -> debug_inspector-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d71c549db6ac7e136e91a3f0e30d96bb
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index 917a0b961cd5..cd0e96d91fc1 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d8271629af08a5304a79ba8c44953e5
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.1.2 b/metadata/md5-cache/dev-ruby/delayer-1.1.2
index 5bfd154aa267..f9c9f62844d0 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.1.2
+++ b/metadata/md5-cache/dev-ruby/delayer-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e2c3a677013fea82a64a35e7155a744
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.0 b/metadata/md5-cache/dev-ruby/delayer-1.2.0
index 59c651c6a1f2..6bdd3a5e23f4 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44631fe0f47a1f35804cfb08c6e56153
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.1 b/metadata/md5-cache/dev-ruby/delayer-1.2.1
index 076d1ba6ce81..efaded9fb6df 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.1
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44631fe0f47a1f35804cfb08c6e56153
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3
index 9ce18d549fa6..39268c965288 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3
@@ -12,5 +12,5 @@ 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/delayer-deferred-2.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f378d015a4b8d2f28d2520e187afe80
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
index 6ec6ed5617cf..9810fb1bb855 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
@@ -12,5 +12,5 @@ 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/delayer-deferred-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8869b2fe9401d1e7672dfe4db00bc1fc
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1
index 0de144981ec0..e9d49a891d83 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c71826dca46919183ddecda494de50ea
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index 04bfce9c7754..76f3c260f335 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/deprecated-3.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f7a90f1525686c1677020baf8e37a60
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index 551444436563..51960482a547 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/descendants_tracker-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=298be84a6e43af95685dfe7930b2ac8b
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
index b5128c1329cb..17a9a5cdd2b3 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.5
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b15ce128018644e0fefbc235a8febf24
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
index 6caa436e47cd..b9c2149251cb 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eaba2c28b60a81b9af74a06e9e75bb6f
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 6160bb5da874..5fc391fa88c8 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2daf1cd1fb1f424e4c132fffb01f9b9
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
index c4becd59d556..22b592c2ecf3 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
@@ -5,12 +5,12 @@ 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 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 ~riscv ~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 ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fe612ee9225ed2485938bc29b420066
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e6c91511500f95d5fa082a9af47e450
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index a3d9727b7f16..cc86e7ddaa94 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22a84d9e81bbcee4f21fa9b25d3b0110
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
index ee199631666a..f31605227fc4 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=246ed1fd7d55be9fb2656503df463d4f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
index e88a35ef5ebd..d15b5af7c20c 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=246ed1fd7d55be9fb2656503df463d4f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
index 29fc11a95784..bda10bde2495 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a57914bf9a3599fe78168193cde3d62d
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2 b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
index 04310a79570f..789687e6c8aa 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.0.2.tar.gz -> diva-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c059623ad13feaa54dbb861ff56318c5
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.3 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
index a93a16989b01..c6bcffb1e1de 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dnsruby-1.61.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11f04cf514c8ed91c69e7fb2e7fe57eb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.7 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
index ba578941b94b..359fd1cdc254 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
@@ -5,12 +5,12 @@ DESCRIPTION=A pure Ruby DNS client library
 EAPI=7
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_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/dnsruby-1.61.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c01f0d525892b9c4a9261f0318f14641
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cdc640d057253d4fb9e4c343fcf35ab6
diff --git a/metadata/md5-cache/dev-ruby/docile-1.3.5 b/metadata/md5-cache/dev-ruby/docile-1.3.5
index 5a30acf02023..057111e53fba 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.3.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.3.5.tar.gz -> docile-1.3.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2bac9ff3f31ed63678a18338b541a49d
diff --git a/metadata/md5-cache/dev-ruby/docile-1.4.0 b/metadata/md5-cache/dev-ruby/docile-1.4.0
index fe4d2870f578..14da0f82df19 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.4.0
+++ b/metadata/md5-cache/dev-ruby/docile-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.4.0.tar.gz -> docile-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=606741186292d9423830b9e6922bdfcc
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
index d42a9bcbcdd5..fd585eaa66dd 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20180417.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=488eb33b7f29736408070cfb4541b3bb
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index a471ebc33e71..8005ce49573b 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -4,12 +4,12 @@ DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/knu/ruby-domain_name
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ruby_targets_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 )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6092d3be222b3863888b10c3c197411
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4700603c4510d0a3a1a8eeb2e5d83d8
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.7.6 b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
index ad212f465e1a..9f5668ed6ca5 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.7.6.tar.gz -> dotenv-2.7.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b17b66ce54a1d774e2a47e8a9fe83d9
diff --git a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2 b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
index 50d9c064a6f2..c67b3c6c1bf0 100644
--- a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/judofyr/duktape.rb/archive/v2.3.0.0.tar.gz -> duktape-rb-2.3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7473914c8bd63bbb6d278ddf47fd56b0
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index 2202e02dacd5..3228c9d5c7cb 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dust-0.1.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4960ff6f82df798c89ed43ffd4cb7ab8
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
index 66bb9d16cb2d..e008166d2d40 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=776a7e2ce11ebc083102237eeeadcdcf
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
index f075454e14bd..3c41b3d49308 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a63e5b6ed84999d7d79c34adda70f64
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
index 2ef88955ca16..e0e256fca33c 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f00247fa37fb9fde5b28f245a12b075
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index f470c9ef97a3..53b63e3f30b2 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f1ccf290bfdd64e3cada52efe7efc28
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
index be2961e8d67d..5f11bb76d56a 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d48ec7db9dc4b9e2c89687d16c11fe56
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
deleted file mode 100644
index cd625efbd7ca..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[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=Ruby integrations for ES, elasticsearch module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.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
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=affd8182ee7aefa4684c12298664a4a8
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
index d4def0e367b9..fba7af8818d7 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21a4977bce141e2abbdee5c84cdd913e
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2
deleted file mode 100644
index 99790279c676..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.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
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21a4977bce141e2abbdee5c84cdd913e
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
new file mode 100644
index 000000000000..359cf1abe3f5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby27(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby27(-)] dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[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 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/elasticsearch-api-6.8.3[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby27(-)] ~dev-ruby/elasticsearch-transport-6.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
+SLOT=6.8.3
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87c889ac73f63727b92711132344f9b3
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
deleted file mode 100644
index 560d545942a7..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[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=Ruby integrations for ES, elasticsearch-api module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[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=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4abc425e6b6e34b474d6046a1f3c5e0a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
index 863b05caa047..acdc2ec17e94 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ff30e40de921ec348dac75eb7bd970e
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2
deleted file mode 100644
index d00c085f2d19..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[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=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38c33ebec7eb0cbad17f73b0388d7af2
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
new file mode 100644
index 000000000000..2529f206895b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) 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/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby27(-)] dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[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-api 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/multi_json[ruby_targets_ruby26(-)] ) 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.8.3
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b2a4d01afcd155931d5c7803b9d05e4
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33 b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
new file mode 100644
index 000000000000..e3152d0ad1b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( 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/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-extensions module
+EAPI=8
+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/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch[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/elastic/elasticsearch-ruby/archive/v0.0.33.tar.gz -> elasticsearch-ruby-0.0.33.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=74566196413f25b46e728574bc3d60e1
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
deleted file mode 100644
index fa859a0afa86..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/faraday:*[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] dev-ruby/curb[ruby_targets_ruby25(-)] dev-ruby/patron[ruby_targets_ruby25(-)] ) ) 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/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/curb[ruby_targets_ruby26(-)] dev-ruby/patron[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=Ruby integrations for ES, elasticsearch-transport module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/faraday:*[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[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=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=631ee35c9fbb1c0850194259797df689
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
index 238ce9598a01..6f00e8034026 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e386fb4bcebbcadd884bf1a1753871b3
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2
deleted file mode 100644
index a3d75cf75c57..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] dev-ruby/curb[ruby_targets_ruby25(-)] dev-ruby/patron[ruby_targets_ruby25(-)] ) ) 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_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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[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=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=576c9d49e2eb5310115e39bd94da7798
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
index fd78237b72b7..1b6517d11b5b 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -10,7 +10,7 @@ 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
+SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e587174e6155801a107c489c10e9ef10
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=af5fe2c4434c1f03d49c2f0d8f28d8c6
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
index adcf95dfbe7a..e05ffa20d47e 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.2.tar.gz -> em-websocket-0.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5508ef55acd641a91446191e06bea404
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index 554cde11368f..aa71ff7122e8 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd3481b76e228655a835c9fca38bb4ec
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
index 1be6ec84c72d..e3ea16fc93ef 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ac342634f37d60acf59794b8b1e8874
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.6.1 b/metadata/md5-cache/dev-ruby/equatable-0.6.1
index 5bb0ace301b6..f4070a8cbdc0 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.6.1
+++ b/metadata/md5-cache/dev-ruby/equatable-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equatable-0.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2cb0e50fb6c328f032dde864fc236b11
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.7.0 b/metadata/md5-cache/dev-ruby/equatable-0.7.0
index d3cd8aa66594..0aca218c23b8 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.7.0
+++ b/metadata/md5-cache/dev-ruby/equatable-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/equatable/archive/v0.7.0.tar.gz -> equatable-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36862f51856a9fe91e61d53b31358d3d
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0 b/metadata/md5-cache/dev-ruby/erubi-1.10.0
index 2b911eda79cc..449565b3cfd0 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.10.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4e3d8382277243c78b6b36034673704
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.9.0 b/metadata/md5-cache/dev-ruby/erubi-1.9.0
index 6be9bfa4fcfd..e160c7eeaa1a 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.9.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubi-1.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75743b64965b7260268242389d214801
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index daf96f8521f2..53a11d41fabe 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8da604a400914df7538ef2490083a37
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
index d28660b24fc2..27f6e35c112a 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae4122acd02970b8572c9d3cc7ba92bb
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.12.0 b/metadata/md5-cache/dev-ruby/ethon-0.12.0
index ce2a95c526d9..2cef80143a6c 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.12.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7956e2d1a91abe47390ab88c4c283717
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.13.0 b/metadata/md5-cache/dev-ruby/ethon-0.13.0
index ba063475e0be..5c82dce97478 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.13.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afb5ed0f7549b6f42e60055f89fd2f56
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.14.0 b/metadata/md5-cache/dev-ruby/ethon-0.14.0
index 1ea40f45a44b..d779bfb48f28 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.14.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afb5ed0f7549b6f42e60055f89fd2f56
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index e9ea04905be4..362e5bf2005a 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/evented-spec-0.9.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d874715cf8436b1e24b741e0c099edda
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
index 402d9e004247..7506df561255 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e2ab3f7e9b8d5248bd670320ab694eb
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0 b/metadata/md5-cache/dev-ruby/execjs-2.7.0
index 43e0dcc14d95..581927f23fc0 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29f86f4ff0c7412754970728cd70c4c1
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1 b/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
index 30aed76cbe95..f66614308511 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=830b4081d7c1c7849e9699691b5df5d3
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.0 b/metadata/md5-cache/dev-ruby/execjs-2.8.0
index 78a13b6489bf..fc264e4b4b26 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.0.tar.gz -> execjs-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=542d70bc3682d937d225a66a8b2d78b6
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1
index b9cac7011619..4fed290a0dde 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=542d70bc3682d937d225a66a8b2d78b6
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.8 b/metadata/md5-cache/dev-ruby/exifr-1.3.8
index 0b10c14e225c..7a6afd3a42d3 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.8
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.8.tar.gz -> exifr-1.3.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.9 b/metadata/md5-cache/dev-ruby/exifr-1.3.9
index c2344474e114..584128285e23 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.9
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.9.tar.gz -> exifr-1.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.17 b/metadata/md5-cache/dev-ruby/facter-3.14.17
index 2ffc929a9bb2..e68608bf1e86 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.17
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.17
@@ -12,5 +12,5 @@ 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.17.tar.gz -> facter-3.14.17.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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dea72c42ef0ec27061e8566cd6e6545a
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.18 b/metadata/md5-cache/dev-ruby/facter-3.14.18
index a9e64761218a..405b89627a79 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.18
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.18
@@ -12,5 +12,5 @@ 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.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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dea72c42ef0ec27061e8566cd6e6545a
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.19 b/metadata/md5-cache/dev-ruby/facter-3.14.19
index 0ade99b49c58..ad4917e06784 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.19
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.19
@@ -12,5 +12,5 @@ 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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f892652831b3a7281c0984b82759ac62
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.8.1 b/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
index 2bf6c5af9378..12125e65572d 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/factory_girl/archive/v4.8.1.tar.gz -> factory_girl-4.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d90fe964a79b2895501eb2c0bc50c6e
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.19.2 b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
index 855faca3fe47..6e56c5c83827 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.19.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.19.2.tar.gz -> fakefs-0.19.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=731d3025da4d27e5451095defa918bd5
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.3 b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
index 5ea25640a330..9717d577fdb5 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.3.tar.gz -> fakefs-1.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=169fd77d996b816f64b6d6f38a6c9501
diff --git a/metadata/md5-cache/dev-ruby/faker-2.14.0 b/metadata/md5-cache/dev-ruby/faker-2.14.0
index 29e705ce997a..849dabcd0624 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.14.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.14.0.tar.gz -> faker-2.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=563237782cb36522cc8d9ab4fd5e8de8
diff --git a/metadata/md5-cache/dev-ruby/faker-2.15.1 b/metadata/md5-cache/dev-ruby/faker-2.15.1
index f22e73c0f260..247695d5c760 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.15.1
+++ b/metadata/md5-cache/dev-ruby/faker-2.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.15.1.tar.gz -> faker-2.15.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fb4c8db7fefa036bead2d05a24a1679
diff --git a/metadata/md5-cache/dev-ruby/faker-2.16.0 b/metadata/md5-cache/dev-ruby/faker-2.16.0
index 79b7fd492640..18cab7d7af88 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.16.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.16.0.tar.gz -> faker-2.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6ef36a3a872889155711db6bf5157e
diff --git a/metadata/md5-cache/dev-ruby/faker-2.17.0 b/metadata/md5-cache/dev-ruby/faker-2.17.0
index 41fee24c322e..99dc79a5dfe3 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.17.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.17.0.tar.gz -> faker-2.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6ef36a3a872889155711db6bf5157e
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.17.3 b/metadata/md5-cache/dev-ruby/faraday-0.17.3
index c4ee46e63788..e9ddab1be84f 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.17.3
+++ b/metadata/md5-cache/dev-ruby/faraday-0.17.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.17.3.tar.gz -> faraday-0.17.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3761d51ab1e70a1413da2be8fd3493ef
diff --git a/metadata/md5-cache/dev-ruby/faraday-1.2.0 b/metadata/md5-cache/dev-ruby/faraday-1.2.0
index 4a82ed58af4d..e9ee866d7ebe 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.2.0
+++ b/metadata/md5-cache/dev-ruby/faraday-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.2.0.tar.gz -> faraday-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7b42fbbfba211e254524964a7305d695
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
index 0a608679ced3..b6f60eddbd68 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.14.0.tar.gz -> faraday_middleware-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15dedaf40c188fa5c806ac8f0cb1c599
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
index ca2f3900bf49..319a084cce29 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.0.0.tar.gz -> faraday_middleware-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee10dd012dab7900a13b91d8d576c810
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
index 3e82403c08bd..3880d2844587 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efeb17d634c226265c11fc95a4c69160
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
index 1e98b60883c6..e99d62b4dfc1 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=712557625ce91aa282d69fc45cd3c062
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index c26a09076d42..72a447f3dcb1 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac9d43e9ffd90f0dc65141bee4d89aac
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
index 3348cad04b66..3d89aa7d369f 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d3ef4d0dffdade42c23b27c4cc96089
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.1.2 b/metadata/md5-cache/dev-ruby/fast_gettext-1.1.2
index 7efde7e261f2..6b9c3f7f703d 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.1.2
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.1.2.tar.gz -> fast_gettext-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bd3d71a1fba50363da9f97dd8d77bea
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
index b38f170c4135..26c6be8fc80a 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.8.0.tar.gz -> fast_gettext-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c49faed56676c532bff0933cf6bbb689
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2 b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2
index 1f88e2d1ecd0..c3b08516fbeb 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.0.2.tar.gz -> fast_gettext-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67a0b44b5cf2b014016c2b25af2d6316
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3 b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
index 4d0ba03f0355..636dd496609e 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.0.3.tar.gz -> fast_gettext-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67a0b44b5cf2b014016c2b25af2d6316
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index 6b39a463eff4..3774a525c918 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=582cb97f23ceac9adc6d42704470325a
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
index 6efa71b0f239..49b17eb670a0 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c20b7e9b4336c96c464fa8109dd0c05
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0 b/metadata/md5-cache/dev-ruby/fattr-2.4.0
index 11e68cbb1d1e..6b550bf9c04d 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f377f598b40dbe738be4baf16093dc07
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index c8b141aa029b..0631ef818808 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0cfda30c5dc0fc58e770376c9389a1d1
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
index 32c514f63dc0..3b41c0a9e24c 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ferret-0.11.8.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ecef68c092655e120b2b626fd7861cc4
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.15.0 b/metadata/md5-cache/dev-ruby/ffaker-2.15.0
index 5a0c1de5fbcc..5c5d21959480 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.15.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c0ed6d81907a5ebe527ca74366c8c28
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.16.0 b/metadata/md5-cache/dev-ruby/ffaker-2.16.0
index ad332056fc67..2c7eb0678619 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.16.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=435213dbf69946621bef414744831344
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.17.0 b/metadata/md5-cache/dev-ruby/ffaker-2.17.0
index 2c46316c9e31..36c467a6e892 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.17.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=435213dbf69946621bef414744831344
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.18.0 b/metadata/md5-cache/dev-ruby/ffaker-2.18.0
index 1157b29f2a2c..96c495502f54 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.18.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.18.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=850315d19eaebf04876ba2aec50c572c
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.11.3 b/metadata/md5-cache/dev-ruby/ffi-1.11.3
index 5e5c6183bb1a..357d7dcdb8f3 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.11.3
+++ b/metadata/md5-cache/dev-ruby/ffi-1.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.11.3.tar.gz -> ffi-git-1.11.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0813d6251f887abb2fb67e728e53d716
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.14.2 b/metadata/md5-cache/dev-ruby/ffi-1.14.2
index 269189440053..9c636d75aacb 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.14.2
+++ b/metadata/md5-cache/dev-ruby/ffi-1.14.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.14.2.tar.gz -> ffi-git-1.14.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3005db356e58c94e7345f39283f3ac4d
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.1 b/metadata/md5-cache/dev-ruby/ffi-1.15.1
index 29c39801e6c7..985b9418c28e 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.1.tar.gz -> ffi-git-1.15.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b7c68682782f4cd0d763e26c41f0159
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.3 b/metadata/md5-cache/dev-ruby/ffi-1.15.3
index 3d9f54d3af5e..9ffec4af9062 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.3
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.3.tar.gz -> ffi-git-1.15.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b7c68682782f4cd0d763e26c41f0159
diff --git a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1 b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
index dbb9c0fe5ffa..8ba4b3a7d83d 100644
--- a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffi-compiler-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aebf72ec512ca97f8d7ca06d9a93a9af
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
index fd8608fc7958..65b166215642 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/file-tail-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0bee090b02d3741ba7218e1bb510fe8
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0 b/metadata/md5-cache/dev-ruby/filesize-0.2.0
index 5cc00dea430d..d8fda140f3f1 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.2.0
 SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0eb7537b5a59abdca88f4acf024ade0d
diff --git a/metadata/md5-cache/dev-ruby/filigree-0.4.1 b/metadata/md5-cache/dev-ruby/filigree-0.4.1
index 5a49caf33eb5..1c860ba43dcf 100644
--- a/metadata/md5-cache/dev-ruby/filigree-0.4.1
+++ b/metadata/md5-cache/dev-ruby/filigree-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/filigree-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b35ed2ff36963528d62dda31051f6450
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.7 b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
index 27033589df84..3a1080731f38 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.7
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fivemat-1.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=509c0fcb29819cac1fb98d615ed1e729
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.6 b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
index 4927f9a5e18c..d5a3c4e4160d 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.6
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.6.tar.gz -> flexmock-2.3.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2041b187cda07431af97c4b7ce4f061f
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.10 b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
index b73750255d29..812829b852a1 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.10
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flickraw-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf8d75c6dbb49f4bdf7eea0241aec3d2
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.4 b/metadata/md5-cache/dev-ruby/flog-4.6.4
index 6613e7b15cee..3c1b67ab4dd9 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.4
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7b7dd6a5f47b62118e2fcb51ae55b3d
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
index 9d3d126c6437..8fbc66acf4b5 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a522019286af69eb5eb89dc7e6d936e
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
index 8c8f54c4fd3f..db4ea64796de 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6afecfd8af98fccc96d293c339cdcc98
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
index 1ad5b20cf5ce..8c10bb507fd4 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=930085b37f698871d4889ca3c3e96ba2
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.8.1 b/metadata/md5-cache/dev-ruby/forgery-0.8.1
index 50c44d717bb7..b74b97a7f2af 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.8.1
+++ b/metadata/md5-cache/dev-ruby/forgery-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/forgery-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=497e6b787229f8504015a71bd1446e9a
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
index 114b0d2b2e43..2a2325eb6c76 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96694fbfc6323b91e414a18e07056386
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
index 5ac5f74aee59..3e8d16063edd 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.0.tar.gz -> fuubar-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8288528bf6168ce97e8bad4645f4a7aa
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index fb22a4ed2be4..84f482fdd440 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=85098efc393e1ccfd05e26d384d59822
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2 b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
index 78473b34c8a7..b5fb5d4140b9 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.34.tar.gz -> gettext-setup-0.34.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ce299a06ee1767491c7674f95331cfe
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
index 86d20fc79f9d..e2b364297ec0 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.1.tar.gz -> gettext_i18n_rails-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=165b0b43bad1f4a7de779d3ff65cc6f3
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0 b/metadata/md5-cache/dev-ruby/gh-0.18.0
index 93a0f5dfa86f..ceb1a47f88d7 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.18.0
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fef9882a67d8a80c93dea0456621775
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.1.0 b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
index 3831338c31c7..ef09053cc47f 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-5.1.0
+++ b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/gherkin-5.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aff42f87036d8fc9e77e99f5fed5f0da
diff --git a/metadata/md5-cache/dev-ruby/gist-6.0.0 b/metadata/md5-cache/dev-ruby/gist-6.0.0
index 8209c4ade705..66c7cab09030 100644
--- a/metadata/md5-cache/dev-ruby/gist-6.0.0
+++ b/metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gist-6.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17cd5729e0b6605d15b1aea522d0e655
diff --git a/metadata/md5-cache/dev-ruby/git-1.7.0 b/metadata/md5-cache/dev-ruby/git-1.7.0
index 3d0cb6bb16a6..759a15b32ffb 100644
--- a/metadata/md5-cache/dev-ruby/git-1.7.0
+++ b/metadata/md5-cache/dev-ruby/git-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.7.0.tar.gz -> git-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b720f7a62d9a4ba71ce3bc06f9cd79fd
diff --git a/metadata/md5-cache/dev-ruby/git-1.9.1 b/metadata/md5-cache/dev-ruby/git-1.9.1
index 848e07dd6a1b..4ff66c580a38 100644
--- a/metadata/md5-cache/dev-ruby/git-1.9.1
+++ b/metadata/md5-cache/dev-ruby/git-1.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.9.1.tar.gz -> git-1.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f01c15c63ab014b6e191a2d866a304de
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2 b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
index 50addf2ab197..895517f90eb6 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dab3745abc0af58a9b4275fb6b95f2b9
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index 18570edf9ad8..2dd9af8a90d9 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gnuplot-2.6.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9e94be223bd6870dd282feef48bd2eb
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4 b/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
index 30d4da150dda..e0071c1d52ef 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> google-protobuf-3.12.4-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82c8afa3df4e6cfebbba511fe8b90e60
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
index fe28a621ae2d..685bdfdb3d95 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> google-protobuf-3.13.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7d75d25927fffa8815fed8660046b2f
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
index f76798fbdcfb..c1b5cf4f48f7 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> google-protobuf-3.14.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f495d8b4807204618d2a02873b95d8b8
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.20 b/metadata/md5-cache/dev-ruby/gpgme-2.0.20
index c88f2ca94e93..1d19de238b3a 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.20
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.20.tar.gz -> ruby-gpgme-2.0.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2898197f86d65ac0c78f203555257b54
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.13.0 b/metadata/md5-cache/dev-ruby/gruff-0.13.0
index 84b5a71ea0e7..98816626d6b5 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.13.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.13.0
@@ -12,5 +12,5 @@ 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/topfunky/gruff/archive/v0.13.0.tar.gz -> gruff-0.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c6603d70a015bb52407a6d7df5b67bd
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2 b/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
index 520ab107e23e..ee2f4784e722 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gruff-0.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d15505223efe813a19ca5ae2647af017
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.2 b/metadata/md5-cache/dev-ruby/haml-5.1.2
index a084e028d05e..6de65b1d8022 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.1.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.1.2.tar.gz -> haml-5.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c59c2feda3bb9adcdac0fc64668e1c2
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.2-r1 b/metadata/md5-cache/dev-ruby/haml-5.1.2-r1
index 54a0d18d8877..b8bbd295b5cd 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.1.2.tar.gz -> haml-5.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f88e44540b5905ab19ecfac6325f503c
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.1 b/metadata/md5-cache/dev-ruby/haml-5.2.1
index 56ca6f87b6c8..375d3ba32238 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.2.1
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff53044f704f6d136d856dc24fdc4fce
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
index fea6ef8c24ce..bcba873cbf43 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2e3b092acd0eb86fef6e5ced378ce10
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
index f238ab47f103..242a830c29d8 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hamster-3.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=680d3a0079f1b6a9a27c1ba23216cfbe
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-1.0.0 b/metadata/md5-cache/dev-ruby/hashdiff-1.0.0
index b3c4c79267de..2091efa493e4 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-1.0.0
+++ b/metadata/md5-cache/dev-ruby/hashdiff-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashdiff-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb7d8382bc76e99e86f96864cc6d744d
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1 b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
index 0bdebcde5531..52e79643462f 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
+++ b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashdiff-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c6f7c1a99c89cf9ab787175528e94f4
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2 b/metadata/md5-cache/dev-ruby/hashery-2.1.2
index cd20a1068c2b..12a8f1384ea0 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashery-2.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8828ef6b0286114440539e613296a2d6
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
index 884e086580e9..a5a7c82d73f2 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d7f13eb2465ba7a3b6ccbc0fbb2eff9
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index 43118fdf6ab2..0194df36dcb9 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashie-2.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a7017a5c6745cea56369c064242f470
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.6.0 b/metadata/md5-cache/dev-ruby/hashie-3.6.0
index 103e24fc67f5..de46c1e309eb 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hashie-3.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/hashie-3.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2a1198cdd96c08b301057e89a7144f3
diff --git a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1 b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
index a22369d57874..174020f4d54c 100644
--- a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/intridea/hashie/archive/v4.1.0.tar.gz -> hashie-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a7ec7d88b86af5559a336fc5b53e101e
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1
index a7724713abb1..eb29082756b9 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashr-2.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b4ae1bbbdcf7e2e1466770a25dad903
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index d5443471dc3d..0b6bda5bcc3d 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86858dbf55de3eb41adb78daeebf06f6
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
index b2cb34773e7d..52657e4aba76 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e33bd6f4b49e7627706bfc03af63862
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.6.0 b/metadata/md5-cache/dev-ruby/hiera-3.6.0
index 45e78e20f2e2..002ebefd29c2 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0fe4b59bee92a8ddf3fcc511d0a666a
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.7.0 b/metadata/md5-cache/dev-ruby/hiera-3.7.0
index de2c9c23f74f..258a417b4be2 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.7.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1065aeb9fc98c081759e2782b673ee7f
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
index f7de49653ca3..951c2f51742e 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6cea6e67ae1b58e80a5e24f6b247ce9
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
index e13ae280ee8c..964bffb40fec 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-gpg-0.7.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96bac9d74e0c46558ca895ca9722023b
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
index fa8948f9a48c..c4a8e9c6b874 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22a97b41e83e6dcd6fdd0ac34ce5e53f
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index 78be02acec27..e9ab0183e266 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc4ba5496eabdc9ae1e140a52f5d2e10
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 31dd6188a2ce..ee4944c9f5ee 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89fdc656c756246e03ce9f424dd3b054
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
index 19a6bda0cef3..7ee7e3ed412c 100644
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46ec51d64432b31055667210d470c17c
diff --git a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1 b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
index 0c03abe66104..302aa2ebb7b3 100644
--- a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
+++ b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/histogram-0.2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1db1d38cfcada659fcfe7232af35e2be
diff --git a/metadata/md5-cache/dev-ruby/hitimes-2.0.0 b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
index 998ff5da399b..3772da5dd983 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hitimes-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1490cf35f4933085e182d815cef7dc4f
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.2.5 b/metadata/md5-cache/dev-ruby/hocon-1.2.5
index 804654979a22..f27319062643 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.2.5
+++ b/metadata/md5-cache/dev-ruby/hocon-1.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hocon-1.2.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ada4fe2ef0a4c73fa37915cc22071712
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1
index f8e24079878d..d41809b29fdc 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=94d947e6b6ef818b8c756f6a3e94a37b
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index fca419986a8e..cb5bde025b5c 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d952c24dd908f4d2415469ef97cb13b
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index c2ae57b5edc7..71933c322ce0 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=40f776ca5a1d9f0e3f81d34457449b6e
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
index c6ddd15539cd..b3e2bcbb2dc8 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f02a1c6bf69942273535ac42ccffc91d
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index 5b8cdb33ba82..0a5f74cff9d8 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=871ba9f8a8312f1d1a530db3dea9536d
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index 8a528f1b0635..d592c3534e4a 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/htmlentities-4.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe37dfee176b8b4e2ac03036d7879923
diff --git a/metadata/md5-cache/dev-ruby/http-3.3.0 b/metadata/md5-cache/dev-ruby/http-3.3.0
index 7058e05bd407..8bfd54ac5f8e 100644
--- a/metadata/md5-cache/dev-ruby/http-3.3.0
+++ b/metadata/md5-cache/dev-ruby/http-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/http-3.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb728a3db46cf6fb8a0138b7378f2004
diff --git a/metadata/md5-cache/dev-ruby/http-4.1.1 b/metadata/md5-cache/dev-ruby/http-4.1.1
index 2d492ecac0a3..810ea80e2edf 100644
--- a/metadata/md5-cache/dev-ruby/http-4.1.1
+++ b/metadata/md5-cache/dev-ruby/http-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca1207ca6dea6cfd88ee2045e832ff81
diff --git a/metadata/md5-cache/dev-ruby/http-4.4.1 b/metadata/md5-cache/dev-ruby/http-4.4.1
index efd47d9c4b32..cd76405c393b 100644
--- a/metadata/md5-cache/dev-ruby/http-4.4.1
+++ b/metadata/md5-cache/dev-ruby/http-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e13c89db8792ddd970e4e906efa9af2
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
index de2828971875..da74e3ab05ec 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84c0c82bb9957de694b8c9f6ed89c8dc
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
index 905700fff54f..d297943c4518 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.1.1
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55b02e53c406e248497f6dea7b2275d4
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
index 705637074e20..566b7e5eff98 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2117629e79e8fc6b7c2e8c2b56404eb2
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
index 78389a5122e4..8100f042e8e9 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
@@ -12,5 +12,5 @@ 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/http-cookie-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af4aede3444dfd686b0de853ea6fd99f
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
index 2abbf266abde..1127279b9c0a 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e11f29a7fb1f32216d84d0d9d9cbbf64
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
index 8914099ba8a4..6b4abe458f11 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8ea209064479366f740233c3e7b4dd1
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.2 b/metadata/md5-cache/dev-ruby/http-parser-1.2.2
index ae4ebec4fbc8..46bf316d4e7d 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.2
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21216159ffc3cfdc2910d47440523086
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.3 b/metadata/md5-cache/dev-ruby/http-parser-1.2.3
index 948e4a59d5e4..88bed25cfd97 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.3
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cd04b60bfd693e074fd28dfbff31a6
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 5b4567d2ccf4..66ea1d5c6f6f 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http_parser.rb-0.6.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f9d6441c1d19b729fee69c0024f5ddb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.17.3 b/metadata/md5-cache/dev-ruby/httparty-0.17.3
deleted file mode 100644
index 84c3a11ad985..000000000000
--- a/metadata/md5-cache/dev-ruby/httparty-0.17.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/mime-types:3[ruby_targets_ruby25(-)] >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/mime-types:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/webmock[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/webmock[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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Makes http fun! Also, makes consuming restful web services dead easy
-EAPI=7
-HOMEPAGE=https://jnunemaker.github.com/httparty
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/mime-types:3[ruby_targets_ruby25(-)] >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/mime-types:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5.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/jnunemaker/httparty/archive/v0.17.3.tar.gz -> httparty-0.17.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec1418db30506a8193a617e89b8c5d8e
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.18.1 b/metadata/md5-cache/dev-ruby/httparty-0.18.1
index 0430d949599d..ae1edf917112 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.18.1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.18.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.18.1.tar.gz -> httparty-0.18.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9c6e4a56ffd9388c2253356c633f267
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index 64a7b9922ebb..c43c2841b244 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f19f865ea68f8ae5ab8e7ac5bfb8a517
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index 9e4f5d10a9cf..2dd2dfb13720 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -11,5 +11,5 @@ 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/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef14bb17c765dbe148fb3c2edb46a9f1
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.10 b/metadata/md5-cache/dev-ruby/i18n-1.8.10
index a58f66b6256c..a57e351dc949 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.10
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.10.tar.gz -> i18n-1.8.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c62ae75095c0e96abe191fe4b391d00
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.5 b/metadata/md5-cache/dev-ruby/i18n-1.8.5
index bb1f7a96a731..edacfe13aad1 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.5
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.5.tar.gz -> i18n-1.8.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2302f3e3ed2ac81c17cdee4fc0ba2130
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.9 b/metadata/md5-cache/dev-ruby/i18n-1.8.9
index 50228de6c37b..5e3378c3c406 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.9
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.9.tar.gz -> i18n-1.8.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8a07367d880886b7ea6bb24165bc00e
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
index c1b49cfc9837..69258739be64 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd6a9d2e4ab936abf3a869af61fcc2e3
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
index 365adb633839..c1e1452fd2a6 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42dc1561531ced3579021f7f7083637e
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
index e387c850b138..b068759872c1 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53eadee1b0ad0b76c71ace4c5d6adff5
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
index da801abfe17d..78dd3e69677e 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=671665ae4de18e07707d856059e4784d
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.12.1 b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
index bcdef6fb2ba9..f596ce0cca9f 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.12.1
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.12.1.tar.gz -> image_processing-1.12.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=232ed8b18887b51e5da0573970895a2c
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 8c6c11e5bfdf..b1dc897e6ffc 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44336050ffef31296dff9eb6da57ce6d
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
index a380d0ccfc6e..7510592178ad 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/inflecto-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17c6b5077748e025e8c7c8fe743c8c74
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index 20b7e3601c99..9848adb9812f 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c17dd03e58b75c7a5f91c7656c071c5a
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
index 3c21c9c4f167..f3928e12f7d3 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee848b7b9654da14281b2d45f6694ed4
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
index 34ed34804a76..f7e6bc1ce0bc 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/instance_storage-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=239eff43bb190ba298c1ca6b339b13a2
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index 03f31d88b546..306dd453f9b5 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instantiator-0.0.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5893e4596777f0180eb8edbbc7abdec6
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index 46c7fa0e6cf3..49d6a4217588 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bbb07db412dc492eca3725d862b852e
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
index 5c9d4ab4bc50..ec49c275bac9 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e7b94d2b0cf1d68db8b4eb75a4bd018
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index bf4ed76e5d69..6197951a6702 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da18036d5158b57d1cfaa62027e9e4c0
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
index 9845f705ffe4..df42a63217ef 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5349034afd92e9b952ea9fc6880ab7b0
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.6.0 b/metadata/md5-cache/dev-ruby/itextomml-1.6.0
index 8b2fcaa86349..46dbef5ffb89 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.6.0
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/itextomml-1.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecd729cd1a5ec4d8a7e6ccf8ecb7be3c
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
index df3537ff75bf..c1733d6b5a5f 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7928513e569de515c728a326155e39f4
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
index dc666aadf29d..8e36b1e755e9 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da6795dfcf466dd24692528babe91ceb
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
index e9ba7db02966..cea38e3c6ff4 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
index 4a9ada09d2ad..fbe139bb0070 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.4.0 b/metadata/md5-cache/dev-ruby/jmespath-1.4.0
index 84be7adb499b..27cbdbfdce91 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.4.0
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.4.0.tar.gz -> jmespath-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fae365f01212cb59201ace230dcfc3e1
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
index 7d1c92cc8184..6d6b1eeb067b 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6426ebd830fd36cc2e69aafd6b72d0b
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
index ef0759a95f4c..57ef9eaf75e8 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=421f88884e5aaa5f1f41f0bda0d94503
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 865e0c6010b9..f243553b1ff7 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4.2
 SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d26a2bef7fc0c8b4c636a98c7e53f883
diff --git a/metadata/md5-cache/dev-ruby/json-2.3.0 b/metadata/md5-cache/dev-ruby/json-2.3.0
index 5b54c33e932e..dca61f95db5c 100644
--- a/metadata/md5-cache/dev-ruby/json-2.3.0
+++ b/metadata/md5-cache/dev-ruby/json-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/json-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbf8bebdb6a7601808cc494dd3351a67
diff --git a/metadata/md5-cache/dev-ruby/json-2.3.1 b/metadata/md5-cache/dev-ruby/json-2.3.1
index e658fc7db7e1..881e1a96a314 100644
--- a/metadata/md5-cache/dev-ruby/json-2.3.1
+++ b/metadata/md5-cache/dev-ruby/json-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/json-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3285fb85b36caae2ab905d7e687a12c5
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1 b/metadata/md5-cache/dev-ruby/json-2.5.1
index 3fc96216ac0d..26378c690c61 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7d25bf7860f74d08a26292f1bd31c73
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1-r1 b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
index 8dbcf6d73f20..32dd4f38b65e 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=7
 HOMEPAGE=https://github.com/flori/json
 IUSE=ruby_targets_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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_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=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de8b09c94148f9aec0efed360f08ce80
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d34cece4de1fd3e9da38004545fa657b
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.8 b/metadata/md5-cache/dev-ruby/json_schema-0.20.8
index 6c58e65479f0..2ddf63b75a34 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.8
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.8.tar.gz -> json_schema-0.20.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f0b658a6f8baf2aeefc6df7c3e5afc0
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.9 b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
index 9d04aa17f34f..a2c3c8edaafe 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.9
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.9.tar.gz -> json_schema-0.20.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05abd6605b04a339981fa2590e21c1a7
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.2 b/metadata/md5-cache/dev-ruby/jwt-2.2.2
index 52463682b0a1..be4f915aaf9f 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.2
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.2.tar.gz -> jwt-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a033c3af61613da6cb02318f8212a00a
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 4e9b4aa55d55..3023aa8a2a3b 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/KirbyBase-2.6.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d191b7fc485ad2e056fcae7cfe1ddbf
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 599cf7c9f0d4..5c17140fb3a0 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kissfft-0.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=923fff2b63a1557639874f3f685afd42
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
index 5c46bbeed203..5ae2e46871fd 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=A simple PEG library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/evanphx/kpeg
 IUSE=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 ~riscv ~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 ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a7981c2814eaccaea9bdd5739cd0619
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a994fb0c3df901cf2a9407ae9d1deb5
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.1 b/metadata/md5-cache/dev-ruby/kramdown-2.3.1
index 7d423a30827c..2aaba8a61c3e 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c445ca5394954edf805b10524e9a23b
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
index 20b98f1df797..a6bc83cb09a6 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=207e8284c07618b166a0b03f673b4461
diff --git a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1 b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
index e1263a066c57..12cd907cd355 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-syntax-coderay-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5cca2d3ee6a5192416ea51fc66e7984
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
index 1bbfb33ad096..15de4b21f669 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.4.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68a2a8dc9597d0d7c9ca44a3988fec6d
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index 91bc4c7e07dd..b85603629347 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -12,5 +12,5 @@ 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/launchy-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1ad556d4ff497edde6057bf6985adfa
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index 981ab8e1351c..570eed4e0380 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lemon-0.9.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ae50a81195d9c018f5700b3e716b521
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.7.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
index ac54e15540de..a4b957475c81 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.7.0.tar.gz -> letter_opener-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4f084504de2b25f54eafaa219f71e63
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index 13ed07d85483..7b301b15a5f4 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/levenshtein-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9978f7550c222c2c6257c15bd7631671
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4 b/metadata/md5-cache/dev-ruby/libusb-0.6.4
index 52edd8d60ee5..de67bb966a25 100644
--- a/metadata/md5-cache/dev-ruby/libusb-0.6.4
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a44a6859389286cab399044e36d3731d
diff --git a/metadata/md5-cache/dev-ruby/liquid-4.0.3 b/metadata/md5-cache/dev-ruby/liquid-4.0.3
index 7f522ecc2a7a..5d7c47209f42 100644
--- a/metadata/md5-cache/dev-ruby/liquid-4.0.3
+++ b/metadata/md5-cache/dev-ruby/liquid-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Shopify/liquid/archive/v4.0.3.tar.gz -> liquid-4.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e01726feae7fe36c60cadd5bc2947df1
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.1 b/metadata/md5-cache/dev-ruby/liquid-5.0.1
index 3804108e49dd..3626ff964046 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.0.1
+++ b/metadata/md5-cache/dev-ruby/liquid-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.1.tar.gz -> liquid-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8439b1563be269eaf398bac553e9b4be
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
index 99b9feff2f15..880aeb199762 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c47a72f1f40e8bea02b822b53756dc45
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
index 8083fbcd5d32..3fabeb55276b 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4fdd719348670776c1009cedc9791a6
diff --git a/metadata/md5-cache/dev-ruby/listen-3.3.3 b/metadata/md5-cache/dev-ruby/listen-3.3.3
index b70a414c1a64..5559fa8917c4 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.3.3
+++ b/metadata/md5-cache/dev-ruby/listen-3.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.3.3.tar.gz -> listen-3.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b6818c7545d40982876014b19860731
diff --git a/metadata/md5-cache/dev-ruby/listen-3.5.1 b/metadata/md5-cache/dev-ruby/listen-3.5.1
index 1526e9315c6d..e6f21e2f9e61 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.5.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.5.1.tar.gz -> listen-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2443fb52e35e8babb839f00a5f225021
diff --git a/metadata/md5-cache/dev-ruby/listen-3.6.0 b/metadata/md5-cache/dev-ruby/listen-3.6.0
new file mode 100644
index 000000000000..ad6155f75e11
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/listen-3.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/thor[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Listens to file modifications and notifies you about the changes
+EAPI=8
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[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=3
+SRC_URI=https://github.com/guard/listen/archive/v3.6.0.tar.gz -> listen-3.6.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7c928e6e73b500c0f2e131b11e0a33
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
index 57aebf67ff9c..e045ae0af17d 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/little-plugger-1.1.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd87a5f90d2657146899d3e2a7f2c724
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.3 b/metadata/md5-cache/dev-ruby/locale-2.1.3
index fc924f4ef7c6..30f1f944fe19 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.3
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.3.tar.gz -> locale-2.1.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2817ec1705a960d68b6a6d1d2a540f51
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index 72f899d9ce64..199960a1055b 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lockfile-2.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=722404714f8b22089afc8ddf25008fe8
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index f5e0ee3aafb6..201f36cf5a89 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58d9f7a3db1e66454ee8d258896b8eb5
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index b890e9ca668d..5875c3d5d4e2 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log_buddy-0.7.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e00bff025217e41f5d9204dba7fd8045
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
index 8a12db7f1a90..33b6931b92b7 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.18.tar.gz -> logue-git-1.0.18.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.10.0 b/metadata/md5-cache/dev-ruby/loofah-2.10.0
index 8fc90db4645a..a6b86f9ff9ea 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.10.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.10.0.tar.gz -> loofah-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d80aa4552b4f4069583c9d585a1f5b3
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.8.0 b/metadata/md5-cache/dev-ruby/loofah-2.8.0
index 77153e116301..3280e8db6e8b 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.8.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.8.0
@@ -12,5 +12,5 @@ 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/flavorjones/loofah/archive/v2.8.0.tar.gz -> loofah-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56e2397db1cd8263f8c732296c35d8f1
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.9.1 b/metadata/md5-cache/dev-ruby/loofah-2.9.1
index e15791650591..48c88b778859 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.9.1
+++ b/metadata/md5-cache/dev-ruby/loofah-2.9.1
@@ -12,5 +12,5 @@ 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/flavorjones/loofah/archive/v2.9.1.tar.gz -> loofah-2.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56e2397db1cd8263f8c732296c35d8f1
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
index 66cfd624bd7e..3e7fb27028db 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c998626f77cf6876833a1fdd0cbb4d9
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
index 146ec90182a9..aca219201c24 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.7.tar.gz -> lumberjack-1.2.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=129d96678de518eacad1d3697f371a3f
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
index 4a1d08b19723..6b845920bd24 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.8.tar.gz -> lumberjack-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a3b48093fd020b92ee9b517db6ebe9b
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3-r1 b/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
index 953867c1781f..1c33acb93fd9 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mab-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a2011cea3e24e00b992981dd421e5f2
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
index df0d1aee68f1..b7e5fdedcee1 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5399893bc074ed83750255693e616a25
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1 b/metadata/md5-cache/dev-ruby/mail-2.7.1
index 6cb1bc663963..0cf3eb1d91b8 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f5a8322ec61694be316c6510d4488ba
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
index 17642e4dc168..14c0c8bd54d9 100644
--- a/metadata/md5-cache/dev-ruby/maildir-2.2.3
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5edb6d767dff67eab0dc0d281ed8ba29
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
index 2f5a1386eac9..856a04831366 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/basecamp/marcel/archive/v0.3.3.tar.gz -> marcel-0.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db1c803eab2af9ea6eec9740dcd42cb3
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.0 b/metadata/md5-cache/dev-ruby/marcel-1.0.0
index e1a8ad2d5902..a48f0998417c 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.0
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.0.tar.gz -> marcel-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fde6866282a4bbf21eec61b1237c73c
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.1 b/metadata/md5-cache/dev-ruby/marcel-1.0.1
index a1ebaf38a9e8..757d17543bfd 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.1
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.1.tar.gz -> marcel-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fde6866282a4bbf21eec61b1237c73c
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3 b/metadata/md5-cache/dev-ruby/maruku-0.7.3
index 4a7ce9f10cd4..481157f13bdb 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/maruku-0.7.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a6bd5995703cb79882fb651145b1f03
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index e49400786c1a..095695f60ab7 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mash-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35f5f7fa7856e68c454ced53f0f78174
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.6.0 b/metadata/md5-cache/dev-ruby/maxitest-3.6.0
index 9b374af2b325..b649ce4e1a5a 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.6.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.6.0.tar.gz -> maxitest-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=925b53f48b2ebdcab7aeb0f49b0d7e44
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1 b/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
index da7340d57dfe..c98ac3ab08d7 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.6.0.tar.gz -> maxitest-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e518c86331625b1dfb032f2d13de79f
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index e6c015b96c9a..5aaf91962a34 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d81a019187cd360f863fcd21491383
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.7 b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
index 2cc5f7d74390..b83367842bb1 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.7
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5cc82da74885cbce42a1000503e93981
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.0 b/metadata/md5-cache/dev-ruby/mechanize-2.8.0
index 385734124ef3..87f4d9f7f533 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26ac86d339f8810831eba55bad59fd1c
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.1 b/metadata/md5-cache/dev-ruby/mechanize-2.8.1
index cc7fa046a02c..5680fc565d16 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26ac86d339f8810831eba55bad59fd1c
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.16.2 b/metadata/md5-cache/dev-ruby/memoist-0.16.2
index f61ba3467f6c..f29e0d280bb6 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.16.2
+++ b/metadata/md5-cache/dev-ruby/memoist-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoist-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d6046b51310380cefaf54fac04b01a1
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index 6daad1deb28b..ff923729f624 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoizable-0.4.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb52c1e49ba747ee813b390218b4013f
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index c61f2c9a6f99..5472951538d8 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoize-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77fb1b8caca38b97bed899b32edbaffc
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.4.0 b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
index b86fdf1941ed..10585d315039 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.4.0
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mercenary-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17594eed5549b7450b5944245e90bcf5
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index 275f52f70bab..236b7b27addc 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=164dae32624d13e4f7cbb86f51bb5a35
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
index ce414adf52f3..0030d7d0f383 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b6dc826413b7a91e3250905b263819c
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.4 b/metadata/md5-cache/dev-ruby/metasm-1.0.4
index 97053af8c517..da88e988135a 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.4
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0.4
 SRC_URI=https://rubygems.org/gems/metasm-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02ac899dd8083bb5e113ff4d23c6bc99
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.5 b/metadata/md5-cache/dev-ruby/metasm-1.0.5
index b9e9a2b9bb9e..6fa0e86c9069 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.5
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0.5
 SRC_URI=https://rubygems.org/gems/metasm-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=414731d9c8af0416824441fadb790b94
diff --git a/metadata/md5-cache/dev-ruby/method_source-1.0.0 b/metadata/md5-cache/dev-ruby/method_source-1.0.0
index c1bc959e3ce3..86d6883e9b5f 100644
--- a/metadata/md5-cache/dev-ruby/method_source-1.0.0
+++ b/metadata/md5-cache/dev-ruby/method_source-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/method_source-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=835ba589d2398982887f5666105ff25e
diff --git a/metadata/md5-cache/dev-ruby/middleware-0.1.0 b/metadata/md5-cache/dev-ruby/middleware-0.1.0
index a414dbce310e..e03af316da2a 100644
--- a/metadata/md5-cache/dev-ruby/middleware-0.1.0
+++ b/metadata/md5-cache/dev-ruby/middleware-0.1.0
@@ -5,12 +5,12 @@ DESCRIPTION=Generalized implementation of the middleware abstraction for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mitchellh/middleware
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~sparc
 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 ) !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_=bf20b274ee71f4edf631514406e60f26
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5a42e6589313f5494955afc9a9d56f22
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index 1ff39970e1cd..6b8fa00534a2 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/mime-types-2.99.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=183d57a6d55adeee44ac000b9a08e932
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index 20f207936c58..38bbdb923aef 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dba374499a7e83ec3017b8f4de3dc537
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2020.1104 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2020.1104
index 3b3d31a6e0a4..d58f1d3baf05 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2020.1104
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2020.1104
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2020.1104.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f6d28a2146bdd0aa2e7098b37be4ff5
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225
index 7a35bcacf30a..abf07f615e74 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0225.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6027eecfd0d71e8b191abd83477f21e2
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
index a23602065243..4c12f52690bb 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0704.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=406fe03f97ad61cd33b0cda8ddf1e509
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
index 6160cf1a5da4..9621dd6945ed 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8cea8b455708e85d72d76868c1a59e7
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
index 47ef378afc35..41f55c629e9f 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efcbca3c854049164e3949ccf3ced057
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
index 5eb0d1500b8e..303dc10a109b 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9dca8e57070ca9fbb4e4a79c4b3aafb7
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.2 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.2
index 22965e82c4d4..690ebfda5663 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.2.tar.gz -> mini_mime-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb9e2ae42ed7463d0b7f063ee67c5f44
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
index 16b75c1fbc9c..d9138337dc8d 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.3.tar.gz -> mini_mime-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce608a712dcd8d0fe30ecd308fc81163
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.0 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.0
index 764964a10cb6..da0b1c78338f 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.0.tar.gz -> mini_mime-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce608a712dcd8d0fe30ecd308fc81163
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
index be925e257b5d..24b4fae02e2b 100644
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b425c9445875f6649831ed561d61d2a6
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
index 9785e7d11618..75453c683fac 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -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/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4b5f9bde9d95888d65bc1be2cf13ffe
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index b731a075facc..003100f67ecc 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-4.7.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ad1c20fd5b9979da9a6de14e0ff1a88
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.11.3 b/metadata/md5-cache/dev-ruby/minitest-5.11.3
index 34c4d2ed2806..4b2646a0037b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.11.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.11.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9c3963e7ab953efb5e5df04e6bcb27d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.13.0 b/metadata/md5-cache/dev-ruby/minitest-5.13.0
index 24ef34e0cf04..85998550b2a8 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.13.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9203ed33ac0fd32cfbda98e4e00fcd59
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.3 b/metadata/md5-cache/dev-ruby/minitest-5.14.3
index fea45d7e60a2..727bee08f810 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=405bdcf2b1bb6ce8de0727ec06b535dc
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.4 b/metadata/md5-cache/dev-ruby/minitest-5.14.4
index e694a02a0926..74cde7f13dd3 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.4
@@ -5,12 +5,12 @@ 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 ~riscv ~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 ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=405bdcf2b1bb6ce8de0727ec06b535dc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17a583cbc9ee96e05d5ed3ebdab42869
diff --git a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0 b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
index 4a691c651e9b..6f399c9203e1 100644
--- a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
@@ -11,5 +11,5 @@ 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/minitest-around-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=306bbbc62107f4070427d053c29286a3
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index 1e5069418043..08950ef170cd 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48040033cc64bce051d482fccf05f12e
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
index 20d451142432..acbd1d59a7e0 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2252e7ac9231b33e8006eb218e7717ba
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
index d17d3a238e9a..d707391349e2 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8020b56cb2d837f25c2fe97c7d36dc2
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index a779b617f064..3538fcf3d03e 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2182f1eb06be19209239e003db19a6bc
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index f2d5e231a5d1..ea876e8afcb1 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2340e426027ae6d6fb8c2ff38b53e71a
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index 31bde75d337f..43463bf4caf1 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c31106bf7cdf36aa1af5cc3d9f0080db
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index be63eb8148cf..7bc0ccd9bd5a 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ed496c6a205455763eb71eb2c46c1d2
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9 b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
index d46ab3d6a4cb..ffdeab16721b 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v3.0.9.tar.gz -> mixlib-shellout-3.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=930c298477ed3f4b4cbccff575d3d1a8
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 27fa6d9e6604..32848bdc2e01 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31bc212c2722cd7e80688025f8d4a21f
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1 b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
index 8a760552bcbb..f8f13c7defe0 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=917a98a032e436cf172829ffecbe306e
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.12.0 b/metadata/md5-cache/dev-ruby/mocha-1.12.0
index 8617860ca5fe..bc78e4b6ecd7 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.12.0.tar.gz -> mocha-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1e47a636101f5ba0636fe874ad03c8c
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.13.0 b/metadata/md5-cache/dev-ruby/mocha-1.13.0
index 8f1f5262d98c..801269f0441c 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.13.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.13.0.tar.gz -> mocha-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1e47a636101f5ba0636fe874ad03c8c
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.8.0 b/metadata/md5-cache/dev-ruby/mocha-1.8.0
index 30ab6b06f2b2..94baaae0640b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.8.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://rubygems.org/gems/mocha-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fadd9cf1eaff44f3369ff8d85aa69f19
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.3.0 b/metadata/md5-cache/dev-ruby/moneta-1.3.0
index f2a74db2ffb0..1ea87c5406d6 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.3.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.3.0.tar.gz -> moneta-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.0 b/metadata/md5-cache/dev-ruby/moneta-1.4.0
index 7c77ab1a5eca..ccfba57a6998 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.0.tar.gz -> moneta-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.1 b/metadata/md5-cache/dev-ruby/moneta-1.4.1
index b948aa835398..a5f4940053d3 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.1.tar.gz -> moneta-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bba7f3771ed7c4d36d8fb76f09cc3c50
diff --git a/metadata/md5-cache/dev-ruby/mqtt-0.5.0 b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
index 51b14f0e0d47..8b0ebb125c54 100644
--- a/metadata/md5-cache/dev-ruby/mqtt-0.5.0
+++ b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/njh/ruby-mqtt/archive/v0.5.0.tar.gz -> mqtt-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ebdd4c1bf06228ee8c0a1b0f57aec687
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.3.3 b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
index 6b7b636f5618..9ee37fc7305d 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.3.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=611c6b8a44f2d56a30a0baeddaa35f3b
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.4.2 b/metadata/md5-cache/dev-ruby/msgpack-1.4.2
index 500ec9cc6ff6..c8eac838057b 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.4.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5599d3e66964f08de67fd1aa2e854561
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.14.1 b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
index dd232f15b78e..d8d19cf78eae 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.14.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.14.1.tar.gz -> multi_json-1.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d69b69aa313fe02b40f7eb04b921a3d
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.15.0 b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
index b1df33aa5539..fb8e353b4ab0 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.15.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbbd50160de172b98f3226337cc0f996
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index f8776b8407d9..376f9868cd69 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98b554c1097a23b8c6309a8c179efdfa
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
index bec88e07e0b1..56e14c474af9 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea1683dcddb2b20e1afb9b2593fc2144
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
index 908a6741250a..3d5e33c76a42 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ac9ac39ee4b6900e2ac52472728a134
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
index ace02ba7ab6b..6eeb43ea48a0 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aef71f88657a959ba3b2ca3ee1c78e7f
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index 4a899de75027..1d52fa28fa61 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0769071b58534beb8f581f28431871a5
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.1.1 b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
index a804fb895f5b..74fc09734d62 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/mustermann-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eada75fed8e32e78f7f576252eae2e98
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3
index 89d819a4b5d6..8acf37438a1d 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby25 ruby_targets_ruby26 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://rubygems.org/gems/mysql2-0.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=135f29c050ec5667ed30b0e06046d4bc
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
index af98f28b6739..ffa7b6a6bbf2 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby25 ruby_targets_ruby26 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://rubygems.org/gems/mysql2-0.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=221172c4222b8cb4b0bcbd19441fdbee
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index c2746fdd7ee0..0881177a539e 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nagios-0.0.4.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68243c2bd32a44760d05d03a77026770
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 42691233e3de..9ac419c70277 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nagios_analyzer-0.0.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0b0af24203bc3bb4eb1c11a9119317e
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index a1178bfa1021..31c4a111f5cb 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc1e21ce305800cdc10c822bddee28a5
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
index 10ec9c6f88e9..a7cf928e192f 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc9ecd36b49bb0b879ecf2b7e2058751
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index b0210a6a4e45..1816fb10af92 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b6d28b62e7a04a00069e34664af14109
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0 b/metadata/md5-cache/dev-ruby/naught-1.1.0
index 09c3190000bb..5998a84e8096 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/naught-1.1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8772675adeda7154ac39b91dcaec1e0
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.5.1 b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
index 747af0fe70c6..b29f3392e9e7 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.5.1
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/necromancer-0.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1365ed1f8149a96ef7b2b3675e2f5223
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.7.0 b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
index ab6fbc5df3fd..9ba8dcaedb68 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/necromancer/archive/v0.7.0.tar.gz -> necromancer-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=969125575321f0b35b32bd3702f4a009
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index 0354453b6e69..942e0458382f 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ba70ca270821b907b8fba241cf5c4b5d
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
index e086f1a6941d..29ad1995ef9b 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/neovim-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5a33a9356267b812a7a9ea9f9fe327d
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index 36c2c6a92bf9..fe267a534d4a 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f81ed009ca52ebc2aca5849bcd9cc522
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
index 3235b3c6ee1b..e001d4aa015a 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ddfd1274226735fd63bdbad28624bac
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
index 74050fa883b9..6a6e4734f082 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/net-http-persistent-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e3337a52a573b8e3990b81debcc8cda
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
index 0dab61a34a3d..a690744f0bca 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/net-http-persistent-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95faffda133a61fec4bcb4063bd34250
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
index 96340238ee04..01b6d7a12b4c 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd612a8d2929ecbad66f14cca6740117
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
index da9bb2a63454..83bcda274d61 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b981f78994353509c4f729f5588d6be6
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index 58a8a2a52883..3f8a41cc0ab4 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/net-http-pipeline-1.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=964dce7f6e3e0310526fee3c937b02c9
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1-r1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1-r1
index 7d05cc9a9450..7d3983b1c8da 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/net-scp-1.2.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3fc1058091847a24b61bc2844e0d3bc1
diff --git a/metadata/md5-cache/dev-ruby/net-scp-3.0.0 b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
index 69cc3cc3fb7c..2d2a42349aa8 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v3.0.0.tar.gz -> net-scp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bba86f9eedec74590f2869c231b20cf
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0 b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
index 7898dd918a7c..0b2fdefa2a4a 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-sftp/archive/v3.0.0.tar.gz -> net-sftp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f204728753df33bee8d85f861e23cdeb
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
index 166c11284eeb..1e50b1b2f73d 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.2.0.tar.gz -> net-ssh-git-5.2.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed002f949b3e4b262a06ca0b637ed7a4
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
index 1520f91e1356..f23584e0e220 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51ed2707d6f953df46c88d552103546a
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index 946531ae7e95..cbf0a06e0476 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e2568a876359508a1024f1bd15e0439
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
index c8074faf46b5..1cf17e9137ca 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Provides telnet client functionality
 EAPI=6
 HOMEPAGE=https://github.com/ruby/net-telnet
 IUSE=test 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 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=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a11a678d9710465436a5825156507ee
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b143fd426b27eb310539b49449aae28
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 0ed1633f174d..dd9b4e051cd3 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c455b30f2a59d3330faf076c7e86c44
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
index 620a9a041d0a..4d06328cd4eb 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6e0a0212fe69c2c211053cbec2df04
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
index 97241775c69f..682ab0a34d03 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/network_interface-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83fa0e9cd3dee0ad2d390e681a92a236
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index 7e0113de7eb4..dcb102c252c5 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/niceogiri-1.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1be431808e617fc2081b959ad8c138c3
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.4 b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
index a80438f99614..c357296810cb 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.4
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=daf0fd8829a69b5f9c177203bc3cf002
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.5 b/metadata/md5-cache/dev-ruby/nio4r-2.5.5
index 0c5d5d546e5b..771e952b760c 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.5
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cff96dbb977ba343a58db0d3d7f5a2bf
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1 b/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
index 0b3fe944095b..8570e77df1eb 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe3e421548053410a00435d93cfed2d2
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.7 b/metadata/md5-cache/dev-ruby/nio4r-2.5.7
index ccaaf4da22ff..40e829030a61 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.7
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95df9996217d5497fe543f6ca63b5bc8
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.4
index 6b5381685428..f39d155aad3d 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.4
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.4.tar.gz -> nokogiri-1.11.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98e8a8408234d3310e72fb53b5f7d420
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.6 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.6
index fc068e7f1681..3c2747c2b292 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.6
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.6.tar.gz -> nokogiri-1.11.6-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9d41536a3a45123cc5a25e8c47843e9
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
index 8058e13e686b..4877a574fe7a 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.7.tar.gz -> nokogiri-1.11.7-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9d41536a3a45123cc5a25e8c47843e9
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 7ebdc9223f61..06388bb17ab1 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nokogiri-diff-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=548c47e61b11b1b2670417a1a32e224a
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.2 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.2
index 53702dad46d8..ca3bc69869f1 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.2
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.2.tar.gz -> nokogumbo-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=843c26eb10e67ee4d28874c5dd346783
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.3 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.3
index deb83f99368c..4fcb25cbbc53 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.3
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.3.tar.gz -> nokogumbo-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fd953b741def506a004a81c1e886836
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
index dcfe2ae25156..993bd1857d65 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.4.tar.gz -> nokogumbo-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fd953b741def506a004a81c1e886836
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5
index cb58f3df6cff..384f7954a2b3 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.5.tar.gz -> nokogumbo-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f11fb18eef67b8743c5214b51fc895e1
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index eb731f04665a..684f49399c92 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/notify-0.5.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2bbbe86ee83908254c8eb0b0bfe799a
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index b9ef622ef841..8547866718c0 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ntlm-http-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96fdcfe49212069ceaa513c3182088ef
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.6 b/metadata/md5-cache/dev-ruby/oauth-0.5.6
index 1674e2bd8b1d..f12fdafabcc1 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.6
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.6.tar.gz -> oauth-0.5.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31d7c582a1f1e1983af8ec447d604c7c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.4 b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
index 81f31033d665..4c8c7ea06bb0 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.4
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.4.tar.gz -> oauth2-1.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eee1046d6d1e2c1444b3ed287a8d377b
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
index d16f75c3995a..582fa13573b7 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=227c2d5647e4aeca5d329e179966598e
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.20.0 b/metadata/md5-cache/dev-ruby/octokit-4.20.0
index f920ec377cbf..30ab7d1cce9f 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.20.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.20.0.tar.gz -> octokit-4.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e59d650b160a11a9a441984838cd684d
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.21.0 b/metadata/md5-cache/dev-ruby/octokit-4.21.0
index 5152e6fe4555..4014bf7fe2b6 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.21.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.21.0.tar.gz -> octokit-4.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e59d650b160a11a9a441984838cd684d
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.9.1 b/metadata/md5-cache/dev-ruby/omniauth-1.9.1
index 88840a16346a..fbd7361a1250 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.9.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.9.1
@@ -12,5 +12,5 @@ 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/intridea/omniauth/archive/v1.9.1.tar.gz -> omniauth-1.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=577a0d360a99cff2c9dacf825058ee46
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.0.4 b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
index fd6c7ace7acc..44efae49185d 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.0.4
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/intridea/omniauth/archive/v2.0.4.tar.gz -> omniauth-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8921c61d2e19844ad67e24c8f05c04b
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index aab63f6d9a7a..e3ede67c9341 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/open4-1.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=409d99716c75b2f4d0a61c5a884669fd
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
index 8ee3e13574e9..7084ea2b3d18 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.2
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7a4e7a44cae6ae17f6d681d3961543f
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.1 b/metadata/md5-cache/dev-ruby/optimist-3.0.1
index 6a2ac719b462..ea5f8cbdc3b9 100644
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.1
+++ b/metadata/md5-cache/dev-ruby/optimist-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/optimist-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67e9faca17a176a2d2bed22167eed0eb
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 1fdaaacdea9a..51185d27f4e3 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/optionable-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62cc2c23ae55c74c903bb6f9447fe67a
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index 1049f3d3a24d..21773c558ffe 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6a43393f8fcfe6b3d83aa2094ef0ffb
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.1 b/metadata/md5-cache/dev-ruby/origin-2.3.1
index 013c756045c1..ffe8aa40b001 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.3.1.tar.gz -> origin-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd0e62a71b4f6f0c57089e49eff29da7
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.1 b/metadata/md5-cache/dev-ruby/ox-2.14.1
index fa448e401523..b0950292d3ac 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.1
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.1.tar.gz -> ox-2.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39922d95debbea8b90b7a6b53ba99159
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.4 b/metadata/md5-cache/dev-ruby/ox-2.14.4
index fecdf65895db..d04ec60b92f5 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.4
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.4.tar.gz -> ox-2.14.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54121f88a21a6839c12151fa82f54ded
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.5 b/metadata/md5-cache/dev-ruby/ox-2.14.5
index eaebf06d6689..b5c1cb3b2329 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.5
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.5.tar.gz -> ox-2.14.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68660ad78d203662e5b6a5566cf63c02
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index 32035e0f56fd..3381a33c950a 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1.13
 SRC_URI=https://rubygems.org/gems/packetfu-1.1.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79ccdf5be14d8957f5d904881ce031dc
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.0 b/metadata/md5-cache/dev-ruby/paint-2.2.0
index bb5a90f81ede..dcc5e55eb454 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.0.tar.gz -> paint-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=106bf803e12fdf3a6fc344c44aa99782
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.1 b/metadata/md5-cache/dev-ruby/paint-2.2.1
index a1f68ca9a69e..6068842e86cf 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.1
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.1.tar.gz -> paint-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=374da28f9f0d7c72733bdc4a09b0697c
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.19.2 b/metadata/md5-cache/dev-ruby/parallel-1.19.2
index 5de5ff3dd6df..f1ec2bd664fd 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.19.2
+++ b/metadata/md5-cache/dev-ruby/parallel-1.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.19.2.tar.gz -> parallel-1.19.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.20.0 b/metadata/md5-cache/dev-ruby/parallel-1.20.0
index d816a7996dd5..5aa10bf0110f 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.20.0
+++ b/metadata/md5-cache/dev-ruby/parallel-1.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.20.0.tar.gz -> parallel-1.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.20.1 b/metadata/md5-cache/dev-ruby/parallel-1.20.1
index 5f6767d0b82e..88cc5b9ad927 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.20.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.20.1.tar.gz -> parallel-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/paramesan-0.1.1 b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
index 20eb70b9bbcb..9d21b9e0ce57 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-0.1.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/paramesan/archive/v0.1.1.tar.gz -> paramesan-0.1.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4082f55aca0133f24586924aecfc11ca
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index bdcfd4454ad9..b6ee22e6a3b2 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb1c3b74530dc318685479a20bfceba5
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.1.5 b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
index aab829ce8d1b..566722a291ba 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.1.5
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/parser-2.7.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d669eaea2d72b31d29ba5ef9627290e1
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
index 74993d1d8b53..b2c22d88a162 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5cc36e60b7a557d82fffe667ca4b0d57
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
index 655ee98fe8c8..8c094ea26455 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2c637fb3c8788602d77d5a331d5bf7e
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.0.0 b/metadata/md5-cache/dev-ruby/parser-3.0.0.0
index da7d40781c74..a0ec52f70779 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.0.0.tar.gz -> parser-3.0.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1a57b4b702653c02f1980d5a8e1c5fd
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.1.0 b/metadata/md5-cache/dev-ruby/parser-3.0.1.0
index ecc97d7f8ce4..8db738b4d33f 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.1.0.tar.gz -> parser-3.0.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1a57b4b702653c02f1980d5a8e1c5fd
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.1.1 b/metadata/md5-cache/dev-ruby/parser-3.0.1.1
index fc6215b5443f..b33628f24c44 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.1.1
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.1.1.tar.gz -> parser-3.0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65b309941fc82eed061ebaba6d628e2a
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.2.0 b/metadata/md5-cache/dev-ruby/parser-3.0.2.0
index ad57816c8556..20d84313e3e6 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.2.0.tar.gz -> parser-3.0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65b309941fc82eed061ebaba6d628e2a
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.7.4 b/metadata/md5-cache/dev-ruby/pastel-0.7.4
index 003d6eac87ed..19d72587c6f6 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.7.4
+++ b/metadata/md5-cache/dev-ruby/pastel-0.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.7.4.tar.gz -> pastel-0.7.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=319c804270e12852fd66cda52fc67e69
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index 68541a8c8896..7a59b378c9e5 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.8.0
+++ b/metadata/md5-cache/dev-ruby/pastel-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b11c77b87025ecb9bb9a6ca5e76c5c71
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.0 b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
index 9c6fd8a946a8..6ff9567b43c7 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.0
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91d1600b928aa7f8f71b020b471374d0
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.16.2 b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
index bcb9e63c977e..f5829a1232e2 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.16.2
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/pathutil/archive/v0.16.2.tar.gz -> pathutil-0.16.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2773ee4d8a0940af16e09e628959d21b
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
index 84fe106cd2d6..49b4de2e2da8 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b10b7c9b78475fc53a6f0658ccbddf0
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index 8573079752c5..6a5aadfbfcdd 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4fa444b6653729e588bcce33dc1634b8
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
index e1c52040446e..647d942c3c41 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0.13
 SRC_URI=https://rubygems.org/gems/pcaprub-0.13.0.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=996a4e30a6a8234d3ed8aa250d5e8e3b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
index e2426ab06cf2..554b1bb2adba 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.7.0.tar.gz -> pdf-core-0.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2412fd6ea9f3c62136f496cba4cf3689
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
index 951a897b220b..7baab33a40cb 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.8.1.tar.gz -> pdf-core-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=069da159be628c332ba89f4e45c79c8c
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
index f2a505a6e9f0..4f8af11f6cca 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.9.0.tar.gz -> pdf-core-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f69939dfb64ddff1714f8c9f8c0dd
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
index aa14dc704f04..78540da1cbbe 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pdf-inspector-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f888e9c449b0483a08c0cb3e8689c97
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
index 01fe936df952..d8d40696924d 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a177a7d99a754a3b168ab1ecc72b3955
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
index 12c5140f182a..6f5b1af64194 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=485b1b6b3b4c461708c2c875b2456a9c
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
index c3cbb933ac4e..07e0e10cef44 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.0.tar.gz -> pdf-reader-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b451eacdf93301e8e1f603296f77e824
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
index 2899d089633b..5c9c1dc9b841 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.1.tar.gz -> pdf-reader-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c8ee7d02b2fc8278780ce8a3a994ffb
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
index f6435e45aad5..4176a222a572 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.2.tar.gz -> pdf-reader-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3f56f86a1f26ca942b97bf8857a1bac
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
index d5368ccfa96b..2fc11fc3050e 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.5.0.tar.gz -> pdf-reader-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3f56f86a1f26ca942b97bf8857a1bac
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 43c6e5569556..81f51d615805 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/permutation-0.1.8.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4040ccd498c3e933dbd154e68e780704
diff --git a/metadata/md5-cache/dev-ruby/pg-1.2.2 b/metadata/md5-cache/dev-ruby/pg-1.2.2
index f0ec11cf9432..96d803b187c1 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.2.2
+++ b/metadata/md5-cache/dev-ruby/pg-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/pg-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83cc29a34cfc7ab5e94ffade28ef5aa8
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
index 12b8b4637e84..10f1e48cefe0 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.0.9
 SRC_URI=https://rubygems.org/gems/pg_array_parser-0.0.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c65ed4b1f6fd2f2cbde6d61f6f226b3f
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
index cff9902afa30..1743c76f3075 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0d9da3d651b6bf4a60aebbc0d034e3c
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.2 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
index 6f02d6964bec..1130fb6141b6 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb634a7018b03dd48d886cb853b88fba
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.3 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
index dac9f0d873a2..b01f33a1b315 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56c94707896826f4945ee0c8fe45353b
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.4 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
index 90d1c1e8f833..3adb9502b890 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.5 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
index 88db9f104f0f..4b30a7b72008 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
index e762313c85ec..6dde05078689 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/plist-3.5.0 b/metadata/md5-cache/dev-ruby/plist-3.5.0
index 89daa519f9c5..36cfc1169757 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.5.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.5.0.tar.gz -> plist-3.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=540b53a3521c8fd03d480750ec1e0cda
diff --git a/metadata/md5-cache/dev-ruby/plist-3.6.0 b/metadata/md5-cache/dev-ruby/plist-3.6.0
index 0142d0a822c5..cc4e0ee0d600 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.6.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.6.0.tar.gz -> plist-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5de5113e4a77d668f04b242b348c0d8e
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
index 0545a7d4a324..6c5a23ab79ea 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d51c011f51fa1641230b12bb13c326b
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
index 1a73a60bf22f..dd49a8f953de 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=810ff5a9aa3e2ca75270afe7560f8954
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
index c8ede96b4176..14c76f59352a 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f80b11d172aae60701be1cf18bb744f
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 8388d8ba7d97..261c45982d00 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/podcast-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97744be1821b2b801ad8d2c7898ee664
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index 93dbf620230e..238aa8cc82ef 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/polyglot-0.3.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8fecb39d7872a2fd0c89f20f7e57f0c
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
index 26f61c1393c0..ac52014c701f 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/posix-spawn-0.3.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=250e2eaa64c8cebb2e5586fb2e78c800
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
index b38cde1b0e21..ee679c3a111d 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/posix-spawn-0.3.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55808df16c4ea6057e56e1e2ca5a9072
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.5 b/metadata/md5-cache/dev-ruby/power_assert-1.1.5
index 21dc1d473a3a..0270b4453bc3 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.5
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.5.tar.gz -> power_assert-1.1.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b01c7376d047a656c1f9f137fdf2b8c7
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 b4313352fc6c..78253a200e6f 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9fb28297b9231d82c6e5f6bd980a656
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.2.0 b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
index 097070f910bd..3b432e686906 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.2.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v1.2.0.tar.gz -> power_assert-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=307cba43edef1687661822595092456a
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.0 b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
index b29bb62030fd..1895f03d4e5a 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=7
 HOMEPAGE=https://github.com/ruby/power_assert
 IUSE=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 ~riscv ~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_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://github.com/ruby/power_assert/archive/v2.0.0.tar.gz -> power_assert-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=25007ba05fa0f3e11ae631d74ebdeb75
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=202b4d3644cd1db5af8af0040e8b4c6f
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.2.2 b/metadata/md5-cache/dev-ruby/prawn-2.2.2
index 37c00ef9f617..3434a90e2283 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.2.2
+++ b/metadata/md5-cache/dev-ruby/prawn-2.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.2.2.tar.gz -> prawn-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b94071e14cf4bfdf812379e4fb33576c
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.4.0 b/metadata/md5-cache/dev-ruby/prawn-2.4.0
index 8eeab021ba76..5070da005954 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.4.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.4.0.tar.gz -> prawn-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ff5868f9682bbf2776b9e767bcbf43d
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
index 796a6be64053..a1902e13624c 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/prawn-table-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a650c6296a687b90c61d400b50f94150
diff --git a/metadata/md5-cache/dev-ruby/pry-0.13.1 b/metadata/md5-cache/dev-ruby/pry-0.13.1
index 48392409fa4c..6dbc786ee771 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.13.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.13.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.13.1.tar.gz -> pry-0.13.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8242c00fad9d949991d23da3a7a7b735
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.0 b/metadata/md5-cache/dev-ruby/pry-0.14.0
index af5e8bd03c63..5bbbdfc4ecac 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.0
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.0.tar.gz -> pry-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7b60def875cc7e201efc562d8050c86
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.1 b/metadata/md5-cache/dev-ruby/pry-0.14.1
index e810edb80ae3..4476c7129df1 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.1.tar.gz -> pry-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57d6bfc1d3ac19501b929161d1a2258d
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
index 59d5042256f0..f8227764ce02 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/public_suffix-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4be889f174a2a16354551c3a1f2305ce
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.5 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
index 7bff2d1e1222..d4ad10da0f51 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=409839739e1ea5ad9986e8d2b7b40782
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
index ef5a97e7ad3d..6b9703f7caf2 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fa0ff7ab77feba8952feede28c70a1e
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.1.0 b/metadata/md5-cache/dev-ruby/pundit-2.1.0
index 8fcfe1a2b5f8..935326d6bbf6 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.1.0
+++ b/metadata/md5-cache/dev-ruby/pundit-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71e8c7845ce69c470e19d143ab85f037
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4 b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
index a52d5234f224..f7a2aebb1539 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6561d89db28219445d210f486f5f2f52
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 31f133b453ba..aa2b74bc3086 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pusher-client-0.6.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95924b0260a4dc72de51d785511fe813
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index 697b3e5ac9e6..a7fe95612532 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/qed-2.9.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4a954247f2987d5bea0b954fa460231
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index 5ad58a06b98a..31cccc30ea0d 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/racc-1.4.14.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=04031ffbfdbf37caa5e7d87b48d42d05
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
index 2f80fa1cb7f3..dfe6d9fc55a2 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/racc
 IUSE=doc test test 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=LGPL-2.1
 RDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) 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 ) 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/tenderlove/racc/archive/v1.4.16.tar.gz -> racc-1.4.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5698b070cc99feace4fbff216c70e642
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75d5f5ec6de4d93be7b0c14c47fa4969
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2 b/metadata/md5-cache/dev-ruby/racc-1.5.2
index 8a1a482fd050..e25d03ce6dce 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fdea1ac0499fdeec74f75f5035c2e639
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1 b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
index da84c2f19af9..e39c6064ee66 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/racc
 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_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/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9efc2956010f56510c1795a2d279b32
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=363789ebaffbba84012876325523b01a
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3 b/metadata/md5-cache/dev-ruby/rack-2.2.3
index c4bb35b2cfcc..36290262c087 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6301d8cd8b38f0b114f7dfcfa468854
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.3.1 b/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
index 13857a350622..6d4db5a020e6 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c331c58240311ce92a3fc6481f882fe
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
index b3e2dfc7cc37..d54ef526ca7f 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3288639980cca4aa562899451b9c404
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.5.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
index fca5ecb65351..45b3d2440c87 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3288639980cca4aa562899451b9c404
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.12.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
index e1af205f97ca..909b69726f99 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.12.0.tar.gz -> rack-cache-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df02194600180f982dcbcab52469efda
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
index d0e8cd125b3b..0d389a1e1ea6 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.12.1.tar.gz -> rack-cache-1.12.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5be29691542afbbbdc98d1977466f515
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 8a842e6fba8d..811b115c93d6 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fc5362c2a5acb8cb257c8f3f4ad7930
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.1.0 b/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
index 19791bd281b8..9c8e8ff75818 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rack-protection-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5480cfcdcdc66b3769fc3e48816eafa0
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 50123b6d7f45..9319b34afcf2 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c39b7cc9ca9a72d4a6036d413d53c8a
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
index 00743afb98a3..08e48861aa76 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef82a9452a77bbfc95e22669b547c038
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.5 b/metadata/md5-cache/dev-ruby/radius-0.7.5
index 96c4dfa9562f..b8a5d6b0a774 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.5
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/radius-0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b98375ff88d47a7df9723b75818184e4
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.6 b/metadata/md5-cache/dev-ruby/rails-5.2.6
index 5e982a6b2148..ede0e1dc4df3 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.6
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://rubygems.org/gems/rails-5.2.6.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26507be0ed860ab012244a6277c60b8c
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.3.7 b/metadata/md5-cache/dev-ruby/rails-6.0.3.7
index 0767da898d55..ad7804eef9e6 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.4 b/metadata/md5-cache/dev-ruby/rails-6.0.4
index c6789f314a2a..4cf8e08b8c14 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.4
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.3.2 b/metadata/md5-cache/dev-ruby/rails-6.1.3.2
index 6008b08c11cf..758b95b237c5 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.4 b/metadata/md5-cache/dev-ruby/rails-6.1.4
index cffd4219fba5..7b8249fadce7 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.4
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6279d37f7a7185724dd84279800f32da
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
index 0ffb8bcfda94..be4561fc34cb 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=155e78c188ba5d54ef21bb4ee2670b0d
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
index 13c76a7a5573..10eabf197fc5 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ac02ad66afde058e6fb617d815e93db
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.6 b/metadata/md5-cache/dev-ruby/railties-5.2.6
index ccc9db633469..ad1d6f56ddbe 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.2.6
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2482b6309bc7f3c04a43708fc6c54d74
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.3.7 b/metadata/md5-cache/dev-ruby/railties-6.0.3.7
index 5dfdf6c78a83..b967e809fd57 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91126d3bcc589a11a8409f0b396b937e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.4 b/metadata/md5-cache/dev-ruby/railties-6.0.4
index fbd5e7a1056c..0425fa891d74 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.4
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.tar.gz -> rails-6.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91126d3bcc589a11a8409f0b396b937e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.3.2 b/metadata/md5-cache/dev-ruby/railties-6.1.3.2
index 10f481ebad50..7e64c4e4fbeb 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.4 b/metadata/md5-cache/dev-ruby/railties-6.1.4
index d83a64d9b07a..229ec9236d15 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.4
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.tar.gz -> rails-6.1.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.0.0 b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
index e5b4fb31ce86..90f7408e2c92 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.0.0.tar.gz -> rainbow-git-3.0.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2ed6ab41078bcb1cc281870c9d8fc7d
diff --git a/metadata/md5-cache/dev-ruby/rake-12.3.3 b/metadata/md5-cache/dev-ruby/rake-12.3.3
index a3f6c63d0d07..bc57710136d7 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 7fd6e00946a7..c1d2767502f0 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 0504cc51b0e4..b8582f4fb6b4 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 a927b57ce28a..ddbcd0c765f1 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 a3aafe1d17ed..705f1ebfc9d4 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6
@@ -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 ~riscv ~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.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f1f8dc5748b050b972f5456415f01792
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e5eaf48595aefb8600a6c6582211e3fa
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
index faa822f47dbd..c3e4d72df0cf 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.0.tar.gz -> rake-compiler-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=476c8a26185ce6e9fec8c60e115444d3
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index 9eeee4c09d18..74537d2e4d8e 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30802dcc60af54d998e12dcba08fd8bf
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
index 43660ca7b568..eea9ff8645df 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rake-remote_task-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97169a930016040d16b700e018c28c59
diff --git a/metadata/md5-cache/dev-ruby/rantly-2.0.0 b/metadata/md5-cache/dev-ruby/rantly-2.0.0
index 649fff0bc257..8d1436825f8c 100644
--- a/metadata/md5-cache/dev-ruby/rantly-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rantly-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rantly-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfe318331a146f7c903329743e1382b9
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
index ad2ed6701f3c..19847e2808fc 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash-0.4.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=387a19fe9e0bc906e260fcf45980bc71
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
index 44bf5427f114..5f678aca2220 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a88c69025438a92458ee35fa06aeea2
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
index 8b51df6dbe05..84b87c24d649 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gsl-2.1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31032a6bc5d147887f359998da09ca6f
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
index 6e6e3b7e3315..00424fcadfe8 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7bbcb4366f636105d52e40f4fe3c8376
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
index 16defb2577f0..f294fde5f465 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5e4ed21286f2866ca44d0d09eaa7bc5
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
index 7dcbd9df426b..ab8c41324812 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-readline-0.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5482a3e5eb76907bb0eb1a1509715c50
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
index 90b11d1d6689..2df0ddcbd083 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/rbnacl-4.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a2c56de159c987050b1006986506b77
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
index c89f87f12a01..d36691473f2a 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19b1ef38e880b4f22567c45b751b6910
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
index b835a39a61c1..4690c193446e 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6fadf63bf7b9a7a7c6dd80a8a51a757
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
index a7b64514adb8..f0102e77b3e0 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbpdf-font-1.19.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36c1880cbaa42eac1c20643737adf823
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.0.6 b/metadata/md5-cache/dev-ruby/rbs-1.0.6
deleted file mode 100644
index a646bb214830..000000000000
--- a/metadata/md5-cache/dev-ruby/rbs-1.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/test-unit[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=The language for type signatures for Ruby and standard library definitions
-EAPI=7
-HOMEPAGE=https://github.com/ruby/rbs
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD 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? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rbs/archive/v1.0.6.tar.gz -> rbs-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26f8a91358fabacebe53ee6ff1901c0c
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.1.1 b/metadata/md5-cache/dev-ruby/rbs-1.1.1
index 9a96ed4f17fe..40155ffd7113 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.1.1.tar.gz -> rbs-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26f8a91358fabacebe53ee6ff1901c0c
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.2.0 b/metadata/md5-cache/dev-ruby/rbs-1.2.0
deleted file mode 100644
index 63c89131e3a3..000000000000
--- a/metadata/md5-cache/dev-ruby/rbs-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/test-unit[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=The language for type signatures for Ruby and standard library definitions
-EAPI=7
-HOMEPAGE=https://github.com/ruby/rbs
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD 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? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rbs/archive/v1.2.0.tar.gz -> rbs-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c023b346e56eb1a24288116e18facb3e
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.2.1 b/metadata/md5-cache/dev-ruby/rbs-1.2.1
index 2acd5bb216cd..98cab1fb05e3 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.2.1
@@ -5,12 +5,12 @@ DESCRIPTION=The language for type signatures for Ruby and standard library defin
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rbs
 IUSE=test 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.2.1.tar.gz -> rbs-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c023b346e56eb1a24288116e18facb3e
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ffb5b5f9b25e5603860afe1fcad16e1
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.3.1 b/metadata/md5-cache/dev-ruby/rbs-1.3.1
new file mode 100644
index 000000000000..363cbf95892e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbs-1.3.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/test-unit[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=The language for type signatures for Ruby and standard library definitions
+EAPI=8
+HOMEPAGE=https://github.com/ruby/rbs
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD 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? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rbs/archive/v1.3.1.tar.gz -> rbs-1.3.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.6.5 b/metadata/md5-cache/dev-ruby/rbst-0.6.5
index 104aaca30b3b..8b2495b5c2fa 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.6.5
+++ b/metadata/md5-cache/dev-ruby/rbst-0.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alphabetum/rbst/archive/0.6.5.tar.gz -> rbst-0.6.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4f9716f2fbaf8d535cccdba11724312
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.5 b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
index 5cb6fa5ffebf..759ee947f744 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31a618bb2ac1129488ab42f9dc77c00b
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.6 b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
index ad9ddb662eb1..74b96d314d8a 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.6
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57f63b12d7cf1649cdc6c577d25886e5
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.5 b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
index b4c765a44dee..6c48655a36fc 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8a72646c2385096e4fefa0ab821984f
diff --git a/metadata/md5-cache/dev-ruby/rchardet-1.8.0 b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
index ffe0c3c1b537..406af06ac169 100644
--- a/metadata/md5-cache/dev-ruby/rchardet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmhodges/rchardet/archive/v1.8.0.tar.gz -> rchardet-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=192fe5c5d70f1723ece6879ac73eda3d
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index 711fd50c1921..02b9ec757e47 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77d8eb8fa9f39d8c8a0ceab50a613b28
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
index 6674c516ad57..4cff986e9ca9 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc7b6ecf78d7e2b17e43b2a31eb5ad0a
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
index a2799c693e76..92867ee7b64a 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f359c9dc6501c1b879c57a80ffe8487
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.1.2 b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
index ab71d74a3f87..5fa23e8e9bb7 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.1.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.1.2.tar.gz -> rdoc-6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a1058b1dfb69386f346455df85b5601
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.2 b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
index 3722b9fef5a7..94266ac690a5 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
@@ -5,12 +5,12 @@ 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 ~riscv ~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 )
 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_=7bee793679eb69fcb941a31dc871d591
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a007b87a92b54d9624c0b415e1d50c72
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index 8686e0f068f3..e6f21b322f2f 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7732ac483460ba34953095ba5a2fe53f
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.19 b/metadata/md5-cache/dev-ruby/recog-2.3.19
index 3b76b46d2f69..f225f2047c56 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.19
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.20 b/metadata/md5-cache/dev-ruby/recog-2.3.20
index c0041c7fe27a..870c684f36e2 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.20
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.1.1 b/metadata/md5-cache/dev-ruby/red-colors-0.1.1
index 8c5f70db2735..1fd3e9423aee 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.1.1
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf90d4b9ed1d21fa941e2fdc93528e00
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.1.2 b/metadata/md5-cache/dev-ruby/red-colors-0.1.2
index f85ca7ebe902..47249ecae536 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.1.2
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfee49ece0c3433bae56485a97efdd67
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.2.0 b/metadata/md5-cache/dev-ruby/red-colors-0.2.0
index 39023130b38e..dce390accf66 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.2.0
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfee49ece0c3433bae56485a97efdd67
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
index 7f15026611aa..c98f8b35e8ff 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a9504bc21bcef0a206ad56498df0fe7
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
index aa4922985f91..ce5b7e7aa569 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=d1169572f0755e3702ca3ed987bbb5f4
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
index f3d994c93a59..17686dd111ff 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=282bee112d5a159a0931623123540c66
diff --git a/metadata/md5-cache/dev-ruby/redis-4.1.4 b/metadata/md5-cache/dev-ruby/redis-4.1.4
index f5f24e6a7453..649c78e85dd8 100644
--- a/metadata/md5-cache/dev-ruby/redis-4.1.4
+++ b/metadata/md5-cache/dev-ruby/redis-4.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/redis/redis-rb/archive/v4.1.4.tar.gz -> redis-rb-4.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e8d9f37c34a6d3f3164c6136e23ea28
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0 b/metadata/md5-cache/dev-ruby/ref-2.0.0
index a7dc42e395d3..9049b6161dc4 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2596fe0838905b4e18a13ae884d6103c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
index bda386ae4536..1e5a64d78267 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.5.0.tar.gz -> regexp_parser-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dccc4b490a8d7c3e0b163154cf4cc62c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
index f55903bfd984..b424ed227e6d 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.2.tar.gz -> regexp_parser-1.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=342dc666070c5a23881919a35e543d58
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
index 2e35beca1e1e..2c98d26e0619 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87093e5ecf10c4b5fe9f9cf320539b3d
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
index 08be568fba51..6f8852f0cbbd 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23c8890b03292c8047d087ee28783809
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
index 10f82773d9b4..89516c5d7ce7 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.0.0.tar.gz -> regexp_property_values-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6a500059457388533975e5fd0abdf9e
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.0 b/metadata/md5-cache/dev-ruby/request_store-1.5.0
index 6cdd8428e357..05e9c23b5cf5 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcdd9622edcd12f133069d55de5a6d6d
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
index b380d328481e..41965f4a0204 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b17c28aca1975321a2a947d25066d908
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 2b88e95f3730..beda2614adbf 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cb5eb30632fe5a6179bd33438c8e4d00
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5 b/metadata/md5-cache/dev-ruby/rexml-3.2.5
index 243458ccb33b..7f0b46187c04 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5
@@ -5,12 +5,12 @@ DESCRIPTION=An XML toolkit for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rexml
 IUSE=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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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_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=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adcf7e2d40a281de80ac8d187ced0f33
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b26d6fb9576c6707fba36db31a81c8e8
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.6 b/metadata/md5-cache/dev-ruby/rinku-2.0.6
index fead5802a34c..25215b7fa117 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.6
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rinku-2.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9e83ddd895787156b6b49694294c034
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index 711651107575..ec3ed633b6c2 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ritex-1.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=134631fa8569354e2d6c05c51afec799
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1 b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
index 02abbd767189..4f31d4589fe8 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eaec1f06796d16aac9b8ec8e771f2bb7
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 9bb4239b769e..d5c526ae776f 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rkelly-remix-0.0.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=098d498131c683e264fe3fb06ad4148c
diff --git a/metadata/md5-cache/dev-ruby/rmagick-3.2.0 b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
index a7116e1b3163..9f39d6dadc34 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rmagick-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60d84807f197bdedb0471f0bccb2d59c
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.1.1 b/metadata/md5-cache/dev-ruby/rmagick-4.1.1
deleted file mode 100644
index 9dce6b51a2bb..000000000000
--- a/metadata/md5-cache/dev-ruby/rmagick-4.1.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? ( 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=>=media-gfx/imagemagick-6.9.0:=[jpeg] 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=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
-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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-1-1.tar.gz -> rmagick-4.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=188023e2b7b65bc9f87409414407a7b9
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.1.2 b/metadata/md5-cache/dev-ruby/rmagick-4.1.2
index d621b7755e74..ca047c090c44 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.1.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-1-2.tar.gz -> rmagick-4.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db92a333cac50eb09556ba6d486d44a4
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.2 b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
index aee0f2af876f..f6e276054713 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42adf110ccb4275f30bdc6dea947e152
diff --git a/metadata/md5-cache/dev-ruby/roadie-4.0.0 b/metadata/md5-cache/dev-ruby/roadie-4.0.0
index 41873fb79f84..f36efd554c1f 100644
--- a/metadata/md5-cache/dev-ruby/roadie-4.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Mange/roadie/archive/v4.0.0.tar.gz -> roadie-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=660aee3d989c4160155c800b483b5058
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1 b/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
index aa8cbdb02e35..15d8168e4fa5 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.1.1.tar.gz -> roadie-rails-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71552077f581bc50fe933f86145608d5
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index d3da54019cb7..53de4a8234fd 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/robots-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0c14e499642e7ad358da752adfbe330
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.19.0 b/metadata/md5-cache/dev-ruby/rouge-3.19.0
index 6e06fb743dba..d323646e9d49 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.19.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.19.0.tar.gz -> rouge-3.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45a7953429551a0acd1b79479e449737
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.23.0 b/metadata/md5-cache/dev-ruby/rouge-3.23.0
index 11134090d1e1..2af9645af543 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.23.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.23.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.23.0.tar.gz -> rouge-3.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=452675c218e8b6bd9019c1fe28ac7538
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.24.0 b/metadata/md5-cache/dev-ruby/rouge-3.24.0
index 95b53d33a42f..45c6c6654f89 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.24.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.24.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.24.0.tar.gz -> rouge-3.24.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=452675c218e8b6bd9019c1fe28ac7538
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.25.0 b/metadata/md5-cache/dev-ruby/rouge-3.25.0
index 0ad309912108..79e3298b30f7 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.25.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.25.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.25.0.tar.gz -> rouge-3.25.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=452675c218e8b6bd9019c1fe28ac7538
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.26.0 b/metadata/md5-cache/dev-ruby/rouge-3.26.0
index 67fe50edd9f7..7464b434177a 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.26.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.26.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.26.0.tar.gz -> rouge-3.26.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=128a755fa161c504a0cb479900f30ee2
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
index 08964fcb4f9f..5d7c5c9b8f98 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v1.2.0.tar.gz -> rqrcode-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c36d5951fced0a7deffe21eb4656be5
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.0.0 b/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
index 9915d41dc14e..fdaed68bf0ac 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.0.0.tar.gz -> rqrcode-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d751c53c820ba1e6154a239d0dfb9f52
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
index 6ec5ab5e1750..5c2f0e0732cd 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v0.2.0.tar.gz -> rqrcode_core-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b560259d92c32a6e258ee3a5d9dd4a2
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
index 11745ff45af8..a1118e16deb7 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.1.0.tar.gz -> rqrcode_core-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=712370465b1f5ba80ffa02146c9e11ea
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index 1aab80778253..941ff5a0a867 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=199fdc91a6b385d693d1228db43f6cf3
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.0 b/metadata/md5-cache/dev-ruby/rr-3.0.0
index 2ea82e82c50b..cf41f1bd9707 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.0.tar.gz -> rr-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b078706670a5585756d8be26ec236248
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.2 b/metadata/md5-cache/dev-ruby/rr-3.0.2
index 5f2543b78fb5..848b30e45e6a 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.2
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.2.tar.gz -> rr-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43d1b9bbcc7197714e1bd93bb4f26950
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.5 b/metadata/md5-cache/dev-ruby/rr-3.0.5
index 8d87ad872f77..61ea6e714f14 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.5
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.5.tar.gz -> rr-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43d1b9bbcc7197714e1bd93bb4f26950
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
index a133b5007dae..b62ac128bfef 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d68ea862efdd4fb27d4c048985868719
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 1835f03b9021..b13248f5491a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
-_eclasses_=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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c86bd0ecb2fed0308d4c154b4beed66f
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index 3d800e53b8b4..852f3fddadef 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -5,12 +5,12 @@ 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 )
 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_=5c12ce2d3c4caf3aecd7cef77c8b24cd
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=179689fb1ab6d1958c78df9015f55d53
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.9.0 b/metadata/md5-cache/dev-ruby/rspec-3.9.0
index aab33056efa0..f5bb881254a7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.9.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b3c5ecfa980884062d2442e2bf7be4
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
index 3bde0d167333..3071c6f1b8d4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-collection_matchers-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=835acda928e845a2a7a72eb7b2140294
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index 32eefae9a563..2a3b6241379d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c98e942b73036d696a071227061cb515
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 b11e182c5895..5e7e3aabf411 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -5,12 +5,12 @@ 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 )
 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_=50880b2d57dc89a493ad21896034b366
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fea9cb7ac3bf50ec3b185ddeb2f00bda
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
index bf0e634d5f7f..28b4d86599e9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.9.3.tar.gz -> rspec-core-3.9.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5eb8d1b54fcc35074856af7a48fcce6c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index e3722fad8218..bad16a791090 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=154f44cd7b7ac0706d18623ba45b420a
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 60986a594912..7769f2cbaf7a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -5,12 +5,12 @@ 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 )
 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_=b7eb52544e476d3057810d4752828c8a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1fe9e0f19fc3c671da849c580bf71f97
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
index 3beeb7463ef6..b3eeaf245f16 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.9.4.tar.gz -> rspec-expectations-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bdf7ec72ac0340bf107150247566de0f
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
index 202214101a19..8b98cfe9f493 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.2.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d93a103af9b09490d0fca86c56aaff7
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0 b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0
index f13471b7ddd1..0e8a7ee8d138 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd5d29cf04ded072f8c8a483e2e8c79c
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
index 99ecaa15af89..bd1d681957c6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcd421b61c441ed00bd0afee950ca311
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index d1b3c5664db0..f37f7886acab 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=394b55425f0605f1943080303b7a876d
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 646ba59fd556..c2ddd2251ae8 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -5,12 +5,12 @@ 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 )
 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_=6e037a6de03e60f0297ce4c1a4496c6e
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ff391fd06266c01642f3a165197f67b
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
index 023590d2a098..4f8489c77bd6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.9.1.tar.gz -> rspec-mocks-3.9.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d39f15043434bb269eb9750f05aee31
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
index e1875a1cbe5b..773d9bb8fba4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.9.1.tar.gz -> rspec-rails-3.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6fe0e6b3ba349479aec4da0c58cd611
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.1 b/metadata/md5-cache/dev-ruby/rspec-rails-4.0.1
deleted file mode 100644
index b7ec0eb0d810..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/actionpack-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/rspec-3.9:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/actionpack-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/rspec-3.9:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby25(-)] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby25(-)] ~dev-ruby/rspec-rails-4.0.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby26(-)] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby26(-)] ~dev-ruby/rspec-rails-4.0.1[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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=7
-HOMEPAGE=https://rspec.info/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/actionpack-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-4.2:*[ruby_targets_ruby25(-)] >=dev-ruby/rspec-3.9:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/actionpack-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-4.2:*[ruby_targets_ruby26(-)] >=dev-ruby/rspec-3.9:3[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=4
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.0.1.tar.gz -> rspec-rails-4.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=53478510803e16faacf0c7e7ac3d102b
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
index 832f037536ac..8aea63dfab51 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.0.2.tar.gz -> rspec-rails-4.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f89c8c255e36572f5c987420dab3893
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
index 956b31cd0003..e4dafcdf4c31 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.1.2.tar.gz -> rspec-rails-4.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb64696049e4f4768219a6ddea99c670
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1 b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
index 336944bebddf..73d7649792f4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.0.1.tar.gz -> rspec-rails-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df30e99ff9e43daebb78d6c06d4ebdfc
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
index b7e40923a5d6..2841a1f81103 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspec-retry-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=125efda5f6f5f16fc36d57e07deb0623
diff --git a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0 b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
index 49610e9ee294..7c4301439030 100644
--- a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
+++ b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-stubbed_env-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16860b027af3f092c6c670eee923583c
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 67958013c20b..1d46873536e6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -5,12 +5,12 @@ 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 )
 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_=dca3acb39f3a609a4c4afa671ce38f92
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba9b8790d51ca9a68b528c086f7e8457
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
index fa5fca119430..619eb780e4ec 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.9.4.tar.gz -> rspec-support-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3a8367995f96e6aaab9b0a82b4d249c
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index 36456f9c910f..adf2c6c879a6 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0da90500554c1f485f71df7b7312abc5
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9 b/metadata/md5-cache/dev-ruby/rss-0.2.9
index dd8bde20c28c..9e5c5e650df0 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9
@@ -5,12 +5,12 @@ DESCRIPTION=Family of libraries that support various formats of XML feeds.
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rss
 IUSE=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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rexml[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 )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23a9fc6b1cade474ec21938746e22737
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b602e4ee2d7d52284c7ef27e112fa84a
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
index ef8bb1de9ced..d317e0974db1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e45c1691b2fc39dd6d8e50c311304cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 7fd9d1c1e9c3..1bb2184e23af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36472186a07a73ac9a89813176ce0ffa
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
index 6acaf819aee2..a625e8f6cd1b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b3a3bfde1b88e00c32462f3c2b5f013
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
index 490d40c92ede..1dc6da8f8575 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=9219ec1a7dc03fde5ada071732075907
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
index 51a433027f7d..47f7fb7e420d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a3add72a981d0c7c27edd7711597709
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
index 678f2f8b8a19..befcdfc3d73a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=d56a4875b3b2cf439dfeeee122300c76
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
index d64a4f430d60..d72b85878f49 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=7e8e1e9562bccfe51d2c7be4abb02a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
index 428435523038..8f1b2a274801 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e82298a9a6825e533443a5747098656c
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index e23c6a84e8ce..a2b355e2f63b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbeb4c2223fe9be4a38a6bd46ee6288d
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
index 9e9102b2e74c..052513f1290b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.9.7.tar.gz -> ruby-feedparser-0.9.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=264e018e9ec1a89eab56c848ea0b849c
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
index 79ffefa76cec..d8d74d04d85b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd787aec0f909ed0838c2331a9c4c896
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
index f2b16203ff31..1317e6590aaf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=26fe993c21f8a7b71c848ce13fac91b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
index bf85d1c84b83..9a69468c4a34 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c014feff6743b2409f59e27bfd4a3a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
index 62d218d9550c..2e58b6c6ec74 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=436b0c157ef691cb85f11ff891ac87c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
index f75cce7c49e9..e428bd0beb86 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e72fd57dbce3c2ee1acee69e3faf5ac
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
index f80ebbebaefd..b6360d39bb34 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f92a2154e378b6f4f54036479550683a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
index 11319c7debc4..ef0e8ebc4385 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8eb4e62efd2009bc97bc6a512db183a1
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
index cf0b54627d51..18b8d0faac2e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9c101f1dd09980e0b59f835a76360cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
index 22cfc4eb3f3c..172025436e29 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby25(-)]
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d5b4e5787b6e1d9d28d22d80fdd4caf
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
index acc351cd7897..d21889efb953 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=0f4b13635743dfd7029cf43e979fe374
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
index 73d2ffda8ec6..82d6490d88a3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=709c1710707289c012fcfb0c8d66c182
diff --git a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
index 540dd421d0db..ef9f82561523 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=9e3f7cd4d38dac5a178dbd378de3ed64
diff --git a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
index 9455e0ae2c7b..a867cf1bc2ea 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d73b8eac709094cea24a7c1b26e5b7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
index a37f174d8f0d..ed70a1e48bc0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=3fc516fb7af14974e87d625ddcf5d5d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
index 33425587abb1..0335fb5f3660 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=9ba1132313b38ce5b122c503a091ee13
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
index be4a33300c11..b196d4b7a40c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=646a0bee3ee7e9ca46d0cc690274a57c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
index 87e8e30814dd..a236f2bef611 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=e69f11f409daf1421dfbc8e1b29e799a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
index 58786dad0890..17febae86c89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=5d53605dfd3d799272e55f0a838a6914
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
index 000ef7772580..899990682441 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=922d5dedca169523ffca11a6014372e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index f473fed606b3..23815b562249 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-hmac-0.4.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c3cce27356865cdc56dec07a9501067
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
index 53090d2ca406..22c9ad1c78f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=239596cce02480eb0805a704040139fc
diff --git a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
index 9f90d32b65a6..5d09080b065c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ba249c61dc417b9b610b28b0b245856
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
index 4a09c7a09862..bd2b5b275461 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/2.2.0.tar.gz -> ruby-macho-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e77251ad0e18a46b5a8a98969c314de
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
index 3112884e4bc8..e3315ebf7a20 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/2.3.0.tar.gz -> ruby-macho-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b6991ce26a27c270b02bcd59ebb626d
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
index 72ac7f35053a..aacb5d0eb1ba 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.0.tar.gz -> ruby-macho-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2880820aca8743acbe6c984f5cdd44c
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
index 96b03d473a4d..7b41689efd6e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.1.tar.gz -> ruby-macho-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77b6967233824d7ffa6af8a4f458b457
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
index 59bdd12ba933..fb00e1e1d596 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b17a3be59c20f3a0e276e88ed8ef8de
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
index 9c2c55d70576..4d58085e7496 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-ldap-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d10158017efde21deeefd65c1b11b71
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
index ccb0a02f0771..36772e508e08 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-ldap-0.16.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86cfe32cd794a1d8f2cb1da5ae0ce1a2
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
index 90548b072a02..7dfd9adfce32 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.0.tar.gz -> ruby-net-ldap-0.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7fabed627e9780b79994c86369f7396
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
index a1412dcd3de0..09e65aeaf659 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99999.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf3d95117a4d9840026abfc3d3b6db88
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
index daed78abf498..04f7e355d0ba 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=742d39571627b5172f4759d44f6d4566
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
index ae98df07a989..cd26dd1e6a24 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-oembed-0.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b653ab612196ada1e646846a742d27d
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
index fd0dd1e057f4..0dd0642785f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ole-1.2.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d7b305e3fa67e7421b459b6040333e5
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index 15d655049e6e..f091105c1d92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad9bdbe19cbf0ef3a818fafa61c6c688
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
index 733198b3b2e4..34256811ab67 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.9.2.tar.gz -> ruby-openid-2.9.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=787f59e034a777d2b21c8942f9e7a5c1
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
index 10ef58e8136d..6f6d2f75842d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c72e6ff3667b730995d8ba7c53be19a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
index 57dd54d20a8f..08d9f5e118cc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01fc4d39a36ac4cc47169761f78cfaef
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
index 4af554aae855..e7eb25e82420 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.2.tar.gz -> ruby-prof-1.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09879b02fd1beaaed3192abde17e5853
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
index e9d6a3092c75..4fe24ffa4bc0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.3.tar.gz -> ruby-prof-1.4.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3a42d7c8bc284ce457c8d2291de42bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
index 41102f252105..3d165e484112 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.10.1.tar.gz -> ruby-progressbar-1.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4c4f3ffbc2bb34f76e0a2672f0669be
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
index 1a5918f7af22..2e219eee174b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.11.0.tar.gz -> ruby-progressbar-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5729658ff81433cff6ed2fdb946ee3c4
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index 692a10c69f12..fc1edf33225f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-rc4-0.1.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b85521b662d644de8610b11447b7fdc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
index eb6c150d1277..78e88237522a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9706d06ac8818c0129cf160f66dd494
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
index e43850579945..6a1fa539379f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=37379b365a9c4867be765ee58b9889bc
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
index 29d626f77656..655f17bfdd23 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5[joystick] truetype? ( >=media-libs/sdl-ttf-2.0
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad9c088f2b37bacd085fd0595717c690
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 4ff3ccbeb4f6..5b22cfd67fa8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f83b2568807d4cdec12934c0b89c9cb5
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
index 1921b1cfb751..ac06bf7827ac 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e47f76bebc1f6122b4bc0b2623af82b1
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
index 4594524f03d3..9a98cc306522 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15a09d58bcbb83b56facc4808ad9a222
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index ce176668bf6f..9a681925f35c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=842486ab3a52d3d0db5126c8db73e4d4
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
index 5a58c8875b26..389c1b5b9050 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0d3a4bfef5ed2831e1a9440895c122d
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
index cb532d12edab..2a279258dc42 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bad87adc3ccb63ac7f3d1546a7da8b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
index 03edef03f2d5..49f19376b744 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=443bb38ac0e26a7f91261e55fa094e8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
index 1083ae7c6651..9f0a47360c6d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=f240019b3280cf236c6b754d5d8a79a0
diff --git a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
index 09759338b3d6..05dde2955422 100644
--- a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-ng-gnome2	bef3074f11f156e9bf5d1b45ff7fbbed	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=aaae1c7c85e4fefb9b4b610bb22961af
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
index aa0d42d0e94e..5a3a5595b3c8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-xslt-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15f1656fcff2be4439f6440daff9c9ea
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index 8c36b3c643d2..f4c19891dd8b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-yadis-0.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb347c1c408e690b2bc3e480d2db065b
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
index c4c7cf882de0..2dc392943f71 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef7937c25f0839c5d169e8c459169b58
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
index 13fa7c333056..c2c856ee1edc 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1355e930bf7d92562ac015e1b407867d
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index c27544e51189..36165b68df7c 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd366e40f8ee4461a93e8f0fc9ec1cae
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index 1d441dd3e45c..1001aa07116c 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25(-)] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.10.0:4[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=test? ( ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby30(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25(-)] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby30(-)] >=dev-ruby/sexp_processor-4.10.0:4[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=Generates readable ruby from ParseTree
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1: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/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby30(-)] >=dev-ruby/ruby_parser-3.1: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 )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6258c191ce909c0f2de3aa454562f2bb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=56637e663920ab7a21249a32a90c0614
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index a30ce3fef3c0..d19e3b7e138a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby_gntp-0.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d5a819059a0456e3a625187c1fea666
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
index f3cf88d69a36..de7409024cfc 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=47642a395e045e78237e28b1a596c8ba
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
index 3b8e6f0383de..e50663d4b61f 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99fb589d11b4bf35a4ed36207cdee426
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
index b4f27c1f2d0e..5e3721f12176 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e42b28d62dc040b7dc0cdd7a979bea1
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
index de8b87f8e215..6cd4317f9096 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14a4887a2c2427d92613befad7ffcf01
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0 b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
index e626b44b6153..c782dd939fd6 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ruby_smb-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d43308e4af2206c5cfde51f977e67a9
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.10 b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
index 64ce60144867..5f4f1d8d6588 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.10
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.10.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61ad8e3206364122d344e6cab2f66337
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.11 b/metadata/md5-cache/dev-ruby/rubygems-2.7.11
index bfe5bb6ec8a3..888d104da050 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.11
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.11.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a5722b7227582936a4a16ef2086e597
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.3 b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
index aea7b43264b7..a85a53236d66 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad310e7082c46e566cdc5d6dd00a0c56
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.9 b/metadata/md5-cache/dev-ruby/rubygems-3.0.9
index edaec8b5b114..50e68b92032c 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.9
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.9.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b20d97269aaac00463d81533fe429123
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.1.6 b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
index e6e5758a0dac..e5bf5a19ec42 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.1.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbddf996d4b542b87c68668c805e7c05
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.11 b/metadata/md5-cache/dev-ruby/rubygems-3.2.11
index 363126fab51f..35219410bc92 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.11
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.11.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6c303378ab9b795edd953c1d3cbe68d
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.13 b/metadata/md5-cache/dev-ruby/rubygems-3.2.13
index debc68f5dcda..0f164744ca03 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.13
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.13
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.13.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6c303378ab9b795edd953c1d3cbe68d
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.14 b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
index b743690ad158..2f7b3d88f791 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.14
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
@@ -5,7 +5,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=7
 HOMEPAGE=https://rubygems.org/
 IUSE=server test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( =dev-ruby/builder-3* )
 RDEPEND=ruby_targets_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 )
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.14.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6c303378ab9b795edd953c1d3cbe68d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b6c3328155b1111f2b3a61cee7db604c
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
index bdac05ef2d8c..1ecca58ec57b 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubyntlm-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59f895e4f8e2fa60a60dc87ebab05c27
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
index aed072eaf822..93982e944977 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubyntlm-0.6.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bfd5798e9cbacf24661cfc8abd7ed67
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.0 b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
index c068079ee29a..66c961f2e5de 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebdf08d4085ec1032e430e505fb8b08
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.1 b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
index 46d1c847a370..9549fab4f2c6 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=301a91ce08baca7550bb126326ed11ea
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index 509a6f63bbad..4b18f7b20c11 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-0.8.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa1859c824d4f176554fa5b207e10185
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index b8bc475bb588..34348c4c3488 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-cli-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=969418935ca257c26e85b40d5fd34afc
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
index 5d98cd0a023d..78a05e93c01d 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytter-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45176f57dd129772307f22e701b73d12
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index 22ea6b958d87..0376f15bb10f 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2f7325262f0726e54031236396ac6a9
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.2.0 b/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
index 4079042baf90..75681e29f0b3 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.2.0.tar.gz -> rubyzip-2.2.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ed88f5f0470fc7d569916b545735077
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
index 6edfdd5fe980..cbc18dabba45 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.0.tar.gz -> rubyzip-2.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86745bafcc0961f999af72d8d9ab8211
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
index d43809829059..5376a81ce806 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86745bafcc0961f999af72d8d9ab8211
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
index 8006c6e40b17..e78cf29fa84c 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abc76e97aa062fe5fd38fdf48b70bc58
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.1 b/metadata/md5-cache/dev-ruby/sanitize-5.2.1
index 2528d03e4dc3..97bc884c5deb 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.1
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.1.tar.gz -> sanitize-5.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.2 b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
index 021e88ce9e79..8510762b65fa 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.2
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.2.tar.gz -> sanitize-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.3 b/metadata/md5-cache/dev-ruby/sanitize-5.2.3
index 06e857de073a..3b0030c972bd 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.3
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.3.tar.gz -> sanitize-5.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.25 b/metadata/md5-cache/dev-ruby/sass-3.4.25
index 44b19c3e3b98..3cb3281da4a5 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.25
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.4
 SRC_URI=https://rubygems.org/gems/sass-3.4.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=1beb7fcbc7ae0e23e83b55091acbab74
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.25-r1 b/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
index c8c9b9f78690..e0142c3f0c15 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.4
 SRC_URI=https://rubygems.org/gems/sass-3.4.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=f986ad5763f0a4536f86dd833e44af92
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7 b/metadata/md5-cache/dev-ruby/sass-3.5.7
index 5e9659205d53..111ec532fbaf 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfd69e750c0383dcf2ecfe6cd8617ead
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1 b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
index bd5dc0b010cd..abfa516bd6a6 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6a1fd6a0e7f49119dcfa24d034020ff
diff --git a/metadata/md5-cache/dev-ruby/sass-3.7.4 b/metadata/md5-cache/dev-ruby/sass-3.7.4
index 5bd08c7e3922..d0cfcdf12208 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.7.4
+++ b/metadata/md5-cache/dev-ruby/sass-3.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.7
 SRC_URI=https://github.com/sass/ruby-sass/archive/3.7.4.tar.gz -> sass-3.7.4.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=488a48a1751fa2547c69f5e5a808b4aa
diff --git a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0 b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
index 3a0bb5fa020f..9e189dea10ec 100644
--- a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
+++ b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/sass/listen/archive/v4.0.0.tar.gz -> sass-listen-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef4951062d1fd0a7a86c90a1bfab399c
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
index 91411b31502f..ea04115cbd28 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.8.tar.gz -> sass-rails-5.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
index a9ff7288d87f..07c7af10a607 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.1
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.2.1 b/metadata/md5-cache/dev-ruby/sassc-2.2.1
index bc0231b65cc7..77bdec35f227 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.2.1
+++ b/metadata/md5-cache/dev-ruby/sassc-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7011526aed83e6d3bbce155d5ecb96a1
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.2.1-r1 b/metadata/md5-cache/dev-ruby/sassc-2.2.1-r1
index 6715f00580c0..9b027168e5e5 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-2.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b2b5e6c1e7e0435db9da1890af555bb
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0 b/metadata/md5-cache/dev-ruby/sassc-2.4.0
index 8b5fce0a8eef..f84c05d1e8e3 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b2b5e6c1e7e0435db9da1890af555bb
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
index eacc4e2fe716..9aa265e9bd96 100644
--- a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45c3693a98e13f8305c0a1e822893d24
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.2 b/metadata/md5-cache/dev-ruby/sawyer-0.8.2
index 9d2b2949e6de..d1bc54ae06c8 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.2
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.8.2.tar.gz -> sawyer-0.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28d22d749e690e05a518512a1c1e15b7
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.1.0 b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
index 139ade442226..d171f0e6d727 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-1.1.0
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sdoc-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ca0efd8a29c44b58b2596631b635244
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
index 4168d592f77f..a3b5a4f7d2f8 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bc1f4a87adaafd9344057feddb4ea30
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
index e7739e8c1844..35f08472c62c 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-3.142.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dc5c57347aa3d8c1f8757a67713d0a4
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
index 83182b4cf5a9..ff44e113557e 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebde591c66693df6f697bd1b60bd609
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
index d6e7e45b2601..d7d45be5a76e 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81975a18a3499300418db602c7611b81
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
new file mode 100644
index 000000000000..62b0f10bc802
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
@@ -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=Library of tools for working with Semantic Versions and module dependencies
+EAPI=8
+HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+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/semantic_puppet-1.0.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=62f0e93aaaa72166106d3d848533dcd1
diff --git a/metadata/md5-cache/dev-ruby/semver2-3.4.2 b/metadata/md5-cache/dev-ruby/semver2-3.4.2
index af0ecf7f5fea..1af72d89f8d2 100644
--- a/metadata/md5-cache/dev-ruby/semver2-3.4.2
+++ b/metadata/md5-cache/dev-ruby/semver2-3.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/haf/semver/archive/v3.4.2.tar.gz -> semver2-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ad7c25ae167938800c3514f8ea5f524
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index da0f94fb0660..9e49e5fccdb1 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3313a4e86accd5b7ec8c8e4136af40f1
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.1 b/metadata/md5-cache/dev-ruby/serverengine-2.2.1
index 951bfa81f873..70fb3b088ee2 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.1
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=661486db1c78db70352f931b9a7cac74
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.2 b/metadata/md5-cache/dev-ruby/serverengine-2.2.2
index 339046e27c7f..30c3ab96fc17 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.2
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=894f35b67398f8bb58caaabe93df947b
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.3 b/metadata/md5-cache/dev-ruby/serverengine-2.2.3
index 72afd16793cf..6576186e6f80 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.3
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c53e20fc40b00bcf44c5f9974663dd7b
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index dff938bc8c53..1dacaf5ef1fe 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/settingslogic-2.0.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b12938721b8a29b6e50504b2ac01e3a7
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
index f9a89e3a35bc..b88a44295c26 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cb61dc31721aa8aae99cac362775bb0
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
index 898ebce1fc64..4802b025f27a 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=25cc9c2c814c18f5d1919d46c27fa69b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
index ea2901a9c2a5..b07b640af7cd 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
index f019cd5397c8..34b906755ee0 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r2 b/metadata/md5-cache/dev-ruby/sfl-2.2-r2
index 72c4f8b63de9..62a70a85452b 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r2
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sfl-2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a9ab2dffafa50a3622db7d68d830d84
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.2 b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
index e8eff9a8f58d..df3e51fd8c95 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.2
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shotgun-0.9.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0b63da8112c3aefa524b9022c46f5dd
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
index 7b4245820133..46982907e01e 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f5ae50db35881f6658f805941a06420
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
index a8595a0e886e..e119b7fd63ac 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=901683567b6c5b1df7f9d4c73103c823
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
index 29f5db3202e6..4bb008604dd1 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shoulda-context-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=418598b65657bd9b1094c511d0d12efc
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
index 6a0487245e04..ce11bb3bc7e1 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6c3ae100654dd0bf15f088cc5ab0e97
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
index e171007f9a6f..9e8f68beff7f 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.3.0.tar.gz -> shoulda-matchers-4.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6e233f943c8a90d6619ec027be8271c
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
index cdf034cddb89..61b61c5fa216 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.4.1.tar.gz -> shoulda-matchers-4.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=499ac189158d1e67941696db0ce5abe9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
index cb6b924a5e0c..3d8f1de45e22 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.5.1.tar.gz -> shoulda-matchers-4.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fd41feb46406849e8d98848db756ffa
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index 9cbd92219d1c..e37a59deed77 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigar-0.7.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d999e14a2aecc88c93773132af5822e
diff --git a/metadata/md5-cache/dev-ruby/sigdump-0.2.4 b/metadata/md5-cache/dev-ruby/sigdump-0.2.4
index 6d05844f655c..995dc6b466d5 100644
--- a/metadata/md5-cache/dev-ruby/sigdump-0.2.4
+++ b/metadata/md5-cache/dev-ruby/sigdump-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigdump-0.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4d758b103a702c440e7d3ff177270ad
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
index d8709c077c9f..7cac6b909015 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simple-rss-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be28eefbb91f55b31de1702a84f04ec8
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index 05114abd4938..7aeb6b239d9d 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9b4df1f06fa4559152267ee75f00dde
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.18.5 b/metadata/md5-cache/dev-ruby/simplecov-0.18.5
index 725984c926ca..74ca0aa7145a 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.18.5
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.18.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/colszowka/simplecov/archive/v0.18.5.tar.gz -> simplecov-0.18.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d583da5d8e60394d2f7066545d9cedd
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.0 b/metadata/md5-cache/dev-ruby/simplecov-0.19.0
index 9fdb50cf9d40..8655b3f7c993 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.0.tar.gz -> simplecov-0.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54b26422bf07226a8a09e06a92d4d0b2
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.1 b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
index c64800d9c6f8..f1a570b69879 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.1.tar.gz -> simplecov-0.19.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54b26422bf07226a8a09e06a92d4d0b2
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
index 1938e94b790f..72304a040939 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.10
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.10.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0f63fb6d0b25ab18292a5d490dedc98
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
index eae0137f8ddd..682028c36418 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.11
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c821948057a424b0659cb7e76c29d45
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
index cf23ccaa0792..d67f36fc2776 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c821948057a424b0659cb7e76c29d45
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
index 1da054f0ae75..55e619c48751 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c821948057a424b0659cb7e76c29d45
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
index da1f37c0fc44..3b3161702e77 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c821948057a424b0659cb7e76c29d45
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
index 20874de3cf35..e286f7c30cd7 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9acaf9a09c72a02f9c36507b1a8a7a92
diff --git a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1 b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
index 826d62d99a51..3e1939a3b5a4 100644
--- a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
+++ b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
@@ -5,12 +5,12 @@ DESCRIPTION=Allows easy conversion from punycode ACE to unicode UTF-8 strings an
 EAPI=7
 HOMEPAGE=https://github.com/mmriis/simpleidn
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby25(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby26(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby27(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby27(-)] ) ruby_targets_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/mmriis/simpleidn/archive/v0.2.1.tar.gz -> simpleidn-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2bee486df6f1aa97598fe66402e16d99
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7fdf0a26a24cca937e8761ef49d23ac0
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.1.0 b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
index 590dd992942a..96346fd4879d 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.1.0.tar.gz -> sinatra-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6793f675b68b09bb220d20b77b560466
diff --git a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1 b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
index 0320f2aa6cec..9c6b15efa99c 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
+++ b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sinatra-partial-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fb5f27b573bfae0f097c49805a6358d
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index a9879eb79299..7595f19c2450 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48d4a891725ce50cdbfba8ab3f144f9c
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9 b/metadata/md5-cache/dev-ruby/slim-3.0.9
index 0605a0fe4789..8f708897af8b 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/slim-3.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79656c7948a2cd8c26c37ab316e430cf
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
index 95a852f7f920..ba4e1bef9ced 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/slim-3.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc83065256f384b42fcead3591e05e9b
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0 b/metadata/md5-cache/dev-ruby/slim-4.1.0
index b1d08c5059bc..fc670279a298 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58e882a19e96c42f46f89e74efb8dc6e
diff --git a/metadata/md5-cache/dev-ruby/slop-4.8.1 b/metadata/md5-cache/dev-ruby/slop-4.8.1
index 2314561d0c41..1f7c5896fe82 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.8.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.8.1.tar.gz -> slop-4.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71df450defcc5a2787a1b3eb9194aa43
diff --git a/metadata/md5-cache/dev-ruby/slop-4.8.2 b/metadata/md5-cache/dev-ruby/slop-4.8.2
index e5573818f1d3..6e511a81efb8 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.8.2
+++ b/metadata/md5-cache/dev-ruby/slop-4.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.8.2.tar.gz -> slop-4.8.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dca509b7a9eee040d8ae047e13f4864c
diff --git a/metadata/md5-cache/dev-ruby/slop-4.9.1 b/metadata/md5-cache/dev-ruby/slop-4.9.1
index dcc058ef13b7..b829a65dc58c 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.9.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.9.1.tar.gz -> slop-4.9.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=37c5342bdc03f3a9d1c50998c5797b71
diff --git a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0 b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
index 8656c2bab280..e5d6e60a171a 100644
--- a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
+++ b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/slow_enumerator_tools-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e55bfbccc8d5b24d70dde760b8ec7702
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 42e718bfd062..e6b74c578afc 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/source_map-3.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=634302f0443694c19bdfc6527e6c3ac8
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
index 763204e706ad..26f3c52fbf4b 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sourcemap-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d59def00b46586bec87294421c74952
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 86850fb2d518..e06c5dd4b0c6 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sparklines-0.5.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d12850f81c7330b2334ba0389e50bd53
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index 4222482f0704..619ed995d9b2 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spork-0.9.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b26443d18afae24aafef640c0d20c6e
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r3 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r3
index c2563625b1b7..c932fae7664a 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r3
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spork-0.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2265882e2de643a3e46ca5b0dea24dd
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6 b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
index 5a0f2fae0644..6c4eca64f197 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.2.6.tar.gz -> spreadsheet-1.2.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=067d5ef924106ab8126a35f52ac7fc38
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9 b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
index 961bd3112768..c2b7fa29cf8e 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.2.9.tar.gz -> spreadsheet-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1992110f3358b021d13fca138b9d092a
diff --git a/metadata/md5-cache/dev-ruby/spring-2.1.1 b/metadata/md5-cache/dev-ruby/spring-2.1.1
index 5e4f43bb728b..628bdb9c370b 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.1.1
+++ b/metadata/md5-cache/dev-ruby/spring-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.1.1.tar.gz -> spring-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cff63f653d8693f9d94117b7a8158ac
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
index 70cc45a5310d..fd11dded8c3d 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=6cfdd1fd8bba97046a603720d7f66788
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
index 7b3001d13bab..fb5dc0cc34e7 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=5f72ba992338d99644811a061e5aa1c3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
index ade626d6c23c..47f9779e97ad 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9eb168216a6ee2bbaff377c570427e78
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
index cd11e3bdf82f..61c7ea9709d8 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.2.tar.gz -> sprockets-rails-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ceae066d1f5711871febd05fa8170f0e
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.0 b/metadata/md5-cache/dev-ruby/spy-1.0.0
index 14dfc53f7869..26bd7e531ea7 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.0
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54a9a9c476b554b6419c32f56be0a401
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.1 b/metadata/md5-cache/dev-ruby/spy-1.0.1
index 7b4cbebdb248..56c8500ca1a1 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.1
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b78626073ab4d673a1873436ac69987
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
index dbd95ed7830e..af6123d9a2ae 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.3.13.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9a7f7593499bcbf9b1c9e8be25c1272a
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
index 60feef067b69..73cf9186df0d 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae5065a224cb4cc11da29ed1e15619c5
diff --git a/metadata/md5-cache/dev-ruby/sshkey-2.0.0 b/metadata/md5-cache/dev-ruby/sshkey-2.0.0
index f9bfad2d0fdb..f43907fda0fa 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-2.0.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkey-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9908097a4fe20d34fff1d3e4ecb8687
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.0 b/metadata/md5-cache/dev-ruby/sshkit-1.21.0
index add4f2c15119..992d9a4c59b8 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=141c9a1574b1f8781db99dad828f3909
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.1 b/metadata/md5-cache/dev-ruby/sshkit-1.21.1
index 5bc1a7d7309d..30d3d6bdb11c 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42a4ff1a8abb58a44a867253d8eb40a8
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.2 b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
index 34c06bf15459..a4a09bd29bd4 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.2
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
@@ -12,5 +12,5 @@ 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/sshkit-1.21.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16548214e94edde210fdbae7f2ef346b
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index 1c59b81f1f29..918a6b95a654 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f3084ed4dbe0d3c0966efd70cfc4bb0
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index fbe5bda46ec9..7e64cf450ab1 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/state_machine-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47967b9abbe5190830ecd3c7cae57af3
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.10 b/metadata/md5-cache/dev-ruby/stomp-1.4.10
index 7e1c7e241d99..7f3e2d1d06c5 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.10
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6b3ad24f64afcdf29e2acbaa00a5116
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.9 b/metadata/md5-cache/dev-ruby/stomp-1.4.9
index 9bbdc5f51199..b823a4a4ebcf 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.9
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d60fc2a6ec522ca1da38300076285184
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5 b/metadata/md5-cache/dev-ruby/stringex-2.8.5
index 8afacadc4368..82126d59d7f7 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b5ddba3ea9ae6c93b8a1044865f0219
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5 b/metadata/md5-cache/dev-ruby/strptime-0.2.5
index bed2d92fcf59..6db670af041e 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e37e4a1ca15efdb59bcfefb22dd5b0c8
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1 b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
index 4c3e7dd6348e..dcfe1b69552b 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dbbf90ba84c9e6b6e44bf94861c51168
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
index aea9d1a37aeb..0468832cfc8b 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac56d63ab94789f28402b64a6779874f
diff --git a/metadata/md5-cache/dev-ruby/sync-0.5.0 b/metadata/md5-cache/dev-ruby/sync-0.5.0
index 2c9de160e972..6d85475d039c 100644
--- a/metadata/md5-cache/dev-ruby/sync-0.5.0
+++ b/metadata/md5-cache/dev-ruby/sync-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/sync/archive/v0.5.0.tar.gz -> sync-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd0d2a7c5ae2b1b284ab8523c3f4d62d
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index fa8c08096c6e..ddbd44dc92f9 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7422cc7db0cda1ed51ddc80418a3c56
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 7f6f19c2af2b..701cd2c2c269 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ef24b79588f64f3c68728db91573206
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.5 b/metadata/md5-cache/dev-ruby/syslogger-1.6.5
index 5e661eddb446..56e160f0a8d5 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.5
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f0ed2dad3d118c6fd9b48303d8ec1a5
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
index 80024f1b2d8d..3acbf823f972 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6aca22828496cf7f8c6c1c0e32a359f
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index b3ff656de3b0..6886bd788be5 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/systemu-2.6.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1f757167a33acad0b4a2ab88fbc3b61
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
index bc5435b987b3..108665c847f8 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed7803e32428ed564c8caf1b832a5374
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2 b/metadata/md5-cache/dev-ruby/temple-0.8.2
index 95d0cc69af2c..b69f79a9a831 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.2
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=878fce08fbebd163eec49853f0a12214
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
index 42c36ac098c4..d3424c057971 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c53d8f49bf69f21a12f1568a76fd7fee
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
new file mode 100644
index 000000000000..b39b72438498
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/tins-1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tins-1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tins-1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( 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=Small Ruby library that colors strings using ANSI escape sequences
+EAPI=8
+HOMEPAGE=https://flori.github.io/term-ansicolor/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tins-1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tins-1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tins-1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=44f3bcacee968d61d1a82bd49234b8d1
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2 b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
index dbc876ded4c6..a29f9fdbba5f 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tj/terminal-table/archive/v1.8.0.tar.gz -> terminal-table-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa3ef94aefe2a0916d5ba63071c066f7
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
index 10a47290dc77..15616fb4d802 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tj/terminal-table/archive/v2.0.0.tar.gz -> terminal-table-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2d7c35e775a336621614288a946eb85
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
index 22792d796975..e3a4877c9c2b 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.0.tar.gz -> terminal-table-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24eecda49ec008b51ca907bd2a9bd6e7
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.1 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
index 56399ba5b691..867a7029ea1b 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.1.tar.gz -> terminal-table-3.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f3e786bcd7a794c37b2f886ddfcb252
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.3 b/metadata/md5-cache/dev-ruby/test-unit-3.3.3
index 5ee1c5826047..bbb58649c4a3 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfb88acb57b1464270bced5d078afca0
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 f96a29ef2ff3..e1091878275c 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96e22b89106d04c4962048a8a0041386
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.0 b/metadata/md5-cache/dev-ruby/test-unit-3.4.0
index b5e37324a91a..6379a9e432de 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.0
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=523e3bb95cb4d0075ce139ea178e4ece
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.1 b/metadata/md5-cache/dev-ruby/test-unit-3.4.1
index 63fd858f7298..2dac4dcfb981 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.1
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=523e3bb95cb4d0075ce139ea178e4ece
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.2 b/metadata/md5-cache/dev-ruby/test-unit-3.4.2
index eda10f858c7c..ae4ed74e62ad 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.2
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=523e3bb95cb4d0075ce139ea178e4ece
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.4 b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
index e6dbd7a4b773..bc71659d83ce 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.4
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
@@ -5,12 +5,12 @@ 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 ~riscv ~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 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=523e3bb95cb4d0075ce139ea178e4ece
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4db83fb4430d8c6d59e4528a7f6aa7e5
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index bcf20afc8c26..97c51f2385dd 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a9cc173596464f93efb0a641f426a2e
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
index 6df55c71353a..8a61477f6803 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c1bfd0fbdb981bc187c71bca62f6646
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
index 07e80c946871..1ac261c32e39 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.2
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test_construct-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4af7a35357abedbb4719a1fe8adc0ae8
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
index 9d192cff30b6..98bd72404fab 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.6 -> test_declarative-0.0.6.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d6bc8d6d5d1a6c433905fbf1c0036cf
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index 07a5289b9f1a..fe09c645366a 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7cbc51c03ea83d851ad145de29e8f61
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index dc58658c3bae..0b0697bab1dc 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-hyphen-1.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4bc16381a35db9ab70aebd71b1994a16
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index ac7c0fa669c5..f565412b45b2 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=318357794772f64c43f43c579f566d37
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.3 b/metadata/md5-cache/dev-ruby/thor-0.20.3
index 7aa74e6c783d..2bc8355124bf 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.3
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.3.tar.gz -> thor-git-0.20.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83a9f6758ca49940b19e7ee500d7c475
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.3-r1 b/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
index 3cecbcb333eb..b7e6a3011882 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.3.tar.gz -> thor-git-0.20.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc911a0c691659d3e5620633b02c6255
diff --git a/metadata/md5-cache/dev-ruby/thor-1.0.1 b/metadata/md5-cache/dev-ruby/thor-1.0.1
index 532cb123d8a4..1af4bc806ff1 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/thor-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.0.1.tar.gz -> thor-git-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39e11fd821cc1ce0806c3a4007bcabfc
diff --git a/metadata/md5-cache/dev-ruby/thor-1.1.0 b/metadata/md5-cache/dev-ruby/thor-1.1.0
index 774524191a70..07a81c739f4b 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thor-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.1.0.tar.gz -> thor-git-1.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f9852442c669d5238d653c0337c4ef8
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index 4297936c035b..0e1d73ed0157 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=475ec7a7ae9b8e4af7ac2b5d64ffa59b
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 05a27a15a372..11427d3c17b8 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20cfff97e64c0ba2d10a7feaee22f8ce
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
index a7ab2ecdd3e6..41593286516a 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=411c380b19e10e2b21d1d741c0ff0dbd
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
index db3967c41eb1..586a98d83774 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy-ext-0.1.14.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=faa9b3c4a036be4c5a502fda8582031a
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
index a61277de7c2b..981c6e1681dc 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy_table-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cecaaa032101307cc3f5c0685ea0884
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.10 b/metadata/md5-cache/dev-ruby/tilt-2.0.10
index 906354cdad70..64114f0fa709 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.10
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.10.tar.gz -> tilt-2.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=707d13d07ed852f1fb5f619753b7f080
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.9 b/metadata/md5-cache/dev-ruby/tilt-2.0.9
index 4db785d2ef08..47f27e14ed97 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.9
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/tilt-2.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=895a5d91d28c09eda288ef152ab259f8
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index 91362e1ac3ee..931fa06ddaba 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9c6c6e4b502d14bcd6ef8bf3da0ec5c
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.2 b/metadata/md5-cache/dev-ruby/timecop-0.9.2
index 013f9e9e55a7..e9213ffd0b34 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.2
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcf6d291ba4a52239539d21bbbce1683
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.3 b/metadata/md5-cache/dev-ruby/timecop-0.9.3
index b6c98bb3bcbd..075a5941db37 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.3
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a96c083f59b812f62079e921bc9f85
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.4 b/metadata/md5-cache/dev-ruby/timecop-0.9.4
index 260e76dc73ca..5a499268e331 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.4
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a96c083f59b812f62079e921bc9f85
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index 2e4504cc83b8..0fa5d0b42858 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a13a29effa5a676134011eb58f7fa4d
diff --git a/metadata/md5-cache/dev-ruby/tins-1.20.2 b/metadata/md5-cache/dev-ruby/tins-1.20.2
index 9fd2bdee12bd..d8bea2d409f6 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.20.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.20.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.20.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99785ab8e5d447baa43887753070848f
diff --git a/metadata/md5-cache/dev-ruby/tins-1.26.0 b/metadata/md5-cache/dev-ruby/tins-1.26.0
index d2a13e4578cf..74e01bb238f2 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.26.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.26.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.26.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b836655dade6ece3b009e95c06c1633
diff --git a/metadata/md5-cache/dev-ruby/tins-1.28.0 b/metadata/md5-cache/dev-ruby/tins-1.28.0
index 9582f1a2b404..79bd825f529f 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.28.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.28.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9931ec99d526c1394771e2c89c344f7
diff --git a/metadata/md5-cache/dev-ruby/tins-1.29.1 b/metadata/md5-cache/dev-ruby/tins-1.29.1
index 67c86741a65e..36e075926fb3 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.29.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.29.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9931ec99d526c1394771e2c89c344f7
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index 256f9a42794e..4044d4623d68 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tokyocabinet-1.32.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39ade17f45b3095f8e82ee85449989db
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8 b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
index 320db7889385..d0660326fcad 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v1.2.8.tar.gz -> tomlrb-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60f572f8b2f211030aa99213dcb6d79d
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.0 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
index 0cdcc87f735e..4df3a9820bd1 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.0.tar.gz -> tomlrb-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49bcdcfed3ecb260f7a6302d3b90a800
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
index 1e45cfe4736d..9275bcfacbf1 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.1.tar.gz -> tomlrb-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a9c42b3e8b99a9c9024f494c483196c
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index fd0879e41869..14f79d0a285a 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/totoridipjp-0.1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2fb896ad4bcd4089a7410c8b1845f46
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index 807a4a22a005..dcac6374c7f0 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/transaction-simple-1.4.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e833df6f1419d17b94068a0f3a7030e6
diff --git a/metadata/md5-cache/dev-ruby/travis-1.10.0 b/metadata/md5-cache/dev-ruby/travis-1.10.0
index ad8fc55725fc..4fd11692974b 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	d3a60385655d9b402be765a6de333245	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	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d4a8fa52ab67560aac69702a4f8719c
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.11 b/metadata/md5-cache/dev-ruby/treetop-1.6.11
index 3e2d9402d7b5..143c86159694 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.11
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cjheath/treetop/archive/v1.6.11.tar.gz -> treetop-1.6.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e97f810f05a37d66b33995a0108fedf5
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.9.10 b/metadata/md5-cache/dev-ruby/trollop-2.9.10
index c1e5f6d03ac7..2c602101c015 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.9.10
+++ b/metadata/md5-cache/dev-ruby/trollop-2.9.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/trollop-2.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ef4839bd8051b6b3d4e8516546a228b
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
index 8bc7074bd727..e718b404bcc6 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.1.tar.gz -> ttfunk-1.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58169e641ea11b51b26a701e3facaa51
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
index bd99dd920917..9ca4e225d97b 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.6.2.1.tar.gz -> ttfunk-1.6.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=268900a5b311b574c4a84882decf9365
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
index f3a4804729e8..c22f93da9aad 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.7
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.7.0.tar.gz -> ttfunk-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2456fac24d80ec980dc882fcdbee0a9
diff --git a/metadata/md5-cache/dev-ruby/tty-color-0.6.0 b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
index 41890ec9c537..4d29a8b00e68 100644
--- a/metadata/md5-cache/dev-ruby/tty-color-0.6.0
+++ b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1df9b9af5553067fa510e781f43508a
diff --git a/metadata/md5-cache/dev-ruby/tty-command-0.10.1 b/metadata/md5-cache/dev-ruby/tty-command-0.10.1
index 484b2b86f67f..65a43f3bf687 100644
--- a/metadata/md5-cache/dev-ruby/tty-command-0.10.1
+++ b/metadata/md5-cache/dev-ruby/tty-command-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-command/archive/v0.10.1.tar.gz -> tty-command-0.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3d6bf99e2f050cd8fde5bdef511b5f1
diff --git a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1 b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
index f871dd48ef12..1fe7cc0d4947 100644
--- a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=25a9d33467b91ea14f348fb283c34a71
diff --git a/metadata/md5-cache/dev-ruby/tty-file-0.10.0 b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
index 49a46810fea0..79c8e6b36cac 100644
--- a/metadata/md5-cache/dev-ruby/tty-file-0.10.0
+++ b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-file/archive/v0.10.0.tar.gz -> tty-file-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d76b629021827d1171e64114a9fb2777
diff --git a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0 b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
index 9874a4053fa1..5a62b6b05e1c 100644
--- a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
+++ b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-platform/archive/v0.3.0.tar.gz -> tty-platform-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1500928a1017902c6e6f9acf81ed5ed
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index 398b36a3a80f..2ad7d9cc475d 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -12,5 +12,5 @@ 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/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=930f9e3019c6454fcfde255e10e40e6c
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
index 05e073e20145..b9983dd5496a 100644
--- a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0343a46fbf7f7a5fcf3446393b4215d
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.7.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
index 7d4f3626c1ae..92627f783d8d 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.7.1.tar.gz -> tty-screen-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6226a66c6adb0b692e0311c402350664
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 0f456946761f..608d901b2df7 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b4f35bf004711439c95afa13944e7e3
diff --git a/metadata/md5-cache/dev-ruby/tty-which-0.4.2 b/metadata/md5-cache/dev-ruby/tty-which-0.4.2
index 6e7472cd2d91..5feecbe65689 100644
--- a/metadata/md5-cache/dev-ruby/tty-which-0.4.2
+++ b/metadata/md5-cache/dev-ruby/tty-which-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-which/archive/v0.4.2.tar.gz -> tty-which-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc0fb330e135d13abdc8c20e3830aa51
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1 b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
index 90fbedfd5106..37b55abc1e52 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/turbolinks-5.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ade34c76c0dc57c51f02a615c82ee5ad
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0 b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
index 393f027e064b..35fe8f666961 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
+++ b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/turbolinks-source-5.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c3f60f8d399cf7f8e83e89d9de3c3f6
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
index 6616f678fe78..5ecca06627b1 100644
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e31016550b699962e395cbbce035e686
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1 b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
index 3a4605a3bcc5..251f8a77a07b 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.1
 SRC_URI=https://rubygems.org/gems/twitter-text-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8622f17aad214d711c3dcd9d796436b5
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index 11a8d0ca219a..b2cb6f79dcb7 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typed-array-0.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ecbd4eeeff6446dde423ce9e83105f5
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.11.0 b/metadata/md5-cache/dev-ruby/typeprof-0.11.0
index cfac9956e2ff..7fb98b0e7779 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.11.0
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.11.0.tar.gz -> typeprof-0.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46bef5b530d2fe5bf8ebe8a4ebc14bb3
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.12.0 b/metadata/md5-cache/dev-ruby/typeprof-0.12.0
index 4d47ff4fd90c..d058b085943f 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.12.0
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.12.0.tar.gz -> typeprof-0.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46bef5b530d2fe5bf8ebe8a4ebc14bb3
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.13.0 b/metadata/md5-cache/dev-ruby/typeprof-0.13.0
index af13ee02be0e..91fed43b3ddb 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.13.0
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.13.0.tar.gz -> typeprof-0.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c0d4ee9b33e08b27f2ccaf6a3fedf91
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.14.1 b/metadata/md5-cache/dev-ruby/typeprof-0.14.1
index 0253223dc907..0adaf4485ec6 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.14.1
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.14.1
@@ -5,12 +5,12 @@ DESCRIPTION=Performs a type analysis of non-annotated Ruby code
 EAPI=7
 HOMEPAGE=https://github.com/ruby/typeprof
 IUSE=test 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rbs-1.2.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.2.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.14.1.tar.gz -> typeprof-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a40b3e1b5b7699c7a0e810d45d8baef
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0ce381da8b61269712931e598c350cba
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.15.0 b/metadata/md5-cache/dev-ruby/typeprof-0.15.0
new file mode 100644
index 000000000000..8a797ef5e5db
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rbs-1.3.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.3.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) 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_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_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Performs a type analysis of non-annotated Ruby code
+EAPI=8
+HOMEPAGE=https://github.com/ruby/typeprof
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rbs-1.3.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.3.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/typeprof/archive/v0.15.0.tar.gz -> typeprof-0.15.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=193b5428fdfe36ed7931a62bd72001b5
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
index 8ac20b3cdd44..9399fd8affa7 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typhoeus-0.6.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5ea099e3009310bb784c1321210be5d
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.3.1 b/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
index 48a39143bdd4..011c4a4d3694 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=129bcc908bee9b3ef2184378dacb3302
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
index be75df181d66..ec512c600068 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f656db08dae2b723db2552ef645b9895
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
index d6e56dd8da7a..a46fe724a23b 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15bcf5011a1c1414d8aad08ba9223433
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
index d374fe760b5a..8c5954a4981b 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
@@ -5,12 +5,12 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=7
 HOMEPAGE=https://tzinfo.github.io/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/thread_safe-0.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 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87c2be94776f56972b34ab8b1d109e41
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a95d4a141eecf9f491932865c4defa7c
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
index e36ce0fd003e..667a3b31a40a 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
@@ -5,12 +5,12 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=7
 HOMEPAGE=https://tzinfo.github.io/
 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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby: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=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.4.tar.gz -> tzinfo-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=efd0de83a97bde0032098b038bace601
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ee20bae644af9062ca4f0c9f96c0bc27
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
index ba799cfb24dd..43ed51000920 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e211bb950833ec6e336a2ce43b50139
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
index 131163d4deb7..67161710cbc2 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc0d081ffa6674b5d8fe11852a0bf8d8
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
index 1475a5a043ce..80ea76446e8a 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ultraviolet-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c164f78dc8fd28d1025f07d47ede8939
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index 45d34b960b4e..0edaf992692b 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf-0.1.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e162e2f7e03910564e31879ecd693e82
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
index e0eb0b975b8f..0c8fce972af3 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54781da30103f8f4889c25847413679f
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
index 637f0fce61ba..f424d7fa044d 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=7
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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://rubygems.org/gems/unf_ext-0.0.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8cb7d1bee94d94806cfb003d8d83b400
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a9dc855e2ba2335da1d9a7ee6b563b13
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
index 5809700b36e5..ed7f6e21354a 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v1.7.0.tar.gz -> unicode-display_width-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27c62c6e71f8fd8d1b594e7f66d69519
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
index 69a1b1a02eaa..27f0e81a8024 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.0.0.tar.gz -> unicode-display_width-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4c830f2cc691de497086b9c6b9f8428
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index ac707a8e0964..5716ed2bc003 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4f137c7a3b826aa6ce7781ee97cba68
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
index ef8df27b288f..423d87de8ade 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0-r1
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0976d025fb7458e512e5d8747681fc88
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index a198131b026e..7060fc024cb1 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.1.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a179f969d0c22c93e9a4c7bf1acce85d
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0 b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
index 959eda20638d..a46cd28d6692 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43e941d1f505fd3c05c09dd48363e5c1
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1 b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
index 7ff2a129e416..3c2089298a6d 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v2.0.3.tar.gz -> vagrant_cloud-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24c85ccd9422c1337ae317921eb27fb2
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.16 b/metadata/md5-cache/dev-ruby/vcard-0.2.16
index b20730d04d08..aeaa5144ebaf 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.16
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.2.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6364a17329983da1392dda44c9f5f4b3
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0 b/metadata/md5-cache/dev-ruby/vcard-0.3.0
index ea68eb870e09..f0a9934407b3 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0
+++ b/metadata/md5-cache/dev-ruby/vcard-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a034657c02551445be09e4599cf7881b
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index 8581a653e624..59c346a582bd 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88030277d71136d556fda8610ebf4504
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.1.0 b/metadata/md5-cache/dev-ruby/vcr-5.1.0
index aa8fce6ac8ce..3f86b19094e4 100644
--- a/metadata/md5-cache/dev-ruby/vcr-5.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/vcr/vcr/archive/v5.1.0.tar.gz -> vcr-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1b8b928e4532f65d831ae7aef7b846d
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.0.0 b/metadata/md5-cache/dev-ruby/vcr-6.0.0
index 5ce0b98e7b66..1f1b306fcd3f 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.0.0.tar.gz -> vcr-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b7edd497a52a1f44011f4913fd1d5f
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index 34f15b6bac54..672f32500ded 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/virtus-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=024b8e9733798ba6e425c0e828f89739
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.1 b/metadata/md5-cache/dev-ruby/vlad-2.7.1
index eee4b3709a1d..7fb323ffb16b 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.1
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vlad-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad5558ed06dbab9573806db551365952
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.9 b/metadata/md5-cache/dev-ruby/warden-1.2.9
index 8983da729eeb..58a3bf074b13 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.9
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wardencommunity/warden/archive/v1.2.9.tar.gz -> warden-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=adc112a27d299b7fc7db9ac8f7c7bfb4
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.7.0 b/metadata/md5-cache/dev-ruby/web-console-3.7.0
index 1514e6af1e48..cad07a4218c7 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.7.0
+++ b/metadata/md5-cache/dev-ruby/web-console-3.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.7.0.tar.gz -> web-console-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed558ba797cbccafc3e792eb3ac6feae
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.1.0 b/metadata/md5-cache/dev-ruby/web-console-4.1.0
index 0fd57d3d6074..f12b6112a1ae 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.1.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.1.0.tar.gz -> web-console-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91fc6aa6c8474af2144c4c2fdd928ace
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.11.3 b/metadata/md5-cache/dev-ruby/webmock-3.11.3
index bc2f4f29fbd4..1e4628ea0be8 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.11.3
+++ b/metadata/md5-cache/dev-ruby/webmock-3.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.11.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=310f6c4376a9c5b7800d97b1b56c8b56
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.13.0 b/metadata/md5-cache/dev-ruby/webmock-3.13.0
index 1298724bdd91..93a6972b4ca2 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.13.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27ed8d702ffb8b1df4020bbefa9e7daf
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.8.3 b/metadata/md5-cache/dev-ruby/webmock-3.8.3
deleted file mode 100644
index 12d435ad3fcb..000000000000
--- a/metadata/md5-cache/dev-ruby/webmock-3.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby25(-)] || ( dev-ruby/http:4[ruby_targets_ruby25(-)] dev-ruby/http:3[ruby_targets_ruby25(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26(-)] || ( dev-ruby/http:4[ruby_targets_ruby26(-)] dev-ruby/http: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? ( 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(-)] ) )
-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? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
-EAPI=7
-HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=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=GPL-2
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.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 ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/webmock-3.8.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b2f99468a6f47396c8a2e34224d7294
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0 b/metadata/md5-cache/dev-ruby/webrick-1.7.0
index 841f7b06db45..5c4a52dfdf4a 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0
@@ -5,12 +5,12 @@ DESCRIPTION=An HTTP server toolkit
 EAPI=7
 HOMEPAGE=https://github.com/ruby/webrick
 IUSE=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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 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://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c8992c18c9380e0b3e8a926371a56db
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54c58cb8a53c31fb36af7c8ff7bc2310
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
index 0325dedb2446..3bebbe4131e6 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webrobots-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02c4e9cdda5bbb437369f359da16f287
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.8 b/metadata/md5-cache/dev-ruby/websocket-1.2.8
index 7aca9a78fdd4..4d91df4b17ea 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.8
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da4a511359b4a5ed302da3595a0a8451
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9 b/metadata/md5-cache/dev-ruby/websocket-1.2.9
index f5257238be8a..a244f3e7b6dd 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95a29971dd0f6386a8fa8c3e88c53e16
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
index 49cd21099256..05411d9db5b3 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c91f1c3a4a6480a69c09ac38ab2988b
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
index d66c621946ed..20f143cf1222 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.5.tar.gz -> websocket-driver-0.7.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2914c101656b7c6edc0e7731252cb580
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
index 203ed7813a3b..ea8373ee3ec5 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eddda92eb51eb6f5896fcebb808359d5
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
index 73ba12105c69..3e029c65b17a 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d8acc480fb76d2fdb569c0edfc87a4b
diff --git a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1 b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
index 1946638bd752..e2630be4ca2c 100644
--- a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/whole_history_rating-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a32304a19065fa2059b5a9a35ca7739
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.3.0 b/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
index dcc1cbe11fd1..dbe745b4534c 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/will_paginate-3.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fbcd53ddd8f043f3ac044f5bfdef1e0
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
index 6f75d9553dda..3210fc8a749d 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.2
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=54afd1fddf94385f22c94c259ec8f7a9
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index b7d80ae04be0..377e7311eb90 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wirble-0.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee952fd297ca74cd70ba1a83715b605e
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index a28021876f18..42ca57f466f3 100644
--- a/metadata/md5-cache/dev-ruby/wisper-2.0.1
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=098f35b4a79cfd19f3ba0df1e1f27ab9
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.8 b/metadata/md5-cache/dev-ruby/x25519-1.0.8
index 9ac1fa959e18..1201fc240fa9 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.8
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.8.tar.gz -> x25519-1.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f489bffa31d38648bce42c824697498b
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.1 b/metadata/md5-cache/dev-ruby/xdr-3.0.1
index 4fdf943631ea..1aacef067f49 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.1
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.0.1
 SRC_URI=https://rubygems.org/gems/xdr-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e2501bdbd886988207bbc9a9e57d5f2
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index 9e9a8c908bfd..dfeeafb77225 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58a26806488a331a7c8c21faa701e5db
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
index 75950ce5a3ee..0907058503f4 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.0.tar.gz -> xmlrpc-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee5610db40ce4be9c84245fa0792d01a
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
index 625511cee33c..2ea765d077e2 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.1.tar.gz -> xmlrpc-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67de72cbdc181c0434212181bf75b356
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
index aaf4cbecb40b..32e810178e6f 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
@@ -5,12 +5,12 @@ DESCRIPTION=XMLRPC is a lightweight protocol that enables remote procedure calls
 EAPI=7
 HOMEPAGE=https://github.com/ruby/xmlrpc
 IUSE=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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_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://github.com/ruby/xmlrpc/archive/v0.3.2.tar.gz -> xmlrpc-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3e58c82836c748618365b7258edd7fc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1aee640b8d40eb4b2539eed2539791b7
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0 b/metadata/md5-cache/dev-ruby/xpath-3.2.0
index 95f64f9dbf55..73fcc3da1f72 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c02234cafc38aeecf3f69cf0d107f59e
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
index 05144613b31b..683bf252e3bd 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3336e24216e40b8cc45d53831f79f473
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
index 0b9f288e2922..8597bc311688 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c11c58abb7ff5e385639f28fe5ee42da
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.20 b/metadata/md5-cache/dev-ruby/yard-0.9.20
index de26e63e7238..c96f03c9d096 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.20
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.20.tar.gz -> yard-0.9.20-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=221ec03e80ba252ade1d709b6bd92bb9
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index 63554eea735c..1e4eed084226 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d75d517b5f36f2765db15081a42684ed
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1 b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
index fa412f837a07..da2c649c6a17 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.3.1.tar.gz -> zeitwerk-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9597854c2018b209449ec5bf6b21b294
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.0 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.0
index 41570e980d90..01a7b134aeed 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.0
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.0.tar.gz -> zeitwerk-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9597854c2018b209449ec5bf6b21b294
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.1 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.1
index 7aad60195a18..b0578b8b56be 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.1
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.1.tar.gz -> zeitwerk-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9597854c2018b209449ec5bf6b21b294
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
index 2bd421ad8dbc..edb307e7d748 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.2.tar.gz -> zeitwerk-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d04c4f4eb7550f5a63354ba652fe02b
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.0 b/metadata/md5-cache/dev-ruby/zentest-4.12.0
index aca4a00589f9..c2cac2aff539 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ZenTest-4.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1c56094b493fe627f5e38e55204f4ed
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ca239c07e605..310918f11826 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/anjuta-3.34.0 b/metadata/md5-cache/dev-util/anjuta-3.34.0
index 907dca48e8b0..ca12739e1a2b 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.34.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.34.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.34/anjuta-3.34.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2920394d64ddccb693a2eb69c496cd86
+_md5_=864f6719ba405611af9ce73efb8a1f07
diff --git a/metadata/md5-cache/dev-util/archdiff-1.1.6 b/metadata/md5-cache/dev-util/archdiff-1.1.6
index 3ce7b28ae3c8..d1145f5b1924 100644
--- a/metadata/md5-cache/dev-util/archdiff-1.1.6
+++ b/metadata/md5-cache/dev-util/archdiff-1.1.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure
-DEPEND=app-arch/libarchive[bzip2?,lzma?] gzip? ( app-arch/libarchive[zlib] ) dev-libs/rremove
+DEPEND=app-arch/libarchive[bzip2?,lzma?] zlib? ( app-arch/libarchive[zlib] ) dev-libs/rremove
 DESCRIPTION=Utility to view the differences between two source code archives
 EAPI=7
 HOMEPAGE=https://frigidcode.com/code/archdiff/
-IUSE=+bzip2 +lzma +gzip
+IUSE=+bzip2 +lzma +zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-arch/libarchive[bzip2?,lzma?] gzip? ( app-arch/libarchive[zlib] ) dev-libs/rremove app-misc/colordiff
+RDEPEND=app-arch/libarchive[bzip2?,lzma?] zlib? ( app-arch/libarchive[zlib] ) dev-libs/rremove app-misc/colordiff
 SLOT=0
 SRC_URI=https://frigidcode.com/code/archdiff/archdiff-1.1.6.tar.gz
-_md5_=8d24f86668eb4f8b1f7a353769370626
+_md5_=98e8c2553179e19073925d52897a82fc
diff --git a/metadata/md5-cache/dev-util/aruba-0.14.14 b/metadata/md5-cache/dev-util/aruba-0.14.14
index 32e35319680d..d8cabf6a5a3e 100644
--- a/metadata/md5-cache/dev-util/aruba-0.14.14
+++ b/metadata/md5-cache/dev-util/aruba-0.14.14
@@ -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/aruba-0.14.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05affe18ebb4e3a20efb0803fed03627
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index b6d4e6cc2041..c6c77eaed1d7 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19cad316a0b504cba01ad67a0a3e032e
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.2 b/metadata/md5-cache/dev-util/aruba-1.0.2
index b6cb0ba41439..3321cea71ad4 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.2
+++ b/metadata/md5-cache/dev-util/aruba-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.2.tar.gz -> aruba-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a79538a220dee4031a2e61a6d7233932
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3 b/metadata/md5-cache/dev-util/aruba-1.0.3
index 6a3a00d0b211..5857f8031cfa 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ade7cb512b45765f520b7d93da452c7f
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3-r1 b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
index 2e967c5869d5..ccb9a9537adf 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a31e86174aad224dfa3370e3c119ef6
diff --git a/metadata/md5-cache/dev-util/aruba-1.1.2 b/metadata/md5-cache/dev-util/aruba-1.1.2
new file mode 100644
index 000000000000..ca37a8268f6b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/aruba-1.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) 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=Cucumber steps for driving out command line applications
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-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? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/cucumber/aruba/archive/v1.1.2.tar.gz -> aruba-1.1.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=386d96bc672ca6c86f0f0add3330ca6c
diff --git a/metadata/md5-cache/dev-util/bats-1.3.0 b/metadata/md5-cache/dev-util/bats-1.3.0
index d64f44f45828..06c254b9c830 100644
--- a/metadata/md5-cache/dev-util/bats-1.3.0
+++ b/metadata/md5-cache/dev-util/bats-1.3.0
@@ -3,10 +3,10 @@ DEPEND=app-shells/bash:*
 DESCRIPTION=Bats-core: Bash Automated Testing System
 EAPI=7
 HOMEPAGE=https://github.com/bats-core/bats-core/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz -> bats-1.3.0.tar.gz
 _eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
-_md5_=9469faac01e557dd3d19392fa394a620
+_md5_=31f9e49a50f1938802e59c06e92adbf2
diff --git a/metadata/md5-cache/dev-util/byacc-20210619 b/metadata/md5-cache/dev-util/byacc-20210619
index 5c6d8cc52732..3082e75ed125 100644
--- a/metadata/md5-cache/dev-util/byacc-20210619
+++ b/metadata/md5-cache/dev-util/byacc-20210619
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=7
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20210619.tgz
-_md5_=24cdce9b1328d2a9eb2bcc1aae9468c3
+_md5_=0a24840eaf5750bcc7a6976ac20978c7
diff --git a/metadata/md5-cache/dev-util/ccache-4.3-r2 b/metadata/md5-cache/dev-util/ccache-4.3-r2
index 5436c13bf69a..f0d15cd16556 100644
--- a/metadata/md5-cache/dev-util/ccache-4.3-r2
+++ b/metadata/md5-cache/dev-util/ccache-4.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=static-c++ test
-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
 RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
 _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_=f419f92d492a396c025f712d8f26025c
+_md5_=0c33002ee9c6d26dc81d8e820807eb49
diff --git a/metadata/md5-cache/dev-util/ccache-4.3-r3 b/metadata/md5-cache/dev-util/ccache-4.3-r3
new file mode 100644
index 000000000000..5604674d225c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-4.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare prerm test
+DEPEND=test? ( dev-libs/elfutils )
+DESCRIPTION=fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.dev/
+IUSE=+static-c++ test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
+_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_=610aef75d9327cc67c706b17988ead7f
diff --git a/metadata/md5-cache/dev-util/codespell-2.1.0 b/metadata/md5-cache/dev-util/codespell-2.1.0
new file mode 100644
index 000000000000..3a0261a26929
--- /dev/null
+++ b/metadata/md5-cache/dev-util/codespell-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man test? ( dev-python/chardet[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=Check text files for common misspellings
+EAPI=8
+HOMEPAGE=https://github.com/codespell-project/codespell
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-3.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/codespell-project/codespell/archive/v2.1.0.tar.gz -> codespell-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_=f22164cea5a3d2c7db3fa912c2ffb045
diff --git a/metadata/md5-cache/dev-util/colm-0.14.7 b/metadata/md5-cache/dev-util/colm-0.14.7
index aa2c1a0b693a..77e3d181ec71 100644
--- a/metadata/md5-cache/dev-util/colm-0.14.7
+++ b/metadata/md5-cache/dev-util/colm-0.14.7
@@ -4,10 +4,10 @@ DESCRIPTION=COmputer Language Manipulation
 EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/colm/
 IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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=!<dev-util/ragel-7.0.3
 SLOT=0
 SRC_URI=https://www.colm.net/files/colm/colm-0.14.7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f5bfa4c2e4bb735ff87390cc033a7ac
+_md5_=b327479a4bd154cc2d59826120dcd344
diff --git a/metadata/md5-cache/dev-util/ctags-20210321.0 b/metadata/md5-cache/dev-util/ctags-20210321.0
index 7fbe071006db..a3dd6a143f82 100644
--- a/metadata/md5-cache/dev-util/ctags-20210321.0
+++ b/metadata/md5-cache/dev-util/ctags-20210321.0
@@ -5,10 +5,10 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=7
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8cddce85716f5cc69aec397427e316d3
+_md5_=f8928ad3757be059cf11e5c7968ee17a
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
index 44017eb9e178..1d30ee987d9a 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54914840b49314d9e33371d9dc9a8a24
diff --git a/metadata/md5-cache/dev-util/cucumber-6.1.0 b/metadata/md5-cache/dev-util/cucumber-6.1.0
index 0fe40986908c..c5ccaa8ae86e 100644
--- a/metadata/md5-cache/dev-util/cucumber-6.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-6.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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
index eab99e5ae187..d8157b7da175 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.0.tar.gz -> cucumber-core-10.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc4b9b092775b12cea6cd1f068f8fdff
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.1 b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
new file mode 100644
index 000000000000..96b4ad6e04da
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.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(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1: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.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1: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.1:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.1: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=8
+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.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1: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.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1: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.1:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.1: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.1.tar.gz -> cucumber-core-10.0.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b10d085129e530d145a50d1d56d7a98f
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 b81712738e3b..80ceaa7557d9 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _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
index f1f7860600ec..778d841a616d 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-9.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-9.0.1
@@ -12,5 +12,5 @@ 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=62709c3719fb091283384c09d6be8455
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0 b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
index 0baaa79bb0cf..1e2f4afeb906 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a36bcfc75d3d4cc47f478612ba5c9ffb
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
new file mode 100644
index 000000000000..c36fab7a4106
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9e6275c3cb8b91ca45555d4d30663b6d
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
index b9d1a37cdd52..05877fc870f5 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-10.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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
index 854673fe5504..ab2085ef0abf 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91c36ae67949d73511c04adc2ee11b37
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index d63eb10f3ec6..3006df77965a 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81f10fbb084db1982b20948393330ea7
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
index c2aa1335fd32..dc344a2d1904 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
@@ -12,5 +12,5 @@ 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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
index ba9dcff6aaad..af18ced90ff9 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16186e441329c6a4e0b77885d7f9a398
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
new file mode 100644
index 000000000000..151ebabefae2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=8
+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.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=20
+SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.1.tar.gz -> cucumber-gherkin-20.0.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=29a4006013c37da4f84930ff319eccd4
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
index 7c4396a8336a..8ac785b2c363 100644
--- 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
@@ -12,5 +12,5 @@ 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f989818e16d5f55f164dcb86b95d20b8
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1
new file mode 100644
index 000000000000..8b1930f11476
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16
+SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=84e0521ff5afd42372c5fe8cd637b377
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-13.2.1 b/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
index 5fc648d7fc83..d20c385f24f0 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_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.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=502ecc7ba991b4a00f4413d1d055b076
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-14.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
index 7314b8bc596c..65270fa837c3 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://rubygems.org/gems/cucumber-messages-14.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=502ecc7ba991b4a00f4413d1d055b076
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-15.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
index 47a80fb131e3..f2d23bc40087 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
@@ -12,5 +12,5 @@ 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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
index 52e147b69bb4..ae531b111031 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fde2ea7003cc8551c70e432bf26e378
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
new file mode 100644
index 000000000000..0d98d70a37a4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.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=Protocol Buffer messages for Cucumber's inter-process communication
+EAPI=8
+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.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cf3e17cce46ba78d12ceaafdb5f41fdf
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
index 44e13b721d33..35108d80c902 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-rails-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9ed6124e370be90e1719e40a82f6702
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.2.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
index d5ba28473771..a231bc7ba579 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/cucumber-rails-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00b10cd4f43997cdc01f8f5c35dca371
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.3.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
index 17e8ada412b5..2c70a76f68b3 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.3.0.tar.gz -> cucumber-rails-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa58ed0508ddb88629a1c63b5d345d80
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.4.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.4.0
new file mode 100644
index 000000000000..28ddca496f58
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.4.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-8[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.10[ruby_targets_ruby26(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] dev-ruby/rexml:3[ruby_targets_ruby26(-)] >=dev-ruby/webrick-1.7:0[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-8[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.10[ruby_targets_ruby27(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby27(-)] <dev-ruby/rails-7:*[ruby_targets_ruby27(-)] dev-ruby/rexml:3[ruby_targets_ruby27(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/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-8[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.10[ruby_targets_ruby26(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] dev-ruby/rexml:3[ruby_targets_ruby26(-)] >=dev-ruby/webrick-1.7:0[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-8[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.10[ruby_targets_ruby27(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby27(-)] <dev-ruby/rails-7:*[ruby_targets_ruby27(-)] dev-ruby/rexml:3[ruby_targets_ruby27(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.4.0.tar.gz -> cucumber-rails-2.4.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=690d90ca6672946c557ab852e9d6e8e0
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
index aaf44a214725..3d37aa84be70 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-2.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=25367fdc7ae5452e6615e85f52831f2c
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
index f55bb9b2076b..b52cfb222b7f 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2349d8a0ad9d7b12b43cbc6fba3813b8
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index a7ffe69e3bff..f2d084fcc665 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcf274368bfbc4cc686fbb95d3f8fc65
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index de489c0923de..cc73239cae8d 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=095c2d5b39ab6aef9cf6cf5efae31e44
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-5.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
index fee58d7705e4..0f61414004f2 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
@@ -12,5 +12,5 @@ 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=271713d6f6eb41fa9e8f2a60a9b13a0a
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
new file mode 100644
index 000000000000..fb437015415a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://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-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://rubygems.org/gems/cucumber-wire-6.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dc003724797d5fed3fdda5ea3dcdffc7
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.16 b/metadata/md5-cache/dev-util/d-feet-0.3.16
index 00438980fe87..f0a182f3cbc2 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.16
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.16
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.16.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	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_=8a6c16f50f30abb520ed2c2526ee7230
+_md5_=19f9aa4b03f730f2a91080bd45f9b063
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
index e2a2c7e49c46..c1c6ce9f277b 100644
--- a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
 _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_=6f3fe22de097e0e72b9d404a2e5be1ab
+_md5_=6df50bee87e58f046aeaa8177d3fb53c
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.3 b/metadata/md5-cache/dev-util/dejagnu-1.6.3
index ac5ae4e382a5..b822277da1ed 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-tcltk/expect
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.3.tar.gz
-_md5_=951883146a389815745139c61d07ca1c
+_md5_=330b82271176eb476a75df88c71287d1
diff --git a/metadata/md5-cache/dev-util/devhelp-40.0 b/metadata/md5-cache/dev-util/devhelp-40.0
index faeb1026d130..2d944aa50e39 100644
--- a/metadata/md5-cache/dev-util/devhelp-40.0
+++ b/metadata/md5-cache/dev-util/devhelp-40.0
@@ -12,4 +12,4 @@ REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_p
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/40/devhelp-40.0.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7595ced3008d7c2ebd3e8d3a8a117c73
+_md5_=500f16a0362cbd2cfde563a6148f9320
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20200327 b/metadata/md5-cache/dev-util/dialog-1.3.20200327
deleted file mode 100644
index b3a1984004cd..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20200327
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool )
-DESCRIPTION=tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/15
-SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20200327.tar.gz
-_md5_=5932b6c10661601160a4a748de301534
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20200327-r1 b/metadata/md5-cache/dev-util/dialog-1.3.20200327-r1
new file mode 100644
index 000000000000..8dd1d252d8d7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20200327-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool )
+DESCRIPTION=tool to display dialog boxes from a shell
+EAPI=7
+HOMEPAGE=https://invisible-island.net/dialog/
+IUSE=examples minimal nls static-libs unicode
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
+SLOT=0/15
+SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20200327.tar.gz
+_md5_=2fcd2c61613c589a1702a51f7d056a2a
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210530 b/metadata/md5-cache/dev-util/dialog-1.3.20210530
deleted file mode 100644
index fef578b34d4c..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20210530
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext )
-DESCRIPTION=Tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/15
-SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210530.tgz
-_md5_=f43d85d21c3a91912b8d566f186b7583
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210530-r1 b/metadata/md5-cache/dev-util/dialog-1.3.20210530-r1
new file mode 100644
index 000000000000..87177295d67f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20210530-r1
@@ -0,0 +1,13 @@
+BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Tool to display dialog boxes from a shell
+EAPI=7
+HOMEPAGE=https://invisible-island.net/dialog/
+IUSE=examples minimal nls unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
+SLOT=0/15
+SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210530.tgz
+_md5_=74a210aecb538ee1bc5d3a9188bf573f
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210621 b/metadata/md5-cache/dev-util/dialog-1.3.20210621
deleted file mode 100644
index 15becf632cfe..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20210621
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext )
-DESCRIPTION=Tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/15
-SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210621.tgz
-_md5_=f43d85d21c3a91912b8d566f186b7583
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1 b/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1
new file mode 100644
index 000000000000..0a6dbc280a1f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20210621-r1
@@ -0,0 +1,13 @@
+BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Tool to display dialog boxes from a shell
+EAPI=7
+HOMEPAGE=https://invisible-island.net/dialog/
+IUSE=examples minimal nls unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
+SLOT=0/15
+SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210621.tgz
+_md5_=74a210aecb538ee1bc5d3a9188bf573f
diff --git a/metadata/md5-cache/dev-util/diffoscope-177-r1 b/metadata/md5-cache/dev-util/diffoscope-177-r1
index 9af530c05797..0f8dc44c5e89 100644
--- a/metadata/md5-cache/dev-util/diffoscope-177-r1
+++ b/metadata/md5-cache/dev-util/diffoscope-177-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Will try to get to the bottom of what makes files or directories dif
 EAPI=7
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-177.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_=1c0407be06b4217681db5ce44e8fc0e1
+_md5_=9a3e5e984dc3f2eae4ffdefec10c50ed
diff --git a/metadata/md5-cache/dev-util/diffuse-0.6.0 b/metadata/md5-cache/dev-util/diffuse-0.6.0
index e40fb5319aa0..43195954608e 100644
--- a/metadata/md5-cache/dev-util/diffuse-0.6.0
+++ b/metadata/md5-cache/dev-util/diffuse-0.6.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/MightyCreak/diffuse/archive/v0.6.0.tar.gz -> diffuse-0.6.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2be403186a01a502ce7fe2abcc3f37e
+_md5_=78f4b3d8401880967cdb2c9edfc6c032
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.32 b/metadata/md5-cache/dev-util/dput-ng-1.32
index 2b3d69aa13fe..38c8e0b3e5bb 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.32
+++ b/metadata/md5-cache/dev-util/dput-ng-1.32
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.32.tar.xz
 _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
+_md5_=b786d33bb292fcbf321071144557aff8
diff --git a/metadata/md5-cache/dev-util/glade-3.38.2 b/metadata/md5-cache/dev-util/glade-3.38.2
index e06fde51bcf3..eed5b068b310 100644
--- a/metadata/md5-cache/dev-util/glade-3.38.2
+++ b/metadata/md5-cache/dev-util/glade-3.38.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3.10/13
 SRC_URI=mirror://gnome/sources/glade/3.38/glade-3.38.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	meson	5bc3f1b890f90cc00cf1d1dddc10233e	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_=461ef68baa82f452a2b61020b6880062
+_md5_=77fd04d005a14aac67c076293e324ecd
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.33.2 b/metadata/md5-cache/dev-util/gtk-doc-1.33.2
index 664517c49436..12e5a9fbf2f8 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.33.2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.33.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=270237e5a9fc96a729a7824acfc44457
+_md5_=b05d48ea173fe7b4adbcfa79b18d8a51
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6-r1 b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
index 0cb950da300d..7114c2e80702 100644
--- a/metadata/md5-cache/dev-util/itstool-2.0.6-r1
+++ b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf3f0d2db35cfff7716afa25f4b614d6
+_md5_=c57e9f64766b5423a63688603ae81828
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.6.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
index 0a86427da0ab..80537ad4166e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.6.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.6.2/src/kdev-python-5.6.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_=4cd8b4b5432c7fdec908cf3c7ad194fd
+_md5_=e02259f7a74653dee7e73b5d1b84e89e
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1 b/metadata/md5-cache/dev-util/lldb-10.0.1
index 03656aa4fe8b..c571c3a765f5 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.1
+++ b/metadata/md5-cache/dev-util/lldb-10.0.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/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=54136a71a50e0e8bb9e8121dce191e89
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=412f6d6707067ac077c2c1d7be53fb7f
diff --git a/metadata/md5-cache/dev-util/lldb-11.1.0 b/metadata/md5-cache/dev-util/lldb-11.1.0
index f0ffe4d6969a..6bd7a8a03cb4 100644
--- a/metadata/md5-cache/dev-util/lldb-11.1.0
+++ b/metadata/md5-cache/dev-util/lldb-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=45c1a1836706fadbd119d8463422b9a3
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=96368732b2ef7bad8eec52ac1ff6775f
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.0 b/metadata/md5-cache/dev-util/lldb-12.0.0
index 5eb2aa96874b..bbed0ec9432f 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.0
+++ b/metadata/md5-cache/dev-util/lldb-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=3605f5df489890a2f21565969f776147
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=7619db5a184d5a9d4627ef6286417248
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.1 b/metadata/md5-cache/dev-util/lldb-12.0.1
index e0db647e0bc8..2dfe84947187 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.1
+++ b/metadata/md5-cache/dev-util/lldb-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=f2559662519c6e08e2130a976db0ca8b
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0.9999 b/metadata/md5-cache/dev-util/lldb-13.0.0.9999
index 91ca18a56fa5..44e819f70dc3 100644
--- a/metadata/md5-cache/dev-util/lldb-13.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=99a26fa58ac93518c816f8979e3d9794
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.12.1 b/metadata/md5-cache/dev-util/lttng-ust-2.12.1
index 2f44070736e4..dd3706b0b538 100644
--- a/metadata/md5-cache/dev-util/lttng-ust-2.12.1
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.12.1
@@ -5,10 +5,10 @@ DESCRIPTION=Linux Trace Toolkit - UST library
 EAPI=7
 HOMEPAGE=https://lttng.org
 IUSE=examples numa
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.12.1.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=09bf2da1722cdb661392e71794ef2b8c
+_md5_=4ad3cc603d15c6b70d2d9a2b13ff1916
diff --git a/metadata/md5-cache/dev-util/maturin-0.11.1 b/metadata/md5-cache/dev-util/maturin-0.11.1
new file mode 100644
index 000000000000..0a5219eb636b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.11.1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=test? ( || ( ( dev-lang/python:3.9 dev-python/cffi[python_targets_python3_9(-)] dev-python/pycparser[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/cffi[python_targets_python3_8(-)] dev-python/pycparser[python_targets_python3_8(-)] ) ) )
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=7
+HOMEPAGE=https://github.com/PyO3/maturin
+IUSE=test debug
+KEYWORDS=~amd64
+LICENSE=|| ( Apache-2.0 MIT )
+PROPERTIES=test_network
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.11.1.tar.gz -> maturin-0.11.1.tar.gz https://crates.io/api/v1/crates/addr2line/0.15.2/download -> addr2line-0.15.2.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.60/download -> backtrace-0.3.60.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/bytesize/1.0.1/download -> bytesize-1.0.1.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/camino/1.0.4/download -> camino-1.0.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.0/download -> cargo_metadata-0.14.0.crate https://crates.io/api/v1/crates/cbindgen/0.19.0/download -> cbindgen-0.19.0.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.2/download -> charset-0.1.2.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/configparser/2.1.0/download -> configparser-2.1.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/cpufeatures/0.1.5/download -> cpufeatures-0.1.5.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.0/download -> crypto-mac-0.10.0.crate https://crates.io/api/v1/crates/dbus/0.2.3/download -> dbus-0.2.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fat-macho/0.4.4/download -> fat-macho-0.4.4.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.15/download -> futures-channel-0.3.15.crate https://crates.io/api/v1/crates/futures-core/0.3.15/download -> futures-core-0.3.15.crate https://crates.io/api/v1/crates/futures-io/0.3.15/download -> futures-io-0.3.15.crate https://crates.io/api/v1/crates/futures-macro/0.3.15/download -> futures-macro-0.3.15.crate https://crates.io/api/v1/crates/futures-sink/0.3.15/download -> futures-sink-0.3.15.crate https://crates.io/api/v1/crates/futures-task/0.3.15/download -> futures-task-0.3.15.crate https://crates.io/api/v1/crates/futures-util/0.3.15/download -> futures-util-0.3.15.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.24.0/download -> gimli-0.24.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.4.2/download -> goblin-0.4.2.crate https://crates.io/api/v1/crates/h2/0.3.3/download -> h2-0.3.3.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-body/0.4.2/download -> http-body-0.4.2.crate https://crates.io/api/v1/crates/httparse/1.4.1/download -> httparse-1.4.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.10/download -> hyper-0.14.10.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.3/download -> indoc-1.0.3.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.51/download -> js-sys-0.3.51.crate https://crates.io/api/v1/crates/keyring/0.10.1/download -> keyring-0.10.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mailparse/0.13.4/download -> mailparse-0.13.4.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.2/download -> num-bigint-0.3.2.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.25.3/download -> object-0.25.3.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/os_type/2.3.0/download -> os_type-2.3.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.1.0/download -> platform-info-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-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/pyproject-toml/0.1.1/download -> pyproject-toml-0.1.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.4.0/download -> python-pkginfo-0.4.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/quoted_printable/0.4.3/download -> quoted_printable-0.4.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.4/download -> reqwest-0.11.4.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.20/download -> rustc-demangle-0.1.20.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/secret-service/1.1.3/download -> secret-service-1.1.3.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/1.0.3/download -> semver-1.0.3.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha2/0.9.5/download -> sha2-0.9.5.crate https://crates.io/api/v1/crates/shlex/1.0.0/download -> shlex-1.0.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/socket2/0.4.0/download -> socket2-0.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.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/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/tar/0.4.35/download -> tar-0.4.35.crate https://crates.io/api/v1/crates/target-lexicon/0.12.0/download -> target-lexicon-0.12.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/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.8.1/download -> tokio-1.8.1.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.7/download -> tokio-util-0.6.7.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-core/0.1.18/download -> tracing-core-0.1.18.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.74/download -> wasm-bindgen-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.74/download -> wasm-bindgen-backend-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.24/download -> wasm-bindgen-futures-0.4.24.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.74/download -> wasm-bindgen-macro-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.74/download -> wasm-bindgen-macro-support-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.74/download -> wasm-bindgen-shared-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.51/download -> web-sys-0.3.51.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate test? ( https://crates.io/api/v1/crates/ctor/0.1.19/download -> ctor-0.1.19.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/inventory/0.1.10/download -> inventory-0.1.10.crate https://crates.io/api/v1/crates/inventory-impl/0.1.10/download -> inventory-impl-0.1.10.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libc/0.2.90/download -> libc-0.2.90.crate https://crates.io/api/v1/crates/libc/0.2.92/download -> libc-0.2.92.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/pyo3/0.14.0/download -> pyo3-0.14.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.14.0/download -> pyo3-build-config-0.14.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.14.0/download -> pyo3-macros-0.14.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.14.0/download -> pyo3-macros-backend-0.14.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/syn/1.0.64/download -> syn-1.0.64.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate )
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=304d0f70e0353d542507edbe3a389fb5
diff --git a/metadata/md5-cache/dev-util/meld-3.20.3 b/metadata/md5-cache/dev-util/meld-3.20.3
index 7391115b3fca..38c0f281062d 100644
--- a/metadata/md5-cache/dev-util/meld-3.20.3
+++ b/metadata/md5-cache/dev-util/meld-3.20.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.3.tar.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7af85ee99cd7979d2a3017a90848e865
+_md5_=f40cb9e3ea6dc98bf533dea998f2c6da
diff --git a/metadata/md5-cache/dev-util/meson-0.58.1 b/metadata/md5-cache/dev-util/meson-0.58.1
index bad35684a2f7..af18df0f1571 100644
--- a/metadata/md5-cache/dev-util/meson-0.58.1
+++ b/metadata/md5-cache/dev-util/meson-0.58.1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.58.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_=f63d9c500884927eb6ab089c83df31c2
+_md5_=1ee221bd4d567d5298f42d9dbfcd3ac0
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
deleted file mode 100644
index c0f74d7d6c0f..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger nsight profiler vis-profiler sanitizer
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-460.27.04 debugger? ( dev-libs/openssl sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) vis-profiler? ( dev-libs/openssl >=virtual/jre-1.8:* )
-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	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=66a12e5a4baeebb24b631790d145abb1
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
deleted file mode 100644
index 2f5c05865eb3..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger nsight profiler vis-profiler sanitizer
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-465.19.01 debugger? ( dev-libs/openssl sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) vis-profiler? ( dev-libs/openssl >=virtual/jre-1.8:* )
-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	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=f08238fbe503d555270c7cd3ca234dff
diff --git a/metadata/md5-cache/dev-util/oprofile-1.3.0 b/metadata/md5-cache/dev-util/oprofile-1.3.0
deleted file mode 100644
index dbb92fc5d0b9..000000000000
--- a/metadata/md5-cache/dev-util/oprofile-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) >=sys-kernel/linux-headers-2.6.31 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 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A transparent low-overhead system-wide profiler
-EAPI=6
-HOMEPAGE=http://oprofile.sourceforge.net
-IUSE=java pch elibc_FreeBSD java kernel_linux
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/oprofile/oprofile-1.3.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=78e7e524f790fb254d8af65149a749c3
diff --git a/metadata/md5-cache/dev-util/oprofile-1.4.0 b/metadata/md5-cache/dev-util/oprofile-1.4.0
index 57f24e68c757..6c4187c5cd9e 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.4.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=7
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=apidoc java pch static-libs elibc_FreeBSD java kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 ) ppc64? ( dev-libs/libpfm ) acct-user/oprofile acct-group/oprofile java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.4.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24451e78b0de0d7e8e04652c2b996519
+_md5_=e41886d380c5bda8aa0eaf2ef80f2a95
diff --git a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8 b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8
index 442b1fe91460..159534bc4cf4 100644
--- a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8
+++ b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/protobuf-cucumber-3.10.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21c529beffb21c7693e6c826ce86ffb6
diff --git a/metadata/md5-cache/dev-util/ragel-7.0.4 b/metadata/md5-cache/dev-util/ragel-7.0.4
index c093e7aec893..73d78533cd43 100644
--- a/metadata/md5-cache/dev-util/ragel-7.0.4
+++ b/metadata/md5-cache/dev-util/ragel-7.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/ragel/
 IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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=~dev-util/colm-0.14.7
 SLOT=0
 SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93f20793dd1611fca80153c19caa8fd8
+_md5_=ec8c1952da192b8d36d020710b0655aa
diff --git a/metadata/md5-cache/dev-util/redo-0.42a b/metadata/md5-cache/dev-util/redo-0.42a
index a6ce68c647d6..e1e8fc5f7a6a 100644
--- a/metadata/md5-cache/dev-util/redo-0.42a
+++ b/metadata/md5-cache/dev-util/redo-0.42a
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.42a.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfe996b59731475e7397c209053d3852
+_md5_=1aaf72a14dbf9d998ef1d62d3df80644
diff --git a/metadata/md5-cache/dev-util/redo-0.42c b/metadata/md5-cache/dev-util/redo-0.42c
index aac05fbab37c..582fd8589cff 100644
--- a/metadata/md5-cache/dev-util/redo-0.42c
+++ b/metadata/md5-cache/dev-util/redo-0.42c
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.42c.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfe996b59731475e7397c209053d3852
+_md5_=1aaf72a14dbf9d998ef1d62d3df80644
diff --git a/metadata/md5-cache/dev-util/redo-99999 b/metadata/md5-cache/dev-util/redo-99999
index d53cdc27c048..f6d0b74fd1df 100644
--- a/metadata/md5-cache/dev-util/redo-99999
+++ b/metadata/md5-cache/dev-util/redo-99999
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python3_8? ( dev-python/beautifulsoup[python_target
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0948b35c62a25afd84e92dea6114044
+_md5_=91ae0dbcf01af2faa46807a3e6ff6c18
diff --git a/metadata/md5-cache/dev-util/rr-5.4.0 b/metadata/md5-cache/dev-util/rr-5.4.0
index fc07464bdbe1..6f2703272ccb 100644
--- a/metadata/md5-cache/dev-util/rr-5.4.0
+++ b/metadata/md5-cache/dev-util/rr-5.4.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.4.0.tar.gz -> mozilla-rr-5.4.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=fef3591cc6a3105626b13a71c371a879
+_md5_=38aa820c7f5346c77573f26f87bd4dc0
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 c53eb6225e81..e6477634a266 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
@@ -4,10 +4,10 @@ DESCRIPTION=Generate highlighted source code as an (x)html document
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
 IUSE=doc static-libs
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 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	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a297dd3a5c69ff78550f9271f54f481
+_md5_=e480b775ecf2560b6e540a26cd823ec9
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2021.1 b/metadata/md5-cache/dev-util/spirv-tools-2021.1
index 23dbef4d6176..e67c468011da 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2021.1
+++ b/metadata/md5-cache/dev-util/spirv-tools-2021.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/c2d5375fa7cc87c93f692e7200d5d974283d4391.tar.gz -> spirv-tools-2021.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=06a4e0e530f09874005c8dffac82a865
+_md5_=fce2952be6177e73da7e474fdc27f258
diff --git a/metadata/md5-cache/dev-util/src-cli-3.30.1 b/metadata/md5-cache/dev-util/src-cli-3.30.1
new file mode 100644
index 000000000000..c8841b497151
--- /dev/null
+++ b/metadata/md5-cache/dev-util/src-cli-3.30.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=command line interface for the Sourcegraph code search tool
+EAPI=7
+HOMEPAGE=https://www.sourcegraph.com https://docs.sourcegraph.com/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/sourcegraph/src-cli/archive/3.30.1.tar.gz -> src-cli-3.30.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!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/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!cloudy!kit/fastprinter/@v/v0.0.0-20170127035650-74b38d55f37a.mod -> github.com%2F!cloudy!kit%2Ffastprinter%2F@v%2Fv0.0.0-20170127035650-74b38d55f37a.mod mirror://goproxy//github.com/!cloudy!kit/jet/@v/v2.1.3-0.20180809161101-62edd43e4f88+incompatible.mod -> github.com%2F!cloudy!kit%2Fjet%2F@v%2Fv2.1.3-0.20180809161101-62edd43e4f88+incompatible.mod mirror://goproxy//github.com/!joker/hpp/@v/v1.0.0.mod -> github.com%2F!joker%2Fhpp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!joker/jade/@v/v1.0.1-0.20190614124447-d475f43051e7.mod -> github.com%2F!joker%2Fjade%2F@v%2Fv1.0.1-0.20190614124447-d475f43051e7.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!shopify/goreferrer/@v/v0.0.0-20181106222321-ec9c9a553398.mod -> github.com%2F!shopify%2Fgoreferrer%2F@v%2Fv0.0.0-20181106222321-ec9c9a553398.mod mirror://goproxy//github.com/ajg/form/@v/v1.5.1.mod -> github.com%2Fajg%2Fform%2F@v%2Fv1.5.1.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-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-20210208195552-ff826a37aa15.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.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/aymerick/raymond/@v/v2.0.3-0.20180322193309-b565731e1464+incompatible.mod -> github.com%2Faymerick%2Fraymond%2F@v%2Fv2.0.3-0.20180322193309-b565731e1464+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/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v1.0.0.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.6.1.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.8.4.zip -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.8.4.zip mirror://goproxy//github.com/cockroachdb/errors/@v/v1.8.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.8.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.zip -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.zip mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/cockroachdb/redact/@v/v1.0.8.zip -> github.com%2Fcockroachdb%2Fredact%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/cockroachdb/redact/@v/v1.0.8.mod -> github.com%2Fcockroachdb%2Fredact%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/cockroachdb/sentry-go/@v/v0.6.1-cockroachdb.2.zip -> github.com%2Fcockroachdb%2Fsentry-go%2F@v%2Fv0.6.1-cockroachdb.2.zip mirror://goproxy//github.com/cockroachdb/sentry-go/@v/v0.6.1-cockroachdb.2.mod -> github.com%2Fcockroachdb%2Fsentry-go%2F@v%2Fv0.6.1-cockroachdb.2.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/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.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.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.4.1.mod -> github.com%2Fdave%2Fjennifer%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/derision-test/go-mockgen/@v/v1.1.2.mod -> github.com%2Fderision-test%2Fgo-mockgen%2F@v%2Fv1.1.2.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/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/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/efritz/pentimento/@v/v0.0.0-20190429011147-ade47d831101.mod -> github.com%2Fefritz%2Fpentimento%2F@v%2Fv0.0.0-20190429011147-ade47d831101.mod mirror://goproxy//github.com/eknkc/amber/@v/v0.0.0-20171010120322-cdade1c07385.mod -> github.com%2Feknkc%2Famber%2F@v%2Fv0.0.0-20171010120322-cdade1c07385.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.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/etcd-io/bbolt/@v/v1.3.3.mod -> github.com%2Fetcd-io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/fasthttp-contrib/websocket/@v/v0.0.0-20160511215533-1f3b11f56072.mod -> github.com%2Ffasthttp-contrib%2Fwebsocket%2F@v%2Fv0.0.0-20160511215533-1f3b11f56072.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/flosch/pongo2/@v/v0.0.0-20190707114632-bbf5a6c351f4.mod -> github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20190707114632-bbf5a6c351f4.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gavv/httpexpect/@v/v2.0.0+incompatible.mod -> github.com%2Fgavv%2Fhttpexpect%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.0.0-20190301062529-5545eab6dad3.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.0.0-20190301062529-5545eab6dad3.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.4.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.4.0.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.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/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/gobwas/httphead/@v/v0.0.0-20180130184737-2c6c146eadee.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.0.0-20180130184737-2c6c146eadee.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.0.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.2.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v0.0.0-20180223154316-0cd9801be74a.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv0.0.0-20180223154316-0cd9801be74a.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/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.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/gogo/status/@v/v1.1.0.mod -> github.com%2Fgogo%2Fstatus%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/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.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.7.1-0.20190724094224-574c33c3df38.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.7.1-0.20190724094224-574c33c3df38.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.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-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/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.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/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.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/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hexops/autogold/@v/v0.8.1.mod -> github.com%2Fhexops%2Fautogold%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/hexops/autogold/@v/v1.3.0.mod -> github.com%2Fhexops%2Fautogold%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hexops/gotextdiff/@v/v1.0.3.mod -> github.com%2Fhexops%2Fgotextdiff%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hexops/valast/@v/v1.4.0.mod -> github.com%2Fhexops%2Fvalast%2F@v%2Fv1.4.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/hydrogen18/memlistener/@v/v0.0.0-20141126152155-54553eb933fb.mod -> github.com%2Fhydrogen18%2Fmemlistener%2F@v%2Fv0.0.0-20141126152155-54553eb933fb.mod mirror://goproxy//github.com/imkira/go-interpol/@v/v1.1.0.mod -> github.com%2Fimkira%2Fgo-interpol%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/inconshreveable/log15/@v/v0.0.0-20201112154412-8562bdadbbac.mod -> github.com%2Finconshreveable%2Flog15%2F@v%2Fv0.0.0-20201112154412-8562bdadbbac.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/iris-contrib/blackfriday/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fblackfriday%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/go.uuid/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fgo.uuid%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/i18n/@v/v0.0.0-20171121225848-987a633949d0.mod -> github.com%2Firis-contrib%2Fi18n%2F@v%2Fv0.0.0-20171121225848-987a633949d0.mod mirror://goproxy//github.com/iris-contrib/schema/@v/v0.0.1.mod -> github.com%2Firis-contrib%2Fschema%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/jig/teereadcloser/@v/v0.0.0-20181016160506-953720c48e05.zip -> github.com%2Fjig%2Fteereadcloser%2F@v%2Fv0.0.0-20181016160506-953720c48e05.zip mirror://goproxy//github.com/jig/teereadcloser/@v/v0.0.0-20181016160506-953720c48e05.mod -> github.com%2Fjig%2Fteereadcloser%2F@v%2Fv0.0.0-20181016160506-953720c48e05.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.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/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20181118221551-089d3ea4e4d5.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20181118221551-089d3ea4e4d5.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20180524022052-584905176618.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20180524022052-584905176618.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20180920084828-472a3e8b2073.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20180920084828-472a3e8b2073.mod mirror://goproxy//github.com/k0kubun/colorstring/@v/v0.0.0-20150214042306-9440f1994b88.mod -> github.com%2Fk0kubun%2Fcolorstring%2F@v%2Fv0.0.0-20150214042306-9440f1994b88.mod mirror://goproxy//github.com/kataras/golog/@v/v0.0.9.mod -> github.com%2Fkataras%2Fgolog%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/kataras/iris/v12/@v/v12.0.1.mod -> github.com%2Fkataras%2Firis%2Fv12%2F@v%2Fv12.0.1.mod mirror://goproxy//github.com/kataras/neffos/@v/v0.0.10.mod -> github.com%2Fkataras%2Fneffos%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/kataras/pio/@v/v0.0.0-20190103105442-ea782b38602d.mod -> github.com%2Fkataras%2Fpio%2F@v%2Fv0.0.0-20190103105442-ea782b38602d.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.8.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.zip -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/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/labstack/echo/v4/@v/v4.1.11.mod -> github.com%2Flabstack%2Fecho%2Fv4%2F@v%2Fv4.1.11.mod mirror://goproxy//github.com/labstack/gommon/@v/v0.3.0.mod -> github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.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/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.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.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.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/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mediocregopher/mediocre-go-lib/@v/v0.0.0-20181029021733-cb65787f37ed.mod -> github.com%2Fmediocregopher%2Fmediocre-go-lib%2F@v%2Fv0.0.0-20181029021733-cb65787f37ed.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.3.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.3.0.mod 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/mitchellh/copystructure/@v/v1.2.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.2.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.2.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-wordwrap/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.2.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.2.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210619224110-3f7ff695adc6.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210619224110-3f7ff695adc6.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210619224110-3f7ff695adc6.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210619224110-3f7ff695adc6.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/moul/http2curl/@v/v1.0.0.mod -> github.com%2Fmoul%2Fhttp2curl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.8.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.0.2.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/neelance/parallel/@v/v0.0.0-20160708114440-4de9ce63d14c.zip -> github.com%2Fneelance%2Fparallel%2F@v%2Fv0.0.0-20160708114440-4de9ce63d14c.zip mirror://goproxy//github.com/neelance/parallel/@v/v0.0.0-20160708114440-4de9ce63d14c.mod -> github.com%2Fneelance%2Fparallel%2F@v%2Fv0.0.0-20160708114440-4de9ce63d14c.mod mirror://goproxy//github.com/nightlyone/lockfile/@v/v1.0.0.mod -> github.com%2Fnightlyone%2Flockfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.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.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.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.13.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.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/pingcap/errors/@v/v0.11.4.zip -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.zip mirror://goproxy//github.com/pingcap/errors/@v/v0.11.4.mod -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.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_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/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/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.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/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/sclevine/agouti/@v/v3.0.0+incompatible.mod -> github.com%2Fsclevine%2Fagouti%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/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/go-goon/@v/v0.0.0-20210110234559-7585751d9a17.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20210110234559-7585751d9a17.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/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/sourcegraph/batch-change-utils/@v/v0.0.0-20210708162152-c9f35b905d94.zip -> github.com%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210708162152-c9f35b905d94.zip mirror://goproxy//github.com/sourcegraph/batch-change-utils/@v/v0.0.0-20210708162152-c9f35b905d94.mod -> github.com%2Fsourcegraph%2Fbatch-change-utils%2F@v%2Fv0.0.0-20210708162152-c9f35b905d94.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.6.1.zip -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.6.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/sourcegraph/jsonx/@v/v0.0.0-20200629203448-1a936bd500cf.zip -> github.com%2Fsourcegraph%2Fjsonx%2F@v%2Fv0.0.0-20200629203448-1a936bd500cf.zip mirror://goproxy//github.com/sourcegraph/jsonx/@v/v0.0.0-20200629203448-1a936bd500cf.mod -> github.com%2Fsourcegraph%2Fjsonx%2F@v%2Fv0.0.0-20200629203448-1a936bd500cf.mod mirror://goproxy//github.com/sourcegraph/sourcegraph/lib/@v/v0.0.0-20210628190057-faa35110fad5.zip -> github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210628190057-faa35110fad5.zip mirror://goproxy//github.com/sourcegraph/sourcegraph/lib/@v/v0.0.0-20210628190057-faa35110fad5.mod -> github.com%2Fsourcegraph%2Fsourcegraph%2Flib%2F@v%2Fv0.0.0-20210628190057-faa35110fad5.mod mirror://goproxy//github.com/sourcegraph/yaml/@v/v1.0.1-0.20200714132230-56936252f152.zip -> github.com%2Fsourcegraph%2Fyaml%2F@v%2Fv1.0.1-0.20200714132230-56936252f152.zip mirror://goproxy//github.com/sourcegraph/yaml/@v/v1.0.1-0.20200714132230-56936252f152.mod -> github.com%2Fsourcegraph%2Fyaml%2F@v%2Fv1.0.1-0.20200714132230-56936252f152.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/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/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.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/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/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.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.6.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.6.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/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/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/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/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/yalp/jsonpath/@v/v0.0.0-20180802001716-5cc68e5049a0.mod -> github.com%2Fyalp%2Fjsonpath%2F@v%2Fv0.0.0-20180802001716-5cc68e5049a0.mod mirror://goproxy//github.com/yudai/gojsondiff/@v/v1.0.0.mod -> github.com%2Fyudai%2Fgojsondiff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/yudai/golcs/@v/v0.0.0-20170316035057-ecda9a501e82.mod -> github.com%2Fyudai%2Fgolcs%2F@v%2Fv0.0.0-20170316035057-ecda9a501e82.mod mirror://goproxy//github.com/yudai/pp/@v/v2.0.1+incompatible.mod -> github.com%2Fyudai%2Fpp%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-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-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/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/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190327091125-710a502c58a2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190327091125-710a502c58a2.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-20190424112056-4829fb13d2c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.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-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-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-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-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-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/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-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-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-20190428183149-804c0c7841b5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190428183149-804c0c7841b5.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-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-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-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-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-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.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-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-20210112080510-489259a85091.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210218084038-e8e29180ff58.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210218084038-e8e29180ff58.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-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-20210611083646-a4fc73990273.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210611083646-a4fc73990273.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/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.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.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.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-20181221001348-537d06c36207.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181221001348-537d06c36207.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-20190327201419-c70d86f8b7cf.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.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-20190428024724-550556f78a90.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190428024724-550556f78a90.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-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-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200624163319-25775e59acb7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200624163319-25775e59acb7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.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.3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180518175338-11a468237815.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180518175338-11a468237815.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.12.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.12.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.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.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.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.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/go-playground/assert.v1/@v/v1.2.1.mod -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod mirror://goproxy//gopkg.in/go-playground/validator.v8/@v/v8.18.2.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v8%2F@v%2Fv8.18.2.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/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.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.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//jaytaylor.com/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.zip -> jaytaylor.com%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.zip mirror://goproxy//jaytaylor.com/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod -> jaytaylor.com%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.0.0-20210107193838-d24d34e18d44.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.0.0-20210107193838-d24d34e18d44.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.0.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=b4052a7dbb465abdc0b465b967050d23
diff --git a/metadata/md5-cache/dev-util/strace-5.13 b/metadata/md5-cache/dev-util/strace-5.13
new file mode 100644
index 000000000000..209e7a9454e8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.13
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.13/strace-5.13.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_=16d70fc2a5e6e2d9807ea7940e961ae6
diff --git a/metadata/md5-cache/dev-util/sysprof-3.40.1-r1 b/metadata/md5-cache/dev-util/sysprof-3.40.1-r1
index 33f68d2c068a..d16a1f723c7c 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.40.1-r1
+++ b/metadata/md5-cache/dev-util/sysprof-3.40.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=System-wide Linux Profiler
 EAPI=7
 HOMEPAGE=http://sysprof.com/
 IUSE=gtk +unwind
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.40.1 >=dev-util/sysprof-capture-3.40.1:4
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.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	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b838afa287503417981d08337175280
+_md5_=3be9e5028a274a44e481c0db15c5d2d2
diff --git a/metadata/md5-cache/dev-util/sysprof-capture-3.40.1 b/metadata/md5-cache/dev-util/sysprof-capture-3.40.1
index 8e20269105ed..8833e9ecd5eb 100644
--- a/metadata/md5-cache/dev-util/sysprof-capture-3.40.1
+++ b/metadata/md5-cache/dev-util/sysprof-capture-3.40.1
@@ -5,10 +5,10 @@ DESCRIPTION=Static library for sysprof capture data generation
 EAPI=7
 HOMEPAGE=http://sysprof.com/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=!=dev-util/sysprof-3.34.1-r0
 SLOT=4
 SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.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
-_md5_=fd3691df414ad93d123acf9068850846
+_md5_=662f5ef882caea1bfa6684c8f34319e8
diff --git a/metadata/md5-cache/dev-util/sysprof-common-3.40.1 b/metadata/md5-cache/dev-util/sysprof-common-3.40.1
index bcdabeb192b0..7e8b216f62de 100644
--- a/metadata/md5-cache/dev-util/sysprof-common-3.40.1
+++ b/metadata/md5-cache/dev-util/sysprof-common-3.40.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Static library for sysprof capture data generation
 EAPI=7
 HOMEPAGE=http://sysprof.com/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=!=dev-util/sysprof-3.34.1-r0 !=dev-util/sysprof-capture-3.36.0-r0
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9
-_md5_=12901916556833536ef0972d3cd96b02
+_md5_=db392add9bda9d7b00bbc8ec62ff6e79
diff --git a/metadata/md5-cache/dev-util/systemtap-4.5 b/metadata/md5-cache/dev-util/systemtap-4.5
index 54b559904814..83ebdf3c7ba7 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.5
+++ b/metadata/md5-cache/dev-util/systemtap-4.5
@@ -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 ~riscv ~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.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95f1bdc39907a4faf29a38387db2a0fd
+_md5_=03e6d03f4f7cbba35fd9fecf96cdceb2
diff --git a/metadata/md5-cache/dev-util/tup-0.7.10 b/metadata/md5-cache/dev-util/tup-0.7.10
new file mode 100644
index 000000000000..f13d305beefd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/tup-0.7.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:3=
+DESCRIPTION=A file-based build system
+EAPI=7
+HOMEPAGE=http://gittup.org/tup
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2 MIT public-domain BSD BSD-2
+RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:3=
+SLOT=0
+SRC_URI=https://github.com/gittup/tup/archive/v0.7.10.tar.gz -> tup-0.7.10.tar.gz
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f6e0d4fc712c9243c18b76664bb8b9f2
diff --git a/metadata/md5-cache/dev-util/visualvm-2.1 b/metadata/md5-cache/dev-util/visualvm-2.1
new file mode 100644
index 000000000000..d921ba091aec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/visualvm-2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
+EAPI=7
+HOMEPAGE=https://visualvm.github.io
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=7
+SRC_URI=https://github.com/oracle/visualvm/archive/2.1.tar.gz -> visualvm-2.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=794a9752c5337a0e9da0e6442c944ea0
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 9100a64dff36..965e4c1f211a 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/cvsps-2.2_beta1-r1 b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
index ead7c335e595..29601c359da6 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-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=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8330cad0302d64e4a574f463e799efa
+_md5_=c21eca7c44988793eb067ee320c757c0
diff --git a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2 b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
index 583d83eaa4e6..bb4f472568a6 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
+++ b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib app-text/asciidoc
 DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-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=GPL-2
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=3
 SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51fe0ec1a24b7fa6bbe6e2eb805957a2
+_md5_=87b051d70f6065e2795a5b3e10d5b079
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1 b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
index ee38c65a12c6..f2e97c226478 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.5.tar.gz -> git-cola-3.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b348661b0067af6e63736a6af3dcadce
+_md5_=344e2f550c8a5ea64be82d2edcb66da0
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.8 b/metadata/md5-cache/dev-vcs/git-cola-3.8
index dedf0628d96e..c46906482137 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.8
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.8.tar.gz -> git-cola-3.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97cd4846e8a3b0449050cd4d411c03cd
+_md5_=985c1fe5247aa0f85c1d83e0c9042dca
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.9 b/metadata/md5-cache/dev-vcs/git-cola-3.9
index bbba2352b298..afc924e47ab7 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.9
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.9
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.9.tar.gz -> git-cola-3.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4daeafd5bce2138e2b495909bebe8b43
+_md5_=4e3331c83f5cf2d3f77c5156f108380b
diff --git a/metadata/md5-cache/dev-vcs/git-num-2.0.1 b/metadata/md5-cache/dev-vcs/git-num-2.0.1
index ffdaf1522578..c90200ef1b52 100644
--- a/metadata/md5-cache/dev-vcs/git-num-2.0.1
+++ b/metadata/md5-cache/dev-vcs/git-num-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schreifels/git-num/archive/v2.0.1.tar.gz -> git-num-2.0.1.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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ccec9011a85c73310013a96c1f5c3c74
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8.1 b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
index 1b14da8194a1..f6dea9be8530 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~am
 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 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? ( 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	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
+_md5_=f2bc25ebdd75fe026221e4c0ff5b9e3c
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index aa87ff5da0bf..4a3018874d84 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -7,9 +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
 LICENSE=GPL-2+
 PROPERTIES=live
-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
+RESTRICT=!test? ( test )
 SLOT=0
 _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
+_md5_=3ebcb2339fe51a10ecce95679e6af851
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.1 b/metadata/md5-cache/dev-vcs/tig-2.5.1
deleted file mode 100644
index 17550c40b56a..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=text mode interface for git
-EAPI=7
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=test unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e478e0e7e5a92034264a60502905a7a
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.1-r1 b/metadata/md5-cache/dev-vcs/tig-2.5.1-r1
new file mode 100644
index 000000000000..518cfdc4fbfe
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0=
+DESCRIPTION=text mode interface for git
+EAPI=7
+HOMEPAGE=https://jonas.github.io/tig/
+IUSE=test unicode
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= dev-vcs/git
+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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5d2dcf0616bbbb51bb547da356736ac9
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.3-r1 b/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
deleted file mode 100644
index 1287317cd77f..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=text mode interface for git
-EAPI=7
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=test unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.3-r2 b/metadata/md5-cache/dev-vcs/tig-2.5.3-r2
new file mode 100644
index 000000000000..47b18776227b
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.3-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0=
+DESCRIPTION=text mode interface for git
+EAPI=7
+HOMEPAGE=https://jonas.github.io/tig/
+IUSE=test unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= dev-vcs/git
+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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ed00381e26c431abbf0db0307f62a65b
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.4 b/metadata/md5-cache/dev-vcs/tig-2.5.4
deleted file mode 100644
index a8ec83252ad8..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=text mode interface for git
-EAPI=7
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=test unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.4-r1 b/metadata/md5-cache/dev-vcs/tig-2.5.4-r1
new file mode 100644
index 000000000000..ef810f2ca14a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0=
+DESCRIPTION=text mode interface for git
+EAPI=7
+HOMEPAGE=https://jonas.github.io/tig/
+IUSE=test unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= dev-vcs/git
+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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f08fe2d466fcf809aab787e0fc7be73c
diff --git a/metadata/md5-cache/dev-vcs/tig-9999 b/metadata/md5-cache/dev-vcs/tig-9999
index 2b374ee8035c..cc786c7ed98a 100644
--- a/metadata/md5-cache/dev-vcs/tig-9999
+++ b/metadata/md5-cache/dev-vcs/tig-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-text/asciidoc app-text/xmlto >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0=
 DESCRIPTION=text mode interface for git
 EAPI=7
 HOMEPAGE=https://jonas.github.io/tig/
 IUSE=test unicode
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= dev-vcs/git
 REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1af17ab4468af13205e6a0940b62b58b
+_md5_=64c82029eabe6c500b2225fcebd37734
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.8 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8
index 2f13e6f22c2f..f55386129c4c 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.8
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/tortoisehg/thg/-/archive/5.8/thg-5.8.tar.gz -> tortoisehg-5.8.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	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-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72ca85fc9957b567fe44f3c33f82b392
+_md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
new file mode 100644
index 000000000000..39b43adaa1c9
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-vcs/mercurial-5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-vcs/mercurial-5.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/iniparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[network,svg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock dev-python/pytest )
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=7
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-vcs/mercurial-5.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/iniparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[network,svg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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://foss.heptapod.net/mercurial/tortoisehg/thg/-/archive/5.8.1/thg-5.8.1.tar.gz -> tortoisehg-5.8.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	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-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index e8e3f3e83bef..81dac0641ea8 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72ca85fc9957b567fe44f3c33f82b392
+_md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index c976de3127ea..f3a9acbcabf0 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r2 b/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r2
index c9b214095ec2..3e666912077b 100644
--- a/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r2
+++ b/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip mirror://debian/pool/main/f/funnyboat/funnyboat_1.5-11.debian.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b619b7a9719bd3d69a7661b4270229e
+_md5_=b6d61ba909d78f36b409c5000f7016e1
diff --git a/metadata/md5-cache/games-arcade/solarwolf-1.5-r2 b/metadata/md5-cache/games-arcade/solarwolf-1.5-r2
deleted file mode 100644
index 1666109ba3ec..000000000000
--- a/metadata/md5-cache/games-arcade/solarwolf-1.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygame-1.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/sdl-mixer[mod,vorbis]
-DESCRIPTION=Action/arcade recreation of SolarFox
-EAPI=7
-HOMEPAGE=http://www.pygame.org/shredwheat/solarwolf/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~hppa ~x86
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygame-1.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/sdl-mixer[mod,vorbis]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=http://www.pygame.org/shredwheat/solarwolf/solarwolf-1.5.tar.gz mirror://debian/pool/main/s/solarwolf/solarwolf_1.5+dfsg1-1.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=080c9c841e410afe63402dee60295a7d
diff --git a/metadata/md5-cache/games-arcade/solarwolf-1.5_p3 b/metadata/md5-cache/games-arcade/solarwolf-1.5_p3
new file mode 100644
index 000000000000..069471b8607c
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/solarwolf-1.5_p3
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Action/arcade recreation of SolarFox
+EAPI=8
+HOMEPAGE=https://www.pygame.org/shredwheat/solarwolf/index.shtml
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~hppa ~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/pygame[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygame[python_targets_python3_9(-)] ) media-libs/sdl2-image[gif,png] media-libs/sdl2-mixer[mod,vorbis]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=http://www.pygame.org/shredwheat/solarwolf/solarwolf-1.5.tar.gz mirror://debian/pool/main/s/solarwolf/solarwolf_1.5+dfsg1-3.debian.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d2855ec3b13b9b85c4fec1ffc3fa1292
diff --git a/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r3 b/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r3
deleted file mode 100644
index b34c4c20524a..000000000000
--- a/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygame[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A traditional and challenging 2D platformer game with a slight rotational twist
-EAPI=7
-HOMEPAGE=http://hectigo.net/puskutraktori/whichwayisup/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-3.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygame[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=http://hectigo.net/puskutraktori/whichwayisup/whichwayisup_b079.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb24202d6e095da79430ca873022c568
diff --git a/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r4 b/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r4
new file mode 100644
index 000000000000..e3d228a59df5
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r4
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Traditional and challenging 2D platformer game with a slight rotational twist
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BitstreamVera CC-BY-3.0 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/pygame[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygame[python_targets_python3_9(-)] ) media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://gentoo/whichwayisup_b079.zip https://dev.gentoo.org/~ionen/distfiles/whichwayisup.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5910480eb123b5068edc4a483d8445e1
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index bc0a0a52ff34..a4e33664034f 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/camato-0.7.4-r2 b/metadata/md5-cache/games-board/camato-0.7.4-r2
index a6fa3a202d95..50e6d1a37a52 100644
--- a/metadata/md5-cache/games-board/camato-0.7.4-r2
+++ b/metadata/md5-cache/games-board/camato-0.7.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/camato-0_7_4.tar.gz https://dev.gentoo.org/~ionen/distfiles/camato.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad7da6182719145a00f4ecd323294151
diff --git a/metadata/md5-cache/games-board/pysolfc-2.6.4-r1 b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
index a4b26827e13f..6fb53034de62 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
+++ b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.6.4.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.1.tar.xz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78305cefd07f4c975a91dcd1c449fda4
+_md5_=03529a0224c7280d3e77be52e250b6f4
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 4a40dd4c402d..7f899281d9df 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/frotz-2.52 b/metadata/md5-cache/games-engines/frotz-2.52
deleted file mode 100644
index 3509a2f60257..000000000000
--- a/metadata/md5-cache/games-engines/frotz-2.52
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst
-DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-DESCRIPTION=Interpreter for Z-code based text games
-EAPI=7
-HOMEPAGE=https://661.org/proj/if/frotz/
-IUSE=ncurses sdl sound unicode
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-REQUIRED_USE=sound? ( || ( ncurses sdl ) )
-SLOT=0
-SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68e421b3f251349c7e67a8db511d6c3d
diff --git a/metadata/md5-cache/games-engines/frotz-2.52-r1 b/metadata/md5-cache/games-engines/frotz-2.52-r1
new file mode 100644
index 000000000000..b9fae1394595
--- /dev/null
+++ b/metadata/md5-cache/games-engines/frotz-2.52-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=ncurses? ( sys-libs/ncurses:=[unicode(+)?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+DESCRIPTION=Interpreter for Z-code based text games
+EAPI=7
+HOMEPAGE=https://661.org/proj/if/frotz/
+IUSE=ncurses sdl sound unicode
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:=[unicode(+)?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+REQUIRED_USE=sound? ( || ( ncurses sdl ) )
+SLOT=0
+SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c97df898b8584dd1093dddd6e5f71ef3
diff --git a/metadata/md5-cache/games-engines/frotz-2.53 b/metadata/md5-cache/games-engines/frotz-2.53
deleted file mode 100644
index f44d26e6b16c..000000000000
--- a/metadata/md5-cache/games-engines/frotz-2.53
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst
-DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-DESCRIPTION=Interpreter for Z-code based text games
-EAPI=7
-HOMEPAGE=https://661.org/proj/if/frotz/
-IUSE=ncurses sdl sound unicode
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-REQUIRED_USE=sound? ( || ( ncurses sdl ) )
-SLOT=0
-SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.53/frotz-2.53.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f0b57695cdb69c56c6df374e310ab93
diff --git a/metadata/md5-cache/games-engines/frotz-2.53-r1 b/metadata/md5-cache/games-engines/frotz-2.53-r1
new file mode 100644
index 000000000000..742d7d35cc2e
--- /dev/null
+++ b/metadata/md5-cache/games-engines/frotz-2.53-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=ncurses? ( sys-libs/ncurses:=[unicode(+)?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+DESCRIPTION=Interpreter for Z-code based text games
+EAPI=7
+HOMEPAGE=https://661.org/proj/if/frotz/
+IUSE=ncurses sdl sound unicode
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:=[unicode(+)?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+REQUIRED_USE=sound? ( || ( ncurses sdl ) )
+SLOT=0
+SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.53/frotz-2.53.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c97df898b8584dd1093dddd6e5f71ef3
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index d1414bdde2d5..147f40b9d91b 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210722 b/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210722
new file mode 100644
index 000000000000..0529a5e9b0fb
--- /dev/null
+++ b/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210722
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen[dot] media-gfx/transfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=client? ( media-libs/libsamplerate net-misc/curl virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) vulkan? ( media-libs/vulkan-loader ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= ) client? ( x11-base/xorg-proto vulkan? ( dev-util/vulkan-headers ) )
+DESCRIPTION=3D engine based on id Software's Quake and QuakeWorld game engines
+EAPI=8
+HOMEPAGE=http://www.quakeforge.net/
+IUSE=alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=client? ( media-libs/libsamplerate net-misc/curl virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) vulkan? ( media-libs/vulkan-loader ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
+SLOT=0
+SRC_URI=https://github.com/quakeforge/quakeforge/archive/e799a7ae45b0ab2ad7b642953277db8ccf256cf8.tar.gz -> quakeforge-0.7.2_p20210722.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d8888dcef2e09501b4d0e613b58f747c
diff --git a/metadata/md5-cache/games-fps/quakeforge-9999 b/metadata/md5-cache/games-fps/quakeforge-9999
new file mode 100644
index 000000000000..6861eabc3f29
--- /dev/null
+++ b/metadata/md5-cache/games-fps/quakeforge-9999
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen[dot] media-gfx/transfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=client? ( media-libs/libsamplerate net-misc/curl virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) vulkan? ( media-libs/vulkan-loader ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= ) client? ( x11-base/xorg-proto vulkan? ( dev-util/vulkan-headers ) )
+DESCRIPTION=3D engine based on id Software's Quake and QuakeWorld game engines
+EAPI=8
+HOMEPAGE=http://www.quakeforge.net/
+IUSE=alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib
+LICENSE=GPL-2+
+PROPERTIES=live
+RDEPEND=client? ( media-libs/libsamplerate net-misc/curl virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) vulkan? ( media-libs/vulkan-loader ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
+SLOT=0
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5b1e7b7527a8d8ab8a61f51672a9619a
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 2b5ba235be5a..c2dc8e42aeaf 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
index ebb12eb6c201..73dee0f1164c 100644
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=639783101ac74595f280afc0b7a9cbad
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 08667b409ca3..8ee1d4b74e95 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/angrydd-1.0.1_p13-r1 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
index 82f14b00728f..eba1edcf7e1b 100644
--- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
+++ b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz mirror://debian/pool/main/a/angrydd/angrydd_1.0.1-13.debian.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=112b25a8faabcb804e3161365e53cd90
+_md5_=040c286d72629fec52b68376669ecd23
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2 b/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2
new file mode 100644
index 000000000000..7abccf9c685a
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/appstream-glib 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
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] >=x11-libs/gtk+-3.24.0:3[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Test your logic skills in this number grid puzzle
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] >=x11-libs/gtk+-3.24.0:3[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-sudoku/40/gnome-sudoku-40.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	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=55654d85ec01801d545a3979befaf7e1
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index bcf4e7757f5f..84ccd6cac513 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/angband-4.2.2 b/metadata/md5-cache/games-roguelike/angband-4.2.2
deleted file mode 100644
index df3380248ede..000000000000
--- a/metadata/md5-cache/games-roguelike/angband-4.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
-DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
-EAPI=7
-HOMEPAGE=https://rephial.org/
-IUSE=+ncurses sdl sound +X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
-REQUIRED_USE=sound? ( sdl ) || ( X ncurses )
-SLOT=0
-SRC_URI=https://github.com/angband/angband/archive/refs/tags/4.2.2.tar.gz -> angband-4.2.2.tar.gz https://dev.gentoo.org/~steils/distfiles/angband-4.2.2-man.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94c9fb1fcbad852c46efd5b852900a05
diff --git a/metadata/md5-cache/games-roguelike/angband-4.2.2-r1 b/metadata/md5-cache/games-roguelike/angband-4.2.2-r1
new file mode 100644
index 000000000000..06fcb8309a73
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/angband-4.2.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
+DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
+EAPI=7
+HOMEPAGE=https://rephial.org/
+IUSE=+ncurses sdl sound +X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
+REQUIRED_USE=sound? ( sdl ) || ( X ncurses )
+SLOT=0
+SRC_URI=https://github.com/angband/angband/archive/refs/tags/4.2.2.tar.gz -> angband-4.2.2.tar.gz https://dev.gentoo.org/~steils/distfiles/angband-4.2.2-man.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=af451bde9399e2882823a980f9905b80
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 88204fd2c351..8ef08c7e94b0 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
index 54d7a19f8894..fa3c5779c5cd 100644
--- a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
-DEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch unpack
 DESCRIPTION=Epic fantasy role-playing adventure in an enormous and unique world
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.spiderwebsoftware.com/avadon
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
-RESTRICT=fetch bindist
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=avadon-linux-1331768904-bin.txt
-_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	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44169fc12698c64934c3591e9094a3a3
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=0c78d4fced217082a8a0c14aab0bfd4a
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608-r1 b/metadata/md5-cache/games-rpg/dear-esther-20130608-r1
index c648531566a5..062efec366bb 100644
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608-r1
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608-r1
@@ -1,13 +1,14 @@
 BDEPEND=app-arch/unzip
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Ghost story, told using first-person gaming technologies
 EAPI=7
 HOMEPAGE=http://dear-esther.com/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=bindist fetch splitdebug
+RDEPEND=media-libs/freetype[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=dearesther-linux-06082013-bin
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2ee8e77d02e96d1cc172d42af34b4493
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=caf60ed27a418101ba1343c1acc0f25b
diff --git a/metadata/md5-cache/games-rpg/grimrock-20150707 b/metadata/md5-cache/games-rpg/grimrock-20150707
index d793f5b767d8..d44a31bf2453 100644
--- a/metadata/md5-cache/games-rpg/grimrock-20150707
+++ b/metadata/md5-cache/games-rpg/grimrock-20150707
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
-DEPEND=app-arch/xz-utils
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.grimrock.net/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/libsdl2[opengl,sound,video] media-libs/libvorbis sys-libs/zlib[minizip] virtual/opengl x11-libs/libX11
-RESTRICT=fetch bindist splitdebug
+RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/libsdl2[opengl,sound,video] media-libs/libvorbis media-libs/openal sys-libs/zlib[minizip] virtual/opengl x11-libs/libX11
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=Grimrock-Linux-2015-07-07.sh
-_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	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12024eb42c3c4c92346ceaba63e6ee04
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89221cb7e70f10e152f407f23e6e74ce
diff --git a/metadata/md5-cache/games-rpg/openglad-0.98_p20200907 b/metadata/md5-cache/games-rpg/openglad-0.98_p20200907
new file mode 100644
index 000000000000..6c67b6e73727
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/openglad-0.98_p20200907
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/premake:4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libyaml dev-libs/libzip:= media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/sdl2-mixer
+DESCRIPTION=SDL clone of Gladiator, a classic RPG game
+EAPI=8
+HOMEPAGE=http://snowstorm.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0 GPL-2+ ZLIB
+RDEPEND=dev-libs/libyaml dev-libs/libzip:= media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/sdl2-mixer
+SLOT=0
+SRC_URI=https://github.com/openglad/openglad/archive/80e33b15cfa6d7d288b4b3db4dcca0349f13691f.tar.gz -> openglad-0.98_p20200907.tar.gz mirror://gentoo/openglad.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef0d7a98786b3b57f69ffbf7eb79e5c6
diff --git a/metadata/md5-cache/games-rpg/pcgen-6.06.01 b/metadata/md5-cache/games-rpg/pcgen-6.06.01
new file mode 100644
index 000000000000..10ddd8bf6c73
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/pcgen-6.06.01
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare
+DESCRIPTION=D&D character generator
+EAPI=8
+HOMEPAGE=http://pcgen.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 OGL-1.0a
+RDEPEND=>=virtual/jre-1.8:*
+SLOT=0
+SRC_URI=https://github.com/PCGen/pcgen/releases/download/6.06.01/pcgen-6.06.01-full.zip
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773
+_md5_=6f671512abf23eac1c3edee7ac7a7d5a
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0-r1 b/metadata/md5-cache/games-rpg/to-the-moon-0-r1
index 4997a8c69243..6f4e2f7385f7 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0-r1
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0-r1
@@ -1,5 +1,4 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
-DEPEND=sys-apps/coreutils sys-apps/grep
+DEFINED_PHASES=install nofetch unpack
 DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
 EAPI=7
 HOMEPAGE=http://freebirdgames.com/games/to-the-moon
@@ -7,8 +6,8 @@ IUSE=bundled-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )
 RDEPEND=sys-libs/zlib virtual/opengl !bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] media-libs/openal media-libs/sdl2-image[png] media-libs/sdl2-ttf )
-RESTRICT=fetch bindist splitdebug
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=ToTheMoon_linux_1389114090.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9cab764bc51e3d528c982ad7ef49a411
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1cf58113bd0e03f650096bf4a3ac757e
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r1 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r1
deleted file mode 100644
index 57fa04ac6e24..000000000000
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup
-DESCRIPTION=Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
-EAPI=7
-HOMEPAGE=https://wasteland.inxile-entertainment.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] virtual/opengl
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=47d25ed9c1a691cdaec86942afce0d7f
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
new file mode 100644
index 000000000000..dafc5c78b16a
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch pretend setup
+DESCRIPTION=Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
+EAPI=7
+HOMEPAGE=https://wasteland.inxile-entertainment.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=dev-libs/atk[abi_x86_32(-)] dev-libs/glib:2[abi_x86_32(-)] media-libs/fontconfig:1.0[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/cairo[abi_x86_32(-)] x11-libs/gdk-pixbuf[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/pango[abi_x86_32(-)]
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d907b0d7ed338a3b5e6bb746f0cad5b6
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index a74b4d850122..d94deb65da10 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/crashtest-1.1-r1 b/metadata/md5-cache/games-simulation/crashtest-1.1-r1
deleted file mode 100644
index ce78bbe91e93..000000000000
--- a/metadata/md5-cache/games-simulation/crashtest-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-games/ode media-libs/alsa-lib media-libs/freeglut x11-libs/fltk:1[opengl] virtual/opengl virtual/glu >=media-libs/plib-1.8.4
-DESCRIPTION=Educational car crash simulator
-EAPI=6
-HOMEPAGE=http://www.stolk.org/crashtest/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-games/ode media-libs/alsa-lib media-libs/freeglut x11-libs/fltk:1[opengl] virtual/opengl virtual/glu
-SLOT=0
-SRC_URI=http://www.stolk.org/crashtest/crashtest-1.1.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_=2cd696473405b9e16a97a46117816f1c
diff --git a/metadata/md5-cache/games-simulation/crashtest-1.1-r2 b/metadata/md5-cache/games-simulation/crashtest-1.1-r2
new file mode 100644
index 000000000000..3626c0657e2b
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/crashtest-1.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-games/ode:= media-libs/freeglut media-libs/plib virtual/glu virtual/opengl x11-libs/fltk:1[opengl]
+DESCRIPTION=Educational car crash simulator
+EAPI=8
+HOMEPAGE=http://www.stolk.org/crashtest/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/ode:= media-libs/freeglut media-libs/plib virtual/glu virtual/opengl x11-libs/fltk:1[opengl]
+SLOT=0
+SRC_URI=http://www.stolk.org/crashtest/crashtest-1.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=92396f69b09ba78200065f2f6347740f
diff --git a/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r1 b/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r1
deleted file mode 100644
index 59317a81d2ac..000000000000
--- a/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal[shared(+)] portaudio? ( media-libs/portaudio ) 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=model-airplane flight simulation program
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/crrcsim/
-IUSE=portaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal[shared(+)] portaudio? ( media-libs/portaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.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_=daedc76a7d4a6fbded52c07f5e14f6ca
diff --git a/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r2 b/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r2
new file mode 100644
index 000000000000..a3ea9a3176a2
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/crrcsim-0.9.13-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/gmp:= media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib virtual/glu virtual/jpeg virtual/opengl portaudio? ( media-libs/portaudio ) sci-mathematics/cgal
+DESCRIPTION=Model-airplane flight simulation program
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/crrcsim/
+IUSE=portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib virtual/glu virtual/jpeg virtual/opengl portaudio? ( media-libs/portaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=4f4fe745fbc1f2b75da756c727abd644
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.3 b/metadata/md5-cache/games-simulation/openrct2-0.3.3
deleted file mode 100644
index a76fae1e504d..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=7
-HOMEPAGE=https://openrct2.org/
-IUSE=dedicated +lightfx +opengl scripting test +truetype
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.3.tar.gz -> openrct2-0.3.3.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.31/replays.zip -> openrct2-replays-0.0.31.zip )
-_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_=284eacab4dff0209c85001abb746b46a
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.4 b/metadata/md5-cache/games-simulation/openrct2-0.3.4
new file mode 100644
index 000000000000..a069bfab5991
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.4
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
+EAPI=7
+HOMEPAGE=https://openrct2.org/
+IUSE=dedicated +lightfx +opengl scripting test +truetype
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.4.tar.gz -> openrct2-0.3.4.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.43/replays.zip -> openrct2-replays-0.0.43.zip )
+_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_=8fed9bcbed27fb67b5ecf55de95c3700
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 88232c1b56d8..5551106014a1 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -10,6 +10,6 @@ PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.38/replays.zip -> openrct2-replays-0.0.38.zip )
+SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.2.1/objects.zip -> openrct2-objects-1.2.1.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.43/replays.zip -> openrct2-replays-0.0.43.zip )
 _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_=29bf98791871fed9058bd4025cfcb43b
+_md5_=8d13269c6c34d679e42da3d06fb97b0a
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 24a58bd2aa9c..5208acda48fa 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/freeorion-0.4.10.1-r3 b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r3
index 4cd4036e8384..3ee58ea3d5f2 100644
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r3
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.10.1.tar.gz -> freeorion-0.4.10.1.tar.gz
 _eclasses_=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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c935d7bf33700dac79572c4c9f6e8d3f
+_md5_=bebdd05b8238ac429dad9c178e60b6b2
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1_p20200629 b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1_p20200629
index 99fbeb7655bd..652b54c1e4a3 100644
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1_p20200629
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1_p20200629
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/freeorion/freeorion/archive/24a08d6c597ce8afc90ccec485a937982b6c3683.tar.gz -> freeorion-0.4.10.1_p20200629.tar.gz
 _eclasses_=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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97365ac8baa9c009076fc3b406b14abc
+_md5_=36e7b21d505a16bba4028bc413956b68
diff --git a/metadata/md5-cache/games-strategy/freeorion-9999 b/metadata/md5-cache/games-strategy/freeorion-9999
index bcbf63fd04f5..7e56a672c835 100644
--- a/metadata/md5-cache/games-strategy/freeorion-9999
+++ b/metadata/md5-cache/games-strategy/freeorion-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( >=dev-libs/boost-1.60:=[nls,python,thr
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=49df39adcfe2f8f7b9019bced839da11
+_md5_=dcacb4a668f6d49f11586df6736fe000
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.14 b/metadata/md5-cache/games-strategy/wesnoth-1.15.14
deleted file mode 100644
index 6102569dd8da..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.14
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads(+),icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=7
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc nls server
-LICENSE=GPL-2
-RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads(+),icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.14.tar.gz -> wesnoth-1.15.14.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_=86f5fcd7d1fbd095f7b7c9ea58c017df
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.15 b/metadata/md5-cache/games-strategy/wesnoth-1.15.15
new file mode 100644
index 000000000000..a1e0b41b89e0
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.15
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads(+),icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=7
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IUSE=dbus dedicated doc nls server
+LICENSE=GPL-2
+RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads(+),icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.15.tar.gz -> wesnoth-1.15.15.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_=86f5fcd7d1fbd095f7b7c9ea58c017df
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 6bd5efdc3e3e..debe2b844be3 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/pyfa-2.32.0 b/metadata/md5-cache/games-util/pyfa-2.32.0
deleted file mode 100644
index 4c9455103978..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.32.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.32.0.tar.gz -> pyfa-2.32.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c2adfc0d8d5b8bbc05a6d9321fb7351
diff --git a/metadata/md5-cache/games-util/pyfa-2.33.0 b/metadata/md5-cache/games-util/pyfa-2.33.0
index db4bcb373e03..ebf674e206c1 100644
--- a/metadata/md5-cache/games-util/pyfa-2.33.0
+++ b/metadata/md5-cache/games-util/pyfa-2.33.0
@@ -13,4 +13,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.33.0.tar.gz -> pyfa-2.33.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cc9ef672429fa038aea06c523cd789b5
+_md5_=f04fc2d646273a4a1ed8dc0006332992
diff --git a/metadata/md5-cache/games-util/pyfa-2.37.0 b/metadata/md5-cache/games-util/pyfa-2.37.0
new file mode 100644
index 000000000000..c16baa0f954f
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-2.37.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) 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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=7
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) 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/beautifulsoup-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.37.0.tar.gz -> pyfa-2.37.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=27aea8db51b0ac9f43c396fbe447bc78
diff --git a/metadata/md5-cache/games-util/pyfa-9999 b/metadata/md5-cache/games-util/pyfa-9999
index e57b5cc5085e..240503f21a42 100644
--- a/metadata/md5-cache/games-util/pyfa-9999
+++ b/metadata/md5-cache/games-util/pyfa-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=mirror bindist
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cc9ef672429fa038aea06c523cd789b5
+_md5_=f04fc2d646273a4a1ed8dc0006332992
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 57d2f7cd9f73..872145c5a1f1 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gdm-40.1 b/metadata/md5-cache/gnome-base/gdm-40.1
new file mode 100644
index 000000000000..0ea65a5e807a
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gdm-40.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=gnome-base/dconf-0.20 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) app-text/yelp-tools >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=virtual/udev >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GDM
+IUSE=accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
+RDEPEND=virtual/udev >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= acct-group/gdm acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd[pam] )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gdm/40/gdm-40.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=19945b04e3eaae712d4908e086922e29
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-40.3 b/metadata/md5-cache/gnome-base/gnome-desktop-40.3
new file mode 100644
index 000000000000..bbd070d2bb0c
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-40.3
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto 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=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library with common API for various GNOME modules
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
+IUSE=debug gtk-doc +introspection seccomp systemd udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
+RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
+SLOT=3/19
+SRC_URI=mirror://gnome/sources/gnome-desktop/40/gnome-desktop-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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=454b04080a04317465daf6a7df5753c9
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.36.0 b/metadata/md5-cache/gnome-base/gnome-menus-3.36.0
index e44003119ef3..6480cf9520c5 100644
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.36.0
+++ b/metadata/md5-cache/gnome-base/gnome-menus-3.36.0
@@ -4,11 +4,11 @@ DESCRIPTION=Library and layout configuration for the Desktop Menu fd.o specifica
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-menus
 IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-menus/3.36/gnome-menus-3.36.0.tar.xz
 _eclasses_=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_=e718a0c4be805d2ea964dee52392cd31
+_md5_=1d399f552902ced23fc652ae4f3f3314
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.36.7 b/metadata/md5-cache/gnome-base/gnome-shell-3.36.7
index d9639bb4c419..43925ee70629 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.36.7
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.36.7
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.36/gnome-shell-3.36.7.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.36.7-patchset.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_=f139158e5857cd7d04b987e1192e10ac
+_md5_=eaeb0f9d0c6ae078552844affe1bbce6
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.1 b/metadata/md5-cache/gnome-base/gnome-shell-40.1
index 8ad584563f3f..8d6a81bc38f6 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-40.1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/40/gnome-shell-40.1.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_=c13b2ec50ea0583d436232a89fd2722f
+_md5_=729e17c97db42f86468eb6176ced6a26
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1 b/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
index 9e2e2004ff05..35bb4c0252bc 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/40/gnome-shell-40.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-40.1-r1-patchset.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_=dac9171ee9f29d7f63f3d5e245e8e269
+_md5_=08aef856af8d20ac998385238509d93d
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.2 b/metadata/md5-cache/gnome-base/gnome-shell-40.2
index fd9744d8e60f..5da0012435d0 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-40.2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/40/gnome-shell-40.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c13b2ec50ea0583d436232a89fd2722f
+_md5_=729e17c97db42f86468eb6176ced6a26
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.3 b/metadata/md5-cache/gnome-base/gnome-shell-40.3
index 771cb00a0b48..1096b2c4344a 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-40.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.3
@@ -14,4 +14,4 @@ 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
+_md5_=4732445ba68453ada6240a57bffdfcbd
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.50.7 b/metadata/md5-cache/gnome-base/librsvg-2.50.7
index 6478d4512fdd..e5f0c85930f3 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.50.7
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.7
@@ -4,7 +4,7 @@ DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.16.0[glib,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/freetype-2.9: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/gdk-pixbuf-2.20:2[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(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4: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/pango-1.44.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.7.tar.xz
 _eclasses_=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	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95de6e2cdb20e4c3f0072d4a7a87256f
+_md5_=838c36fa1e2ed77b98da2ef9cc7deadf
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 1ca0f39949bc..ad24354eb120 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/chrome-gnome-shell-10-r4 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
index 2174ccecd5ee..a867334ce646 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	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_=b26b4f2b3f63504e426a5fad2b6b4bb8
+_md5_=586311585b68f88f49697c8ca857ee85
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.3 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.3
new file mode 100644
index 000000000000..532458c8f271
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:=[vala?] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:=[vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution groupware backend
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:=[vala?] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:=[vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test !test? ( test )
+SLOT=0/62-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.40/evolution-data-server-3.40.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	db-use	063d3e7add942762a8203b52ec3066c2	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=82e6662c53c1a7acac941dd7b0c33094
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.40.3 b/metadata/md5-cache/gnome-extra/evolution-ews-3.40.3
new file mode 100644
index 000000000000..27bf201fbe06
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.40.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.40.3:0= >=mail-client/evolution-3.40.3:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.40.3:0= >=mail-client/evolution-3.40.3:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.40/evolution-ews-3.40.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=982aafe127e6c6d77f06c3466113c31a
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
index b8b0ec2a098a..0351c6343f61 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.0.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72083316bf6c098f47672b7310306e29
+_md5_=c05cdcf8be8643c6f32bf3828e1e2d07
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
index fffdd5bc7908..30824d8c6cc6 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://linux.dropboxstatic.com/packages/nautilus-dropbox-2019.02.14.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8bde113cb71ef0ae95b893fba8177a4
+_md5_=218d8289d7683a5e0b41406ba82fa55f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
index 15f5524b7c0a..c9b0db46f037 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://linux.dropboxstatic.com/packages/nautilus-dropbox-2020.03.04.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5415618acea22d63be40345015a8b41
+_md5_=e65a402db323f3b5d60d927ed4d58df3
diff --git a/metadata/md5-cache/gnome-extra/yelp-40.3 b/metadata/md5-cache/gnome-extra/yelp-40.3
new file mode 100644
index 000000000000..781d56fa4526
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-40.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.13 dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/40/yelp-40.3.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ab9833247aab6d9669c5077f9a77c0fc
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 9fe5ec88131d..d6cb038ec315 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/swaybg-1.0 b/metadata/md5-cache/gui-apps/swaybg-1.0
index 20739ec9a0a8..30239531eb4a 100644
--- a/metadata/md5-cache/gui-apps/swaybg-1.0
+++ b/metadata/md5-cache/gui-apps/swaybg-1.0
@@ -5,10 +5,10 @@ DESCRIPTION=A wallpaper utility for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaybg
 IUSE=+man
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland !<gui-wm/sway-1.1_alpha1
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaybg/archive/1.0.tar.gz -> swaybg-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_=9c682ebd82c753e6ef68966d542381e3
+_md5_=7032731ed0cfbd68ac2083171e4d6a92
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.6 b/metadata/md5-cache/gui-apps/swayidle-1.6
index ef387773a45b..1e0f751a63e0 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.6
+++ b/metadata/md5-cache/gui-apps/swayidle-1.6
@@ -5,11 +5,11 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 IUSE=elogind fish-completion +man systemd zsh-completion
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.6.tar.gz -> swayidle-1.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59432ceecd0411ad91dcb233aeb2af51
+_md5_=f1e7afa4ac0963d5245f7e9bd3692a24
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.5 b/metadata/md5-cache/gui-apps/swaylock-1.5
index 99864a542a5e..3f92d1e6b384 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.5
+++ b/metadata/md5-cache/gui-apps/swaylock-1.5
@@ -5,10 +5,10 @@ DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.5.tar.gz -> swaylock-1.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15160c8c2ebd28d60e6ae026ed910354
+_md5_=5c5e855f8e8e30defb976fc035855625
diff --git a/metadata/md5-cache/gui-apps/tuigreet-0.6.1 b/metadata/md5-cache/gui-apps/tuigreet-0.6.1
new file mode 100644
index 000000000000..aa91a46884f0
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/tuigreet-0.6.1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=TUI greeter for greetd login manager
+EAPI=7
+HOMEPAGE=https://github.com/apognu/tuigreet
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Boost-1.0 GPL-3 MIT
+RDEPEND=gui-libs/greetd
+SLOT=0
+SRC_URI=https://github.com/apognu/tuigreet/archive/0.6.1.tar.gz -> tuigreet-0.6.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/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/cassowary/0.3.0/download -> cassowary-0.3.0.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/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/dashmap/4.0.2/download -> dashmap-4.0.2.crate https://crates.io/api/v1/crates/dlv-list/0.2.3/download -> dlv-list-0.2.3.crate https://crates.io/api/v1/crates/find-crate/0.6.3/download -> find-crate-0.6.3.crate https://crates.io/api/v1/crates/fluent/0.15.0/download -> fluent-0.15.0.crate https://crates.io/api/v1/crates/fluent-bundle/0.15.1/download -> fluent-bundle-0.15.1.crate https://crates.io/api/v1/crates/fluent-langneg/0.13.0/download -> fluent-langneg-0.13.0.crate https://crates.io/api/v1/crates/fluent-syntax/0.11.0/download -> fluent-syntax-0.11.0.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/greetd_ipc/0.6.0/download -> greetd_ipc-0.6.0.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.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/i18n-config/0.4.2/download -> i18n-config-0.4.2.crate https://crates.io/api/v1/crates/i18n-embed/0.12.1/download -> i18n-embed-0.12.1.crate https://crates.io/api/v1/crates/i18n-embed-fl/0.5.0/download -> i18n-embed-fl-0.5.0.crate https://crates.io/api/v1/crates/i18n-embed-impl/0.7.0/download -> i18n-embed-impl-0.7.0.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/intl-memoizer/0.5.1/download -> intl-memoizer-0.5.1.crate https://crates.io/api/v1/crates/intl_pluralrules/7.0.1/download -> intl_pluralrules-7.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/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/locale_config/0.3.0/download -> locale_config-0.3.0.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/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/nix/0.21.0/download -> nix-0.21.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.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/ordered-multimap/0.3.1/download -> ordered-multimap-0.3.1.crate https://crates.io/api/v1/crates/ouroboros/0.9.5/download -> ouroboros-0.9.5.crate https://crates.io/api/v1/crates/ouroboros_macro/0.9.5/download -> ouroboros_macro-0.9.5.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/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.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/pure-rust-locales/0.5.6/download -> pure-rust-locales-0.5.6.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.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/rust-embed/5.9.0/download -> rust-embed-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-impl/5.9.0/download -> rust-embed-impl-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-utils/5.1.0/download -> rust-embed-utils-5.1.0.crate https://crates.io/api/v1/crates/rust-ini/0.17.0/download -> rust-ini-0.17.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.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/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/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smart-default/0.6.0/download -> smart-default-0.6.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.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/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/system_shutdown/3.0.0/download -> system_shutdown-3.0.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.14.2/download -> textwrap-0.14.2.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/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinystr/0.3.4/download -> tinystr-0.3.4.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tui/0.15.0/download -> tui-0.15.0.crate https://crates.io/api/v1/crates/type-map/0.4.0/download -> type-map-0.4.0.crate https://crates.io/api/v1/crates/unic-langid/0.9.0/download -> unic-langid-0.9.0.crate https://crates.io/api/v1/crates/unic-langid-impl/0.9.0/download -> unic-langid-impl-0.9.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.1/download -> unicode-linebreak-0.1.1.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/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.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/zeroize/1.3.0/download -> zeroize-1.3.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1fa80ddcf38c06e4ab1e57c59467f170
diff --git a/metadata/md5-cache/gui-apps/wayvnc-0.4.0 b/metadata/md5-cache/gui-apps/wayvnc-0.4.0
index dbeb9ad5a1e8..2a75aefc296c 100644
--- a/metadata/md5-cache/gui-apps/wayvnc-0.4.0
+++ b/metadata/md5-cache/gui-apps/wayvnc-0.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=VNC server for wlroots based Wayland compositors
 EAPI=7
 HOMEPAGE=https://github.com/any1/wayvnc
 IUSE=gbm tracing
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/aml dev-libs/wayland gui-libs/neatvnc[tracing?] media-libs/mesa:=[egl,gles2,gbm?] x11-libs/libxkbcommon x11-libs/pixman tracing? ( dev-util/systemtap )
 SLOT=0
 SRC_URI=https://github.com/any1/wayvnc/archive/v0.4.0.tar.gz -> wayvnc-0.4.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a46fa6d7da228cee07159555f370348
+_md5_=0361d7b5697a1875d8d2bec3b1b7055a
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 9880e2e92c55..8140e2de88ff 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.7 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.7
deleted file mode 100644
index 9d165e0132df..000000000000
--- a/metadata/md5-cache/gui-libs/egl-wayland-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/wayland !x11-drivers/nvidia-drivers[wayland(-)] gui-libs/eglexternalplatform media-libs/libglvnd
-DESCRIPTION=EGLStream-based Wayland external platform (for NVIDIA)
-EAPI=7
-HOMEPAGE=https://github.com/NVIDIA/egl-wayland
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/wayland !x11-drivers/nvidia-drivers[wayland(-)]
-SLOT=0
-SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/1.1.7.tar.gz -> egl-wayland-1.1.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6cf358ce992d08773fc0833fad47d34b
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
new file mode 100644
index 000000000000..6c634cc698d8
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)] gui-libs/eglexternalplatform media-libs/libglvnd
+DESCRIPTION=EGLStream-based Wayland external platform
+EAPI=7
+HOMEPAGE=https://github.com/NVIDIA/egl-wayland
+KEYWORDS=amd64
+LICENSE=MIT
+RDEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]
+SLOT=0
+SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/1.1.7.tar.gz -> egl-wayland-1.1.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b5f95321b10bdacd2a4b2bcbe1f27e07
diff --git a/metadata/md5-cache/gui-libs/neatvnc-0.4.0 b/metadata/md5-cache/gui-libs/neatvnc-0.4.0
index 2999c301e27e..1f612b25ad1d 100644
--- a/metadata/md5-cache/gui-libs/neatvnc-0.4.0
+++ b/metadata/md5-cache/gui-libs/neatvnc-0.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=liberally licensed VNC server library with a clean interface
 EAPI=7
 HOMEPAGE=https://github.com/any1/neatvnc/
 IUSE=examples ssl jpeg tracing
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/libdrm dev-libs/aml sys-libs/zlib ssl? ( net-libs/gnutls:= ) jpeg? ( media-libs/libjpeg-turbo:= ) tracing? ( dev-util/systemtap )
 SLOT=0
 SRC_URI=https://github.com/any1/neatvnc/archive/v0.4.0.tar.gz -> neatvnc-0.4.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46196b0e46608153786a0e83fe05ef97
+_md5_=89324e4c411563e5c3b83b3e7f5d9bee
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.14.0 b/metadata/md5-cache/gui-libs/wlroots-0.14.0
index 93903edfcf85..83221817403e 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.14.0
+++ b/metadata/md5-cache/gui-libs/wlroots-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=x11-backend X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 SLOT=0/14
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.14.0.tar.gz -> wlroots-0.14.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0dc558e94db91acc4dee33383068844
+_md5_=c47f7ded10871ac87c3308c56b5644bb
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 6ece7a19648c..423c96f23eba 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-1.6.1 b/metadata/md5-cache/gui-wm/sway-1.6.1
index 920aa3f15792..7da0b49bb03f 100644
--- a/metadata/md5-cache/gui-wm/sway-1.6.1
+++ b/metadata/md5-cache/gui-wm/sway-1.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.6.1.tar.gz -> sway-1.6.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=486f657cc9d267b68046976395c2590a
+_md5_=a615f1fddb1d28e8c11611e4645957c2
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index a08d1ea83b65..098cd8df78ed 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/kajongg-20.12.3 b/metadata/md5-cache/kde-apps/kajongg-20.12.3
index 0caa1fdcebf7..f15b1e032b5f 100644
--- a/metadata/md5-cache/kde-apps/kajongg-20.12.3
+++ b/metadata/md5-cache/kde-apps/kajongg-20.12.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kajongg-20.12.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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f583fef8cf6854b0e5b2fec7e50c2cbe
+_md5_=3e18bd51a95530d7b100a26f9fe713fe
diff --git a/metadata/md5-cache/kde-apps/kajongg-21.04.3 b/metadata/md5-cache/kde-apps/kajongg-21.04.3
index a9dc5c36e250..de20e240e552 100644
--- a/metadata/md5-cache/kde-apps/kajongg-21.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-21.04.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kajongg-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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e06df7e42cdd34b6ef3c0c823482699
+_md5_=43a562a0ec655c0a18f9adab50ab2b83
diff --git a/metadata/md5-cache/kde-apps/kig-20.12.3 b/metadata/md5-cache/kde-apps/kig-20.12.3
index 0fe0d3f667ca..9f6579dd4689 100644
--- a/metadata/md5-cache/kde-apps/kig-20.12.3
+++ b/metadata/md5-cache/kde-apps/kig-20.12.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kig-20.12.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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d0f504ff06e6a2c3a344de5ea62ac358
+_md5_=d5c45372152f49c09af4647af8772e7b
diff --git a/metadata/md5-cache/kde-apps/kig-21.04.3 b/metadata/md5-cache/kde-apps/kig-21.04.3
index 5a70dad127c6..0a7424307365 100644
--- a/metadata/md5-cache/kde-apps/kig-21.04.3
+++ b/metadata/md5-cache/kde-apps/kig-21.04.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kig-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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90e5db7f0e38eae9fde327bb215258a5
+_md5_=e9a6ef61ca24bb1324628738e05d8ec0
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
deleted file mode 100644
index 93947bca3072..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r1
+++ /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_=bc99935585d18d88b450b34c21d6876b
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2 b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2
new file mode 100644
index 000000000000..c51a2ce66607
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2
@@ -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_=75e2bb63cad9249eeaf3ffb7da46e83c
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.12.3 b/metadata/md5-cache/kde-apps/lokalize-20.12.3
index 9354550b8706..2d1809c0a3a0 100644
--- a/metadata/md5-cache/kde-apps/lokalize-20.12.3
+++ b/metadata/md5-cache/kde-apps/lokalize-20.12.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/lokalize-20.12.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_=bfa1cfda35f3bb27164a4cccf93d683a
+_md5_=6a4745fa743107718968c118d627926c
diff --git a/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1 b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
index a6ffb7a49aca..90f08d0eb9ad 100644
--- a/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
@@ -13,4 +13,4 @@ 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
+_md5_=3bec3aab85383aca90802dcfc07bade9
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 73e154b7acf6..014e82dc03e3 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/kapidox-5.82.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
index 13b09e847b01..4c2538c663fa 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kapidox-5.82.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_=c5600f1f4bedc76692f278d6ec854c65
+_md5_=841162d136ff7c6ba6fc4da5c0e80dac
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.84.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.84.0
index d103d1a64dd9..67b236848f66 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.84.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.84.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=5/5.84
 SRC_URI=mirror://kde/stable/frameworks/5.84/kapidox-5.84.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_=9c092fbf74b2b8abce4b75110cabea08
+_md5_=563b248b2c486f69a6b5d45641e38f22
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.84.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.84.0
deleted file mode 100644
index e2a217fddbbc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.84.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.84: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.84*: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.84*: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.84
-SRC_URI=mirror://kde/stable/frameworks/5.84/kimageformats-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_=2dac815c470e3b9ee0330ad1a88f1e75
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.84.0-r1 b/metadata/md5-cache/kde-frameworks/kimageformats-5.84.0-r1
new file mode 100644
index 000000000000..01fce3c9c5c6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.84.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.84: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.84*: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:0 <media-libs/openexr-3.0.0:0 ) ( dev-libs/imath:3 media-libs/openexr:3 ) ) ) 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.84*: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:0 <media-libs/openexr-3.0.0:0 ) ( dev-libs/imath:3 media-libs/openexr:3 ) ) ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.84
+SRC_URI=mirror://kde/stable/frameworks/5.84/kimageformats-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_=11a7894efbb300dae3d1734ee75bbde0
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index d502f70cbf01..695a8f601b47 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/skanlite-2.2.0 b/metadata/md5-cache/kde-misc/skanlite-2.2.0
index 5fe6dae5e483..44fb59a92b00 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.2.0
+++ b/metadata/md5-cache/kde-misc/skanlite-2.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple image scanning application based on libksane and KDE Framewor
 EAPI=7
 HOMEPAGE=https://apps.kde.org/skanlite/
 IUSE=debug +handbook test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/libksane-19.04.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/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/libpng:0= || ( 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/skanlite/2.2/skanlite-2.2.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e231d6c52db362b81e9a390a6919c5f9
+_md5_=b6b88c128faa92578bf0789cfde2c086
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 1796178a762c..0c0a334437ef 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2 b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
index a8bc5415099f..f58898f603bd 100644
--- a/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
+++ b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
@@ -5,9 +5,9 @@ DESCRIPTION=LXDE GTK+ theme switcher
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXAppearance
 IUSE=dbus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 dbus? ( dev-libs/dbus-glib )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxappearance-0.6.3.tar.xz
-_md5_=278a10c03cc672dfb1772fa52b628799
+_md5_=b5f91ce593a8c416c9b6170553760c14
diff --git a/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1 b/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
index 39c53aa873b6..8d2a7ca3fb71 100644
--- a/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
+++ b/metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
@@ -4,9 +4,9 @@ DEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 >=lx
 DESCRIPTION=LXAppearance plugin for configuring OpenBox
 EAPI=7
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 >=lxde-base/lxappearance-0.6.3-r2 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/pango x11-wm/openbox
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxappearance-obconf-0.2.3.tar.xz
-_md5_=881857873cdb11143a28c7d638116374
+_md5_=5445cba5f08091a23b9a550e6eed69ab
diff --git a/metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1 b/metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
index 8afcfd697895..07def680f4cb 100644
--- a/metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
+++ b/metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install
 DESCRIPTION=LXDE Session default configuration files and nuoveXT2 iconset
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXDE_Common
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 PDEPEND=lxde-base/lxde-icon-theme
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxde-common-0.99.2.tar.xz
-_md5_=be287d997da624f9dec064507da98dce
+_md5_=3d96ab54814f0d4abc5b39410d0d79d0
diff --git a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1 b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
index eae6fe382041..50bb259be3e0 100644
--- a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
+++ b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
@@ -4,9 +4,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=nuoveXT2 iconset
 EAPI=7
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-0.5.1/lxde-icon-theme-0.5.1.tar.xz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=777405fd0b421807d693ad11c993e297
+_md5_=5582e493435002e2bd0395d42e7b1625
diff --git a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7 b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
index 05f74e433b6b..adb43c18abdc 100644
--- a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
+++ b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Meta ebuild for LXDE, the Lightweight X11 Desktop Environment
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/Status_of_LXDE_components
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=>=lxde-base/menu-cache-1.1.0-r1 >=lxde-base/lxappearance-0.6.3-r2 >=lxde-base/lxde-icon-theme-0.5.1-r1 >=lxde-base/lxde-common-0.99.2-r1 >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/lxinput-0.3.5-r2 >=lxde-base/lxpanel-0.10.1 >=lxde-base/lxrandr-0.3.2-r1 >=lxde-base/lxsession-0.5.5 >=lxde-base/lxtask-0.1.10 >=lxde-base/lxterminal-0.3.2-r1 media-gfx/gpicview >=x11-libs/libfm-1.3.2 >=x11-misc/obconf-2.0.4 >=x11-misc/pcmanfm-1.3.2 >=x11-wm/openbox-3.6.1-r3
 SLOT=0
-_md5_=22f68cdde9428e0eb2e41e78e1239003
+_md5_=1cb22037f3714cd3a8027aab520c5922
diff --git a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2 b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
index 2b1687a518de..5710200e8631 100644
--- a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
+++ b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=LXDE Display Manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXDM
 IUSE=debug elogind nls pam systemd
-KEYWORDS=amd64 arm ~arm64 ppc x86
+KEYWORDS=amd64 arm ~arm64 ppc ~riscv x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libxcb x11-libs/gtk+:3 pam? ( sys-libs/pam ) elogind? ( sys-auth/elogind[pam] ) systemd? ( sys-apps/systemd[pam] )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxdm-0.5.3.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17e8b5cf4ae11f5fac1e598e62bb2ec1
+_md5_=f11a51bf2a8291d0be43cd1df8d92d16
diff --git a/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2 b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
index 18ada13c0f74..246cc23e9e03 100644
--- a/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
+++ b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11
 DESCRIPTION=LXDE keyboard and mouse configuration tool
 EAPI=7
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxinput-0.3.5.tar.xz
-_md5_=a974ec31c4d28795d1aced86656a3e4c
+_md5_=22341a2375bbe6a1c4ac4f90ab9cfb93
diff --git a/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1 b/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1
index 93ed84b08b9d..967718a5e5e2 100644
--- a/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1
+++ b/metadata/md5-cache/lxde-base/lxlauncher-0.2.5-r1
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 gnome-base/gnome-menus lxde-base/menu-cache x11-libs/cair
 DESCRIPTION=Open source clone of the Asus launcher for EeePC
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXLauncher
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/gnome-menus lxde-base/menu-cache x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/startup-notification
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxlauncher-0.2.5.tar.xz
-_md5_=1f7d87a5692eef1955b33b309d792ce6
+_md5_=34122e5db37688c86c6aa02b1609df44
diff --git a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5 b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
index db61ef79fc6f..165ca8195195 100644
--- a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
+++ b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Provides files needed for LXDE application menus
 EAPI=7
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxmenu-data-0.1.5.tar.xz
-_md5_=2301a59e53a0d212b72a7f7d4931baa7
+_md5_=b071c86a5119989eb593b8e58065ba53
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.10.1 b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
index fd234b2bbf28..fa2a3e042775 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.10.1
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight X11 desktop panel for LXDE
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXPanel
 IUSE=+alsa wifi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:3 lxde-base/lxmenu-data >=lxde-base/menu-cache-1.1.0-r1 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2[gtk] x11-libs/libwnck:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxpanel-0.10.1.tar.xz
 _eclasses_=readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=feeceb401395bed2bd5843a67718b731
+_md5_=70a89c7ca45ccf68abc6db504a0e2218
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1
index 03903cae633d..b1620d7526db 100644
--- a/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1
+++ b/metadata/md5-cache/lxde-base/lxrandr-0.3.2-r1
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 x11-apps/xrandr x11-libs/gtk+:3 x11-libs/libXrandr x11-ba
 DESCRIPTION=LXDE GUI interface to RandR extention
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXRandR
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-apps/xrandr x11-libs/gtk+:3 x11-libs/libXrandr
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxrandr-0.3.2.tar.xz
-_md5_=e3789f001c8921e369c93f1d84f24b28
+_md5_=546f07b5ed90439b2925548090c0ad5b
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.5.5 b/metadata/md5-cache/lxde-base/lxsession-0.5.5
index 64f270f89d61..2e8b4718091e 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.5.5
+++ b/metadata/md5-cache/lxde-base/lxsession-0.5.5
@@ -5,10 +5,10 @@ DESCRIPTION=LXDE session manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXSession
 IUSE=nls upower
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=lxde-base/lxde-common-0.99.2-r1 sys-apps/dbus sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.5.5.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1eac4403cce16915c04d5e597d50206
+_md5_=b4ff3800345657a1afafcfcabb1b3790
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.10 b/metadata/md5-cache/lxde-base/lxtask-0.1.10
index c89bbd5305f7..76d4a9fe1304 100644
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.10
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.10
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3
 DESCRIPTION=LXDE Task manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXTask
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.10.tar.xz
-_md5_=e53f9c2bf9db249e7b298addd5e3dbdc
+_md5_=67ac10d196561cb575c57f31e8954aff
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.4.0 b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
index 8855fe2b2609..8483c8bfca34 100644
--- a/metadata/md5-cache/lxde-base/lxterminal-0.4.0
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11
 DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXTerminal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango x11-libs/vte:2.91
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxterminal-0.4.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ef95361f3818af0cf57c52649a359d5a
+_md5_=c42e5b94eb72c7aba07ba84d18ae457b
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.1.0-r1 b/metadata/md5-cache/lxde-base/menu-cache-1.1.0-r1
index 49d7562319cb..f4f752ea2634 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-1.1.0-r1
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.1.0-r1
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 x11-libs/libfm-extra
 DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
 EAPI=7
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 x11-libs/libfm-extra
 SLOT=0/2
 SRC_URI=mirror://sourceforge/lxde/menu-cache-1.1.0.tar.xz
-_md5_=be49f8961a22c287cd9d4d01f291fdbf
+_md5_=0a1c296fa97b2bd434e044fb92a35359
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 9e4489ccb39e..3d1b3d9387ae 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/evolution-3.40.3 b/metadata/md5-cache/mail-client/evolution-3.40.3
new file mode 100644
index 000000000000..45ee4981c187
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.40.3
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.40.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.40.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.40/evolution-3.40.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	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	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=72d621ae093954b159ee69e8b32d26dd
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807 b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
index d17ce78fe5b7..1885adac5875 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx
 DESCRIPTION=The $ mail program, which is used to send mail via shell scripts
 EAPI=7
 HOMEPAGE=https://www.debian.org/
-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
 RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef0440b06d191fd665e0978fe69daf94
+_md5_=bdbee26ec6da645fd6f40aa796ec0698
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-78.11.0
deleted file mode 100644
index 4683cb85477d..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-78.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) 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.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	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
index 7dabbd96f2ab..7fb8c687e97b 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.12.0
+++ b/metadata/md5-cache/mail-client/thunderbird-78.12.0
@@ -5,11 +5,11 @@ 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
+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
+_md5_=d92485b1778eed2cb58e8008e6c0625a
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
deleted file mode 100644
index 83c4d007d616..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland 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
-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/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	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f99471bb6728676b111bc3ac979c4665
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.12.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.12.0
new file mode 100644
index 000000000000..510d5856089c
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-78.12.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland 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
+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/78
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-US/thunderbird-78.12.0.tar.bz2 -> thunderbird-bin_x86_64-78.12.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-US/thunderbird-78.12.0.tar.bz2 -> thunderbird-bin_i686-78.12.0.tar.bz2 ) 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_=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 bb21eb612821..7a9b61f4f56c 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.4-r3 b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r3
deleted file mode 100644
index 8f780b6a5bd0..000000000000
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=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:* ) ) )
-DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for speed
-EAPI=7
-HOMEPAGE=http://bogofilter.sourceforge.net/
-IUSE=berkdb sqlite tokyocabinet
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-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.4.tar.bz2
-_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_=f1e01a1067cbd947d25421c0dfcbc277
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r4 b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r4
new file mode 100644
index 000000000000..16c13afae07c
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r4
@@ -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 prepare setup test
+DEPEND=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:* ) ) )
+DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for speed
+EAPI=7
+HOMEPAGE=http://bogofilter.sourceforge.net/
+IUSE=berkdb +sqlite tokyocabinet
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+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.4.tar.bz2
+_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_=1e7ac4fc9b0d7021673ad7b050ae0674
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.5 b/metadata/md5-cache/mail-filter/bogofilter-1.2.5
deleted file mode 100644
index c5026c8d0c17..000000000000
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=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:* ) ) )
-DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for speed
-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+
-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_=79b2cd6aa6989192c6097e8849795b4e
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1 b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
new file mode 100644
index 000000000000..c75c8a827145
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-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 install prepare setup test
+DEPEND=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:* ) ) )
+DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for speed
+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+
+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_=be293cb5436eb210d063694876047f69
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2 b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
index b735f32548ab..37753a2a85c1 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
@@ -3,9 +3,10 @@ DESCRIPTION=The Sendmail Filter API (Milter)
 EAPI=7
 HOMEPAGE=http://www.sendmail.org/
 IUSE=ipv6 poll
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Sendmail
 RDEPEND=!<mail-mta/sendmail-8.16.1
 SLOT=0/1.0.2_p1
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d2e473ee37ad09f728f59018f859111
+_md5_=333646dae6492edd1e3fbf5116a96323
diff --git a/metadata/md5-cache/mail-filter/procmail-3.22-r15 b/metadata/md5-cache/mail-filter/procmail-3.22-r15
index 93af14646471..89a9a8bd0014 100644
--- a/metadata/md5-cache/mail-filter/procmail-3.22-r15
+++ b/metadata/md5-cache/mail-filter/procmail-3.22-r15
@@ -4,10 +4,10 @@ DESCRIPTION=Mail delivery agent/filter
 EAPI=6
 HOMEPAGE=http://www.procmail.org/
 IUSE=mbox selinux
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=selinux? ( sec-policy/selinux-procmail )
 SLOT=0
 SRC_URI=http://www.procmail.org/procmail-3.22.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f4fbe1afc3c81170a142eed0f0219e5
+_md5_=3b82209b3417859cb68d08612dcf692f
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.5 b/metadata/md5-cache/mail-filter/spamassassin-3.4.5
deleted file mode 100644
index 190908c5d518..000000000000
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) test? ( app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness )
-DESCRIPTION=An extensible mail filter which can identify and tag spam
-EAPI=7
-HOMEPAGE=https://spamassassin.apache.org/
-IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.5.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40029e6a69640323a62ebb739f852fc9
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.5-r1 b/metadata/md5-cache/mail-filter/spamassassin-3.4.5-r1
new file mode 100644
index 000000000000..23b9d3b32724
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) test? ( app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness )
+DESCRIPTION=An extensible mail filter which can identify and tag spam
+EAPI=7
+HOMEPAGE=https://spamassassin.apache.org/
+IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.5.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=08d7ea881ef1d696906fad8622057916
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.6 b/metadata/md5-cache/mail-filter/spamassassin-3.4.6
deleted file mode 100644
index bc109f66e5ee..000000000000
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) test? ( app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness )
-DESCRIPTION=An extensible mail filter which can identify and tag spam
-EAPI=7
-HOMEPAGE=https://spamassassin.apache.org/
-IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93b9b53ca1117763572a356c145acb26
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.6-r1 b/metadata/md5-cache/mail-filter/spamassassin-3.4.6-r1
new file mode 100644
index 000000000000..aaac38838b9f
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) test? ( app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness )
+DESCRIPTION=An extensible mail filter which can identify and tag spam
+EAPI=7
+HOMEPAGE=https://spamassassin.apache.org/
+IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e04fc74b813f412bdadcb11e2d225a50
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 79fb8552dd09..e379157bfd24 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/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index ef3371909853..077b3e48364a 100644
--- a/metadata/md5-cache/mail-mta/notqmail-9999
+++ b/metadata/md5-cache/mail-mta/notqmail-9999
@@ -11,6 +11,6 @@ RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
+SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	qmail	5e8c0b723a0dd58e095f12233aa9d00c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=15b2c13c106bb51722415574a9811fd1
+_md5_=1dbdc3ae86f0383bd94e60d5b6c7bc91
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1 b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
index d86e1634b43c..368ca38d5f52 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
 EAPI=7
 HOMEPAGE=https://www.opensmtpd.org
 IUSE=berkdb +mta pam split-usr
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 RDEPEND=acct-user/smtpd acct-user/smtpq >=dev-libs/openssl-1.1:0= elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( sys-libs/pam ) berkdb? ( sys-libs/db:= ) dev-libs/libevent:= app-misc/ca-certificates net-mail/mailbase net-libs/libasr virtual/libcrypt:= !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.8.0p2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31ef0f2a33d2eba4da6cd69906fa25a2
+_md5_=fcc264f2937f0fda1732969a0f64d799
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.1 b/metadata/md5-cache/mail-mta/postfix-3.6.1
index 5223fe037e8d..970aeff562af 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6.1
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-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=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=736ab4f146f91a911e59172b5b5cb550
+_md5_=4b858aa2597e1c1e5b2bebc052626aef
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1 b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
index 4e7dd7fd1cb3..6a67d0b3d4de 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
+++ b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
@@ -1,14 +1,15 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=7
 HOMEPAGE=https://www.sendmail.org/
 IUSE=ipv6 ldap mbox nis sasl sockets ssl tcpd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Sendmail GPL-2
 PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) acct-group/smmsp >=acct-user/smmsp-0-r2 >=mail-filter/libmilter-1.0.2_p1-r1 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/vacation
+RDEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) >=mail-filter/libmilter-1.0.2_p1-r1 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/vacation
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d8b6c0d9de213adbed141585d0988f0
+_md5_=6696291b23a150fd9845cb131d355955
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index d67f299ef8d7..a3ca46313541 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
index 27ff570fec64..4937384597ce 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21f5d7df86d3ef96b38ec52c3b0235a8
+_md5_=00280ba1d54a1df63212cc7ee8225ba4
diff --git a/metadata/md5-cache/mate-extra/caja-hide-0.9.0 b/metadata/md5-cache/mate-extra/caja-hide-0.9.0
index e26d1b114193..8cfaac8f0db2 100644
--- a/metadata/md5-cache/mate-extra/caja-hide-0.9.0
+++ b/metadata/md5-cache/mate-extra/caja-hide-0.9.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Fred-Barclay/Caja-hide/archive/v0.9.0.tar.gz -> caja-hide-0.9.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f747e929947e58966c21a4d2c6f36b07
+_md5_=2f6a40256c1c1712dce029ea690965fa
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index d07e8b0c34f1..82e5fc7503de 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/terminus-font-4.49.1 b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
index 08419e6f3090..e2ef09c65d82 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.49.1
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/gzip || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/gzip || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/awk pcf-8bit? ( x11-apps/bdftopcf ) pcf-unicode? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=7
 HOMEPAGE=http://terminus-font.sourceforge.net/
-IUSE=a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
+IUSE=a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote ru-dv +ru-g ru-i ru-k X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=OFL-1.1 GPL-2
-REQUIRED_USE=X? ( || ( otf pcf ) )
+REQUIRED_USE=X? ( || ( otf pcf-8bit pcf-unicode ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/terminus-font/terminus-font-4.49/terminus-font-4.49.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78f608fae83482f9f4b9af8ecd4bd8dd
+_md5_=55f87f65ba4eb9414671519adfed1469
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 687129699b5a..74cec5c1d8cb 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/ahoviewer-1.6.5-r3 b/metadata/md5-cache/media-gfx/ahoviewer-1.6.5-r3
deleted file mode 100644
index cda6e0d95192..000000000000
--- a/metadata/md5-cache/media-gfx/ahoviewer-1.6.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libconfig:=[cxx] dev-libs/libxml2:2 dev-libs/libsigc++:2 net-misc/curl gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( media-libs/gst-plugins-bad:1.0 media-libs/gstreamer:1.0 ) rar? ( app-arch/unrar:= ) ssl? ( gnutls? ( net-libs/gnutls:= net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( >=dev-libs/openssl-1.0.0:0= net-misc/curl[curl_ssl_openssl] ) ) zip? ( dev-libs/libzip ) 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 GTK2 image viewer, manga reader, and booru browser
-EAPI=6
-HOMEPAGE=https://github.com/ahodesuka/ahoviewer
-IUSE=gnutls gnome-keyring +gstreamer +rar +ssl +zip
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libconfig:=[cxx] dev-libs/libxml2:2 dev-libs/libsigc++:2 net-misc/curl gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( media-libs/gst-plugins-bad:1.0 media-libs/gstreamer:1.0 ) rar? ( app-arch/unrar:= ) ssl? ( gnutls? ( net-libs/gnutls:= net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( >=dev-libs/openssl-1.0.0:0= net-misc/curl[curl_ssl_openssl] ) ) zip? ( dev-libs/libzip ) gstreamer? ( media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 || ( media-plugins/gst-plugins-vpx media-plugins/gst-plugins-libav ) )
-SLOT=0
-SRC_URI=https://github.com/ahodesuka/ahoviewer/archive/1.6.5.tar.gz -> ahoviewer-1.6.5.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_=0852cf8b6dcf0379824642850f0cbfc8
diff --git a/metadata/md5-cache/media-gfx/album-4.13-r2 b/metadata/md5-cache/media-gfx/album-4.13-r2
deleted file mode 100644
index 2eddb3f4eca3..000000000000
--- a/metadata/md5-cache/media-gfx/album-4.13-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=HTML photo album generator
-EAPI=5
-HOMEPAGE=http://MarginalHacks.com/Hacks/album/
-IUSE=doc ffmpeg plugins themes
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=marginalhacks
-RDEPEND=dev-lang/perl media-gfx/jhead virtual/imagemagick-tools ffmpeg? ( media-video/ffmpeg )
-SLOT=0
-SRC_URI=http://marginalhacks.com/bin/album.versions/album-4.13.tar.gz http://marginalhacks.com/bin/album.versions/data-4.05.tar.gz
-_md5_=440c4673a15f2627edeafafad12b702e
diff --git a/metadata/md5-cache/media-gfx/album-4.15-r1 b/metadata/md5-cache/media-gfx/album-4.15-r1
index b159dd151662..305fccf4da51 100644
--- a/metadata/md5-cache/media-gfx/album-4.15-r1
+++ b/metadata/md5-cache/media-gfx/album-4.15-r1
@@ -8,4 +8,4 @@ LICENSE=marginalhacks
 RDEPEND=dev-lang/perl media-gfx/jhead virtual/imagemagick-tools ffmpeg? ( media-video/ffmpeg )
 SLOT=0
 SRC_URI=https://marginalhacks.com/bin/album.versions/album-4.15.tar.gz https://marginalhacks.com/bin/album.versions/data-4.05.tar.gz
-_md5_=b0e058ce1188f7d75a8e09cd775e06ca
+_md5_=83c60b8348849ad15d0526b8bfd5e89f
diff --git a/metadata/md5-cache/media-gfx/alembic-1.8.0 b/metadata/md5-cache/media-gfx/alembic-1.8.0
deleted file mode 100644
index 1b39a835c95a..000000000000
--- a/metadata/md5-cache/media-gfx/alembic-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/ilmbase-2.5.5:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
-DESCRIPTION=Open framework for storing and sharing scene data
-EAPI=7
-HOMEPAGE=https://www.alembic.io/
-IUSE=examples hdf5 test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=media-libs/ilmbase-2.5.5:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alembic/alembic/archive/1.8.0.tar.gz -> alembic-1.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1065712d10a3a988770ae01a2cdb14ef
diff --git a/metadata/md5-cache/media-gfx/alembic-1.8.1 b/metadata/md5-cache/media-gfx/alembic-1.8.1
deleted file mode 100644
index eb4c43092cb6..000000000000
--- a/metadata/md5-cache/media-gfx/alembic-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=dev-libs/imath-3.0.1 >=media-libs/ilmbase-2.5.5 ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
-DESCRIPTION=Open framework for storing and sharing scene data
-EAPI=7
-HOMEPAGE=https://www.alembic.io/
-IUSE=examples hdf5 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( >=dev-libs/imath-3.0.1 >=media-libs/ilmbase-2.5.5 ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alembic/alembic/archive/1.8.1.tar.gz -> alembic-1.8.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_=4007269c45a436d804423d274c3b293b
diff --git a/metadata/md5-cache/media-gfx/alembic-1.8.2 b/metadata/md5-cache/media-gfx/alembic-1.8.2
index 55ea42968cd5..4f967a0e819a 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.8.2
+++ b/metadata/md5-cache/media-gfx/alembic-1.8.2
@@ -5,11 +5,11 @@ DESCRIPTION=Open framework for storing and sharing scene data
 EAPI=7
 HOMEPAGE=https://www.alembic.io/
 IUSE=examples hdf5 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=dev-libs/imath-3.0.1 >=media-libs/ilmbase-2.5.5 ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.8.2.tar.gz -> alembic-1.8.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_=4007269c45a436d804423d274c3b293b
+_md5_=b36298a08d605f0e37b23c50ef594060
diff --git a/metadata/md5-cache/media-gfx/chafa-1.6.1 b/metadata/md5-cache/media-gfx/chafa-1.6.1
new file mode 100644
index 000000000000..2055091c3e21
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/chafa-1.6.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
+DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
+EAPI=8
+HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
+IUSE=+tools
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
+SLOT=0
+SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.1.tar.xz
+_md5_=f26ff2b6eb538a894abda27ffc210219
diff --git a/metadata/md5-cache/media-gfx/cura-4.9.1 b/metadata/md5-cache/media-gfx/cura-4.9.1
index 454e64cc62f8..0247c0780d6d 100644
--- a/metadata/md5-cache/media-gfx/cura-4.9.1
+++ b/metadata/md5-cache/media-gfx/cura-4.9.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/4.9.1.tar.gz -> cura-4.9.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c241a29998b5608eeb2dbf6aad59b0e
+_md5_=eba30ae8909dc4d581cdaf5802470d59
diff --git a/metadata/md5-cache/media-gfx/darktable-3.4.1 b/metadata/md5-cache/media-gfx/darktable-3.4.1
index 24f086de190d..0c486364f7b3 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.4.1
+++ b/metadata/md5-cache/media-gfx/darktable-3.4.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.4.1/darktable-3.4.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -> darktable-usermanual-3.4.0.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_=9714ab787d091c00af479d602e1f4cf1
+_md5_=945d46e9bf8c6a665f39cc0166871ce1
diff --git a/metadata/md5-cache/media-gfx/darktable-3.6.0 b/metadata/md5-cache/media-gfx/darktable-3.6.0
index f0a5d65a654f..761a3dee1258 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.6.0
+++ b/metadata/md5-cache/media-gfx/darktable-3.6.0
@@ -13,4 +13,4 @@ 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://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_=6335f9a42c0e3764cc6d4e13cbd3f4c8
+_md5_=f6222f1157a751d30f3d81c9a3569ea8
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.7 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
index d86a6f950d7f..a407dcf16e7c 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
@@ -12,4 +12,4 @@ REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_8 python_
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=47f848d4d83bbe4eac536fb78b6f3f9b
+_md5_=1ac179a0672cb2d74ce6ebeaf411728b
diff --git a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1 b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
deleted file mode 100644
index 1d4a47a2d600..000000000000
--- a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure prepare setup
-DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) 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 ) ) openexr? ( media-libs/openexr ) php? ( dev-lang/php:* ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) swig? ( dev-lang/swig )
-DESCRIPTION=A fast, modern and generic image processing library
-EAPI=7
-HOMEPAGE=http://www.exactcode.de/site/open_source/exactimage/
-IUSE=expat jpeg lua openexr php perl png ruby swig tiff truetype X 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=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) 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 ) ) openexr? ( media-libs/openexr ) php? ( dev-lang/php:* ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
-REQUIRED_USE=lua? ( swig )
-SLOT=0
-SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2
-_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=483352b76d77767deae6747436ec7ecb
diff --git a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r2 b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r2
new file mode 100644
index 000000000000..0a1d110309a9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare setup
+DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) 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 ) ) openexr? ( <media-libs/openexr-3.0.0:0= ) php? ( dev-lang/php:* ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) swig? ( dev-lang/swig )
+DESCRIPTION=A fast, modern and generic image processing library
+EAPI=7
+HOMEPAGE=http://www.exactcode.de/site/open_source/exactimage/
+IUSE=expat jpeg lua openexr php perl png ruby swig tiff truetype X 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=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) 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 ) ) openexr? ( <media-libs/openexr-3.0.0:0= ) php? ( dev-lang/php:* ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) ruby? ( dev-lang/ruby:* ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
+REQUIRED_USE=lua? ( swig )
+SLOT=0
+SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2
+_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7d027720ffeac091050069debeb77060
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.2-r3 b/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
index ce81e172579f..ac9aa27ece62 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.19.2.tar.gz -> freecad-0.19.2.tar.gz https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=593551f22499454894c0d5eeb04481c0
+_md5_=ad9ede25b5de64f01f972eeff7a50b64
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index ae0ecbba6562..9c6a2baac7ad 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=31538f2994190e25794af8ef06985627
+_md5_=85f405db388280c4d2be989833026835
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.6 b/metadata/md5-cache/media-gfx/gimp-2.99.6
index 4cda793126a9..13a835cfe8e9 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.6
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5586679c85faa1c6e798916fd7d2142b
+_md5_=d192fb9673f7252379b18a2c62187e07
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 61595788d2be..9053d0a6b6ea 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=643b6f8df53446ff1f20cb7b47bcaef6
+_md5_=899aa59db2fc6af77293826e823a7b55
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
index 0fbe7e0f7b44..96a6b8e769c4 100644
--- a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/jpeg:0 x11-libs/gtk+:3 >=dev-util/intltool-0.40 sys-devel/gettext
 DESCRIPTION=A Simple and Fast Image Viewer for X
 EAPI=7
 HOMEPAGE=http://lxde.sourceforge.net/gpicview
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.tar.xz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=73daad87d5fb06ad163c0962feb11f91
+_md5_=9eb1b11b2dd1b991f29625d911475af6
diff --git a/metadata/md5-cache/media-gfx/hydrus-444 b/metadata/md5-cache/media-gfx/hydrus-444
index 070b052dfd44..3d48a697df13 100644
--- a/metadata/md5-cache/media-gfx/hydrus-444
+++ b/metadata/md5-cache/media-gfx/hydrus-444
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v444.tar.gz -> hydrus-444.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
+_md5_=8c2c1946f7f41395f09c8f2993f7b8cb
diff --git a/metadata/md5-cache/media-gfx/hydrus-445 b/metadata/md5-cache/media-gfx/hydrus-445
index 1193005e185b..c71d9e6a29ed 100644
--- a/metadata/md5-cache/media-gfx/hydrus-445
+++ b/metadata/md5-cache/media-gfx/hydrus-445
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v445.tar.gz -> hydrus-445.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
+_md5_=b447e14f2d6a375bd5b111f056c3ef5a
diff --git a/metadata/md5-cache/media-gfx/hydrus-446 b/metadata/md5-cache/media-gfx/hydrus-446
index 5102d3ca95de..c32ed9bd69d4 100644
--- a/metadata/md5-cache/media-gfx/hydrus-446
+++ b/metadata/md5-cache/media-gfx/hydrus-446
@@ -12,4 +12,4 @@ 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
+_md5_=b447e14f2d6a375bd5b111f056c3ef5a
diff --git a/metadata/md5-cache/media-gfx/hydrus-447 b/metadata/md5-cache/media-gfx/hydrus-447
index 932f56ff688b..eb9fe6df1c39 100644
--- a/metadata/md5-cache/media-gfx/hydrus-447
+++ b/metadata/md5-cache/media-gfx/hydrus-447
@@ -12,4 +12,4 @@ 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
+_md5_=b447e14f2d6a375bd5b111f056c3ef5a
diff --git a/metadata/md5-cache/media-gfx/hydrus-9999 b/metadata/md5-cache/media-gfx/hydrus-9999
index 378d6a440444..e8dac65894ed 100644
--- a/metadata/md5-cache/media-gfx/hydrus-9999
+++ b/metadata/md5-cache/media-gfx/hydrus-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b69fd34f075ffcc23453976f6ffb4c92
+_md5_=b447e14f2d6a375bd5b111f056c3ef5a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19
new file mode 100644
index 000000000000..6c957702e6ce
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19
@@ -0,0 +1,16 @@
+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-19.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-7.1.0.4 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4
new file mode 100644
index 000000000000..8735134dacfa
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4
@@ -0,0 +1,16 @@
+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-4.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/inkscape-1.0.2-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
index 0de0f7e57a71..ae453f4aa4d8 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/media-gfx/inkscape/inkscape-1.0.2.tar.xz
 _eclasses_=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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=294b22e91a80a25aa5077171ea24be44
+_md5_=0713f4c72c94c05ebd8c224aadeed352
diff --git a/metadata/md5-cache/media-gfx/inkscape-9999 b/metadata/md5-cache/media-gfx/inkscape-9999
index 0df8825e8557..6cbfab701d2a 100644
--- a/metadata/md5-cache/media-gfx/inkscape-9999
+++ b/metadata/md5-cache/media-gfx/inkscape-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=27486392185044a97de00a66cedc0e04
+_md5_=1d829247a6044845e4b2615d6499c89d
diff --git a/metadata/md5-cache/media-gfx/krita-4.4.5 b/metadata/md5-cache/media-gfx/krita-4.4.5
deleted file mode 100644
index 1a8ce66f1a82..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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/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/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=7
-HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
-IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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/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/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.4.5/krita-4.4.5.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.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_=2391b0ea474f2a6ad2d1f885181c77e0
diff --git a/metadata/md5-cache/media-gfx/krita-4.4.5-r1 b/metadata/md5-cache/media-gfx/krita-4.4.5-r1
new file mode 100644
index 000000000000..c5c264594e47
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.4.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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/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/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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/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/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.4.5/krita-4.4.5.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.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_=fca3684c3aac93475fc2db0b1f769f65
diff --git a/metadata/md5-cache/media-gfx/libredwg-0.12.4 b/metadata/md5-cache/media-gfx/libredwg-0.12.4
index af5be1df8246..15fd2dce8854 100644
--- a/metadata/md5-cache/media-gfx/libredwg-0.12.4
+++ b/metadata/md5-cache/media-gfx/libredwg-0.12.4
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen )
+BDEPEND=|| ( sys-devel/gcc[sanitize] sys-libs/compiler-rt-sanitizers[asan(-)] ) doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install setup
 DEPEND=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] ) ) perl? ( dev-lang/perl ) dev-libs/libpcre2 dev-libs/pslib python? ( dev-lang/swig ) perl? ( dev-lang/swig )
 DESCRIPTION=C library to handle DWG files
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/LibreDWG/libredwg/releases/download/0.12.4/libredwg-0.12.4.tar.gz
 _eclasses_=docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7f104d22a27ad20b2da043b1794fc306
+_md5_=d7597fa7cf129a2c4922598082b1926e
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
index ff6db2e150d0..097ce363108c 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure preinst prepare test
-DEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=6
-HOMEPAGE=http://www.povray.org/
+HOMEPAGE=https://www.povray.org/
 IUSE=debug +io-restrictions openexr static-libs tiff X test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=AGPL-3
-RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
+RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz https://dev.gentoo.org/~soap/distfiles/povray-3.7.0.0_p20160914-fix-c++14.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a6562d78a01ab938a511e227e9c9e5b
+_md5_=1acfc1c93fa9dfac50061d3b4c473b31
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.5.1 b/metadata/md5-cache/media-gfx/yafaray-3.5.1
deleted file mode 100644
index 6f82afb213b4..000000000000
--- a/metadata/md5-cache/media-gfx/yafaray-3.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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-lang/swig ) sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libxml2:2 sys-libs/zlib jpeg? ( virtual/jpeg ) opencv? ( media-libs/opencv:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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] ) ) qt5? ( dev-qt/qtwidgets:5 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 )
-DESCRIPTION=A free open-source montecarlo raytracing engine
-EAPI=7
-HOMEPAGE=https://www.yafaray.org https://github.com/YafaRay/libYafaRay
-IUSE=+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2:2 sys-libs/zlib jpeg? ( virtual/jpeg ) opencv? ( media-libs/opencv:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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] ) ) qt5? ( dev-qt/qtwidgets:5 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/YafaRay/libYafaRay/archive/v3.5.1.tar.gz -> yafaray-3.5.1.tar.gz
-_eclasses_=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_=337b54e7a16d51386fd4534b52fe5e12
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.5.1-r1 b/metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
new file mode 100644
index 000000000000..6b1d75c56bd9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-lang/swig ) sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libxml2:2 sys-libs/zlib jpeg? ( virtual/jpeg ) opencv? ( media-libs/opencv:= ) openexr? ( <media-libs/openexr-3.0.0:0= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtwidgets:5 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 )
+DESCRIPTION=A free open-source montecarlo raytracing engine
+EAPI=7
+HOMEPAGE=https://www.yafaray.org https://github.com/YafaRay/libYafaRay
+IUSE=+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2:2 sys-libs/zlib jpeg? ( virtual/jpeg ) opencv? ( media-libs/opencv:= ) openexr? ( <media-libs/openexr-3.0.0:0= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtwidgets:5 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/YafaRay/libYafaRay/archive/v3.5.1.tar.gz -> yafaray-3.5.1.tar.gz
+_eclasses_=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_=e335b39d10673fee4e92a9bd38f4cea1
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23.1 b/metadata/md5-cache/media-gfx/zbar-0.23.1
index 56845308ebed..b21e932cb30a 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.23.1
+++ b/metadata/md5-cache/media-gfx/zbar-0.23.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mchehab/zbar/archive/0.23.1.tar.gz -> zbar-0.23.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7b4d1dd55b1894195e10011322b78a4
+_md5_=9e5b395363214c78de028ee74c3bd425
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ac5fcfaa0971..65066aac2c68 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/allegro-4.4.3.1 b/metadata/md5-cache/media-libs/allegro-4.4.3.1
index 9c430197c894..b6c1e0c3e47c 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.3.1
+++ b/metadata/md5-cache/media-libs/allegro-4.4.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=cross-platform multimedia library
 EAPI=7
 HOMEPAGE=https://liballeg.org/
 IUSE=alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 ~riscv x86
 LICENSE=Allegro MIT GPL-2+ ZLIB
 RDEPEND=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(-)?] ) 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(-)?] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[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/libXt[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/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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_=3ca14aee1b766c57e15ef5672ef428ee
+_md5_=aede547b25967c2f9b0101bc7a45f336
diff --git a/metadata/md5-cache/media-libs/allegro-5.2.7.0 b/metadata/md5-cache/media-libs/allegro-5.2.7.0
index 4484859bb253..aee874056d49 100644
--- a/metadata/md5-cache/media-libs/allegro-5.2.7.0
+++ b/metadata/md5-cache/media-libs/allegro-5.2.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=Cross-platform library aimed at video game and multimedia programmin
 EAPI=7
 HOMEPAGE=https://liballeg.org/
 IUSE=alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD ZLIB
 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(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-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(-)?] ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=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(-)?] ) opus? ( 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(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.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(-)?] ) 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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp: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/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.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(-)?] ) xinerama? ( >=x11-libs/libXinerama-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(-)?] )
 REQUIRED_USE=X? ( opengl ) xinerama? ( X ) || ( alsa openal oss pulseaudio )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/5.2.7.0/allegro-5.2.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_=4b5f157b35978755ed6d13c1a6f2b54d
+_md5_=290f4f9df252a94e69dcac698489e241
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r2 b/metadata/md5-cache/media-libs/devil-1.7.8-r2
index f5cd829a4efb..b8bdc0abd3c7 100644
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r2
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig X? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare
-DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig X? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
 DESCRIPTION=DevIL image library
-EAPI=6
+EAPI=8
 HOMEPAGE=http://openil.sourceforge.net/
 IUSE=allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.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_=61d6a840bf18a217786275278fad129e
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=94313ea36d393be3f105c7df88e4453a
diff --git a/metadata/md5-cache/media-libs/freetype-2.10.4 b/metadata/md5-cache/media-libs/freetype-2.10.4
index 7f7615d45f43..50adb1564850 100644
--- a/metadata/md5-cache/media-libs/freetype-2.10.4
+++ b/metadata/md5-cache/media-libs/freetype-2.10.4
@@ -7,10 +7,9 @@ HOMEPAGE=https://www.freetype.org/
 IUSE=X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
-PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
 RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.10.4.tar.xz mirror://nongnu/freetype/freetype-2.10.4.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.10.4.tar.xz mirror://nongnu/freetype/ft2demos-2.10.4.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.10.4.tar.xz mirror://nongnu/freetype/freetype-doc-2.10.4.tar.xz )
 _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_=fcf8a572ff80799df72fd67b3674f883
+_md5_=13ad855ea5657c19888c71461f8e6b0c
diff --git a/metadata/md5-cache/media-libs/freetype-2.11.0 b/metadata/md5-cache/media-libs/freetype-2.11.0
new file mode 100644
index 000000000000..5f0a328b252c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.11.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install 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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
+DESCRIPTION=High-quality and portable font engine
+EAPI=8
+HOMEPAGE=https://www.freetype.org/
+IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=|| ( FTL GPL-2+ )
+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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-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=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.11.0.tar.xz mirror://nongnu/freetype/freetype-2.11.0.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.11.0.tar.xz mirror://nongnu/freetype/ft2demos-2.11.0.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.11.0.tar.xz mirror://nongnu/freetype/freetype-doc-2.11.0.tar.xz )
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b803eaffb6b52e5e04693ceac30017e5
diff --git a/metadata/md5-cache/media-libs/freetype-9999 b/metadata/md5-cache/media-libs/freetype-9999
index 4cac72152f36..5227cd26ea48 100644
--- a/metadata/md5-cache/media-libs/freetype-9999
+++ b/metadata/md5-cache/media-libs/freetype-9999
@@ -1,14 +1,13 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install 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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
 DESCRIPTION=High-quality and portable font engine
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.freetype.org/
 IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs 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
 LICENSE=|| ( FTL GPL-2+ )
-PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 PROPERTIES=live
 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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( 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/libXau-1.0.7-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/libXdmcp-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=2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b4b7db2692f1833a878262eea590592
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4fbe845faeb1365a09b4dc9a0e8e5b56
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.11.0 b/metadata/md5-cache/media-libs/gupnp-dlna-0.11.0
new file mode 100644
index 000000000000..8dda7fe366dc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.11.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) app-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 prepare test
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+DESCRIPTION=Library providing DLNA-related functionality for MediaServers
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-dlna
+IUSE=gtk-doc +introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+SLOT=2.0/4
+SRC_URI=mirror://gnome/sources/gupnp-dlna/0.11/gupnp-dlna-0.11.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=403a9d13adea24ff44fc92ae708239ba
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.8.1 b/metadata/md5-cache/media-libs/harfbuzz-2.8.1
index 1f7c2a5a6bc1..019744837776 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.8.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.1.tar.gz -> harfbuzz-2.8.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c89b2f734e225d2db9c13d277d46a8b
+_md5_=3a50fa5553c23c7a12fbd3d80dd4b353
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.8.2 b/metadata/md5-cache/media-libs/harfbuzz-2.8.2
index b0d839a64069..6d198edbc409 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.8.2
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.2.tar.gz -> harfbuzz-2.8.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e627c2d8147e3ccadaa098453793e21f
+_md5_=be10588d77908f8a382a99aeed510a97
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.8.2-r1 b/metadata/md5-cache/media-libs/harfbuzz-2.8.2-r1
index 90618e403774..9f6f19590b76 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.8.2-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.2.tar.gz -> harfbuzz-2.8.2.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b34c2589aa1eeaaabd2d30ce0b13d7dc
+_md5_=f22940942c488ae5b9fb0ad2abb8e784
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 296b65a62ed0..34113b9d02ae 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b34c2589aa1eeaaabd2d30ce0b13d7dc
+_md5_=f22940942c488ae5b9fb0ad2abb8e784
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.5.7 b/metadata/md5-cache/media-libs/ilmbase-2.5.7
index 670cae578e98..b8e643193805 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.5.7
+++ b/metadata/md5-cache/media-libs/ilmbase-2.5.7
@@ -4,10 +4,10 @@ DESCRIPTION=OpenEXR ILM Base libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=large-stack static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> ilmbase-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_=3d1cbdf240f1254d757c117ad02a6394
+_md5_=e46892770921b054350795b818b56800
diff --git a/metadata/md5-cache/media-libs/imlib-1.9.15-r5 b/metadata/md5-cache/media-libs/imlib-1.9.15-r5
index e752ef0e67b9..b70c01341eb3 100644
--- a/metadata/md5-cache/media-libs/imlib-1.9.15-r5
+++ b/metadata/md5-cache/media-libs/imlib-1.9.15-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading and rendering library
 EAPI=6
 HOMEPAGE=http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/
 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 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/giflib-5.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libICE-1.0.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(-)?] >=x11-libs/libSM-1.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(-)?] >=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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/imlib/1.9/imlib-1.9.15.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	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_=d0431a794589a57bf17d81b0d90f588c
+_md5_=590144a5a64d106961cd61392b252d1f
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 387a14fda8df..f78b59fa9075 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_=710b1cbb0d2af62a7d54ae896f3b22ac
+_md5_=19da4bdcfaf307d67c85fc8c8485e7f7
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r7 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r7
index 59b5ac9c0534..c3125886d268 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r7
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r7
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9da71b5a606151d0558024372ace38c5
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.4-r1 b/metadata/md5-cache/media-libs/libffado-2.4.4-r1
index 6b641413f9c5..60278eb4e0aa 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.4-r1
+++ b/metadata/md5-cache/media-libs/libffado-2.4.4-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.4.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=6dd49af41af64cb4aeba6caf15d65486
+_md5_=d27f361538598e137418f1c47cafc7ee
diff --git a/metadata/md5-cache/media-libs/libkeyfinder-2.2.5 b/metadata/md5-cache/media-libs/libkeyfinder-2.2.5
new file mode 100644
index 000000000000..13a5f829f340
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libkeyfinder-2.2.5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/fftw:3.0
+DESCRIPTION=Musical key detection library for digital audio
+EAPI=7
+HOMEPAGE=https://github.com/mixxxdj/libkeyfinder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=sci-libs/fftw:3.0
+SLOT=0
+SRC_URI=https://github.com/mixxxdj/libkeyfinder/archive/v2.2.5.tar.gz -> libkeyfinder-2.2.5.tar.gz
+_eclasses_=cmake	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_=d2cff1de1142eae2b2a820f4c5c3596a
diff --git a/metadata/md5-cache/media-libs/libmng-2.0.3-r1 b/metadata/md5-cache/media-libs/libmng-2.0.3-r1
index da9556882556..2823f0e92f1b 100644
--- a/metadata/md5-cache/media-libs/libmng-2.0.3-r1
+++ b/metadata/md5-cache/media-libs/libmng-2.0.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Multiple Image Networkgraphics lib (animated png's)
 EAPI=7
 HOMEPAGE=https://www.libmng.com/
 IUSE=lcms 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 ~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=libmng
 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(-)?] >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lcms? ( >=media-libs/lcms-2.5: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(-)?] )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/libmng/libmng-2.0.3.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b70d038212a6175c345d98f5e05e505
+_md5_=cc99d2c6a07aa337c39484f58352a4e8
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-2.2.1 b/metadata/md5-cache/media-libs/libsidplayfp-2.2.1
new file mode 100644
index 000000000000..4ab2dc52f848
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsidplayfp-2.2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Library for the sidplay2 fork with resid-fp
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
+IUSE=static-libs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+SLOT=0/6
+SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/2.2/libsidplayfp-2.2.1.tar.gz
+_md5_=1edbc44de8733789c524887657a2cf6a
diff --git a/metadata/md5-cache/media-libs/lv2-1.18.2 b/metadata/md5-cache/media-libs/lv2-1.18.2
index 1bbef71c4bf2..c3d8e2362fa3 100644
--- a/metadata/md5-cache/media-libs/lv2-1.18.2
+++ b/metadata/md5-cache/media-libs/lv2-1.18.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://lv2plug.in/spec/lv2-1.18.2.tar.bz2
 _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_=cd28af74c3851fac2c90a7f6a98e716b
+_md5_=78758fef8d8bb8aa0df52cee31f36c17
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.5 b/metadata/md5-cache/media-libs/mesa-21.1.5
new file mode 100644
index 000000000000..c92441bf0986
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-21.1.5
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[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/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup 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(-)?] >=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(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-21.1.5.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_=8f8184f75367677c0999642b0428df02
diff --git a/metadata/md5-cache/media-libs/mesa-21.2.0_rc2 b/metadata/md5-cache/media-libs/mesa-21.2.0_rc2
new file mode 100644
index 000000000000..82aa1773c6d0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-21.2.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[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/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup 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(-)?] >=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.107[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.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[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.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[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-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-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-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-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-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-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-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-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(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+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 +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
+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.107[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.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[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.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[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-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-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-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-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-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-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-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-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? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-21.2.0-rc2.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_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 44bdd6afd7e1..397b56849278 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,15 +1,15 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[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/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[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/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 pretend setup test unpack
-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(-)?] >=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-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-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-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-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-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-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-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-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(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+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(-)?] >=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.107[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.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[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.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[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-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-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-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-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-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-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-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-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(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 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
+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 +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
 LICENSE=MIT
 PROPERTIES=live
-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-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-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-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-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-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-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-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-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 )
+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.107[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.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[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.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[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-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-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-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-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-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-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-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-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? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	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_=6b859485a27f5d07425c472b9576c991
+_md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/opencolorio-2.0.1 b/metadata/md5-cache/media-libs/opencolorio-2.0.1
new file mode 100644
index 000000000000..ca929bd57422
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencolorio-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16.2-r1 virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/testresources[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/testresources[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/testresources[python_targets_python3_10(-)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-cpp/pystring dev-python/pybind11 media-libs/ilmbase dev-cpp/yaml-cpp:= dev-libs/tinyxml opengl? ( media-libs/lcms:2 >=media-libs/openimageio-2.2.13.0 media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) )
+DESCRIPTION=A color management framework for visual effects and animation
+EAPI=7
+HOMEPAGE=https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO
+IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-cpp/pystring dev-python/pybind11 media-libs/ilmbase dev-cpp/yaml-cpp:= dev-libs/tinyxml opengl? ( media-libs/lcms:2 >=media-libs/openimageio-2.2.13.0 media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) )
+REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.0.1.tar.gz -> opencolorio-2.0.1.tar.gz
+_eclasses_=cmake	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_=a35f0c38b58aef660f852c92f0bd3cde
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.0 b/metadata/md5-cache/media-libs/opencv-4.5.0
deleted file mode 100644
index 94183325f93d..000000000000
--- a/metadata/md5-cache/media-libs/opencv-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
-SLOT=0/4.5.0
-SRC_URI=https://github.com/opencv/opencv/archive/4.5.0.tar.gz -> opencv-4.5.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.0.tar.gz -> opencv-4.5.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=74dd889eb9aa16530c5746f72bd530cd
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.0-r1 b/metadata/md5-cache/media-libs/opencv-4.5.0-r1
new file mode 100644
index 000000000000..d2e23b61a5df
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-4.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=7
+HOMEPAGE=https://opencv.org
+IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+SLOT=0/4.5.0
+SRC_URI=https://github.com/opencv/opencv/archive/4.5.0.tar.gz -> opencv-4.5.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.0.tar.gz -> opencv-4.5.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8dcf3e12408ab5e248035466a3a6be8a
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.1 b/metadata/md5-cache/media-libs/opencv-4.5.1
deleted file mode 100644
index 359ea3572c9d..000000000000
--- a/metadata/md5-cache/media-libs/opencv-4.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
-SLOT=0/4.5.1
-SRC_URI=https://github.com/opencv/opencv/archive/4.5.1.tar.gz -> opencv-4.5.1.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.1.tar.gz -> opencv-4.5.1_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d916d49beb1a27650b4dbb7682f780b1
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.1-r1 b/metadata/md5-cache/media-libs/opencv-4.5.1-r1
new file mode 100644
index 000000000000..5a42b33251c9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-4.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=7
+HOMEPAGE=https://opencv.org
+IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+SLOT=0/4.5.1
+SRC_URI=https://github.com/opencv/opencv/archive/4.5.1.tar.gz -> opencv-4.5.1.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.1.tar.gz -> opencv-4.5.1_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8aef87766255494fb46374c795dfcb1a
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.2 b/metadata/md5-cache/media-libs/opencv-4.5.2
deleted file mode 100644
index 9b111d0e770f..000000000000
--- a/metadata/md5-cache/media-libs/opencv-4.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
-SLOT=0/4.5.2
-SRC_URI=https://github.com/opencv/opencv/archive/4.5.2.tar.gz -> opencv-4.5.2.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.2.tar.gz -> opencv-4.5.2_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94678f97196b6b4459801aba5a2dcf03
diff --git a/metadata/md5-cache/media-libs/opencv-4.5.2-r1 b/metadata/md5-cache/media-libs/opencv-4.5.2-r1
new file mode 100644
index 000000000000..30a8c11299c9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-4.5.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( || ( >=dev-cpp/eigen-3.3.8-r1:3 <dev-cpp/eigen-3.3.8:3 ) ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=7
+HOMEPAGE=https://opencv.org
+IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 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 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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(-)?] dev-libs/protobuf:=[abi_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg: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(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/cblas virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( <media-libs/openexr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+SLOT=0/4.5.2
+SRC_URI=https://github.com/opencv/opencv/archive/4.5.2.tar.gz -> opencv-4.5.2.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.5.2.tar.gz -> opencv-4.5.2_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a544a5196f3367dfe22b9f19dc28025
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.7 b/metadata/md5-cache/media-libs/openexr-2.5.7
index 2a473b1d3eaa..4bff14368ed7 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.7
+++ b/metadata/md5-cache/media-libs/openexr-2.5.7
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~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_=004e77691b6fb519879920877aff89ad
+_md5_=7a479b226e1aa200cf6195dd1209e5a1
diff --git a/metadata/md5-cache/media-libs/openexr-3.0.1 b/metadata/md5-cache/media-libs/openexr-3.0.1
deleted file mode 100644
index 031465184681..000000000000
--- a/metadata/md5-cache/media-libs/openexr-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!media-libs/ilmbase dev-libs/imath:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
-EAPI=7
-HOMEPAGE=https://www.openexr.com/
-IUSE=cpu_flags_x86_avx doc examples large-stack static-libs utils test threads 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 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=!media-libs/ilmbase dev-libs/imath:= 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/27
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.0.1.tar.gz -> openexr-3.0.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95e7d5d72bea500edc8433fc14452fac
diff --git a/metadata/md5-cache/media-libs/openexr-3.0.5 b/metadata/md5-cache/media-libs/openexr-3.0.5
new file mode 100644
index 000000000000..4b677744878b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-3.0.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-libs/imath-3.0.5:= sys-libs/zlib
+DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=7
+HOMEPAGE=https://www.openexr.com/
+IUSE=cpu_flags_x86_avx doc examples large-stack static-libs utils test threads
+KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=~dev-libs/imath-3.0.5:= sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=3/29
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.0.5.tar.gz -> openexr-3.0.5.tar.gz
+_eclasses_=cmake	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_=178783e3efa6d3813d0dc09dae325664
diff --git a/metadata/md5-cache/media-libs/portaudio-19.07.00-r2 b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
index d1955b39d8df..fc2b0f3a957b 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
+++ b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=7
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss 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 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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(-)?] ) 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(-)?] )
 SLOT=0
 SRC_URI=http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz https://dev.gentoo.org/~sam/distfiles/media-libs/portaudio/portaudio-19.07.00-audacity.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a4fe3b0a84ff76c8eea00b0a4237a5e7
+_md5_=9c3b4411fa8fa89eaee873050dc124a0
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 0eaa1e1ae906..825bfa726cdc 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/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
deleted file mode 100644
index 6858aef74891..000000000000
--- a/metadata/md5-cache/media-plugins/hexter-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) media-libs/ladspa-sdk
-DESCRIPTION=Yamaha DX7 modeling DSSI plugin
-EAPI=7
-HOMEPAGE=http://smbolton.com/hexter.html
-IUSE=gtk2 readline
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30fcf4c979af504b19742f3e54c78c8e
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.1 b/metadata/md5-cache/media-plugins/hexter-1.1.1
index dc001235e5b7..db08caea0d3b 100644
--- a/metadata/md5-cache/media-plugins/hexter-1.1.1
+++ b/metadata/md5-cache/media-plugins/hexter-1.1.1
@@ -5,9 +5,9 @@ DESCRIPTION=Yamaha DX7 modeling DSSI plugin
 EAPI=7
 HOMEPAGE=http://smbolton.com/hexter.html
 IUSE=readline
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-libs/dssi media-libs/liblo readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.1/hexter-1.1.1.tar.bz2
-_md5_=2aef06f3b301c1b09f328fb1de0a5f7c
+_md5_=f4fa7f99c9e95cdd26f0e40cf972f60e
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.20 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.20
new file mode 100644
index 000000000000..53e617efaf7d
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.20
@@ -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.20-Matrix.tar.gz -> kodi-inputstream-adaptive-2.6.20.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-inputstream-adaptive-2.6.21 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.21
new file mode 100644
index 000000000000..ac5e8a22079a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.21
@@ -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.21-Matrix.tar.gz -> kodi-inputstream-adaptive-2.6.21.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-inputstream-adaptive-2.6.22 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.22
new file mode 100644
index 000000000000..ee390a75f6ee
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.22
@@ -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.22-Matrix.tar.gz -> kodi-inputstream-adaptive-2.6.22.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-hts-8.3.4 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.4
new file mode 100644
index 000000000000..d7528ee9cc47
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.4
@@ -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.4-Matrix.tar.gz -> kodi-pvr-hts-8.3.4.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-vuplus-7.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.8
new file mode 100644
index 000000000000..a19af8fd7e81
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.8
@@ -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.8-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.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_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
new file mode 100644
index 000000000000..7d25f4f37829
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
@@ -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.9-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.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_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.0.0
new file mode 100644
index 000000000000..011a0f0219fe
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+DESCRIPTION=Shadertoy visualizer for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/visualization.shadertoy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-shadertoy-19.0.0.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_=8c7387f5b8796843d23274b71c3e8f3c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
new file mode 100644
index 000000000000..e590d4ad77fc
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+DESCRIPTION=Spectrum visualizer for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/visualization.spectrum
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-spectrum-19.0.0.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_=bbe4a19f172e8083141b0e30017a8a9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
new file mode 100644
index 000000000000..4678bca1c3bf
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+DESCRIPTION=StarBurst visualizer for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/visualization.starburst
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/xbmc/visualization.starburst/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-starburst-19.0.0.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_=8ad70449941ee3fcdf4f0b86bb3eae71
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0
new file mode 100644
index 000000000000..bc94ba0d5caa
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+DESCRIPTION=Waveform visualizer for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/visualization.waveform
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/xbmc/visualization.waveform/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-waveform-19.0.0.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_=424b3709ea4597ab5419ea92d1a74262
diff --git a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1 b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
new file mode 100644
index 000000000000..fce21a88a8b2
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
+DESCRIPTION=Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing
+EAPI=8
+HOMEPAGE=http://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins
+IUSE=jack opengl
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
+SLOT=0
+SRC_URI=https://github.com/zamaudio/zam-plugins/archive/refs/tags/3.14.tar.gz -> zam-plugins-3.14.tar.gz https://github.com/DISTRHO/DPF/archive/9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz -> DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz
+_md5_=43b3993fed3f5ec887fc6cd49e61f2d0
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 57589485d977..e91d09a781da 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.1 b/metadata/md5-cache/media-radio/flrig-1.4.1
new file mode 100644
index 000000000000..d34fc69c90b3
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.4.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=-
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=7
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70cbe0afbc51ec841d9a68bca18ced95
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 09c4458066af..6c03c4221ed4 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/beets-1.4.9-r6 b/metadata/md5-cache/media-sound/beets-1.4.9-r6
index bbf13d7596fe..748ba0dd291f 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r6
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
 _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
+_md5_=009e126ad9b01d05b618eebd9e9f98e4
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index 042d770e590f..913138636e85 100644
--- a/metadata/md5-cache/media-sound/beets-9999
+++ b/metadata/md5-cache/media-sound/beets-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _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
+_md5_=8ce2e64a364e682658a124f87dfbc1c3
diff --git a/metadata/md5-cache/media-sound/brutefir-1.0k-r2 b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
deleted file mode 100644
index fe11e1bcdccf..000000000000
--- a/metadata/md5-cache/media-sound/brutefir-1.0k-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
-DESCRIPTION=Software convolution engine for applying long FIR filters
-EAPI=7
-HOMEPAGE=https://torger.se/anders/brutefir.html
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
-SLOT=0
-SRC_URI=https://torger.se/anders/files/brutefir-1.0k.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77e7029b2ea329e0609e4c2de96a7438
diff --git a/metadata/md5-cache/media-sound/brutefir-1.0o b/metadata/md5-cache/media-sound/brutefir-1.0o
index 9e7b464faa45..e4d35fd6efe2 100644
--- a/metadata/md5-cache/media-sound/brutefir-1.0o
+++ b/metadata/md5-cache/media-sound/brutefir-1.0o
@@ -3,10 +3,10 @@ DEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 DESCRIPTION=Software convolution engine for applying long FIR filters
 EAPI=7
 HOMEPAGE=https://torger.se/anders/brutefir.html
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 SLOT=0
 SRC_URI=https://torger.se/anders/files/brutefir-1.0o.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17593e2a6e23808a8f134312a7072b86
+_md5_=2a72261d0e83fbfa2a5c9a08cf092427
diff --git a/metadata/md5-cache/media-sound/cadence-0.9.1 b/metadata/md5-cache/media-sound/cadence-0.9.1
index 57c8818b081c..a59bce86b506 100644
--- a/metadata/md5-cache/media-sound/cadence-0.9.1
+++ b/metadata/md5-cache/media-sound/cadence-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/falkTX/Cadence/archive/v0.9.1.tar.gz -> cadence-0.9.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a656c68434e83c86adc9bef2eb31138
+_md5_=fa4dd8fa245a1defb9328f3b8faaff0c
diff --git a/metadata/md5-cache/media-sound/cadence-9999 b/metadata/md5-cache/media-sound/cadence-9999
index a48b1dd84154..03e940e4486f 100644
--- a/metadata/md5-cache/media-sound/cadence-9999
+++ b/metadata/md5-cache/media-sound/cadence-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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8843bebaf4ec1635bf3d2508220b98bf
+_md5_=1a664f740427ef572cd92400d05dafc1
diff --git a/metadata/md5-cache/media-sound/cmus-2.9.1 b/metadata/md5-cache/media-sound/cmus-2.9.1
deleted file mode 100644
index 78030fb6afda..000000000000
--- a/metadata/md5-cache/media-sound/cmus-2.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=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 )
-DESCRIPTION=Ncurses based music player with plugin support for many formats
-EAPI=7
-HOMEPAGE=https://cmus.github.io/
-IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-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
-SRC_URI=https://github.com/cmus/cmus/archive/v2.9.1.tar.gz -> cmus-2.9.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15b190457da42b1e37ee81f62165b2d2
diff --git a/metadata/md5-cache/media-sound/cmus-2.9.1-r1 b/metadata/md5-cache/media-sound/cmus-2.9.1-r1
new file mode 100644
index 000000000000..d7b865213b99
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cmus-2.9.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/ncurses:=[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 )
+DESCRIPTION=Ncurses based music player with plugin support for many formats
+EAPI=7
+HOMEPAGE=https://cmus.github.io/
+IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
+KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[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
+SRC_URI=https://github.com/cmus/cmus/archive/v2.9.1.tar.gz -> cmus-2.9.1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f0ee72d5fce515a90b971fbc732e7c4e
diff --git a/metadata/md5-cache/media-sound/cmus-9999 b/metadata/md5-cache/media-sound/cmus-9999
index c7659c2d3cca..e54f97f272f7 100644
--- a/metadata/md5-cache/media-sound/cmus-9999
+++ b/metadata/md5-cache/media-sound/cmus-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install unpack
-DEPEND=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 )
+DEPEND=sys-libs/ncurses:=[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 )
 DESCRIPTION=Ncurses based music player with plugin support for many formats
 EAPI=7
 HOMEPAGE=https://cmus.github.io/
 IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
 LICENSE=GPL-2
 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 )
+RDEPEND=sys-libs/ncurses:=[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	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c07261124bd6060819bf7209343f3f9
+_md5_=48bdc71c7eb87eee8d2a81759f6a2be9
diff --git a/metadata/md5-cache/media-sound/csound-6.16.2 b/metadata/md5-cache/media-sound/csound-6.16.2
new file mode 100644
index 000000000000..59aad0bb6589
--- /dev/null
+++ b/metadata/md5-cache/media-sound/csound-6.16.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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:= ) dev-libs/boost doc? ( app-arch/unzip )
+DESCRIPTION=Sound design and signal processing system for composition and performance
+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
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.16.2-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.16.2/Csound6.16.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.16.2/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_=cd0be6b2035b40a858ca9eaff9291715
diff --git a/metadata/md5-cache/media-sound/dir2ogg-0.13-r1 b/metadata/md5-cache/media-sound/dir2ogg-0.13-r1
index a2bc555e70b3..a750268d68c9 100644
--- a/metadata/md5-cache/media-sound/dir2ogg-0.13-r1
+++ b/metadata/md5-cache/media-sound/dir2ogg-0.13-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://jak-linux.org/projects/dir2ogg/0.13/dir2ogg-0.13.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=53dc3e67538eaee15f0c58cf6bd7d931
+_md5_=11682e7c45e94892ced7380c004d8296
diff --git a/metadata/md5-cache/media-sound/easyeffects-5.0.4-r1 b/metadata/md5-cache/media-sound/easyeffects-5.0.4-r1
new file mode 100644
index 000000000000..c23f1fc6d665
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-5.0.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate 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 test
+DEPEND=>=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 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.24[gstreamer] >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise )
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy
+IUSE=bs2b calf rnnoise rubberband webrtc zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=!media-sound/pulseeffects >=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 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.24[gstreamer] >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) gnome-extra/yelp >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=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 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
+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_=fa8a8811f1f52cc18e5d01af0b4da278
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.0.3 b/metadata/md5-cache/media-sound/easyeffects-6.0.3
new file mode 100644
index 000000000000..eba637832c05
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-6.0.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate 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 pretend test
+DEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=x11-libs/gtk+-4.2.1:4
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/easyeffects
+IUSE=calf zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=x11-libs/gtk+-4.2.1:4 gnome-extra/yelp >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) zamaudio? ( media-plugins/zam-plugins )
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.0.3.tar.gz -> easyeffects-6.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_=4e5cbd93be71b93c3d4f9acf78ecc137
diff --git a/metadata/md5-cache/media-sound/exaile-4.1.1 b/metadata/md5-cache/media-sound/exaile-4.1.1
index d9f3768399f4..368ed9fbcdb5 100644
--- a/metadata/md5-cache/media-sound/exaile-4.1.1
+++ b/metadata/md5-cache/media-sound/exaile-4.1.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/exaile/exaile/archive/4.1.1/exaile-4.1.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6302e81ee2fe8abb0befb07a1eb95d9e
+_md5_=572f51f30a8de6eca6c5b5bd182a2638
diff --git a/metadata/md5-cache/media-sound/exaile-9999 b/metadata/md5-cache/media-sound/exaile-9999
index e384de1cbb04..efff7b9b03b0 100644
--- a/metadata/md5-cache/media-sound/exaile-9999
+++ b/metadata/md5-cache/media-sound/exaile-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95026aa811569633855170bc89f93f6d
+_md5_=80ced1d925034ad1cec1777484358dab
diff --git a/metadata/md5-cache/media-sound/gnome-music-40.0 b/metadata/md5-cache/media-sound/gnome-music-40.0
index 95d2356550c6..208432f83c4d 100644
--- a/metadata/md5-cache/media-sound/gnome-music-40.0
+++ b/metadata/md5-cache/media-sound/gnome-music-40.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/40/gnome-music-40.0.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f23d0534c2da1f28135c2f74195d1744
+_md5_=60348b7085057c12af287e8aeeed4f26
diff --git a/metadata/md5-cache/media-sound/gnome-music-40.1.1 b/metadata/md5-cache/media-sound/gnome-music-40.1.1
index dc4097c5a0b2..16d1cf83b174 100644
--- a/metadata/md5-cache/media-sound/gnome-music-40.1.1
+++ b/metadata/md5-cache/media-sound/gnome-music-40.1.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/40/gnome-music-40.1.1.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f23d0534c2da1f28135c2f74195d1744
+_md5_=60348b7085057c12af287e8aeeed4f26
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1 b/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
index 7ae1e6f250c4..94309b0434c4 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.16.tar.gz -> gpodder-3.10.16.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17db294c2531146215965af210ec9ce9
+_md5_=622fa9151e81b616620111e9f84616b3
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.20 b/metadata/md5-cache/media-sound/gpodder-3.10.20
index 11f66dc1a59b..259d7e836825 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.20
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.20
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.20.tar.gz -> gpodder-3.10.20.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22c13606c288cdfa61e1afb74b754825
+_md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.21 b/metadata/md5-cache/media-sound/gpodder-3.10.21
new file mode 100644
index 000000000000..857fce77caa3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.21
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/html5lib[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_8(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_9(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) dev-util/desktop-file-utils dev-util/intltool sys-apps/help2man test? ( python_single_target_python3_8? ( dev-python/minimock[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-localserver[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/minimock[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free cross-platform podcast aggregator
+EAPI=7
+HOMEPAGE=https://gpodder.github.io/
+IUSE=+dbus bluetooth kernel_linux mtp test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-python/html5lib[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_8(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_9(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.21.tar.gz -> gpodder-3.10.21.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/herrie-2.2-r1 b/metadata/md5-cache/media-sound/herrie-2.2-r1
deleted file mode 100644
index 9d496cca3987..000000000000
--- a/metadata/md5-cache/media-sound/herrie-2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/ncurses:0=[unicode?] >=dev-libs/glib-2:2 ao? ( media-libs/libao ) alsa? ( media-libs/alsa-lib ) http? ( net-misc/curl ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad media-libs/libid3tag ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis ) xspf? ( >=media-libs/libxspf-1.2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Herrie is a command line music player
-EAPI=6
-HOMEPAGE=http://herrie.info/
-IUSE=ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] >=dev-libs/glib-2:2 ao? ( media-libs/libao ) alsa? ( media-libs/alsa-lib ) http? ( net-misc/curl ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad media-libs/libid3tag ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis ) xspf? ( >=media-libs/libxspf-1.2 )
-REQUIRED_USE=|| ( ao alsa pulseaudio oss )
-SLOT=0
-SRC_URI=http://herrie.info/distfiles/herrie-2.2.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f19be987afc3028ad27b0e3e87f46da3
diff --git a/metadata/md5-cache/media-sound/herrie-2.2-r2 b/metadata/md5-cache/media-sound/herrie-2.2-r2
new file mode 100644
index 000000000000..146d99027dc6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/herrie-2.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:=[unicode(+)?] >=dev-libs/glib-2:2 ao? ( media-libs/libao ) alsa? ( media-libs/alsa-lib ) http? ( net-misc/curl ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad media-libs/libid3tag ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis ) xspf? ( >=media-libs/libxspf-1.2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Herrie is a command line music player
+EAPI=6
+HOMEPAGE=http://herrie.info/
+IUSE=ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls
+KEYWORDS=amd64 ppc x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] >=dev-libs/glib-2:2 ao? ( media-libs/libao ) alsa? ( media-libs/alsa-lib ) http? ( net-misc/curl ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad media-libs/libid3tag ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis ) xspf? ( >=media-libs/libxspf-1.2 )
+REQUIRED_USE=|| ( ao alsa pulseaudio oss )
+SLOT=0
+SRC_URI=http://herrie.info/distfiles/herrie-2.2.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9bfee6acfc6dfb062968857217ae306f
diff --git a/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706 b/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
index cebbb4795b92..186fc5c9135f 100644
--- a/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
+++ b/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jack-cli-cd-ripper/jack/archive/8e2004d7453f5d71d5e73032cbe7770b75bfbd41.tar.gz -> jack-4.0.0_pre20200706.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_=8da7c57fc8128f165c5aaf9bfcf310d0
+_md5_=a910a191fb7289de280ba1f995cbd718
diff --git a/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220 b/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220
index 6a75b0a3ed7d..7acb730779ec 100644
--- a/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220
+++ b/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/jack-cli-cd-ripper/jack/archive/5f3e5f43f476b0d506144c103eb8d4edf76fc5de.tar.gz -> jack-4.0.0_pre20201220.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_=7b0ac09e1e5dc8e5fcf8573519cb88cc
+_md5_=a3ad1fb0a352430193bb65d535f94d7a
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.18 b/metadata/md5-cache/media-sound/jack2-1.9.18
index b36ddc012159..db6df8e3557f 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.18
+++ b/metadata/md5-cache/media-sound/jack2-1.9.18
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.18/v1.9.18.tar.gz -> jack2-1.9.18.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_=665b7f2987e49d2aae1fdc6fd009a43e
+_md5_=eaf91c4f4ec7514673057b0211d591c6
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.19 b/metadata/md5-cache/media-sound/jack2-1.9.19
index a9dda8a19a37..abb67b187f9f 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.19
+++ b/metadata/md5-cache/media-sound/jack2-1.9.19
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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
+_md5_=b0f21dfafd1281484d811bb74a021780
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index 45a41233e93f..8c8aa5870e34 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( classic dbus )
 SLOT=2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	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_=546b68fbc5e634f5b6cbf72527956bde
+_md5_=cb1fadbbc88dbd8e61b217c1c1a29608
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.6 b/metadata/md5-cache/media-sound/kid3-3.8.6
deleted file mode 100644
index 139bad1b6b85..000000000000
--- a/metadata/md5-cache/media-sound/kid3-3.8.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-qt/linguist-tools:5 kde? ( kde-frameworks/extra-cmake-modules:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple tag editor based on Qt
-EAPI=7
-HOMEPAGE=https://kid3.kde.org/
-IUSE=acoustid flac kde mp3 mp4 +mpris +taglib test vorbis
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis )
-REQUIRED_USE=flac? ( vorbis )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://sourceforge/kid3/kid3-3.8.6.tar.gz
-_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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cc20baf52b46400d31e9c91eb7aecdc9
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.7 b/metadata/md5-cache/media-sound/kid3-3.8.7
index 2d5781dabb45..f3e4803ea225 100644
--- a/metadata/md5-cache/media-sound/kid3-3.8.7
+++ b/metadata/md5-cache/media-sound/kid3-3.8.7
@@ -5,7 +5,7 @@ DESCRIPTION=Simple tag editor based on Qt
 EAPI=7
 HOMEPAGE=https://kid3.kde.org/
 IUSE=acoustid flac kde mp3 mp4 +mpris +taglib test vorbis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis )
 REQUIRED_USE=flac? ( vorbis )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.8.7.tar.gz
 _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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cdbda99807ebedb16ed8ca62c13f1051
+_md5_=204b7e19c37db9a6dcf94ca82eb3b135
diff --git a/metadata/md5-cache/media-sound/lollypop-1.2.35 b/metadata/md5-cache/media-sound/lollypop-1.2.35
index 516b6a54a7bf..cca157e0c75d 100644
--- a/metadata/md5-cache/media-sound/lollypop-1.2.35
+++ b/metadata/md5-cache/media-sound/lollypop-1.2.35
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://adishatz.org/lollypop/lollypop-1.2.35.tar.xz
 _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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=656ab0f839c5fc33f24e5541923cfe90
+_md5_=6516adb864ce03c0f7705451a992615b
diff --git a/metadata/md5-cache/media-sound/lollypop-1.4.18 b/metadata/md5-cache/media-sound/lollypop-1.4.18
index 98e4a3b1ed4e..26fdd5cd3149 100644
--- a/metadata/md5-cache/media-sound/lollypop-1.4.18
+++ b/metadata/md5-cache/media-sound/lollypop-1.4.18
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://adishatz.org/lollypop/lollypop-1.4.18.tar.xz
 _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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fceca198c1bcc7cf24955973e1a3a8e6
+_md5_=badd1e8ff7bd1a350f6e3b7e56af83e3
diff --git a/metadata/md5-cache/media-sound/moc-2.5.2-r1 b/metadata/md5-cache/media-sound/moc-2.5.2-r1
deleted file mode 100644
index 4dffbe8af176..000000000000
--- a/metadata/md5-cache/media-sound/moc-2.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libltdl-2:0 sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4:= ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Music On Console - ncurses interface for playing audio files
-EAPI=6
-HOMEPAGE=https://moc.daper.net
-IUSE=aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile speex timidity tremor +unicode vorbis wavpack
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libltdl-2:0 sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4:= ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.2.tar.bz2
-_md5_=05fef20990f3ca621a1c8fddece3581b
diff --git a/metadata/md5-cache/media-sound/moc-2.5.2-r2 b/metadata/md5-cache/media-sound/moc-2.5.2-r2
new file mode 100644
index 000000000000..a1bd582a4603
--- /dev/null
+++ b/metadata/md5-cache/media-sound/moc-2.5.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libltdl-2:0 sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4:= ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Music On Console - ncurses interface for playing audio files
+EAPI=6
+HOMEPAGE=https://moc.daper.net
+IUSE=aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile speex timidity tremor +unicode vorbis wavpack
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libltdl-2:0 sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cache? ( >=sys-libs/db-4:= ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.2.tar.bz2
+_md5_=d2a4076e5bab454710eb1aebc635eef9
diff --git a/metadata/md5-cache/media-sound/moc-2.6_alpha3-r3 b/metadata/md5-cache/media-sound/moc-2.6_alpha3-r3
deleted file mode 100644
index 8710250e6c86..000000000000
--- a/metadata/md5-cache/media-sound/moc-2.6_alpha3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libltdl-2:0 dev-libs/popt sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) cache? ( >=sys-libs/db-4.1:= ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) flac? ( >=media-libs/flac-1.1.3 ) jack? ( virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( >=media-libs/libmodplug-0.7 ) musepack? ( media-sound/musepack-tools >=media-libs/taglib-1.5 ) sid? ( >=media-libs/libsidplay-2.1.1 ) sndfile? ( >=media-libs/libsndfile-1.0.0 ) sndio? ( media-sound/sndio ) speex? ( >=media-libs/speex-1.0.0 ) timidity? ( >=media-libs/libtimidity-0.1.0 media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.0 tremor? ( media-libs/tremor ) !tremor? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( >=media-sound/wavpack-4.31 ) app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Music On Console - ncurses interface for playing audio files
-EAPI=7
-HOMEPAGE=https://moc.daper.net
-IUSE=aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libltdl-2:0 dev-libs/popt sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) cache? ( >=sys-libs/db-4.1:= ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) flac? ( >=media-libs/flac-1.1.3 ) jack? ( virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( >=media-libs/libmodplug-0.7 ) musepack? ( media-sound/musepack-tools >=media-libs/taglib-1.5 ) sid? ( >=media-libs/libsidplay-2.1.1 ) sndfile? ( >=media-libs/libsndfile-1.0.0 ) sndio? ( media-sound/sndio ) speex? ( >=media-libs/speex-1.0.0 ) timidity? ( >=media-libs/libtimidity-0.1.0 media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.0 tremor? ( media-libs/tremor ) !tremor? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( >=media-sound/wavpack-4.31 )
-SLOT=0
-SRC_URI=http://ftp.daper.net/pub/soft/moc/unstable/moc-2.6-alpha3.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8555e2d83edf9d9cceb2d7e925dd0bb3
diff --git a/metadata/md5-cache/media-sound/moc-2.6_alpha3-r4 b/metadata/md5-cache/media-sound/moc-2.6_alpha3-r4
new file mode 100644
index 000000000000..44ff5a24df46
--- /dev/null
+++ b/metadata/md5-cache/media-sound/moc-2.6_alpha3-r4
@@ -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 prepare
+DEPEND=>=dev-libs/libltdl-2:0 dev-libs/popt sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) cache? ( >=sys-libs/db-4.1:= ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) flac? ( >=media-libs/flac-1.1.3 ) jack? ( virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( >=media-libs/libmodplug-0.7 ) musepack? ( media-sound/musepack-tools >=media-libs/taglib-1.5 ) sid? ( >=media-libs/libsidplay-2.1.1 ) sndfile? ( >=media-libs/libsndfile-1.0.0 ) sndio? ( media-sound/sndio ) speex? ( >=media-libs/speex-1.0.0 ) timidity? ( >=media-libs/libtimidity-0.1.0 media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.0 tremor? ( media-libs/tremor ) !tremor? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( >=media-sound/wavpack-4.31 ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Music On Console - ncurses interface for playing audio files
+EAPI=7
+HOMEPAGE=https://moc.daper.net
+IUSE=aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libltdl-2:0 dev-libs/popt sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) cache? ( >=sys-libs/db-4.1:= ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) flac? ( >=media-libs/flac-1.1.3 ) jack? ( virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) magic? ( sys-apps/file ) modplug? ( >=media-libs/libmodplug-0.7 ) musepack? ( media-sound/musepack-tools >=media-libs/taglib-1.5 ) sid? ( >=media-libs/libsidplay-2.1.1 ) sndfile? ( >=media-libs/libsndfile-1.0.0 ) sndio? ( media-sound/sndio ) speex? ( >=media-libs/speex-1.0.0 ) timidity? ( >=media-libs/libtimidity-0.1.0 media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.0 tremor? ( media-libs/tremor ) !tremor? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( >=media-sound/wavpack-4.31 )
+SLOT=0
+SRC_URI=http://ftp.daper.net/pub/soft/moc/unstable/moc-2.6-alpha3.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=09d9e5aabb28a183da2d9c8574ab7b40
diff --git a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2 b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
deleted file mode 100644
index ed3a6374641c..000000000000
--- a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:0=[unicode] dev-libs/icu:= 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=Music Player For Console
-EAPI=6
-HOMEPAGE=http://mpfc.sourceforge.net/
-IUSE=alsa cdda flac gpm mad nls oss static-libs vorbis wav
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:0=[unicode] dev-libs/icu:=
-SLOT=0
-SRC_URI=mirror://sourceforge/mpfc/mpfc-1.3.8.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43b4fd6cb5efc9a0cf48a2564f774e5d
diff --git a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r3 b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r3
new file mode 100644
index 000000000000..5bd980782666
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:=[unicode(+)] dev-libs/icu:= 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=Music Player For Console
+EAPI=6
+HOMEPAGE=http://mpfc.sourceforge.net/
+IUSE=alsa cdda flac gpm mad nls oss static-libs vorbis wav
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:=[unicode(+)] dev-libs/icu:=
+SLOT=0
+SRC_URI=mirror://sourceforge/mpfc/mpfc-1.3.8.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=89247d905b81e7c234401074062e5a28
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.39 b/metadata/md5-cache/media-sound/ncmpc-0.39
deleted file mode 100644
index a4a2daedf0c7..000000000000
--- a/metadata/md5-cache/media-sound/ncmpc-0.39
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-libs/boost-1.62
-DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
-EAPI=7
-HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
-IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.39.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c8346547e6d59ebd54024b671168b0f
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.39-r1 b/metadata/md5-cache/media-sound/ncmpc-0.39-r1
new file mode 100644
index 000000000000..c155280b1c0f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpc-0.39-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-libs/boost-1.62
+DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
+IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.39.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a68f0aa916c4be201263e74e24bd97f
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r1 b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r1
deleted file mode 100644
index 582d1b7e2aae..000000000000
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
-DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
-EAPI=7
-HOMEPAGE=https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp
-IUSE=clock lto outputs taglib visualizer
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
-SLOT=0
-SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.9.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3baf32c4210fb9ebde51d5ba238ac654
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r2 b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r2
new file mode 100644
index 000000000000..6ebd5e1509b3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
+EAPI=7
+HOMEPAGE=https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp
+IUSE=clock lto outputs taglib visualizer
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+SLOT=0
+SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.9.2.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9ea0f859c795c849e11a303ca36e5d7d
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-9999 b/metadata/md5-cache/media-sound/ncmpcpp-9999
index d2f849200e20..34662c249282 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-9999
+++ b/metadata/md5-cache/media-sound/ncmpcpp-9999
@@ -1,13 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
+DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
 DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=7
 HOMEPAGE=https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp
 IUSE=clock lto outputs taglib visualizer
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 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_=eff22a41d36e3b11a3626aed58c182a4
+_md5_=7d36c89d4d2061642bfb6df5fc67a1bd
diff --git a/metadata/md5-cache/media-sound/pamix-1.6-r1 b/metadata/md5-cache/media-sound/pamix-1.6-r1
deleted file mode 100644
index c683ba22e941..000000000000
--- a/metadata/md5-cache/media-sound/pamix-1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
-DESCRIPTION=A PulseAudio NCurses mixer
-EAPI=7
-HOMEPAGE=https://github.com/patroclos/PAmix
-IUSE=+unicode
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
-SLOT=0
-SRC_URI=https://github.com/patroclos/PAmix/archive/v1.6.tar.gz -> pamix-1.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_=7d73fc0a01c31af0d37760ab46c52f79
diff --git a/metadata/md5-cache/media-sound/pamix-1.6-r2 b/metadata/md5-cache/media-sound/pamix-1.6-r2
new file mode 100644
index 000000000000..95a4962b827e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pamix-1.6-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-sound/pulseaudio sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=A PulseAudio NCurses mixer
+EAPI=7
+HOMEPAGE=https://github.com/patroclos/PAmix
+IUSE=+unicode
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=media-sound/pulseaudio sys-libs/ncurses:=[unicode(+)?]
+SLOT=0
+SRC_URI=https://github.com/patroclos/PAmix/archive/v1.6.tar.gz -> pamix-1.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_=b96f2196d804257f94fb51184ee8c1b0
diff --git a/metadata/md5-cache/media-sound/pamix-9999 b/metadata/md5-cache/media-sound/pamix-9999
index ebc481bcb880..02b6f22f2c13 100644
--- a/metadata/md5-cache/media-sound/pamix-9999
+++ b/metadata/md5-cache/media-sound/pamix-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
+DEPEND=media-sound/pulseaudio sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=A PulseAudio NCurses mixer
 EAPI=7
 HOMEPAGE=https://github.com/patroclos/PAmix
 IUSE=+unicode
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
+RDEPEND=media-sound/pulseaudio sys-libs/ncurses:=[unicode(+)?]
 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_=539beb9571b480901b23d35b79982c44
+_md5_=863a8b025e16c4d09062a313b52571bf
diff --git a/metadata/md5-cache/media-sound/picard-2.6.2 b/metadata/md5-cache/media-sound/picard-2.6.2
index 43f78d15793c..d4b2c811b382 100644
--- a/metadata/md5-cache/media-sound/picard-2.6.2
+++ b/metadata/md5-cache/media-sound/picard-2.6.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.6.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	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90b23fc4f13dce8eb0d191dea97987c8
+_md5_=4dd79522e0e7d0ddeaeb2fac5a967b55
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index f2d6eed8dfef..475519247025 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bdd945f25f448b1b05c6ab6ebed7567f
+_md5_=2cb68b42bfc64875f837f107b6d6b976
diff --git a/metadata/md5-cache/media-sound/pms-0.42_p20170508 b/metadata/md5-cache/media-sound/pms-0.42_p20170508
deleted file mode 100644
index 1ac942062bde..000000000000
--- a/metadata/md5-cache/media-sound/pms-0.42_p20170508
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/pandoc ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
-DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
-EAPI=7
-HOMEPAGE=https://ambientsound.github.io/pms
-IUSE=+regex doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
-SLOT=0
-SRC_URI=https://github.com/ambientsound/pms/archive/8c8918488a4a22924ee04442dc5e5216783d51ff.tar.gz -> pms-0.42_p20170508.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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=338bbda3547a72ac3ee71d948d25b187
diff --git a/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1 b/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
new file mode 100644
index 000000000000..ff57b04b93b9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/pandoc ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
+DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
+EAPI=7
+HOMEPAGE=https://ambientsound.github.io/pms
+IUSE=+regex doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
+SLOT=0
+SRC_URI=https://github.com/ambientsound/pms/archive/8c8918488a4a22924ee04442dc5e5216783d51ff.tar.gz -> pms-0.42_p20170508.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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cf9545c04d001f9bc0a40ba922eeec2c
diff --git a/metadata/md5-cache/media-sound/pms-9999 b/metadata/md5-cache/media-sound/pms-9999
index 46ef7a86a295..be4f12e95ec8 100644
--- a/metadata/md5-cache/media-sound/pms-9999
+++ b/metadata/md5-cache/media-sound/pms-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig doc? ( app-text/pandoc ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
+DEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
 DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
 EAPI=7
 HOMEPAGE=https://ambientsound.github.io/pms
 IUSE=+regex doc
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
+RDEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
 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_=830fad15e78c60eae6f9c471438a6360
+_md5_=108bfffe3fb236cd22380f0f4a923a84
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1 b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
new file mode 100644
index 000000000000..a30f6576bb20
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate 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 test
+DEPEND=>=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 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise )
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
+IUSE=bs2b calf rnnoise rubberband webrtc zamaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) gnome-extra/yelp >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=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 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
+SLOT=0
+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_=7eefbbe9040f89d37d59807718ec5ab9
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.4 b/metadata/md5-cache/media-sound/pulseeffects-5.0.4
deleted file mode 100644
index 98d82a0f1255..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.4
+++ /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=!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/easyeffects
-IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-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/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_=95e7f0c331660281a44ab10829620ddf
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.4 b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
index fb33150b86f5..68473cf17c5e 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.4
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b83a137ee8a13c4cd63d3655639def9
+_md5_=619ba654075ddee84319eae892aa527e
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.06.1 b/metadata/md5-cache/media-sound/rosegarden-21.06.1
new file mode 100644
index 000000000000..d81bb7c54c83
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rosegarden-21.06.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MIDI and audio sequencer and notation editor
+EAPI=7
+HOMEPAGE=https://www.rosegardenmusic.com/
+IUSE=lirc test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.06.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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e40e58666186a16515be9638b20dc209
diff --git a/metadata/md5-cache/media-sound/solfege-3.23.4 b/metadata/md5-cache/media-sound/solfege-3.23.4
index ec95332c3caf..162d801ade5d 100644
--- a/metadata/md5-cache/media-sound/solfege-3.23.4
+++ b/metadata/md5-cache/media-sound/solfege-3.23.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/solfege/solfege-3.23.4.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_=77feee5f4998b0fcdb4e0b311c9ea4e7
+_md5_=1c39dd5bc85fcc45b4d5104e150aa337
diff --git a/metadata/md5-cache/media-sound/sonata-1.7.0 b/metadata/md5-cache/media-sound/sonata-1.7.0
index 0f5fb2ceb6a9..0f4c6b07a979 100644
--- a/metadata/md5-cache/media-sound/sonata-1.7.0
+++ b/metadata/md5-cache/media-sound/sonata-1.7.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/multani/sonata/archive/refs/tags/v1.7.0.tar.gz -> sonata-1.7.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=46ee2f54308348300eb2959f8a624b78
+_md5_=e7c269213be8e5332ab94f855b223dc3
diff --git a/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212 b/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
index 0fd8eaef61af..1420ca758468 100644
--- a/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
+++ b/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/multani/sonata/archive/0c807e593f7571a654ad055cb126652d7f3a698d.tar.gz -> sonata-1.7_beta1_p20200212.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d0591dc80b7a410268ed09ce8a826be
+_md5_=c1a3fc9ea4b121cc225679b29e5f97b2
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1 b/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
index 8fb68ed30129..882c471dee9c 100644
--- a/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
+++ b/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.2/+download/soundconverter-3.0.2.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0900c79e73fa47998b8b6f40f73d3196
+_md5_=2070204df4e6dd8fab3d8fb07b386215
diff --git a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2 b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
deleted file mode 100644
index ea6c83d8a35e..000000000000
--- a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Subsonic is a complete, personal media streaming solution
-EAPI=5
-HOMEPAGE=http://www.subsonic.org/
-IUSE=ffmpeg lame selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/jre lame? ( media-sound/lame ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-subsonic )
-SLOT=0
-SRC_URI=mirror://sourceforge/subsonic/5.2.1/subsonic-5.2.1-standalone.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=970ec6c6578ac9df120ef597caf3554e
diff --git a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r3 b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r3
new file mode 100644
index 000000000000..165b96555305
--- /dev/null
+++ b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Subsonic is a complete, personal media streaming solution
+EAPI=7
+HOMEPAGE=http://www.subsonic.org/
+IUSE=ffmpeg lame selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/subsonic acct-user/subsonic virtual/jre lame? ( media-sound/lame ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-subsonic )
+SLOT=0
+SRC_URI=mirror://sourceforge/subsonic/5.2.1/subsonic-5.2.1-standalone.tar.gz
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2b3b54e4dfdf0b4de04a096c17050971
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1 b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
deleted file mode 100644
index 992dafb68b3b..000000000000
--- a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A volume control trayicon with mouse wheel support
-EAPI=7
-HOMEPAGE=https://oliwer.net/b/volwheel.html
-IUSE=alsa
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
-SLOT=0
-SRC_URI=https://olwtools.googlecode.com/files/volwheel-0.2.8.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05b0fec35a5d45cb957ec76a2e35f469
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.9 b/metadata/md5-cache/media-sound/volwheel-0.2.9
index 9139296f65a0..e3e3d9cc50a7 100644
--- a/metadata/md5-cache/media-sound/volwheel-0.2.9
+++ b/metadata/md5-cache/media-sound/volwheel-0.2.9
@@ -4,10 +4,10 @@ DESCRIPTION=A volume control trayicon with mouse wheel support
 EAPI=7
 HOMEPAGE=https://oliwer.net/b/volwheel.html
 IUSE=alsa
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
 SLOT=0
 SRC_URI=https://github.com/oliwer/volwheel/archive/refs/tags/v0.2.9.tar.gz -> volwheel-0.2.9.tar.gz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5fe727e18faa18f17c4d5f1b0bcddb39
+_md5_=73489606b861f3416a8533e7766635ed
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index d8397c021603..0f35cfb49add 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 dcab69e43b6a..35109241a1a5 100644
--- a/metadata/md5-cache/media-tv/kodi-19.0
+++ b/metadata/md5-cache/media-tv/kodi-19.0
@@ -13,4 +13,4 @@ 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	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=426aa43224eb2c8294854a72547c22a0
+_md5_=66ae3df6e84f7ce1facdcc118482bd94
diff --git a/metadata/md5-cache/media-tv/kodi-19.1 b/metadata/md5-cache/media-tv/kodi-19.1
index bfd680efc73a..91e0fa0c2795 100644
--- a/metadata/md5-cache/media-tv/kodi-19.1
+++ b/metadata/md5-cache/media-tv/kodi-19.1
@@ -13,4 +13,4 @@ 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	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ec737dcd44e52fae634861f585dc4edc
+_md5_=f16dc36aeb37c169930e97f4284287d9
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 77cc012ccb8e..bfa05c012c30 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -13,4 +13,4 @@ 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	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa494d1c82c6e1b28a500109995e70fa
+_md5_=ffba91d7b955f332ac08a9d101e8c80e
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 7b0cf1060ac2..1123207b9473 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -13,4 +13,4 @@ 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	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2fb1a5e9e3370fc5a161b263da7fe21f
+_md5_=7d2b545693a07d9d5ffcfba5e812893f
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.3.4707 b/metadata/md5-cache/media-tv/plex-media-server-1.23.3.4707
deleted file mode 100644
index a09792865d2e..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.23.3.4707
+++ /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.3.4707-ebb5fe9f3/debian/plexmediaserver_1.23.3.4707-ebb5fe9f3_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.3.4707-ebb5fe9f3/debian/plexmediaserver_1.23.3.4707-ebb5fe9f3_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=4a09c2f1f70d817ac48bd90829066f14
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841 b/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841
new file mode 100644
index 000000000000..0fd95d46f3d7
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841
@@ -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.5.4841-549599676/debian/plexmediaserver_1.23.5.4841-549599676_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.5.4841-549599676/debian/plexmediaserver_1.23.5.4841-549599676_i386.deb )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=6a7205a7174b3e78181ea6695c878fbb
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 19ba38950131..406e0d5056dd 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/openshot-2.5.1-r1 b/metadata/md5-cache/media-video/openshot-2.5.1-r1
index f88fb4a3472e..a9961a1b5ade 100644
--- a/metadata/md5-cache/media-video/openshot-2.5.1-r1
+++ b/metadata/md5-cache/media-video/openshot-2.5.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.5.1.tar.gz -> openshot-2.5.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=978a84d64760d3d2be6087e784c5c603
+_md5_=9821ea2490e934b5d3bf888c673465d7
diff --git a/metadata/md5-cache/media-video/openshot-2.5.1_p20210228 b/metadata/md5-cache/media-video/openshot-2.5.1_p20210228
index 6b6378c60d7a..1b579e42656d 100644
--- a/metadata/md5-cache/media-video/openshot-2.5.1_p20210228
+++ b/metadata/md5-cache/media-video/openshot-2.5.1_p20210228
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/146189dc050a9462f71a8b37e783aa52b73e4d9b.tar.gz -> openshot-2.5.1_p20210228.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=550465a6185a0774d81b14e2dd01fc78
+_md5_=4d46f0151504e7ab0eb45743995b8e2e
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.25 b/metadata/md5-cache/media-video/pipewire-0.3.25
deleted file mode 100644
index 6f2ccc1df95b..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
-DEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses[unicode] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses[unicode] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.25/pipewire-0.3.25.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=be80584e5dd9fcddb4fba54ebadc8f36
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.25-r1 b/metadata/md5-cache/media-video/pipewire-0.3.25-r1
new file mode 100644
index 000000000000..6376db26536d
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.25-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
+DEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses:=[unicode(+)] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses:=[unicode(+)] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.25/pipewire-0.3.25.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=1c28bb9f1d9c1f20d3f11daf47a3726a
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.26 b/metadata/md5-cache/media-video/pipewire-0.3.26
deleted file mode 100644
index daf3563f6f67..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
-DEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses[unicode] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses[unicode] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.26/pipewire-0.3.26.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=eda576787e4767618782e3991a214567
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.26-r1 b/metadata/md5-cache/media-video/pipewire-0.3.26-r1
new file mode 100644
index 000000000000..1c24d9cf7eb7
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.26-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
+DEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses:=[unicode(+)] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/alsa-lib sys-apps/dbus sys-libs/ncurses:=[unicode(+)] virtual/libudev bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7 || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.26/pipewire-0.3.26.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=1bf8bd41a82d797e2f29bf4940112b0d
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.27-r1 b/metadata/md5-cache/media-video/pipewire-0.3.27-r1
deleted file mode 100644
index eacc1c2e4674..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.27-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.27/pipewire-0.3.27.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=9d589368433646d7edfc5cb8c109b5a7
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.27-r2 b/metadata/md5-cache/media-video/pipewire-0.3.27-r2
new file mode 100644
index 000000000000..a43baf1b6aec
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.27-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.27/pipewire-0.3.27.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=b114d80c866a2e8db007b2b57ada4db2
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.28 b/metadata/md5-cache/media-video/pipewire-0.3.28
deleted file mode 100644
index 8728ca423ad4..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.28
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.28/pipewire-0.3.28.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=99d3e06149b18e1c96363b53107b07b4
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.28-r1 b/metadata/md5-cache/media-video/pipewire-0.3.28-r1
new file mode 100644
index 000000000000..c73839461033
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.28-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.28/pipewire-0.3.28.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=4b8914321603f69d85740cea3d5355d6
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.29 b/metadata/md5-cache/media-video/pipewire-0.3.29
deleted file mode 100644
index e26e6a4b695b..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.29
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.29/pipewire-0.3.29.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=d07aebd2ba70c5ea900ac5071bd96a40
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.29-r1 b/metadata/md5-cache/media-video/pipewire-0.3.29-r1
new file mode 100644
index 000000000000..0e8462d9bec2
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.29-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) >=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 test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.29/pipewire-0.3.29.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=913229d24a746f910d509ea425bad14f
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.30-r1 b/metadata/md5-cache/media-video/pipewire-0.3.30-r1
deleted file mode 100644
index e2acfb767b17..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.30-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.30/pipewire-0.3.30.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=d61f96df119e2f493b51256ffa211054
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.30-r2 b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
new file mode 100644
index 000000000000..ad3bc58b18c4
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=jack-sdk? ( !jack-client )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.30/pipewire-0.3.30.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=a42e298d8a10304d19d36069bc50aa5a
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.31 b/metadata/md5-cache/media-video/pipewire-0.3.31
deleted file mode 100644
index e9c7600d866f..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.31
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.31/pipewire-0.3.31.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=aee7734c4c6184a52f319c49f4e3a25b
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.31-r1 b/metadata/md5-cache/media-video/pipewire-0.3.31-r1
new file mode 100644
index 000000000000..a8a5e1b4df25
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.31-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=jack-sdk? ( !jack-client )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.31/pipewire-0.3.31.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=a9e2e366c6fd279f8baeb96e0fc5758b
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.32 b/metadata/md5-cache/media-video/pipewire-0.3.32
new file mode 100644
index 000000000000..63b26fdaddb1
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.32
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=jack-sdk? ( !jack-client )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.32/pipewire-0.3.32.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=8c61e3b60c33387a178d651f46fc40f6
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 23f2c78df7e5..c05ed0b6e64f 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.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=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT LGPL-2.1+ GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=aee7734c4c6184a52f319c49f4e3a25b
+_md5_=8c61e3b60c33387a178d651f46fc40f6
diff --git a/metadata/md5-cache/media-video/pitivi-0.999-r4 b/metadata/md5-cache/media-video/pitivi-0.999-r4
index fb46ab84e26e..9d0066892df0 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999-r4
+++ b/metadata/md5-cache/media-video/pitivi-0.999-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6091f94a0836c3696fe642b702d98270
+_md5_=c69a3a3792e7722ea2fac8303dbf97b6
diff --git a/metadata/md5-cache/media-video/totem-3.38.0 b/metadata/md5-cache/media-video/totem-3.38.0
index c85de0012af5..e001356802c0 100644
--- a/metadata/md5-cache/media-video/totem-3.38.0
+++ b/metadata/md5-cache/media-video/totem-3.38.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.38/totem-3.38.0.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_=3833e7675f00038bb1648d6aedd5e4d3
+_md5_=3c24a9bd46b6dc2a898493270b688091
diff --git a/metadata/md5-cache/media-video/totem-3.38.1 b/metadata/md5-cache/media-video/totem-3.38.1
index 224ecf4d3b52..5c612a11c258 100644
--- a/metadata/md5-cache/media-video/totem-3.38.1
+++ b/metadata/md5-cache/media-video/totem-3.38.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.38/totem-3.38.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	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_=88d740b3f6e2dab9498a7a20135dca1e
+_md5_=756348cc1584982488f14690dc5dd2e1
diff --git a/metadata/md5-cache/media-video/vlc-3.0.12.1-r101 b/metadata/md5-cache/media-video/vlc-3.0.12.1-r101
deleted file mode 100644
index 8e38e316610c..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.12.1-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.12.1/vlc-3.0-3.0.12.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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8275502aede2b6f82e4a1099a858eb05
diff --git a/metadata/md5-cache/media-video/vlc-3.0.12.1-r102 b/metadata/md5-cache/media-video/vlc-3.0.12.1-r102
new file mode 100644
index 000000000000..09157b87b6c0
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.12.1-r102
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.12.1/vlc-3.0-3.0.12.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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5a4c7836573ff368123162e1c5468673
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r3 b/metadata/md5-cache/media-video/vlc-3.0.14-r3
deleted file mode 100644
index 3113b6729066..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8fe669744da83598c5f550bb8b913a2
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r4 b/metadata/md5-cache/media-video/vlc-3.0.14-r4
deleted file mode 100644
index 7de831a860fd..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f5f65a0718f1e074ffe715913c919d6
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r5 b/metadata/md5-cache/media-video/vlc-3.0.14-r5
new file mode 100644
index 000000000000..d87bc5353827
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r5
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=915c8f80f38435f2f4bb940c60e0453f
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r6 b/metadata/md5-cache/media-video/vlc-3.0.14-r6
new file mode 100644
index 000000000000..f6c1d3f4235b
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r6
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0e0b9be444598667b413239c33091234
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r3 b/metadata/md5-cache/media-video/vlc-3.0.16-r3
deleted file mode 100644
index f4f882da5a5b..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.16-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84c69fc65e12a7a146dd20bc5f3dd789
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r4 b/metadata/md5-cache/media-video/vlc-3.0.16-r4
deleted file mode 100644
index 23a37c98e3ec..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.16-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a2fcb5f1e6a33d62658705c77ef58ad0
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r5 b/metadata/md5-cache/media-video/vlc-3.0.16-r5
new file mode 100644
index 000000000000..1d1c33443164
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.16-r5
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=22432c43707465bbf592e6c2b798ad6c
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r6 b/metadata/md5-cache/media-video/vlc-3.0.16-r6
new file mode 100644
index 000000000000..8b69cb29493b
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.16-r6
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a48a840983d7997ad39267f3f050afa3
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index dfa67f48d25e..e3c1f909db75 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f69f2c24be658dc049851d14f7e96f61
+_md5_=1f24541afe386ef019a016608b535b6d
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index f3bbf7a243a6..829c345da79b 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate kms libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d21c6a4612d0017768389618799bc6b
+_md5_=c9729286a5518c2cbb9f93221d08c0dc
diff --git a/metadata/md5-cache/media-video/xvid4conf-1.12 b/metadata/md5-cache/media-video/xvid4conf-1.12
index 363b1df0ec39..97fa687b4053 100644
--- a/metadata/md5-cache/media-video/xvid4conf-1.12
+++ b/metadata/md5-cache/media-video/xvid4conf-1.12
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=>=x11-libs/gtk+-2.2.4:2 virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-2.2.4:2
 DESCRIPTION=GTK2-configuration dialog for xvid4
-EAPI=6
+EAPI=7
 HOMEPAGE=http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2.4:2
 SLOT=0
 SRC_URI=mirror://gentoo/xvid4conf-1.12.tar.gz
-_md5_=3e3544ee748e3c534cd064727d5e952d
+_md5_=5ded744f9d6a2e5552aa1cf9ab15f6b3
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1b0e5a30d788..2d5399444392 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/goaccess-1.4.2 b/metadata/md5-cache/net-analyzer/goaccess-1.4.2
deleted file mode 100644
index 4149f0f549ce..000000000000
--- a/metadata/md5-cache/net-analyzer/goaccess-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A real-time web log analyzer and interactive viewer that runs in a terminal
-EAPI=7
-HOMEPAGE=https://goaccess.io
-IUSE=debug geoip geoipv2 getline ssl unicode
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=geoipv2? ( geoip )
-SLOT=0
-SRC_URI=https://tar.goaccess.io/goaccess-1.4.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f39a026a7842a2565d4703098e6b8edb
diff --git a/metadata/md5-cache/net-analyzer/goaccess-1.4.2-r1 b/metadata/md5-cache/net-analyzer/goaccess-1.4.2-r1
new file mode 100644
index 000000000000..0c54e8a72d79
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/goaccess-1.4.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A real-time web log analyzer and interactive viewer that runs in a terminal
+EAPI=7
+HOMEPAGE=https://goaccess.io
+IUSE=debug geoip geoipv2 getline ssl unicode
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=geoipv2? ( geoip )
+SLOT=0
+SRC_URI=https://tar.goaccess.io/goaccess-1.4.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aec6c64a5bbee1e14fcbda5acbb9492e
diff --git a/metadata/md5-cache/net-analyzer/goaccess-9999 b/metadata/md5-cache/net-analyzer/goaccess-9999
index 76d8e6d3cf05..85e1983e0349 100644
--- a/metadata/md5-cache/net-analyzer/goaccess-9999
+++ b/metadata/md5-cache/net-analyzer/goaccess-9999
@@ -1,14 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=sys-libs/ncurses:0=[unicode?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=A real-time web log analyzer and interactive viewer that runs in a terminal
 EAPI=7
 HOMEPAGE=https://goaccess.io
 IUSE=debug geoip geoipv2 getline ssl unicode
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=[unicode?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=geoipv2? ( geoip )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f39a026a7842a2565d4703098e6b8edb
+_md5_=aec6c64a5bbee1e14fcbda5acbb9492e
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-27 b/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-27
deleted file mode 100644
index 361e537709e1..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-27
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare test
-DEPEND=curl? ( net-misc/curl:0= ) varlink? ( dev-libs/libvarlink:= )
-DESCRIPTION=Additional and alternative Nagios plugins for Linux
-EAPI=7
-HOMEPAGE=https://github.com/madrisan/nagios-plugins-linux
-IUSE=curl varlink
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=curl? ( net-misc/curl:0= ) varlink? ( dev-libs/libvarlink:= )
-SLOT=0
-SRC_URI=https://github.com/madrisan/nagios-plugins-linux/releases/download/v27/nagios-plugins-linux-27.tar.xz -> nagios-plugins-linux-madrisan-27.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c2e488f6fd8a8c43f38e8732fac217e
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-29 b/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-29
new file mode 100644
index 000000000000..e4fbb2b29e12
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-29
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure prepare test
+DEPEND=curl? ( net-misc/curl:0= ) varlink? ( dev-libs/libvarlink:= )
+DESCRIPTION=Additional and alternative Nagios plugins for Linux
+EAPI=8
+HOMEPAGE=https://github.com/madrisan/nagios-plugins-linux
+IUSE=curl varlink
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=curl? ( net-misc/curl:0= ) varlink? ( dev-libs/libvarlink:= )
+SLOT=0
+SRC_URI=https://github.com/madrisan/nagios-plugins-linux/releases/download/v29/nagios-plugins-linux-29.tar.xz -> nagios-plugins-linux-madrisan-29.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=18cfaf9f87fb3b993258b34624c8dd3b
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.5 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.5
deleted file mode 100644
index 29c580e3577d..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/rpm2targz virtual/pkgconfig
-DEFINED_PHASES=install nofetch postinst unpack
-DESCRIPTION=A remote security scanner for Linux - agent component
-EAPI=7
-HOMEPAGE=https://www.tenable.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2 Nessus-EULA
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=NessusAgent-8.2.5-es8.x86_64.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2e12931b71a140244a9c834d33a1a66
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.0
new file mode 100644
index 000000000000..5a3957f6f303
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/rpm2targz virtual/pkgconfig
+DEFINED_PHASES=install nofetch postinst unpack
+DESCRIPTION=A remote security scanner for Linux - agent component
+EAPI=7
+HOMEPAGE=https://www.tenable.com/
+KEYWORDS=~amd64
+LICENSE=GPL-2 Nessus-EULA
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=NessusAgent-8.3.0-es8.x86_64.rpm
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b2e12931b71a140244a9c834d33a1a66
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
index 2739b2628e1c..c86fe9743759 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
@@ -13,4 +13,4 @@ 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
+_md5_=f931333fde8e5e738938c793eebf3935
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
index 97d856a78c31..1189315d31e6 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
@@ -13,4 +13,4 @@ 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
+_md5_=c172cdb121d5118d2df4eb2d9f4dbc79
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
index dec61e8d840d..1ed8cdf0975e 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
@@ -13,4 +13,4 @@ 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
+_md5_=c6076ba20a7dfa85f03bdbf30baa7566
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index b6caeef055ad..06cff79c5691 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -13,4 +13,4 @@ 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_=18d2a11745cf491b2c12f945b1b554e6
+_md5_=95d7e525e06239df295800f22e5eed96
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.0 b/metadata/md5-cache/net-analyzer/netdata-1.29.0
index 19a432139764..de08e2b737db 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.0
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.0.tar.gz -> netdata-1.29.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdf6793f2b37b332b576a01b7cb90802
+_md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.1 b/metadata/md5-cache/net-analyzer/netdata-1.29.1
index 7d1220d3a010..8d2a3db5c9e0 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.1
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.1.tar.gz -> netdata-1.29.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdf6793f2b37b332b576a01b7cb90802
+_md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.2 b/metadata/md5-cache/net-analyzer/netdata-1.29.2
index 180446b00f2e..db78d3d97ac3 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.2
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.2
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.2.tar.gz -> netdata-1.29.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdf6793f2b37b332b576a01b7cb90802
+_md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.3 b/metadata/md5-cache/net-analyzer/netdata-1.29.3
index d6e0abf7011d..04780fc3c696 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.3
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.3
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.3.tar.gz -> netdata-1.29.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdf6793f2b37b332b576a01b7cb90802
+_md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
index 74dfe708b451..dfb36e79fecb 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.30.1/netdata-v1.30.1.tar.gz -> netdata-1.30.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f0ae0e2046465ca3dfa8f9c97f8b546
+_md5_=9ca26d731a2852c3d9b5f0ccccb3fed7
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0 b/metadata/md5-cache/net-analyzer/netdata-1.31.0
index 217e47b9a284..1545157f049f 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10c8eef013dcb23754236f19cd2ac545
+_md5_=dd90998344c38653eb46bd2e41777b5f
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
index 5ff7505e412e..f2f1c966aae9 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 pyt
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a29c07f1561ff1ef7803e0c5ac6e24e
+_md5_=1a81dfd9e9768799703f438e550cf2f0
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 0134c214e81d..a56d85ef0bba 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a29c07f1561ff1ef7803e0c5ac6e24e
+_md5_=1a81dfd9e9768799703f438e550cf2f0
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.7 b/metadata/md5-cache/net-analyzer/sngrep-1.4.7
deleted file mode 100644
index f3ac3d021d5f..000000000000
--- a/metadata/md5-cache/net-analyzer/sngrep-1.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) pcre? ( dev-libs/libpcre )
-DESCRIPTION=Ncurses SIP Messages flow viewer
-EAPI=7
-HOMEPAGE=https://github.com/irontec/sngrep
-IUSE=eep gnutls ipv6 openssl pcre unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) pcre? ( dev-libs/libpcre )
-REQUIRED_USE=gnutls? ( !openssl )
-SLOT=0
-SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=568b48820f694987f1eec91b46933479
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.7-r1 b/metadata/md5-cache/net-analyzer/sngrep-1.4.7-r1
new file mode 100644
index 000000000000..02cea172ac90
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sngrep-1.4.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Ncurses SIP Messages flow viewer
+EAPI=7
+HOMEPAGE=https://github.com/irontec/sngrep
+IUSE=eep gnutls ipv6 openssl pcre unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) pcre? ( dev-libs/libpcre )
+REQUIRED_USE=gnutls? ( !openssl )
+SLOT=0
+SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ce7a0fade6f5a486e4e0e7b7b43c8c36
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
index 88ca3d25317d..0c2621482f71 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 ~riscv ~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_=415c2d21b4fce5482f9a0be255d69a43
+_md5_=fbecdff09867f6c0e920b8003f0862e3
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.7 b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
index 2fbf9601b117..e7cde823d7aa 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.7
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt: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 )
@@ -13,4 +13,4 @@ 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
+_md5_=e34a2df3c0e249c59b14ec242f374e64
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.14 b/metadata/md5-cache/net-analyzer/zabbix-5.0.14
new file mode 100644
index 000000000000..e02c20f59012
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.14
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
+RESTRICT=test
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.14.tar.gz agent2? ( 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/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.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/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/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.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/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.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-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-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.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/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.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/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.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 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.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.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.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.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.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.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/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.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.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/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.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/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.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/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/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//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-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.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-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-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.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/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/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-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/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-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-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-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-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-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.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.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/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-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-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.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-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.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/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.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//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//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.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/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.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.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.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=61e4072c1299272c356a8120bce85f42
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.6-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.2.6-r1
deleted file mode 100644
index 135fbad2e0d5..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
-RESTRICT=test
-SLOT=0/5.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.6.tar.gz agent2? ( 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.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.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/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/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 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/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/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.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-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-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.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/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.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/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.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 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.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.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.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.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.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.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/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.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.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/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.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/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.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/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/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//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-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.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-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-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.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/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/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-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/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-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-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-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-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-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.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.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/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-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-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.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-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.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/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.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//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//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.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/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.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.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.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=1b3c17b0dff2bee7094e3ebf02d0e061
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.7 b/metadata/md5-cache/net-analyzer/zabbix-5.2.7
deleted file mode 100644
index 871bcc3e6916..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
-RESTRICT=test
-SLOT=0/5.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.7.tar.gz agent2? ( 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.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.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/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/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 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/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/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.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-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-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.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/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.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/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.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 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.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.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.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.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.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.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/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.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.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/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.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/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.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/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/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//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-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.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-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-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.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/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/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-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/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-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-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-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-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-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.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.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/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-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-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.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-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.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/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.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//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//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.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/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.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.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.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=34e17db9556910006fc0670f60a75395
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.3 b/metadata/md5-cache/net-analyzer/zabbix-5.4.3
new file mode 100644
index 000000000000..af8231995cca
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
+RESTRICT=test
+SLOT=0/5.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.3.tar.gz agent2? ( 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.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.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/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/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 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/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/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.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-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-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.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/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/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.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/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.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 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.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.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.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.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.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.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/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.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.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/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.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/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.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/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/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//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-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.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-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-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.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/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/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-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/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-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-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-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-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-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip 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/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/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/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-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-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.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-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.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/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.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//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//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.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/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.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.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.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=bcd259bc42f0193a6660fb4b84251219
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index e7ea1e367792..258406f11bc0 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/bind-9.16.15-r1 b/metadata/md5-cache/net-dns/bind-9.16.15-r1
deleted file mode 100644
index 53292b5f38d7..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.16.15-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 config configure install postinst prepare
-DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:=
-DESCRIPTION=Berkeley Internet Name Domain - Name Server
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib 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
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
-REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.15/bind-9.16.15.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9079ec076e80fb8f700bf8b4af009b3c
diff --git a/metadata/md5-cache/net-dns/bind-9.16.15-r2 b/metadata/md5-cache/net-dns/bind-9.16.15-r2
new file mode 100644
index 000000000000..3578efbcd543
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.15-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare
+DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib 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
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.15/bind-9.16.15.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bf378f4553b90924dce01ebe6943f55f
diff --git a/metadata/md5-cache/net-dns/bind-9.16.18 b/metadata/md5-cache/net-dns/bind-9.16.18
new file mode 100644
index 000000000000..b66202da45b2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.18
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare
+DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib 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
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.18/bind-9.16.18.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=28e24cd68ba4c2340c2e37dfe477dada
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.15 b/metadata/md5-cache/net-dns/bind-tools-9.16.15
index 4a16ff0b92f0..a99a7bbf794b 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.15
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.15
@@ -5,11 +5,11 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
 IUSE=+caps doc gssapi idn ipv6 libedit readline xml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) dev-libs/openssl:= xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.15/bind-9.16.15.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_=177705517020da48a484b8f85da5cf83
+_md5_=217926077d7ee4b482884a99abceae75
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.18 b/metadata/md5-cache/net-dns/bind-tools-9.16.18
new file mode 100644
index 000000000000..234ddb0b1a5f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.18
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) dev-libs/openssl:= xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=+caps doc gssapi idn ipv6 libedit readline xml
+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=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) dev-libs/openssl:= xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.18/bind-9.16.18.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_=f8a92943c520c2be497dbab372c2cec5
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r33 b/metadata/md5-cache/net-dns/djbdns-1.05-r33
deleted file mode 100644
index 9d7eb1d360a1..000000000000
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r33
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare unpack
-DESCRIPTION=Collection of DNS client/server software
-EAPI=6
-HOMEPAGE=http://cr.yp.to/djbdns.html
-IUSE=ipv6 selinux
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86
-LICENSE=public-domain
-RDEPEND=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fab70dd1669b616ec68e31ec0f6088da
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r35 b/metadata/md5-cache/net-dns/djbdns-1.05-r35
index deea8085736d..3ac74bcce340 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_=ee89c067d5c08dc0d69fd0395c109b8d
+_md5_=47bb0f83e9013c2793b7b372228fe4de
diff --git a/metadata/md5-cache/net-dns/hash-slinger-3.1 b/metadata/md5-cache/net-dns/hash-slinger-3.1
index 9b81ef73150e..ff02a8c70a53 100644
--- a/metadata/md5-cache/net-dns/hash-slinger-3.1
+++ b/metadata/md5-cache/net-dns/hash-slinger-3.1
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/letoams/hash-slinger/archive/3.1.tar.gz -> hash-slinger-3.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=373e5faca5cbb529e5625ca8a1ca5776
+_md5_=34eab1a6efea4e739360c156d6e5dcb9
diff --git a/metadata/md5-cache/net-dns/libidn-1.38-r1 b/metadata/md5-cache/net-dns/libidn-1.38-r1
new file mode 100644
index 000000000000..c22a8e2bb208
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn-1.38-r1
@@ -0,0 +1,14 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) nls? ( >=sys-devel/gettext-0.17 ) verify-sig? ( app-crypt/openpgp-keys-libidn ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-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(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Internationalized Domain Names (IDN) implementation
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libidn/
+IUSE=doc emacs java mono nls 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 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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 GPL-3 LGPL-3 java? ( Apache-2.0 )
+RDEPEND=java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/12
+SRC_URI=mirror://gnu/libidn/libidn-1.38.tar.gz verify-sig? ( mirror://gnu/libidn/libidn-1.38.tar.gz.sig )
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=db918873189dc08788e1e6accc00ac38
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.2 b/metadata/md5-cache/net-dns/libidn2-2.3.2
new file mode 100644
index 000000000000..fb60de2938e4
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/help2man verify-sig? ( app-crypt/openpgp-keys-libidn ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libunistring:=[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 implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2
+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 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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+ LGPL-3+
+RDEPEND=dev-libs/libunistring:=[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
+SRC_URI=mirror://gnu/libidn/libidn2-2.3.2.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.2.tar.gz.sig )
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=897c9e25bfc4e4537875363fafd001cc
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.4 b/metadata/md5-cache/net-dns/nsd-4.3.4
deleted file mode 100644
index ea03861c3042..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=656d1eb9fe615e9c65efb4fe548dd25c
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.5 b/metadata/md5-cache/net-dns/nsd-4.3.5
deleted file mode 100644
index 341f3f664b33..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0841529ca81e3db977e5a63e08583e9e
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.6 b/metadata/md5-cache/net-dns/nsd-4.3.6
index a9eea641896a..0b09d0107ce8 100644
--- a/metadata/md5-cache/net-dns/nsd-4.3.6
+++ b/metadata/md5-cache/net-dns/nsd-4.3.6
@@ -5,10 +5,10 @@ DESCRIPTION=An authoritative only, high performance, open source name server
 EAPI=7
 HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
 IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.6.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0841529ca81e3db977e5a63e08583e9e
+_md5_=656d1eb9fe615e9c65efb4fe548dd25c
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.7 b/metadata/md5-cache/net-dns/nsd-4.3.7
new file mode 100644
index 000000000000..6d9506fde05f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-4.3.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=7
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.7.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0841529ca81e3db977e5a63e08583e9e
diff --git a/metadata/md5-cache/net-dns/openresolv-3.12.0 b/metadata/md5-cache/net-dns/openresolv-3.12.0
index e5a29b4e7a86..d0ca859e0674 100644
--- a/metadata/md5-cache/net-dns/openresolv-3.12.0
+++ b/metadata/md5-cache/net-dns/openresolv-3.12.0
@@ -5,7 +5,7 @@ HOMEPAGE=https://roy.marples.name/projects/openresolv
 IUSE=selinux
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
-RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
+RDEPEND=!sys-apps/systemd[resolvconf] selinux? ( sec-policy/selinux-resolvconf )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/openresolv/openresolv-3.12.0.tar.xz
-_md5_=92e7e823518bf43fefb834a4cd6dc2d8
+_md5_=eb09786fa5bb6bf496b0b87a56dc5b1f
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0f8d139c1881..ec2e4db9a7a2 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 5a4c95e0a1ac..6da02b1c5657 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
@@ -13,4 +13,4 @@ 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	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
+_md5_=d95471f6da9bdc1433ed5fe9e3b07282
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 6f5e906f8941..c290f8c59bc8 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
@@ -13,4 +13,4 @@ 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	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
+_md5_=01820613288d3fbeea2e846ccda3423a
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 9f5ccc7b9d71..9119b4371c5d 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
@@ -13,4 +13,4 @@ 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	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
+_md5_=6446de7303c723dccf777a7b855f30e2
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
index 38d7f75624d6..476b69a1ae69 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
@@ -13,4 +13,4 @@ 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	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
+_md5_=213c94b88124e17fd5a1b7c6ebd6225f
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.7 b/metadata/md5-cache/net-firewall/iptables-1.8.7
index c22841416027..16fc897862a5 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.7
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.7
@@ -11,4 +11,4 @@ RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-li
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2
 _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	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff4fd0adf5c0ccb1b65a0dd4a72e9989
+_md5_=1bf78fe5241841c317f70d3a3324de2e
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 70ddde763e56..095fa9dab131 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.12 b/metadata/md5-cache/net-fs/cifs-utils-6.12
index 74b82def5c1d..bf038e6fce49 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.12
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.12
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
 EAPI=7
 HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
 IUSE=+acl +ads +caps creds pam systemd kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
 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] ) !net-fs/mount-cifs sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam )
@@ -13,4 +13,4 @@ REQUIRED_USE=acl? ( ads ) ^^ ( python_single_target_python3_8 python_single_targ
 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	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
+_md5_=6cd42d4c73f5aa835d4dd8d5b6ebbaca
diff --git a/metadata/md5-cache/net-fs/samba-4.13.10-r1 b/metadata/md5-cache/net-fs/samba-4.13.10-r1
index 009ecb9a8349..a75175620ea0 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.10-r1
+++ b/metadata/md5-cache/net-fs/samba-4.13.10-r1
@@ -13,4 +13,4 @@ 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
+_md5_=ab200046db7ed4ac0f6fb8bc7e7d351e
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r2 b/metadata/md5-cache/net-fs/samba-4.13.9-r2
index 5f94277f80ce..0f280b0f2a95 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.9-r2
+++ b/metadata/md5-cache/net-fs/samba-4.13.9-r2
@@ -13,4 +13,4 @@ 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
+_md5_=a4763b94b5fa77317fd53e3f2848240b
diff --git a/metadata/md5-cache/net-fs/samba-4.14.4-r2 b/metadata/md5-cache/net-fs/samba-4.14.4-r2
index 2773c648e447..10caaa635ca9 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.4-r2
+++ b/metadata/md5-cache/net-fs/samba-4.14.4-r2
@@ -13,4 +13,4 @@ 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
+_md5_=5f9417407c257ad04e9c3b7cccf7b59a
diff --git a/metadata/md5-cache/net-fs/samba-4.14.5-r2 b/metadata/md5-cache/net-fs/samba-4.14.5-r2
index 87a0d5be0c2c..dc7384302d55 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.5-r2
+++ b/metadata/md5-cache/net-fs/samba-4.14.5-r2
@@ -1,16 +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 ) )
+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? ( !riscv? ( 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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
+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? ( !riscv? ( 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
+_md5_=12e256498358eed42cc0aa41ee622fff
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r1 b/metadata/md5-cache/net-fs/samba-4.14.6-r1
index 652fd64a5f0d..ddf6db6b46ba 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.6-r1
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r1
@@ -13,4 +13,4 @@ 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
+_md5_=5f9417407c257ad04e9c3b7cccf7b59a
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
index 3eccc6a4f1e1..3096c016e872 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
+++ b/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
@@ -1,15 +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 ) )
+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? ( !riscv? ( 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
+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? ( !riscv? ( 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
+_md5_=b80b2032da762519b4e30b559189e008
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index f25c702cd7ab..89c82c23f016 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/ftpbase-0.01-r5 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
new file mode 100644
index 000000000000..ef4c3b62b6c6
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=pam? ( sys-libs/pam ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=File Transfer Protocol (FTP) base layout
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=pam zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/ftp acct-user/ftp
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=da0bd27a323bc2ea502d49002bedc499
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 2cbb368f4dfa..e338fcc865c0 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/ekg2-0.4_pre20190315 b/metadata/md5-cache/net-im/ekg2-0.4_pre20190315
deleted file mode 100644
index cb90a632ea54..000000000000
--- a/metadata/md5-cache/net-im/ekg2-0.4_pre20190315
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend
-DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= ) sys-devel/gettext
-DESCRIPTION=Text-based, multi-protocol instant messenger
-EAPI=7
-HOMEPAGE=https://github.com/ekg2/ekg2/
-IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl readline rss spell sqlite ssl xmpp unicode zlib
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
-SLOT=0
-SRC_URI=https://github.com/ekg2/ekg2/archive/f427d083ee899d42532c046100490a915b0e8a82.tar.gz -> ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c9b89420dd00350757194904908f799c
diff --git a/metadata/md5-cache/net-im/ekg2-0.4_pre20190315-r1 b/metadata/md5-cache/net-im/ekg2-0.4_pre20190315-r1
new file mode 100644
index 000000000000..8a9497377fd6
--- /dev/null
+++ b/metadata/md5-cache/net-im/ekg2-0.4_pre20190315-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 install prepare pretend
+DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:=[unicode(+)=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= ) sys-devel/gettext
+DESCRIPTION=Text-based, multi-protocol instant messenger
+EAPI=7
+HOMEPAGE=https://github.com/ekg2/ekg2/
+IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl readline rss spell sqlite ssl xmpp unicode zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:=[unicode(+)=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
+SLOT=0
+SRC_URI=https://github.com/ekg2/ekg2/archive/f427d083ee899d42532c046100490a915b0e8a82.tar.gz -> ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b681ab9e3e8e901938bc1f087d5755
diff --git a/metadata/md5-cache/net-im/ekg2-9999 b/metadata/md5-cache/net-im/ekg2-9999
index 5685850d58b7..fd8802efd58e 100644
--- a/metadata/md5-cache/net-im/ekg2-9999
+++ b/metadata/md5-cache/net-im/ekg2-9999
@@ -1,13 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare pretend unpack
-DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= ) sys-devel/gettext
+DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:=[unicode(+)=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= ) sys-devel/gettext
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=7
 HOMEPAGE=https://github.com/ekg2/ekg2/
 IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl readline rss spell sqlite ssl xmpp unicode zlib
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
+RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:=[unicode(+)=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6058bcfd996575975303ace0e4a94b72
+_md5_=d14f2f81500427ae4653cbd5ce227afe
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.31 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.31
deleted file mode 100644
index 7c98c1525c52..000000000000
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.7.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
-EAPI=7
-HOMEPAGE=https://element.io
-IUSE=+emoji
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.31_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b3448e9f1bf5464474a05d852d648941
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.32 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.32
new file mode 100644
index 000000000000..7b32236235dc
--- /dev/null
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.7.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
+EAPI=7
+HOMEPAGE=https://element.io
+IUSE=+emoji
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.32_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1324e6ad5226659d956113ed77b61867
diff --git a/metadata/md5-cache/net-im/gajim-1.2.1 b/metadata/md5-cache/net-im/gajim-1.2.1
deleted file mode 100644
index 8daba7eea858..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://gajim.org/
-IUSE=+crypt geolocation jingle remote rst +spell upnp +webp +python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-1.0.1[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://gajim.org/downloads/1.2/gajim-1.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=39106cb142379c39511a3f538ab3083d
diff --git a/metadata/md5-cache/net-im/gajim-1.2.2 b/metadata/md5-cache/net-im/gajim-1.2.2
deleted file mode 100644
index 06cc024ed392..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://gajim.org/
-IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-1.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-1.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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://gajim.org/downloads/1.2/gajim-1.2.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb52152bc228a87219cddf7e6c9bdc83
diff --git a/metadata/md5-cache/net-im/gajim-1.3.0 b/metadata/md5-cache/net-im/gajim-1.3.0
deleted file mode 100644
index bc63b18190c7..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://gajim.org/
-IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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://gajim.org/downloads/1.3/gajim-1.3.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b3f96930e762fcf7beba4db17ebf443
diff --git a/metadata/md5-cache/net-im/gajim-1.3.1 b/metadata/md5-cache/net-im/gajim-1.3.1
deleted file mode 100644
index 130c0ad68ec3..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://gajim.org/
-IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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://gajim.org/downloads/1.3/gajim-1.3.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a24c25c1d09993b881ed05672ba6e180
diff --git a/metadata/md5-cache/net-im/gajim-1.3.2 b/metadata/md5-cache/net-im/gajim-1.3.2
new file mode 100644
index 000000000000..53a36fd6b47a
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://gajim.org/
+IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_8(-)] dev-python/qrcode[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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://gajim.org/downloads/1.3/gajim-1.3.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5d32adf222bf44533d85144a2ac54dc9
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.3-r1 b/metadata/md5-cache/net-im/pidgin-2.14.3-r1
deleted file mode 100644
index d4377262e085..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=7
-HOMEPAGE=https://pidgin.im/
-IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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.3.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.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_=6385c49d52238ecdf06200f438af59b9
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.3-r2 b/metadata/md5-cache/net-im/pidgin-2.14.3-r2
new file mode 100644
index 000000000000..9b3ed18110a2
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.14.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=7
+HOMEPAGE=https://pidgin.im/
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
+REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.3.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.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_=bf78fd4a25da2fc4f97f371a0b29b35c
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.5 b/metadata/md5-cache/net-im/pidgin-2.14.5
deleted file mode 100644
index 9f90178abef7..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.14.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=7
-HOMEPAGE=https://pidgin.im/
-IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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_=82bb7c67a8a160b4c889fc0aa6e6c52d
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.5-r1 b/metadata/md5-cache/net-im/pidgin-2.14.5-r1
new file mode 100644
index 000000000000..22700fa61471
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.14.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=7
+HOMEPAGE=https://pidgin.im/
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
+REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.5.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
+_eclasses_=autotools	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_=7b92e0465dd4bfb5ec479663bdc8258e
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.6 b/metadata/md5-cache/net-im/pidgin-2.14.6
deleted file mode 100644
index fa445b673ff7..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.14.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=7
-HOMEPAGE=https://pidgin.im/
-IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses: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.6.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_=6e419a9f8b470d909c8ab2b05a365d80
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.6-r1 b/metadata/md5-cache/net-im/pidgin-2.14.6-r1
new file mode 100644
index 000000000000..ec438992229d
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.14.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=7
+HOMEPAGE=https://pidgin.im/
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
+REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.6.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_=4bb9943af371cc64c0cfa4b6edeb585e
diff --git a/metadata/md5-cache/net-im/profanity-0.9.5 b/metadata/md5-cache/net-im/profanity-0.9.5
deleted file mode 100644
index 1d0e94870ea4..000000000000
--- a/metadata/md5-cache/net-im/profanity-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-db/sqlite dev-libs/expat dev-libs/glib dev-libs/libstrophe:= dev-libs/openssl:0= net-misc/curl sys-apps/util-linux sys-libs/ncurses:=[unicode] gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( net-libs/libsignal-protocol-c dev-libs/libgcrypt ) otr? ( net-libs/libotr ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 ) test? ( dev-util/cmocka )
-DESCRIPTION=A console based XMPP client inspired by Irssi
-EAPI=7
-HOMEPAGE=https://profanity-im.github.io
-IUSE=libnotify omemo otr gpg test xscreensaver
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite dev-libs/expat dev-libs/glib dev-libs/libstrophe:= dev-libs/openssl:0= net-misc/curl sys-apps/util-linux sys-libs/ncurses:=[unicode] gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( net-libs/libsignal-protocol-c dev-libs/libgcrypt ) otr? ( net-libs/libotr ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://profanity-im.github.io/profanity-0.9.5.tar.gz
-_md5_=92f4fa95163746b6f7b52e4f73d97fbf
diff --git a/metadata/md5-cache/net-im/profanity-0.9.5-r1 b/metadata/md5-cache/net-im/profanity-0.9.5-r1
new file mode 100644
index 000000000000..817282e0de64
--- /dev/null
+++ b/metadata/md5-cache/net-im/profanity-0.9.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=dev-db/sqlite dev-libs/expat dev-libs/glib dev-libs/libstrophe:= dev-libs/openssl:0= net-misc/curl sys-apps/util-linux sys-libs/ncurses:=[unicode(+)] gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( net-libs/libsignal-protocol-c dev-libs/libgcrypt ) otr? ( net-libs/libotr ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 ) test? ( dev-util/cmocka )
+DESCRIPTION=A console based XMPP client inspired by Irssi
+EAPI=7
+HOMEPAGE=https://profanity-im.github.io
+IUSE=libnotify omemo otr gpg test xscreensaver
+KEYWORDS=amd64
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite dev-libs/expat dev-libs/glib dev-libs/libstrophe:= dev-libs/openssl:0= net-misc/curl sys-apps/util-linux sys-libs/ncurses:=[unicode(+)] gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( net-libs/libsignal-protocol-c dev-libs/libgcrypt ) otr? ( net-libs/libotr ) xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://profanity-im.github.io/profanity-0.9.5.tar.gz
+_md5_=0b18ac94fae856cfa39af642620eaada
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152 b/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152
new file mode 100644
index 000000000000..459f549d3430
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=7
+HOMEPAGE=https://www.skype.com/
+IUSE=kernel_linux abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.74.0.152-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	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/telegram-desktop-2.8.10 b/metadata/md5-cache/net-im/telegram-desktop-2.8.10
deleted file mode 100644
index 2985c9ba585d..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.8.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
-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-im/telegram-desktop-2.8.11 b/metadata/md5-cache/net-im/telegram-desktop-2.8.11
new file mode 100644
index 000000000000..97c8d2e8a830
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.8.11
@@ -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/jemalloc:= 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:= ) 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 +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/jemalloc:= 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:= ) 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.11/tdesktop-2.8.11-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_=65dc70cc50a50f29e245f07873dcba29
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
deleted file mode 100644
index 0271658ddb76..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.6.1.tar.gz -> tdesktop-2.6.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.6.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
deleted file mode 100644
index 9bbbb4ea95bc..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.7.1.tar.gz -> tdesktop-2.7.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.7.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.4 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.4
deleted file mode 100644
index 0f1e7d65abd5..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.7.4.tar.gz -> tdesktop-2.7.4.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.7.4.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9
new file mode 100644
index 000000000000..6b3d0b561b9e
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.8.9.tar.gz -> tdesktop-2.8.9.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.8.9.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-im/zoom-5.6.22045.0607 b/metadata/md5-cache/net-im/zoom-5.6.22045.0607
deleted file mode 100644
index 8a1baa952f03..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.6.22045.0607
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=7
-HOMEPAGE=https://zoom.us/
-IUSE=bundled-libjpeg-turbo +bundled-qt pulseaudio wayland
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip:0= media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 wayland? ( dev-qt/qtwayland ) )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://zoom.us/client/5.6.22045.0607/zoom_x86_64.tar.xz -> zoom-5.6.22045.0607_x86_64.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9bcd84f7d534d1039ae0ff7591fe2f97
diff --git a/metadata/md5-cache/net-im/zoom-5.7.28852.0718 b/metadata/md5-cache/net-im/zoom-5.7.28852.0718
new file mode 100644
index 000000000000..50263b442f96
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.7.28852.0718
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=8
+HOMEPAGE=https://zoom.us/
+IUSE=bundled-libjpeg-turbo +bundled-qt pulseaudio wayland
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip:0= media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 wayland? ( dev-qt/qtwayland ) )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://zoom.us/client/5.7.28852.0718/zoom_x86_64.tar.xz -> zoom-5.7.28852.0718_x86_64.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=687132ed280d771f67a8028be1402173
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f37497f12001..98a635ddead6 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.30-r2 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r2
deleted file mode 100644
index ea00c2d43d14..000000000000
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=virtual/libcrypt:= 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= ) )
-DESCRIPTION=IRC fileserver using DCC
-EAPI=6
-HOMEPAGE=http://iroffer.dinoex.net/
-IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libcrypt:= 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.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c1275090ce3b56a847d411efbc790199
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31-r1
deleted file mode 100644
index c713fce3011a..000000000000
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=virtual/libcrypt:= 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= ) )
-DESCRIPTION=IRC fileserver using DCC
-EAPI=6
-HOMEPAGE=http://iroffer.dinoex.net/
-IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libcrypt:= 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.31.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.31.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=8fb5d982a0f6500ee3c9843cb9f15d3e
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r2 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r2
deleted file mode 100644
index 4f056eac03bb..000000000000
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/tokyocabinet[ruby_targets_ruby25(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby25(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby25(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/tokyocabinet[ruby_targets_ruby26(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby26(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby26(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/tokyocabinet[ruby_targets_ruby27(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby27(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby27(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.0.5-r2[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 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=A ruby IRC bot
-EAPI=7
-HOMEPAGE=https://ruby-rbot.org/
-IUSE=spell aspell timezone translator nls figlet fortune cal host sqlite toilet test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64
-LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( sys-apps/util-linux ) host? ( net-dns/bind-tools ) ruby_targets_ruby25? ( dev-ruby/tokyocabinet[ruby_targets_ruby25(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby25(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby25(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/tokyocabinet[ruby_targets_ruby26(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby26(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby26(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/tokyocabinet[ruby_targets_ruby27(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby27(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby27(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.0.5-r2[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=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=ac755113076c116439e4eee40e759664
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
new file mode 100644
index 000000000000..f69879dfa425
--- /dev/null
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/tokyocabinet[ruby_targets_ruby25(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby25(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby25(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/tokyocabinet[ruby_targets_ruby26(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby26(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby26(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/tokyocabinet[ruby_targets_ruby27(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby27(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby27(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.0.5-r2[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 configure install postinst prepare setup test unpack
+DEPEND=acct-group/rbot acct-user/rbot 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 ruby IRC bot
+EAPI=7
+HOMEPAGE=https://ruby-rbot.org/
+IUSE=spell aspell timezone translator nls figlet fortune cal host sqlite toilet test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
+KEYWORDS=~amd64
+LICENSE=|| ( feh GPL-2 )
+RDEPEND=acct-group/rbot acct-user/rbot spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( sys-apps/util-linux ) host? ( net-dns/bind-tools ) ruby_targets_ruby25? ( dev-ruby/tokyocabinet[ruby_targets_ruby25(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby25(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby25(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/tokyocabinet[ruby_targets_ruby26(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby26(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby26(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/tokyocabinet[ruby_targets_ruby27(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby27(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby27(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.0.5-r2[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=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=94bfdf01e2f9c037191df752c44c6fb8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 748b7bbc8e21..3467fbcca6f7 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/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
deleted file mode 100644
index c1a40ed8d2db..000000000000
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r100
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
-EAPI=7
-HOMEPAGE=http://axtls.sourceforge.net/
-IUSE=httpd cgi-lua cgi-php static static-libs doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-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 savedconfig
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=httpd? ( cgi-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 ) ) cgi-php? ( dev-lang/php[cgi] ) )
-REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
-SLOT=0/1
-SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=28b2063d729fbcdcf37df6393da70f0b
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5-r101 b/metadata/md5-cache/net-libs/axtls-2.1.5-r101
new file mode 100644
index 000000000000..d02a96d08ce1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r101
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
+EAPI=7
+HOMEPAGE=http://axtls.sourceforge.net/
+IUSE=httpd cgi-lua cgi-php static static-libs doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-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 savedconfig
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=httpd? ( acct-group/axtls acct-user/axtls cgi-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 ) ) cgi-php? ( dev-lang/php[cgi] ) )
+REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
+SLOT=0/1
+SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
+_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=938db8f7f2dda213f09f0e394866eeec
diff --git a/metadata/md5-cache/net-libs/gssdp-1.0.3 b/metadata/md5-cache/net-libs/gssdp-1.0.3
deleted file mode 100644
index 41061f20d91b..000000000000
--- a/metadata/md5-cache/net-libs/gssdp-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.34.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(-)?] >=net-libs/libsoup-2.44.2:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( 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-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.14 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GObject-based API for handling resource discovery and announcement over SSDP
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IUSE=+introspection gtk 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=LGPL-2
-RDEPEND=>=dev-libs/glib-2.34.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(-)?] >=net-libs/libsoup-2.44.2:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( 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-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3
-SLOT=0/3
-SRC_URI=mirror://gnome/sources/gssdp/1.0/gssdp-1.0.3.tar.xz
-_eclasses_=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	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e15bbfa1503d11ca331a62b337123b9d
diff --git a/metadata/md5-cache/net-libs/gssdp-1.2.2 b/metadata/md5-cache/net-libs/gssdp-1.2.2
deleted file mode 100644
index 3aec3fa60162..000000000000
--- a/metadata/md5-cache/net-libs/gssdp-1.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/libsoup:2.4[vala] ) 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.54: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-libs/libsoup-2.26.1:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.12:3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject-based API for handling resource discovery and announcement over SSDP
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IUSE=gtk-doc +introspection gtk vala 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=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.54: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-libs/libsoup-2.26.1:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.12:3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1.2-0
-SRC_URI=mirror://gnome/sources/gssdp/1.2/gssdp-1.2.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25ed005ce8cdf0d83e06a7dc3785ee38
diff --git a/metadata/md5-cache/net-libs/gssdp-1.3.0 b/metadata/md5-cache/net-libs/gssdp-1.3.0
new file mode 100644
index 000000000000..3d33953fe910
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gssdp-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/libsoup:2.4[vala] ) 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.54: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-libs/libsoup-2.26.1:2.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(-)?,introspection?] gtk? ( gui-libs/gtk:4 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject-based API for handling resource discovery and announcement over SSDP
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp
+IUSE=gtk-doc +introspection gtk vala 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=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.54: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-libs/libsoup-2.26.1:2.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(-)?,introspection?] gtk? ( gui-libs/gtk:4 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/1.2-0
+SRC_URI=mirror://gnome/sources/gssdp/1.3/gssdp-1.3.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=904d957a518f13c39b587a2c1b17ce5a
diff --git a/metadata/md5-cache/net-libs/gupnp-1.3.0 b/metadata/md5-cache/net-libs/gupnp-1.3.0
new file mode 100644
index 000000000000..475604405ef2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) >=net-libs/gssdp-1.3.0:0[vala] net-libs/libsoup:2.4[vala] ) 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 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] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.66: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-libs/gssdp-1.3.0:0=[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(-)?] >=net-libs/libsoup-2.48.0:2.4[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(-)?] >=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(-)?] >=sys-apps/util-linux-2.24.1-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp
+IUSE=connman gtk-doc +introspection kernel_linux networkmanager vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+ 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] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.66: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-libs/gssdp-1.3.0:0=[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(-)?] >=net-libs/libsoup-2.48.0:2.4[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(-)?] >=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(-)?] >=sys-apps/util-linux-2.24.1-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( connman networkmanager )
+SLOT=0/1.2-0
+SRC_URI=mirror://gnome/sources/gupnp/1.3/gupnp-1.3.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6f93312a2ddaafe0d6cc54111b0ab5e0
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.13.0 b/metadata/md5-cache/net-libs/gupnp-av-0.13.0
new file mode 100644
index 000000000000..1067f169dc6f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.13.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) app-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 prepare test
+DEPEND=>=dev-libs/glib-2.58:2 >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av
+IUSE=gtk-doc +introspection
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.58:2 >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+SLOT=0/3
+SRC_URI=mirror://gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9fbf968f5e80fcb258ef419e38c0b536
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-1.2.0 b/metadata/md5-cache/net-libs/gupnp-igd-1.2.0
new file mode 100644
index 000000000000..2508fd85b0cd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-igd-1.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils sys-devel/gettext virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) 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.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
+EAPI=7
+HOMEPAGE=http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd
+IUSE=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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 )
+SLOT=0/1.2
+SRC_URI=mirror://gnome/sources/gupnp-igd/1.2/gupnp-igd-1.2.0.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=067aa6dfd315040d946f4ef069c2e472
diff --git a/metadata/md5-cache/net-libs/libasr-1.0.4 b/metadata/md5-cache/net-libs/libasr-1.0.4
index 1ab2ecfa4825..a3ba593aed0f 100644
--- a/metadata/md5-cache/net-libs/libasr-1.0.4
+++ b/metadata/md5-cache/net-libs/libasr-1.0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Async Resolver Library from OpenBSD/OpenSMTPD
 EAPI=7
 HOMEPAGE=https://github.com/OpenSMTPD/libasr
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/libasr-1.0.4.tar.gz
-_md5_=249dabae9b6289919d2c42b67918eed4
+_md5_=8bae69e4c264888bacfb37956e7ed158
diff --git a/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1 b/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1
index f30475bc024b..723bfc8ca6c5 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1
+++ b/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=C library for building NETCONF servers and clients
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libnetconf2
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v2.0.1.tar.gz -> libnetconf2-2.0.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_=61720a1337370aed814fee23de64dce9
+_md5_=05ed8ffe1255b31b72160c1f2e67e8e6
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
index b597017fcd73..7e46bf8d0d9e 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.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_=d4298b92d7b6c71b2d11f873cd3304c8
+_md5_=c23d398a91b24c7cb1123c77e44d3758
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.13 b/metadata/md5-cache/net-libs/libvncserver-0.9.13
index 2253ba7efcb7..8089f7139438 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.13
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.13
@@ -5,11 +5,11 @@ DESCRIPTION=library for creating vnc servers
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib
-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
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ BSD MIT
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.2:0= ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
 REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.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_=1c9c72051988d36cb8b4a27eb00c61f5
+_md5_=6da5494ef17e30f90729158450120e1e
diff --git a/metadata/md5-cache/net-libs/libyang-2.0.7 b/metadata/md5-cache/net-libs/libyang-2.0.7
index 7ca9162f3af8..893fcb218d96 100644
--- a/metadata/md5-cache/net-libs/libyang-2.0.7
+++ b/metadata/md5-cache/net-libs/libyang-2.0.7
@@ -5,11 +5,11 @@ DESCRIPTION=YANG data modeling language library
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libyang
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libyang/archive/v2.0.7.tar.gz -> libyang-2.0.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_=7e549daf636e1fa2f16a690caf390296
+_md5_=492369183fbe3fb0e6d138889e43c63c
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.2 b/metadata/md5-cache/net-libs/miniupnpc-2.2.2
index 9494b6a96080..08171472a682 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.2
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.2
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz.sig )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=d98cbdc5900f02aa7051ab2258226be4
+_md5_=adb1bb5ecbf936956351ff1217328512
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.42.0-r2 b/metadata/md5-cache/net-libs/nghttp2-1.42.0-r2
deleted file mode 100644
index d0b7f11faf93..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.42.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.42.0/nghttp2-1.42.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d376ddc4d569f1ae498e2c6bcf3b38a
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
index 736ba1b624c6..0b93e7d3b1ff 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
+++ b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a1a4b55aab7204c7f1f852f6dd6a66b
+_md5_=9504ad169f3da5bc8d270040f8e9e2cf
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.44.0 b/metadata/md5-cache/net-libs/nghttp2-1.44.0
new file mode 100644
index 000000000000..3bad9453999b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.44.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.44.0/nghttp2-1.44.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5a1a4b55aab7204c7f1f852f6dd6a66b
diff --git a/metadata/md5-cache/net-libs/pjproject-2.10-r2 b/metadata/md5-cache/net-libs/pjproject-2.10-r2
new file mode 100644
index 000000000000..db87cd3ff6de
--- /dev/null
+++ b/metadata/md5-cache/net-libs/pjproject-2.10-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
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-libs/libsrtp:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
+EAPI=7
+HOMEPAGE=https://www.pjsip.org/
+IUSE=amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libsrtp:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+SLOT=0/2.10
+SRC_URI=https://github.com/pjsip/pjproject/archive/2.10.tar.gz -> pjproject-2.10.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_=d7528d43c21cae7b11cf5366088be6f7
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.2
new file mode 100644
index 000000000000..0a9c1f5b1b6c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source web browser engine
+EAPI=7
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.2.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	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_=de1e6a13ea666592d108c383fdc3921a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
new file mode 100644
index 000000000000..5e773c72a4c4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source web browser engine
+EAPI=7
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.3.tar.xz
+_eclasses_=check-reqs	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_=de1e6a13ea666592d108c383fdc3921a
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d6f69a86ac75..9fac660f51ec 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.15-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.15-r1
index 6bfbd85687c0..cd4491b0ff27 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.15-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.15-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 systemd tcpd textcat unwind lua_single_target_lua5-1 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 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=dev-libs/icu:= dev-libs/openssl:0= virtual/libiconv 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-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) 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:* ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= 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-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.15.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.15.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.15.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_=70b19c868207e31aa6f3ddcae0f77fc9
+_eclasses_=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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3d09dcc2afaff456c571da03d2d927fd
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.16 b/metadata/md5-cache/net-mail/fetchmail-6.4.16
index 6faec401c58e..b0bd626b63ec 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.16
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.16
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_pyth
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.16.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d8b15c24e2bc42617839208efbfd54c
+_md5_=abbdf187d845f4d7175549a4a482f51f
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.19 b/metadata/md5-cache/net-mail/fetchmail-6.4.19
index 6ffc53f17da6..7439576a887b 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.19
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.19
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_pyth
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.19.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e812c97efc0391b0c99a589d0b2492f
+_md5_=48dd8f40fc2ef47f27d7731ee836785f
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.8 b/metadata/md5-cache/net-mail/fetchmail-6.4.8
index 100194fb575b..9b027bc45500 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.8
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.8
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.8.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b503b7c63165046cb04e3f6852f95ec8
+_md5_=8b046e94dff70dcc0e73ba14b3428c8e
diff --git a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8 b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
index f30ab0564caa..b0bcc737e041 100644
--- a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
+++ b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( python ) python? ( ^^ ( python_single_target_python3_8 python
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-7.0.0-alpha8.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c06f6e1b55c60458fb8b2fd67cab681c
+_md5_=a8f1230dad51f12b8e2d9b5074b58f10
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.4-r1 b/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
index 77a1f7ddc81a..36b67a2e0e59 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mailshears-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=508a816788dfd1c28fb7deffdc65b636
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3 b/metadata/md5-cache/net-mail/notmuch-0.31.3
deleted file mode 100644
index 43cd8a01467d..000000000000
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
-EAPI=7
-HOMEPAGE=https://notmuchmail.org/
-IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser ) nmbug? ( dev-vcs/git )
-REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
-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	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.31.3-r1 b/metadata/md5-cache/net-mail/notmuch-0.31.3-r1
new file mode 100644
index 000000000000..38c70fe53ae3
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=7
+HOMEPAGE=https://notmuchmail.org/
+IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long dev-perl/Pod-Parser ) nmbug? ( dev-vcs/git )
+REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
+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	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_=34afc54dc9b4baa1aa61b9b9db39b174
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.1 b/metadata/md5-cache/net-mail/notmuch-0.32.1
deleted file mode 100644
index e04aa1fdddab..000000000000
--- a/metadata/md5-cache/net-mail/notmuch-0.32.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( sys-process/parallel )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
-EAPI=7
-HOMEPAGE=https://notmuchmail.org/
-IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser ) nmbug? ( dev-vcs/git )
-REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
-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	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.1-r1 b/metadata/md5-cache/net-mail/notmuch-0.32.1-r1
new file mode 100644
index 000000000000..994e5b393cd6
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( sys-process/parallel )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=7
+HOMEPAGE=https://notmuchmail.org/
+IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long dev-perl/Pod-Parser ) nmbug? ( dev-vcs/git )
+REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
+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	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_=6ec6e48f40b1e40d782b9490dcf2c467
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.2 b/metadata/md5-cache/net-mail/notmuch-0.32.2
deleted file mode 100644
index 090f4ee60101..000000000000
--- a/metadata/md5-cache/net-mail/notmuch-0.32.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( sys-process/parallel )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
-EAPI=7
-HOMEPAGE=https://notmuchmail.org/
-IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser ) nmbug? ( dev-vcs/git )
-REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
-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	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-mail/notmuch-0.32.2-r1 b/metadata/md5-cache/net-mail/notmuch-0.32.2-r1
new file mode 100644
index 000000000000..290bc948b33d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( app-doc/doxygen dev-lang/perl ) doc? ( dev-python/sphinx sys-apps/texinfo ) python? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( sys-process/parallel )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=7
+HOMEPAGE=https://notmuchmail.org/
+IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-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(-)?] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long dev-perl/Pod-Parser ) nmbug? ( dev-vcs/git )
+REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
+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	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_=b177a485af608568391d2bd25587f482
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2fc69fc7161b..f3c489793f43 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/asterisk-13.38.3 b/metadata/md5-cache/net-misc/asterisk-13.38.3
new file mode 100644
index 000000000000..8fe1e7a4fd1f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.3
@@ -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 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib 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 ) 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:= ) 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/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) 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 curl dahdi debug 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 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 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib 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 ) 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:= ) 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/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) 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/13
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.3.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_=166d3c66158c6ff94f8e87462fa44926
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.1 b/metadata/md5-cache/net-misc/asterisk-16.19.1
new file mode 100644
index 000000000000..28f326ab0fca
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.19.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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.1.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.1 b/metadata/md5-cache/net-misc/asterisk-18.5.1
new file mode 100644
index 000000000000..c49f022889ed
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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.1.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/bfgminer-5.5.0 b/metadata/md5-cache/net-misc/bfgminer-5.5.0
deleted file mode 100644
index fbf9b64cfed8..000000000000
--- a/metadata/md5-cache/net-misc/bfgminer-5.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
-DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
-EAPI=6
-HOMEPAGE=https://bitcointalk.org/?topic=168174
-IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
-REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
-SLOT=0
-SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.tar.xz
-_md5_=3f05a62a1ca71fe97406cff6e861bb8a
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1 b/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1
new file mode 100644
index 000000000000..5de76e4ecaea
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
+DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
+EAPI=6
+HOMEPAGE=https://bitcointalk.org/?topic=168174
+IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
+REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
+SLOT=0
+SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.tar.xz
+_md5_=c9e0c4285843342e3a1b3159766d03f8
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 287b2c548a8a..34587ea745cc 100644
--- a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
+++ b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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_=da40889587c59f9c3aeb0fd03f2130ee
+_md5_=1b80030ef6e0995c9c85198f7857e8a4
diff --git a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3 b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
index 11c692bb9dd0..2cc21ab5f804 100644
--- a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
+++ b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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
+_md5_=5343919b2bfa88f9e00ecf3c454e0cf4
diff --git a/metadata/md5-cache/net-misc/curl-7.78.0 b/metadata/md5-cache/net-misc/curl-7.78.0
new file mode 100644
index 000000000000..9e389100a4d1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.78.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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:0=[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/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(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[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/ngtcp2[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(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_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(-)?] 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(-)?] )
+DESCRIPTION=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt 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=curl
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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:0=[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/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(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[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/ngtcp2[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(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_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(-)?] 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(-)?] )
+REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.78.0.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=26ad9e65a664354208871ef2566fbfbe
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
index 448c580f196d..d11d8eacdde0 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
@@ -11,4 +11,4 @@ RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-app
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.2-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4715d8d69d190d3877ae8afaf68ef01d
+_md5_=de2b5bc746ffe205cb2af18f5604d540
diff --git a/metadata/md5-cache/net-misc/dropbox-127.4.4265 b/metadata/md5-cache/net-misc/dropbox-127.4.4265
new file mode 100644
index 000000000000..1a4e6a765a51
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-127.4.4265
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-127.4.4265.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-127.4.4265.tar.gz )
+_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/electrum-4.1.5 b/metadata/md5-cache/net-misc/electrum-4.1.5
new file mode 100644
index 000000000000..df4010c7e19d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.1.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=7
+HOMEPAGE=https://electrum.org/
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[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_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.1.5.tar.gz -> electrum-4.1.5.gh.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-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=26b78ae418112b117e42a59a42f030e6
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.34 b/metadata/md5-cache/net-misc/geomyidae-0.34
deleted file mode 100644
index 475c06bceefe..000000000000
--- a/metadata/md5-cache/net-misc/geomyidae-0.34
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=A daemon to serve the gopher protocol
-EAPI=7
-HOMEPAGE=http://r-36.net/scm/geomyidae/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=33277beb5cbc528af4d1ccc137c558db
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.34-r1 b/metadata/md5-cache/net-misc/geomyidae-0.34-r1
new file mode 100644
index 000000000000..2ca271e92dfe
--- /dev/null
+++ b/metadata/md5-cache/net-misc/geomyidae-0.34-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=acct-group/gopherd acct-user/gopherd
+DESCRIPTION=A daemon to serve the gopher protocol
+EAPI=7
+HOMEPAGE=http://r-36.net/scm/geomyidae/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=acct-group/gopherd acct-user/gopherd
+SLOT=0
+SRC_URI=ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3d0f96e861c7b4b93e263079b050c2f5
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4 b/metadata/md5-cache/net-misc/icecast-2.4.4
deleted file mode 100644
index 10709f68e6f3..000000000000
--- a/metadata/md5-cache/net-misc/icecast-2.4.4
+++ /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=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
-DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac streaming
-EAPI=7
-HOMEPAGE=https://www.icecast.org/
-IUSE=kate logrotate +speex +ssl +theora +yp
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
-SLOT=0
-SRC_URI=https://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=f996d2b41d9871f25fc6aa57ba18f6ab
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4-r1 b/metadata/md5-cache/net-misc/icecast-2.4.4-r1
new file mode 100644
index 000000000000..7e910ec4a2dd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/icecast-2.4.4-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=configure install postinst prepare
+DEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
+DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac streaming
+EAPI=7
+HOMEPAGE=https://www.icecast.org/
+IUSE=kate logrotate +speex +ssl +theora +yp
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7269fbf5607bcf134099ed99982c108f
diff --git a/metadata/md5-cache/net-misc/iputils-20210722 b/metadata/md5-cache/net-misc/iputils-20210722
new file mode 100644
index 000000000000..6ce47428e437
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iputils-20210722
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) filecaps? ( sys-libs/libcap ) >=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 test
+DEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) virtual/os-headers static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) )
+DESCRIPTION=Network monitoring tools including ping and ping6
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
+IUSE=+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6 +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2+ rdisc
+RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/iputils/iputils/archive/20210722.tar.gz -> iputils-20210722.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20210722.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=263ab3630c720b5f9ce01100c311c11e
diff --git a/metadata/md5-cache/net-misc/linuxptp-2.0-r1 b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
index 9d50b260e1cc..d82b6841ad72 100644
--- a/metadata/md5-cache/net-misc/linuxptp-2.0-r1
+++ b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The Linux Precision Time Protocol (PTP) implementation
 EAPI=7
 HOMEPAGE=http://linuxptp.sourceforge.net/
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v2.0/linuxptp-2.0.tgz
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a399cea3384607bb7c25ccbe73570864
+_md5_=2f33b78945ce03740e9cbdb913178164
diff --git a/metadata/md5-cache/net-misc/mikutter-4.0.6-r1 b/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
index f71abc07c24f..b5d59d1db316 100644
--- a/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
+++ b/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
@@ -12,5 +12,5 @@ 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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c31e22b53a6011aedd7ec1ae4523d823
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.5-r1 b/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
index 8b0fd81acd53..f4c6b608fa8c 100644
--- a/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
+++ b/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
@@ -12,5 +12,5 @@ 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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	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 c2009dd0616c..803723537ed8 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -12,5 +12,5 @@ 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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c31e22b53a6011aedd7ec1ae4523d823
diff --git a/metadata/md5-cache/net-misc/netopeer2-2.0.0 b/metadata/md5-cache/net-misc/netopeer2-2.0.0
index 72ab8b7541c0..3bb209c59c32 100644
--- a/metadata/md5-cache/net-misc/netopeer2-2.0.0
+++ b/metadata/md5-cache/net-misc/netopeer2-2.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-2.0.0:= >=net-libs/
 DESCRIPTION=Server for implementing NETCONF configuration management
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/netopeer2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-2.0.0:= >=net-libs/libnetconf2-2.0.0:= net-libs/libssh:= >=net-libs/libyang-2.0.0:=
 SLOT=0
 SRC_URI=https://github.com/CESNET/netopeer2/archive/v2.0.0.tar.gz -> netopeer2-2.0.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_=9485a520282f948770c311bd1ff6fbd0
+_md5_=1faf582cb93dd5f2f656ecb7bcfb361c
diff --git a/metadata/md5-cache/net-misc/putty-0.76 b/metadata/md5-cache/net-misc/putty-0.76
new file mode 100644
index 000000000000..0e259b528daa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/putty-0.76
@@ -0,0 +1,15 @@
+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.76/putty-0.76.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=20c5e084e0afae555b608857737482c0
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02-r1 b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
new file mode 100644
index 000000000000..831e6ea031e6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
@@ -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=r8168 driver for Realtek 8111/8168 PCI-E NICs
+EAPI=7
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+IUSE=use-firmware kernel_linux kernel_linux kernel_linux dist-kernel
+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/~pacho/r8168/r8168-8.049.02.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f1172b305e7905b766b74d0f77bc570f
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.19 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.19
new file mode 100644
index 000000000000..738ba3ba8630
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.19
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=acct-group/rabbitmq acct-user/rabbitmq >=dev-lang/erlang-22[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0 dev-libs/libxslt || ( ( dev-lang/python:3.10 dev-python/simplejson[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/simplejson[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/simplejson[python_targets_python3_8(-)] ) )
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=7
+HOMEPAGE=https://www.rabbitmq.com/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 MPL-2.0
+RDEPEND=acct-group/rabbitmq acct-user/rabbitmq >=dev-lang/erlang-22[ssl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.19/rabbitmq-server-3.8.19.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7056ac3fedf826cd60b4bc84ab1f62a0
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1 b/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
index 9596302f1e1c..9e626327e122 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
+++ b/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client for Amazon S3
 EAPI=7
 HOMEPAGE=https://s3tools.org/s3cmd
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~ia64 x86 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.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_=34633c2cecaccdd6fcbbccef19e8e91c
+_md5_=e83a9a4acf308323bd4b42706056d51b
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.1 b/metadata/md5-cache/net-misc/seafile-8.0.1
index ff6a784b2b48..747c1dbe5068 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v8.0.1.tar.gz -> seafile-8.0.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c2687ae63758a0fc09665b3cf6bac63
+_md5_=a0a9ae324a90976d3020d0f584178a0a
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.2 b/metadata/md5-cache/net-misc/seafile-8.0.2
index f182a7c909ab..b1b54f822249 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.2
+++ b/metadata/md5-cache/net-misc/seafile-8.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/2493113afb174b1a0e6f860512922b69c05cee69.tar.gz -> seafile-8.0.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=accee8b0ee07709ed58bba9ed572fe54
+_md5_=02d5a1d753c6d7b79e6a54a65f51ff59
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1 b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
index b5e6a513ced4..3b1c8ffbe220 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
+++ b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.1/streamlink-1.3.1.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_=adf1507b5353b6fd6ecb8ca5379112f3
+_md5_=bf8fe80ef7e0fad8c6472a5956130e34
diff --git a/metadata/md5-cache/net-misc/streamlink-2.0.0 b/metadata/md5-cache/net-misc/streamlink-2.0.0
index c33185db5f94..157551d97463 100644
--- a/metadata/md5-cache/net-misc/streamlink-2.0.0
+++ b/metadata/md5-cache/net-misc/streamlink-2.0.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/2.0.0/streamlink-2.0.0.tar.gz https://dev.gentoo.org/~leio/distfiles/streamlink.1-2.0.0.man.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b16c6bd1e8940a1dd94988f285941ed8
+_md5_=12b6d198b592976327f53f8a76779184
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 8ec8ba3d4a1f..abca08dfeb94 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b16c6bd1e8940a1dd94988f285941ed8
+_md5_=12b6d198b592976327f53f8a76779184
diff --git a/metadata/md5-cache/net-misc/sysrepo-2.0.1 b/metadata/md5-cache/net-misc/sysrepo-2.0.1
index 754d4d89acb2..7ba3bf895809 100644
--- a/metadata/md5-cache/net-misc/sysrepo-2.0.1
+++ b/metadata/md5-cache/net-misc/sysrepo-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=YANG-based configuration and operational state data store
 EAPI=7
 HOMEPAGE=https://www.sysrepo.org
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/libyang-2.0.3:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sysrepo/sysrepo/archive/v2.0.1.tar.gz -> sysrepo-2.0.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_=a8865cefb9d7ac07503a8b013c2abbbd
+_md5_=f81698f1c4dbbd6b41227c33288de86f
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
index d1cc22e7d32b..610c37067102 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
 IUSE=dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-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=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=47c952ff5187f314c83b1d7f91bd81df
+_md5_=891778f5e001d2679d74289ca76e5462
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
index a93920017f78..ec8f180ab71f 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=7
 HOMEPAGE=http://www.tigervnc.org
 IUSE=dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-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=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=43f85ce6d85f3046b6cc55c5b3a64a21
+_md5_=bc0d2adf6a03aaa73b2a549fd25190d9
diff --git a/metadata/md5-cache/net-misc/usbip-4.13-r1 b/metadata/md5-cache/net-misc/usbip-4.13-r1
index 25a3c4af75b5..9005f958a8fc 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13-r1
+++ b/metadata/md5-cache/net-misc/usbip-4.13-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtu
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	kernel-2	9788655f424cd85443f40d85540c700c	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	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	kernel-2	6b17cdaee897466001a472284e0421c8	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d8cd139f4cd66e96ed87d0eb695bde3
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
index 98418787aab5..fc57053a8818 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
 IUSE=rdp +ssh spice +telepathy zeroconf kernel_linux
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7697d99f64c8213386e85820f210498
+_md5_=720a9cdb60ef9d4f60047bd5bf963715
diff --git a/metadata/md5-cache/net-misc/websocketd-0.4.1 b/metadata/md5-cache/net-misc/websocketd-0.4.1
new file mode 100644
index 000000000000..1242f6ee1598
--- /dev/null
+++ b/metadata/md5-cache/net-misc/websocketd-0.4.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=Like inetd, but for WebSockets.
+EAPI=7
+HOMEPAGE=https://github.com/joewalnes/websocketd
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/joewalnes/websocketd/archive/refs/tags/v0.4.1.tar.gz -> websocketd-0.4.1.tar.gz mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=94d12072ca783ff11bae76ec6843fbed
diff --git a/metadata/md5-cache/net-misc/xmrig-6.12.2 b/metadata/md5-cache/net-misc/xmrig-6.12.2
index 58c7e9a7c898..178b1db3d3fe 100644
--- a/metadata/md5-cache/net-misc/xmrig-6.12.2
+++ b/metadata/md5-cache/net-misc/xmrig-6.12.2
@@ -5,10 +5,10 @@ DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
 EAPI=7
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
 IUSE=cpu_flags_x86_sse4_1 donate hwloc +ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 GPL-3+ MIT
 RDEPEND=dev-libs/libuv:= hwloc? ( sys-apps/hwloc:= ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
 SRC_URI=https://github.com/xmrig/xmrig/archive/v6.12.2.tar.gz -> xmrig-6.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	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3eae387d2d8753fb79b86c932ed24f91
+_md5_=4b689e327c4b203c682bc63380d1808e
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.4.4.13 b/metadata/md5-cache/net-nds/389-ds-base-1.4.4.13
index f329c25e9c56..bf8a0adb2cb1 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.4.4.13
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.4.4.13
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=1.4/0
 SRC_URI=https://releases.pagure.org/389-ds-base/389-ds-base-1.4.4.13.tar.bz2 https://crates.io/api/v1/crates/ahash/0.6.3/download -> ahash-0.6.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/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.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/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/concread/0.2.7/download -> concread-0.2.7.crate https://crates.io/api/v1/crates/const_fn/0.4.5/download -> const_fn-0.4.5.crate https://crates.io/api/v1/crates/crossbeam/0.8.0/download -> crossbeam-0.8.0.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-queue/0.3.1/download -> crossbeam-queue-0.3.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/fernet/0.1.3/download -> fernet-0.1.3.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/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/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.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.86/download -> libc-0.2.86.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/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.1/download -> num-bigint-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/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/openssl/0.10.32/download -> openssl-0.10.32.crate https://crates.io/api/v1/crates/openssl-sys/0.9.60/download -> openssl-sys-0.9.60.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/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-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/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.1/download -> rand_core-0.6.1.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.4/download -> redox_syscall-0.2.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/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/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.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.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-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/uuid/0.8.2/download -> uuid-0.8.2.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.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_=autotools	2a36908d5f63f41614b450a2459567da	cargo	c7fefacaebdcb455d2a7b59429eb47a6	db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=181f06956590c58aa51af84aaed88df2
+_md5_=531fefff4e17a4844a9f1a324ab74479
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index ba8f891eefa2..7e8a5a7e350e 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 88fb7b0a7860..407dc6bfda29 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/newsboat-2.21 b/metadata/md5-cache/net-news/newsboat-2.21
deleted file mode 100644
index 7d2e634f500b..000000000000
--- a/metadata/md5-cache/net-news/newsboat-2.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ruby/asciidoctor virtual/awk virtual/pkgconfig >=virtual/rust-1.42.0 >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] sys-libs/zlib dev-libs/openssl sys-devel/gettext
-DESCRIPTION=An RSS/Atom feed reader for text terminals
-EAPI=7
-HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-IUSE=debug
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB
-RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] sys-libs/zlib dev-libs/openssl
-SLOT=0
-SRC_URI=https://newsboat.org/releases/2.21/newsboat-2.21.tar.xz https://crates.io/api/v1/crates/addr2line/0.12.2/download -> addr2line-0.12.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.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/backtrace/0.3.49/download -> backtrace-0.3.49.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.2/download -> bit-vec-0.6.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/0.1.6/download -> block-0.1.6.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.57/download -> cc-1.0.57.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.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.36+curl-7.71.1/download -> curl-sys-0.4.36+curl-7.71.1.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.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gettext-rs/0.5.0/download -> gettext-rs-0.5.0.crate https://crates.io/api/v1/crates/gettext-sys/0.19.9/download -> gettext-sys-0.19.9.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.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/lexical-core/0.7.4/download -> lexical-core-0.7.4.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.0/download -> libz-sys-1.1.0.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.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/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.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/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.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/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.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.17/download -> pkg-config-0.3.17.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/proptest/0.10.1/download -> proptest-0.10.1.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/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/rand_xorshift/0.2.0/download -> rand_xorshift-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/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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.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/tempfile/3.1.0/download -> tempfile-3.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/tinyvec/0.3.3/download -> tinyvec-0.3.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.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/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/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 https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dce3feb6eb93d7a0168037a85dc2a901
diff --git a/metadata/md5-cache/net-news/newsboat-2.21-r1 b/metadata/md5-cache/net-news/newsboat-2.21-r1
new file mode 100644
index 000000000000..d284f37c477c
--- /dev/null
+++ b/metadata/md5-cache/net-news/newsboat-2.21-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ruby/asciidoctor virtual/awk virtual/pkgconfig >=virtual/rust-1.42.0 >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
+DESCRIPTION=An RSS/Atom feed reader for text terminals
+EAPI=7
+HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
+IUSE=debug
+KEYWORDS=amd64 ~arm ~ppc64 x86
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB
+RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl
+SLOT=0
+SRC_URI=https://newsboat.org/releases/2.21/newsboat-2.21.tar.xz https://crates.io/api/v1/crates/addr2line/0.12.2/download -> addr2line-0.12.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.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/backtrace/0.3.49/download -> backtrace-0.3.49.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.2/download -> bit-vec-0.6.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/0.1.6/download -> block-0.1.6.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.57/download -> cc-1.0.57.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.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.36+curl-7.71.1/download -> curl-sys-0.4.36+curl-7.71.1.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.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gettext-rs/0.5.0/download -> gettext-rs-0.5.0.crate https://crates.io/api/v1/crates/gettext-sys/0.19.9/download -> gettext-sys-0.19.9.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.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/lexical-core/0.7.4/download -> lexical-core-0.7.4.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.0/download -> libz-sys-1.1.0.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.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/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.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/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.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/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.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.17/download -> pkg-config-0.3.17.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/proptest/0.10.1/download -> proptest-0.10.1.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/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/rand_xorshift/0.2.0/download -> rand_xorshift-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/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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.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/tempfile/3.1.0/download -> tempfile-3.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/tinyvec/0.3.3/download -> tinyvec-0.3.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.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/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/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 https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=317a8ade29f4369fab2fa02437447fbb
diff --git a/metadata/md5-cache/net-news/newsboat-2.23 b/metadata/md5-cache/net-news/newsboat-2.23
deleted file mode 100644
index 9b2ceeebc409..000000000000
--- a/metadata/md5-cache/net-news/newsboat-2.23
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-ruby/asciidoctor-1.5.3 virtual/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] sys-libs/zlib dev-libs/openssl sys-devel/gettext
-DESCRIPTION=An RSS/Atom feed reader for text terminals
-EAPI=7
-HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB
-RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] sys-libs/zlib dev-libs/openssl
-SLOT=0
-SRC_URI=https://newsboat.org/releases/2.23/newsboat-2.23.tar.xz https://crates.io/api/v1/crates/addr2line/0.14.0/download -> addr2line-0.14.0.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/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/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitvec/0.19.4/download -> bitvec-0.19.4.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.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/codespan-reporting/0.9.5/download -> codespan-reporting-0.9.5.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/cxx/0.5.10/download -> cxx-0.5.10.crate https://crates.io/api/v1/crates/cxx-build/0.5.10/download -> cxx-build-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-flags/0.5.10/download -> cxxbridge-flags-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-macro/0.5.10/download -> cxxbridge-macro-0.5.10.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/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/getrandom/0.2.0/download -> getrandom-0.2.0.crate https://crates.io/api/v1/crates/gettext-rs/0.6.0/download -> gettext-rs-0.6.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.0/download -> gettext-sys-0.21.0.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.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/lexical-core/0.7.5/download -> lexical-core-0.7.5.crate https://crates.io/api/v1/crates/libc/0.2.90/download -> libc-0.2.90.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/link-cplusplus/1.0.4/download -> link-cplusplus-1.0.4.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.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/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/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-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/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/object/0.22.0/download -> object-0.22.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/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/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.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/proptest/0.10.1/download -> proptest-0.10.1.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.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download -> rand_xorshift-0.2.0.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/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/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scratch/1.0.0/download -> scratch-1.0.0.crate https://crates.io/api/v1/crates/section_testing/0.0.5/download -> section_testing-0.0.5.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/syn/1.0.55/download -> syn-1.0.55.crate https://crates.io/api/v1/crates/tap/1.0.0/download -> tap-1.0.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/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/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-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.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/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/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/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=654e366bb0e008d9d49bca71960acd33
diff --git a/metadata/md5-cache/net-news/newsboat-2.23-r1 b/metadata/md5-cache/net-news/newsboat-2.23-r1
new file mode 100644
index 000000000000..e01dc6c1e221
--- /dev/null
+++ b/metadata/md5-cache/net-news/newsboat-2.23-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-ruby/asciidoctor-1.5.3 virtual/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
+DESCRIPTION=An RSS/Atom feed reader for text terminals
+EAPI=7
+HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB
+RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl
+SLOT=0
+SRC_URI=https://newsboat.org/releases/2.23/newsboat-2.23.tar.xz https://crates.io/api/v1/crates/addr2line/0.14.0/download -> addr2line-0.14.0.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/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/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitvec/0.19.4/download -> bitvec-0.19.4.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.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/codespan-reporting/0.9.5/download -> codespan-reporting-0.9.5.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/cxx/0.5.10/download -> cxx-0.5.10.crate https://crates.io/api/v1/crates/cxx-build/0.5.10/download -> cxx-build-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-flags/0.5.10/download -> cxxbridge-flags-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-macro/0.5.10/download -> cxxbridge-macro-0.5.10.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/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/getrandom/0.2.0/download -> getrandom-0.2.0.crate https://crates.io/api/v1/crates/gettext-rs/0.6.0/download -> gettext-rs-0.6.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.0/download -> gettext-sys-0.21.0.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.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/lexical-core/0.7.5/download -> lexical-core-0.7.5.crate https://crates.io/api/v1/crates/libc/0.2.90/download -> libc-0.2.90.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/link-cplusplus/1.0.4/download -> link-cplusplus-1.0.4.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.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/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/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-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/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/object/0.22.0/download -> object-0.22.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/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/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.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/proptest/0.10.1/download -> proptest-0.10.1.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.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download -> rand_xorshift-0.2.0.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/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/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scratch/1.0.0/download -> scratch-1.0.0.crate https://crates.io/api/v1/crates/section_testing/0.0.5/download -> section_testing-0.0.5.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/syn/1.0.55/download -> syn-1.0.55.crate https://crates.io/api/v1/crates/tap/1.0.0/download -> tap-1.0.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/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/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-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.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/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/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/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bfe692076fbf565e0f7356d64083d941
diff --git a/metadata/md5-cache/net-news/snownews-1.6.10 b/metadata/md5-cache/net-news/snownews-1.6.10
deleted file mode 100644
index 0f74a0d28dc2..000000000000
--- a/metadata/md5-cache/net-news/snownews-1.6.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode]
-DESCRIPTION=Command-line RSS feed reader
-EAPI=7
-HOMEPAGE=https://github.com/kouya/snownews
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode] dev-perl/XML-LibXML dev-perl/libwww-perl
-SLOT=0
-SRC_URI=https://github.com/kouya/snownews/archive/1.6.10.tar.gz -> snownews-1.6.10.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf343a97fd6b9d393f37ae7006edc553
diff --git a/metadata/md5-cache/net-news/snownews-1.6.10-r1 b/metadata/md5-cache/net-news/snownews-1.6.10-r1
new file mode 100644
index 000000000000..508f00452c57
--- /dev/null
+++ b/metadata/md5-cache/net-news/snownews-1.6.10-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure prepare
+DEPEND=>=dev-libs/libxml2-2.5.6 sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Command-line RSS feed reader
+EAPI=7
+HOMEPAGE=https://github.com/kouya/snownews
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libxml2-2.5.6 sys-libs/ncurses:=[unicode(+)] dev-perl/XML-LibXML dev-perl/libwww-perl
+SLOT=0
+SRC_URI=https://github.com/kouya/snownews/archive/1.6.10.tar.gz -> snownews-1.6.10.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5125dcaf766b0057c3814e3fdf9f9488
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 99a1eec8a2e7..54b98b5293e6 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.2.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
index c9d05dd92ffb..09318e0bebb8 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.2.1/SABnzbd-3.2.1-src.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92660b36be2bf2bc6e9e4b0a32774637
+_md5_=f858282ce954cbf144fd77b100100f53
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.3.0 b/metadata/md5-cache/net-nntp/sabnzbd-3.3.0
index 58949b63cf1f..e62410cb7d1e 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.3.0
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.3.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.3.0/SABnzbd-3.3.0-src.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9a8c04402d686f3711662192c74cba1
+_md5_=a7ce4c72d1922adfc88b45c2524fd67a
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.3.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.3.1
index 02eb00f0ff83..cd8cee13e8ac 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.3.1
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.3.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.3.1/SABnzbd-3.3.1-src.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9a8c04402d686f3711662192c74cba1
+_md5_=a7ce4c72d1922adfc88b45c2524fd67a
diff --git a/metadata/md5-cache/net-nntp/tin-2.4.5 b/metadata/md5-cache/net-nntp/tin-2.4.5
deleted file mode 100644
index f0111fa750a0..000000000000
--- a/metadata/md5-cache/net-nntp/tin-2.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses:0[unicode?] unicode? ( dev-libs/icu:= )
-DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
-EAPI=7
-HOMEPAGE=http://www.tin.org/
-IUSE=cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode
-KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses:0[unicode?] unicode? ( dev-libs/icu:= )
-SLOT=0
-SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.4.5.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d181424bd90f795191ae3c5736f79a8e
diff --git a/metadata/md5-cache/net-nntp/tin-2.4.5-r1 b/metadata/md5-cache/net-nntp/tin-2.4.5-r1
new file mode 100644
index 000000000000..47d3dc960d52
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/tin-2.4.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/libpcre dev-libs/uulib sys-libs/ncurses:=[unicode(+)?] gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) unicode? ( dev-libs/icu:= )
+DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
+EAPI=7
+HOMEPAGE=http://www.tin.org/
+IUSE=cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode
+KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre dev-libs/uulib sys-libs/ncurses:=[unicode(+)?] gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) unicode? ( dev-libs/icu:= )
+SLOT=0
+SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.4.5.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57bc2af78e5564d3979873bbcee6ab33
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index e0ce0fa348d7..db5297e16715 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/bitflu-1.52 b/metadata/md5-cache/net-p2p/bitflu-1.52
deleted file mode 100644
index b488866d7ade..000000000000
--- a/metadata/md5-cache/net-p2p/bitflu-1.52
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
-DESCRIPTION=BitTorrent client, written in Perl and is designed to run as a daemon
-EAPI=5
-HOMEPAGE=http://bitflu.workaround.ch
-KEYWORDS=amd64 x86
-LICENSE=Artistic-2 GPL-2
-RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
-SLOT=0
-SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.52.tgz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c7d82b9d94e2d857b24905b32121393c
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.52-r1 b/metadata/md5-cache/net-p2p/bitflu-1.52-r1
new file mode 100644
index 000000000000..eefc19974a41
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitflu-1.52-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=acct-group/bitflu acct-user/bitflu dev-perl/Danga-Socket dev-perl/Sys-Syscall
+DESCRIPTION=BitTorrent client, written in Perl and is designed to run as a daemon
+EAPI=7
+HOMEPAGE=http://bitflu.workaround.ch
+KEYWORDS=amd64 x86
+LICENSE=Artistic-2 GPL-2
+RDEPEND=acct-group/bitflu acct-user/bitflu dev-perl/Danga-Socket dev-perl/Sys-Syscall
+SLOT=0
+SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.52.tgz
+_md5_=43af6a3490422210d2c137d1fe86d6cb
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
index 239e765a458d..ff828bc60a51 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
 _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_=2dcf0e64c9f603237c631cb0914f4a9b
+_md5_=2afadd7fc66adfd4db4a0ce57c098150
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index 64a598a47d05..f15dbfcbf88b 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7815bb8156a1605f8bd02b7873500c3
+_md5_=4c9c37f2ab2001ef1fac5618721fd74f
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0-r2 b/metadata/md5-cache/net-p2p/litecoind-0.10.4.0-r2
deleted file mode 100644
index 4a150f787e02..000000000000
--- a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0-r2
+++ /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=acct-group/litecoin acct-user/litecoin dev-libs/boost:=[threads(+)] dev-libs/leveldb:= dev-libs/openssl:0[-bindist(-)] sys-libs/db:4.8[cxx] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) >=app-shells/bash-4.1 sys-apps/sed
-DESCRIPTION=The offical daemon to run your own (full) Litecoin node
-EAPI=7
-HOMEPAGE=https://litecoin.org/
-IUSE=logrotate upnp +wallet
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC GPL-2
-RDEPEND=acct-group/litecoin acct-user/litecoin dev-libs/boost:=[threads(+)] dev-libs/leveldb:= dev-libs/openssl:0[-bindist(-)] sys-libs/db:4.8[cxx] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc )
-SLOT=0
-SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.4.0.tar.gz -> litecoin-0.10.4.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	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_=ffb612875651c0234175e7dbc97c4003
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.22.1 b/metadata/md5-cache/net-p2p/ncdc-1.22.1
deleted file mode 100644
index 3db9b9fee715..000000000000
--- a/metadata/md5-cache/net-p2p/ncdc-1.22.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/makeheaders virtual/pkgconfig
-DEFINED_PHASES=compile configure prepare
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
-DESCRIPTION=ncurses directconnect client
-EAPI=7
-HOMEPAGE=https://dev.yorhel.nl/ncdc
-IUSE=geoip
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdc-1.22.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4389d31f2000d5f4855a70d5dd69bc64
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1 b/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1
new file mode 100644
index 000000000000..3a07a014f570
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/makeheaders virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+DESCRIPTION=ncurses directconnect client
+EAPI=7
+HOMEPAGE=https://dev.yorhel.nl/ncdc
+IUSE=geoip
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+SLOT=0
+SRC_URI=https://dev.yorhel.nl/download/ncdc-1.22.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=48d2abe1f0816f12f98a722a9c02e2ef
diff --git a/metadata/md5-cache/net-p2p/ncdc-9999 b/metadata/md5-cache/net-p2p/ncdc-9999
index 61fb7bdd58b8..d8d2c68a304d 100644
--- a/metadata/md5-cache/net-p2p/ncdc-9999
+++ b/metadata/md5-cache/net-p2p/ncdc-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/makeheaders virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure prepare unpack
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
 DESCRIPTION=ncurses directconnect client
 EAPI=7
 HOMEPAGE=https://dev.yorhel.nl/ncdc
 IUSE=geoip
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8820bda547be2002daf269325c84160
+_md5_=614a7e91cb58bfafd4afad2d27364ee1
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index a22f93f6d80d..23d708bd6327 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2 b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
index 6c6ce144fec2..d0ee44b98737 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
+++ b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
@@ -5,7 +5,7 @@ DESCRIPTION=The Common Unix Printing System
 EAPI=7
 HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IUSE=acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.3.3op2/cups-2.3.3op2-source.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=242825c629b5b6fe4768ced1410c0695
+_md5_=534fe9a928c95e9035e28fff5acfc799
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.9 b/metadata/md5-cache/net-print/cups-filters-1.28.9
index e88f319867d7..d7bfec048ac3 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.9
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.9
@@ -5,11 +5,11 @@ DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
-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=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.9.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0527da20246d9bb3a9c1bdd8339624c3
+_md5_=6dac00e4b2dc8e0844e5320f67caa678
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11-r2 b/metadata/md5-cache/net-print/hplip-3.20.11-r2
index 59e0f4c59b7c..de95488df2f1 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.11-r2
+++ b/metadata/md5-cache/net-print/hplip-3.20.11-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-2.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=1233042b7356b7ce8908619d62e45c09
+_md5_=fbeda7744a5094b1b940d8b84d0f4708
diff --git a/metadata/md5-cache/net-print/hplip-3.21.2-r1 b/metadata/md5-cache/net-print/hplip-3.21.2-r1
index 0e482f3bc316..7b3c26e41ff3 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.2-r1
+++ b/metadata/md5-cache/net-print/hplip-3.21.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.21.2.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.2-patches-1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=72df909cab1a6085c65b1560beaafe80
+_md5_=92549e1e8b8e1c5c0b8dd474e3b6b883
diff --git a/metadata/md5-cache/net-print/hplip-3.21.4 b/metadata/md5-cache/net-print/hplip-3.21.4
index da52ec3cc340..51ea2e02e118 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.4
+++ b/metadata/md5-cache/net-print/hplip-3.21.4
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.21.4.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.4-patches-1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=73c16499e195c4e2058a2f2b869794a2
+_md5_=6877dbcdba66091847207ade876a793e
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 20ca6fdc818e..c09c8adc023c 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-r6 b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
index 1ac0cd87dfb1..eebe2d661672 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.1-r6
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
@@ -5,10 +5,10 @@ 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~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
+_md5_=751f7f33272e3f7996d709675e28f685
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1 b/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
deleted file mode 100644
index e0428a6b6385..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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
deleted file mode 100644
index a6a06fc2da8c..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.14-r4 b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r4
new file mode 100644
index 000000000000..29c637d1254d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r4
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=920ea41b3a76daad4e1d9a83ca4f0308
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1 b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
deleted file mode 100644
index 367203bb22f2..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.22-r2 b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r2
new file mode 100644
index 000000000000..c2a249a13553
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r2
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.23-r1 b/metadata/md5-cache/net-proxy/haproxy-2.0.23-r1
new file mode 100644
index 000000000000..1730718a2cf2
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.23-r1
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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.23.tar.gz
+_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_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index 4abde7737550..b0607b05676a 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 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? ( lua_single_target_lua5-3? ( 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= ) 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 +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? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=243e85b5965532c052f3dc7f8bd95c02
+_md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1 b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
deleted file mode 100644
index 6f2c1d35d253..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.14-r2 b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r2
new file mode 100644
index 000000000000..ad6e76ec7330
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r2
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.15-r1 b/metadata/md5-cache/net-proxy/haproxy-2.2.15-r1
new file mode 100644
index 000000000000..ec6f622f53a1
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.15-r1
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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.15.tar.gz
+_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_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2 b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
deleted file mode 100644
index 6170e18f5e60..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.5-r3 b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r3
new file mode 100644
index 000000000000..9f7a813170c6
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r3
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d777c92020b73b1a9b414fac516f1dfb
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index 6903bff33257..3137cab81a64 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 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? ( lua_single_target_lua5-3? ( 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= ) 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 +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? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5984513f36c7a9537331181d34807cff
+_md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1 b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
deleted file mode 100644
index 898819225bda..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.10-r2 b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r2
new file mode 100644
index 000000000000..f83d9fc0d297
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r2
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98441c16797ae78308cdfae268b62a63
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.12 b/metadata/md5-cache/net-proxy/haproxy-2.3.12
deleted file mode 100644
index 7ce72145fe2e..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.12
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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-r1 b/metadata/md5-cache/net-proxy/haproxy-2.3.12-r1
new file mode 100644
index 000000000000..30a7a3bc2785
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.12-r1
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98441c16797ae78308cdfae268b62a63
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.9999 b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
index d91f905baf44..f7e3e75c488f 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 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? ( lua_single_target_lua5-3? ( 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= ) 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 +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? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b0a9b2fa1d4174564ed507ff44936b2
+_md5_=98441c16797ae78308cdfae268b62a63
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1 b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
deleted file mode 100644
index 63f8851e06cc..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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.1-r2 b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r2
new file mode 100644
index 000000000000..6bafe90324b1
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r2
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.2 b/metadata/md5-cache/net-proxy/haproxy-2.4.2
deleted file mode 100644
index 2917f9313865..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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 +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? ( 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	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-r1 b/metadata/md5-cache/net-proxy/haproxy-2.4.2-r1
new file mode 100644
index 000000000000..a43ff649c102
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.2-r1
@@ -0,0 +1,15 @@
+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= ) 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 +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= ) 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	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index 8eaf911aec74..776fa7ed10d1 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 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? ( lua_single_target_lua5-3? ( 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= ) 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 +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? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=758fc862b37847c6604a3342d1c3bf87
+_md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-7.0.0 b/metadata/md5-cache/net-proxy/mitmproxy-7.0.0
new file mode 100644
index 000000000000..cd16fdfe5905
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/mitmproxy-7.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/hypothesis-5.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parver-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-asyncio-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/openssl:0 >=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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
+EAPI=8
+HOMEPAGE=https://mitmproxy.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/openssl:0 python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v7.0.0.tar.gz -> mitmproxy-7.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=31ab25526b74784c777592cdc0d797ad
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 972af2877a78..2c3d4a67437b 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/networkmanager-openconnect-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
deleted file mode 100644
index 08e7735d5179..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/gcr-3.4:= >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager OpenConnect plugin
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=gtk
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/gcr-3.4:= >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.tar.xz
-_eclasses_=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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b32beec9807c913beedb06e6593063bf
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
new file mode 100644
index 000000000000..73235cfb9d85
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/gcr-3.4:= >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenConnect plugin
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/gcr-3.4:= >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) acct-group/nm-openconnect acct-user/nm-openconnect
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.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_=cacdb83a7ae86225cbd0ac069cec27b9
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
deleted file mode 100644
index ec81b3ec666a..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager OpenVPN plugin
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=gtk test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.tar.xz
-_eclasses_=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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6a3d04ccea461f94fadc501791c78ff6
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12-r1 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12-r1
new file mode 100644
index 000000000000..484a831fc451
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext >=dev-util/intltool-0.35 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.32:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenVPN plugin
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk test
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 ) acct-group/nm-openvpn acct-user/nm-openvpn
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.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_=e82f689909f5cd639570ead994c32a42
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.6 b/metadata/md5-cache/net-vpn/tor-0.4.6.6
index 849250869287..7da81f4e3cb7 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.6
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.6
@@ -3,13 +3,13 @@ DEFINED_PHASES=configure install setup unpack
 DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=7
-HOMEPAGE=http://www.torproject.org/
+HOMEPAGE=https://www.torproject.org/
 IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.6.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.6.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.6.tar.gz.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b308993511cf8f95d79983a86d2ae5c5
+_md5_=410271a18f45a43259236ef55b337f89
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 7dc2e2a32168..ef4da87fc657 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/blueberry-1.4.2 b/metadata/md5-cache/net-wireless/blueberry-1.4.2
index d8bcd6a2bcd4..3360309b0133 100644
--- a/metadata/md5-cache/net-wireless/blueberry-1.4.2
+++ b/metadata/md5-cache/net-wireless/blueberry-1.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/linuxmint/blueberry/archive/1.4.2.tar.gz -> blueberry-1.4.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c97c8f9f10ec227d43800db15cbbc85
+_md5_=c233d6ff2b93623f76cb174409bb9b82
diff --git a/metadata/md5-cache/net-wireless/blueman-2.2.1 b/metadata/md5-cache/net-wireless/blueman-2.2.1
index 683f766c6ff7..0c33fc4062ea 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.2.1
+++ b/metadata/md5-cache/net-wireless/blueman-2.2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.2.1/blueman-2.2.1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d8e20a501035d1cfa9945d4c2f5671a
+_md5_=7ef7893d48d83aaedb7c32c6312f412d
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 792e3b4153e6..7057b4853c8e 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a41b4588f857cfaf0f301f27cca58f8c
+_md5_=8297f5ffb1988ae68d1c2177687a8933
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58 b/metadata/md5-cache/net-wireless/bluez-5.58
index 2820a3757d7a..4a9bb3a0721d 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.58
+++ b/metadata/md5-cache/net-wireless/bluez-5.58
@@ -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_=9c6ab563855ae98c4a4934b04ab286b6
+_md5_=4705c6ca9a55031c449e40a087ba50e2
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58-r1 b/metadata/md5-cache/net-wireless/bluez-5.58-r1
index 6539f2aa065b..a28d6e099ac9 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.58-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.58-r1
@@ -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_=a711725a006114f173e212eb8f9a2cea
+_md5_=71d7b632d0021813bd72571e576f8dd4
diff --git a/metadata/md5-cache/net-wireless/bluez-5.60 b/metadata/md5-cache/net-wireless/bluez-5.60
index 8bce8310c2a8..2abb591d2ac3 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.60
+++ b/metadata/md5-cache/net-wireless/bluez-5.60
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.60.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_=4a1a70b646432bb4b0d0c7105e90f920
+_md5_=709d2ef0f558c285f7a3bdbad01835e1
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
index 33e9b8749bf0..086bc519eb8c 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/0.0_p20200812
 SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/c5e55146fadffa9288ed6de52c6c3ccc936688af.tar.gz -> gr-ieee802154-0.0_p20200812.tar.gz
 _eclasses_=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_=a4c45563af13b6cc67fd7ba5cf10ecf6
+_md5_=44863c7f3958f7815dce6bad96551476
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index f0b22b658633..3b9f54f7efd5 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -11,4 +11,4 @@ RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/9999
 _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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a4c45563af13b6cc67fd7ba5cf10ecf6
+_md5_=44863c7f3958f7815dce6bad96551476
diff --git a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1 b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
index 42856db20cfc..5c6514694bab 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
+++ b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drmpeg/gr-paint38/archive/9cb4eabe3b570ccd1f53837681607d73501b5c1e.tar.gz -> gr-paint-0.0_p20200517.tar.gz
 _eclasses_=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_=33adbc53fec219fc6ce23b9298f839aa
+_md5_=5032ca60fed6b27a0ef8362403f3363b
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index 51aca2306c7d..5b598022b7ef 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=33adbc53fec219fc6ce23b9298f839aa
+_md5_=5032ca60fed6b27a0ef8362403f3363b
diff --git a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807 b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
index faca76f2f539..6f1832e117b7 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
+++ b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/0.0_p20200807
 SRC_URI=https://github.com/bastibl/gr-rds/archive/ffbe3ea302c32a621f14329b7fcc09e868305e78.tar.gz -> gr-rds-0.0_p20200807.tar.gz
 _eclasses_=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_=23503a020332713a7352912ba65168b4
+_md5_=0ee7119333a218ca5fb517140455ffbe
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index 76d29052a71a..f66f63de65e2 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-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/9999
 _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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=23503a020332713a7352912ba65168b4
+_md5_=0ee7119333a218ca5fb517140455ffbe
diff --git a/metadata/md5-cache/net-wireless/iwd-1.15 b/metadata/md5-cache/net-wireless/iwd-1.15
index 44c7aa8a4499..c6807618de0a 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_=9b2dd75cabe522d587dae3c7d8bafd8f
+_md5_=7fc7f8a6ef5bc39f6d28bf94b79c897c
diff --git a/metadata/md5-cache/net-wireless/kismet-2020.12.3 b/metadata/md5-cache/net-wireless/kismet-2020.12.3
index 39279fe77f6a..30162c08c0b1 100644
--- a/metadata/md5-cache/net-wireless/kismet-2020.12.3
+++ b/metadata/md5-cache/net-wireless/kismet-2020.12.3
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/2020.12.3
 SRC_URI=https://www.kismetwireless.net/code/kismet-2020-12-R3.tar.xz
 _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	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=0355c54faa0841b8d744a6f04c9bdd2a
+_md5_=e4efa9057b5b4218b84e978645e82ec8
diff --git a/metadata/md5-cache/net-wireless/kismet-2021.05.1 b/metadata/md5-cache/net-wireless/kismet-2021.05.1
index 47bd6c2bc722..1a543f09a5da 100644
--- a/metadata/md5-cache/net-wireless/kismet-2021.05.1
+++ b/metadata/md5-cache/net-wireless/kismet-2021.05.1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/2021.05.1
 SRC_URI=https://www.kismetwireless.net/code/kismet-2021-05-R1.tar.xz
 _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	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=d07ef3e091bfaee5e44bd2b211b74f67
+_md5_=71bc929da4c4d481f5d2c6fc214f2141
diff --git a/metadata/md5-cache/net-wireless/kismet-2021.06.1 b/metadata/md5-cache/net-wireless/kismet-2021.06.1
index f0b8aee341f6..685c8434cc0f 100644
--- a/metadata/md5-cache/net-wireless/kismet-2021.06.1
+++ b/metadata/md5-cache/net-wireless/kismet-2021.06.1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/2021.06.1
 SRC_URI=https://www.kismetwireless.net/code/kismet-2021-06-R1.tar.xz
 _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	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=6faa0d6496888068f438e0e1eac6b585
+_md5_=4d9474f0a400d52bee86833c6c8114b7
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 901e026216cb..7f7439501493 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=6faa0d6496888068f438e0e1eac6b585
+_md5_=4d9474f0a400d52bee86833c6c8114b7
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
index cf387dbc7da2..8e588723ab33 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
@@ -5,10 +5,10 @@ DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
 IUSE=+zerocopy
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.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_=8184bb4e6c14675434589d481904f9d2
+_md5_=94cba2f4a6be028b18bb6b52f07ac2f6
diff --git a/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100 b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
index 8f465acb5efb..a5239b24cb7c 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
+++ b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.15.0
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.15.0.0.tar.gz -> EttusResearch-UHD-3.15.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.15.0.0/uhd-images_3.15.0.0.tar.xz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8267bf95b7da2c0068b98098f375ee2e
+_md5_=676547f2ab58186fe051cd27cede3f0e
diff --git a/metadata/md5-cache/net-wireless/uhd-4.0.0.0 b/metadata/md5-cache/net-wireless/uhd-4.0.0.0
index 3b411358e414..5c4fb51b8c0f 100644
--- a/metadata/md5-cache/net-wireless/uhd-4.0.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-4.0.0.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v4.0.0.0.tar.gz -> EttusResearch-UHD-4.0.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v4.0.0.0/uhd-images_4.0.0.0.tar.xz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=36f8de6c80883e8a8d8fc4a92328fbca
+_md5_=9dbf2ff7377e73648c114df28ef78ccf
diff --git a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1 b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
index ce4289c30b72..74a09e35c2af 100644
--- a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
+++ b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A collection of tools to configure IEEE 802.11 wireless LAN cards
 EAPI=7
 HOMEPAGE=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 IUSE=multicall
-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=GPL-2
 SLOT=0
 SRC_URI=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.30.pre9.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b50351d39b48bdd47a30c08a0d96671
+_md5_=b6775c1484e78f8b70113c963057cc65
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.231.100 b/metadata/md5-cache/perl-core/File-Temp-0.231.100
index b711557c9760..50f9a86fe735 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.231.100
+++ b/metadata/md5-cache/perl-core/File-Temp-0.231.100
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Temp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2311.tar.gz
 _eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1fd01bfe4d560a2c20172e64a2875eb5
+_md5_=aa64db82b2b74ee633fe64904a9fee1d
diff --git a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0 b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
index 5cd69f2d5698..46f1d6907800 100644
--- a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
+++ b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/Pod-Parser dev-lang/perl:=[-build(-)]
 DESCRIPTION=Advanced handling of command line options
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Getopt-Long
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Pod-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.42.tar.gz
 _eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	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_=b9576305c2e8db3af75f0278aa59e9a6
+_md5_=c7961312f88a57775f5868681c310963
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index e718c41032bf..edb71a85ef57 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 3500f0e91b00..0f76188693e2 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 96bb2a433da4..d6c127c0b3b1 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 a28840fa5332..5df8e787ca7e 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.3
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.3
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install setup test
 DEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) sys-devel/flex virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=Astronomical World Coordinate System transformations library
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 b26df85ac632..1d5923ea69f9 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.3.1
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.3.1
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install setup test
 DEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) sys-devel/flex virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=Astronomical World Coordinate System transformations library
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 7e5934670630..6715a40f11cf 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.4
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.4
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install setup test
 DEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) sys-devel/flex virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=Astronomical World Coordinate System transformations library
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 1781c03d3e97..9d2ac3179798 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/bcftools-1.10.2 b/metadata/md5-cache/sci-biology/bcftools-1.10.2
index 22e93d59d879..45a1af597c98 100644
--- a/metadata/md5-cache/sci-biology/bcftools-1.10.2
+++ b/metadata/md5-cache/sci-biology/bcftools-1.10.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/samtools/bcftools/releases/download/1.10.2/bcftools-1.10.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2fd4d2217632ea38f3b2adae16fec9fb
+_md5_=73b8ffce0b88618f264d8ad775c675d5
diff --git a/metadata/md5-cache/sci-biology/foldingathome-7.6.13 b/metadata/md5-cache/sci-biology/foldingathome-7.6.13
deleted file mode 100644
index 04d7d79d3c59..000000000000
--- a/metadata/md5-cache/sci-biology/foldingathome-7.6.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=config install postinst postrm setup
-DEPEND=dev-util/patchelf
-DESCRIPTION=Folding@Home is a distributed computing project for protein folding
-EAPI=7
-HOMEPAGE=https://foldingathome.org/
-KEYWORDS=~amd64
-LICENSE=FAH-EULA-2014 FAH-special-permission
-RDEPEND=app-arch/bzip2 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) sys-devel/gcc sys-libs/glibc sys-libs/zlib acct-group/video
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient_7.6.13-64bit-release.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=35efc85acab21d56c5bb97f30da7e0f8
diff --git a/metadata/md5-cache/sci-biology/foldingathome-7.6.13-r1 b/metadata/md5-cache/sci-biology/foldingathome-7.6.13-r1
new file mode 100644
index 000000000000..20fbd1a65fcc
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/foldingathome-7.6.13-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=config install postinst postrm setup
+DEPEND=dev-util/patchelf
+DESCRIPTION=Folding@Home is a distributed computing project for protein folding
+EAPI=7
+HOMEPAGE=https://foldingathome.org/
+KEYWORDS=~amd64
+LICENSE=FAH-EULA-2014 FAH-special-permission
+RDEPEND=acct-group/foldingathome acct-group/video acct-user/foldingathome app-arch/bzip2 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) sys-devel/gcc sys-libs/glibc sys-libs/zlib
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient_7.6.13-64bit-release.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2ef46b617dbd53a6e9dbdd86ff70bf1
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 49675d029925..55dc774117fa 100644
--- a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
+++ b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip virtual/fortran
 DEFINED_PHASES=compile configure install setup
 DEPEND=sci-biology/uchime mpi? ( virtual/mpi ) virtual/fortran
 DESCRIPTION=A suite of algorithms for ecological bioinformatics
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a931ea6d0536a0cb3441d235f5d2d6b
diff --git a/metadata/md5-cache/sci-biology/samtools-1.10 b/metadata/md5-cache/sci-biology/samtools-1.10
deleted file mode 100644
index 92e567274a62..000000000000
--- a/metadata/md5-cache/sci-biology/samtools-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:0=[unicode] sys-libs/zlib:=
-DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
-EAPI=7
-HOMEPAGE=http://www.htslib.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:0=[unicode] sys-libs/zlib:=
-SLOT=0
-SRC_URI=mirror://sourceforge/samtools/samtools-1.10.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67d56fa48d3a475403ad1a726690e370
diff --git a/metadata/md5-cache/sci-biology/samtools-1.10-r1 b/metadata/md5-cache/sci-biology/samtools-1.10-r1
new file mode 100644
index 000000000000..4b29d994f810
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/samtools-1.10-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:=
+DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
+EAPI=7
+HOMEPAGE=http://www.htslib.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:=
+SLOT=0
+SRC_URI=mirror://sourceforge/samtools/samtools-1.10.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=421db8c182476986b3e15d19e2ec8922
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 4ccc31104d8e..4634a4baf36c 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 51266e2d8190..09598f64c3df 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/chemex-2018.10.3 b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
index e73d31d28181..3904eceb7290 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
+++ b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/chemex/archive/2018.10.3.tar.gz -> chemex-2018.10.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ad70c52b5aee2bf811747f21d6e9b3e
+_md5_=3275627c04cf126235173404b2fc026c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index 4155b0a3ccf7..aecb61869c2f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -12,4 +12,4 @@ 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	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
+_md5_=01b04fb2ec28ac60b59ec5669f8f43e3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.6 b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
index 64836a95183f..3df4c284917a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
@@ -12,4 +12,4 @@ 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	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
+_md5_=6c5e2ad761870bdf868917d276f9c5e7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.2 b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
index 2eab6331c950..c5225d163717 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
@@ -12,4 +12,4 @@ 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	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
+_md5_=fc0196d0135a3f3e71aa966ca07c27fd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index c6fa3a453279..61603eda7c32 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	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
+_md5_=ad50020b4cfc68902965d5038f8595e9
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 9b868c3f9219..d8c1ed9176ec 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	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
+_md5_=ad50020b4cfc68902965d5038f8595e9
diff --git a/metadata/md5-cache/sci-chemistry/mm-align-20120321 b/metadata/md5-cache/sci-chemistry/mm-align-20120321
index faafa21e871d..9a1988efa619 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	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
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 84e4161b276e..fc7a2c56fafc 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 47a96aeeb02b..b543b1343910 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 63d370ae1e48..b6047c302e52 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	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
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 d577d5ea8434..42202d08e84f 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 c51afb1d8be5..e218adca46ef 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/byacc virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/byacc virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/fortran
 DESCRIPTION=Suite for ab initio quantum chemistry computing various molecular properties
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 5ac097354bc8..cb755199aaf3 100644
--- a/metadata/md5-cache/sci-chemistry/raster3d-3.0.6
+++ b/metadata/md5-cache/sci-chemistry/raster3d-3.0.6
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=gd? ( media-libs/gd[jpeg,png] ) tiff? ( media-libs/tiff:0 ) virtual/fortran
 DESCRIPTION=Generation high quality raster images of proteins or other molecules
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 450be70a42c3..295751bba3a6 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	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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 9a8da8d39c23..04ca0ecd0f38 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	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
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 518bbfa6903c..d39a3aa54dbd 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
@@ -13,4 +13,4 @@ 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	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
+_md5_=8b2cc7a2bd011a6f3854147562919701
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-2021.1 b/metadata/md5-cache/sci-chemistry/votca-csg-2021.1
new file mode 100644
index 000000000000..1cfb3f53e736
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-2021.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.1 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+DESCRIPTION=Votca coarse-graining engine
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=examples extras +gromacs hdf5 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.1 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/csg/archive/v2021.1.tar.gz -> votca-csg-2021.1.tar.gz examples? ( https://github.com/votca/csg-tutorials/archive/v2021.1.tar.gz -> votca-csg-tutorials-2021.1.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_=36697845e114dda663872b4f39c17710
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-2021.1 b/metadata/md5-cache/sci-chemistry/votca-xtp-2021.1
new file mode 100644
index 000000000000..fa811c505f0e
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-2021.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.1 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.1
+DESCRIPTION=Votca excitation and charge properties module
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.1 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/xtp/archive/v2021.1.tar.gz -> votca-xtp-2021.1.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_=8263546cfc693f6fe224a55c0a16dafd
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-9999 b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
index 354f0252118d..8db50c683266 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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
+DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 sci-libs/hdf5[cxx] sci-libs/libecpint sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-9999
 DESCRIPTION=Votca excitation and charge properties module
 EAPI=7
 HOMEPAGE=https://www.votca.org/
 IUSE=test
 LICENSE=Apache-2.0
 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
+RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 sci-libs/hdf5[cxx] sci-libs/libecpint sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-9999
 RESTRICT=!test? ( test )
 SLOT=0
 _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
+_md5_=3ba46831b4efbed133f5cb003e610635
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 20424a4659b0..b88106ca05db 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/kicad-5.1.10-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
index 823dea8247d3..4044d6a34b1c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.10/kicad-5.1.10.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	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8debe5359ca6b2ed971014f6415e707
+_md5_=d214711d5847e67f2453662bfbef0432
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.26.11 b/metadata/md5-cache/sci-electronics/klayout-0.26.11
index b7868b3274fd..b82d42ce18db 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.26.11
+++ b/metadata/md5-cache/sci-electronics/klayout-0.26.11
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.26.11.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c52b652742bd3de97d72ac8ae0a7bcf0
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27 b/metadata/md5-cache/sci-electronics/klayout-0.27
index 5936da1c8df4..4e7feb16f682 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2762c9e36702dfacfb738f0f884a08c
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index d2af18ec92f2..5d5852f62c2f 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2762c9e36702dfacfb738f0f884a08c
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.7.6 b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
index 998d5a03fb80..621b3745d801 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.7.6
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=compile setup
 DEPEND=virtual/fortran
 DESCRIPTION=HF propagation prediction tool
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 bd059ac8ff48..23ce108da3b5 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/gnome-maps-40.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-40.3
new file mode 100644
index 000000000000..5efb5d634aef
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-40.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils >=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 setup test
+DEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-0.84:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A map application for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-0.84:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/40/gnome-maps-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-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=49dd6e5facdaa12574c5debbe79e6da4
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-9.2 b/metadata/md5-cache/sci-geosciences/gpxsee-9.2
new file mode 100644
index 000000000000..88e903928ce9
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-9.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=7
+HOMEPAGE=https://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/9.2.tar.gz -> gpxsee-9.2.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e260936f846b73a5dbc936cd5957da72
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.18.3 b/metadata/md5-cache/sci-geosciences/qgis-3.18.3
index 8d25336471a5..bedaa603a5ea 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.18.3
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.18.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.18.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd2e9de0ad0b7d76c24594ff80734226
+_md5_=2600be010cb83fae7aebe9fd824b0a4f
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.20.0-r1 b/metadata/md5-cache/sci-geosciences/qgis-3.20.0-r1
index 1d0ab686ee00..fede0db8837b 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.20.0-r1
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.20.0-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.20.0.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32970c617cfe49d8299a7ff882470ee1
+_md5_=861a41741c7f50c6f1b639a22482a672
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index 5692284101ee..b2bd59dfe3f2 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32970c617cfe49d8299a7ff882470ee1
+_md5_=861a41741c7f50c6f1b639a22482a672
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 76db34082cc1..338f23ccbf41 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/amd-2.4.6 b/metadata/md5-cache/sci-libs/amd-2.4.6
index 130585fc50de..ec65d0c4eed7 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base ) fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install setup
 DEPEND=>=sci-libs/suitesparseconfig-5.4.0 fortran? ( virtual/fortran )
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 0b6675c78f7a..39435c367f6e 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( 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
+BDEPEND=virtual/pkgconfig doc? ( 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 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=sci-libs/suitesparseconfig-5.4.0 fortran? ( virtual/fortran )
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
@@ -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_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 d92ae1369e64..e73fa40e658c 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.8.0
+++ b/metadata/md5-cache/sci-libs/arpack-3.8.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 ca1f8e0dfdd8..c09507dfbe0d 100644
--- a/metadata/md5-cache/sci-libs/arpack-9999
+++ b/metadata/md5-cache/sci-libs/arpack-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
@@ -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	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 719f6cdd2d8e..a355e65598d8 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 b97ac522e400..1bfb1281910d 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 414392a00b12..eb88bbeb5db4 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.4-r1
+++ b/metadata/md5-cache/sci-libs/buddy-2.4-r1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
 DEPEND=virtual/fortran
 DESCRIPTION=Binary Decision Diagram Package
@@ -9,5 +10,5 @@ LICENSE=buddy
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/buddy/buddy-2.4.tar.gz
-_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d55bb0c1d7c81f697a7e6fd08a699b0
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 7b0732c5f4a0..aea4d14631d8 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[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] )
+BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[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] )
 DEFINED_PHASES=compile configure install postinst 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] ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_8? ( dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ruamel-yaml[python_targets_python3_9(-)] ) ) python? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) dev-cpp/yaml-cpp <sci-libs/sundials-5.3.0:0=[lapack?] dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 python? ( python_single_target_python3_8? ( dev-python/h5py[python_targets_python3_8(-)] dev-python/pandas[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/h5py[python_targets_python3_9(-)] dev-python/pandas[python_targets_python3_9(-)] ) ) ) fortran? ( virtual/fortran )
 DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b448b0c72a3a5da1e85c5bb105399a1
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20a275eb4d0650b77ff32494f13ca6ee
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.490 b/metadata/md5-cache/sci-libs/cfitsio-3.490
index 4f093ea160ea..2e63b7209256 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.490
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.490
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex
+BDEPEND=sys-devel/bison sys-devel/flex virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup 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(-)?] 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(-)?] ) dev-lang/cfortran virtual/fortran
 DESCRIPTION=C and Fortran library for manipulating FITS files
@@ -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	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 e30597a34ec8..2b0fe11f7da3 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 1425d511a182..cf333c5418ef 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-3.4.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
 DESCRIPTION=CFD General Notation System standard library
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/coinhsl-2015.06.23 b/metadata/md5-cache/sci-libs/coinhsl-2015.06.23
index 13eb1dd99cd4..c8b23d226735 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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-couenne-0.5.8-r1 b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
index 9188ab3280b7..ea53d1ccaafa 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
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] virtual/latex-base )
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] virtual/latex-base ) virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=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
 DESCRIPTION=COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f26bbb70f06ec5e46afe6b12e4c31f28
diff --git a/metadata/md5-cache/sci-libs/eccodes-2.18.0 b/metadata/md5-cache/sci-libs/eccodes-2.18.0
index 3121b938334a..be14db909c42 100644
--- a/metadata/md5-cache/sci-libs/eccodes-2.18.0
+++ b/metadata/md5-cache/sci-libs/eccodes-2.18.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/zlib szip? ( sci-libs/szip ) netcdf? ( >=sci-libs/netcdf-4.2[hdf5] ) jpeg2k? ( >=media-libs/openjpeg-2:2 ) png? ( media-libs/libpng ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/fortran
 DESCRIPTION=A set of encoding/decoding APIs and tools for WMO GRIB, BUFR, and GTS messages
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 a73e23069370..a569449f0eae 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake test? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/netcdf[hdf5] test? ( app-shells/tcsh ) test? ( virtual/fortran )
+DEPEND=sci-libs/netcdf[hdf5] test? ( app-shells/tcsh )
 DESCRIPTION=Model developed to store and retrieve transient data for finite element analyses
 EAPI=7
 HOMEPAGE=https://github.com/certik/exodus
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 ee0adacad523..b86d6c1b2e29 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.9
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.9
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-lang/perl )
+BDEPEND=test? ( dev-lang/perl ) fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=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 )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 45e2bd77d670..4f121519bfa5 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-lang/perl ) fortran? ( virtual/fortran ) 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=compile configure install prepare pretend setup test unpack
 DEPEND=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 )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
@@ -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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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/getdata-0.9.0-r3 b/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
index 2f517f881389..cdb2c419f270 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 ed78ab0cf202..ad9070a57433 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.6.0
+++ b/metadata/md5-cache/sci-libs/gmsh-4.6.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( dev-lang/python:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
 DESCRIPTION=A three-dimensional finite element mesh generator
@@ -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	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
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 4cf0a08cdbcb..f7feac15239f 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.8.4
+++ b/metadata/md5-cache/sci-libs/gmsh-4.8.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( dev-lang/python:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
 DESCRIPTION=A three-dimensional finite element mesh generator
@@ -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	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
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 aab3f709b6df..7e4ee97856f7 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 fc94be888d8c..6994b9fcc829 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.15
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.15
@@ -1,4 +1,4 @@
-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
+BDEPEND=fortran? ( virtual/fortran ) 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-libs/libtirpc sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) test? ( virtual/szip ) fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and format for storing scientific data
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 74549854b746..7674823deed9 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -1,15 +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
+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 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi szip threads zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6bc8615894f8e21e102fa6a103e0111
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1fe6110a01bf4ca3aa70801c615cecc1
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 2cdb6e158ba4..e42bb3e73620 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -1,15 +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
+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 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72ecb4224d6a50593ca71a93771a86a0
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b755bac4026b5b8babb5c16751fae820
diff --git a/metadata/md5-cache/sci-libs/hypre-2.20.0 b/metadata/md5-cache/sci-libs/hypre-2.20.0
index b07a1413b1c9..d0fe77716b72 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.20.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.20.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 DESCRIPTION=Parallel matrix preconditioners library
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 fb79c8e916be..a1db1ea5a2e5 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.21.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.21.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 DESCRIPTION=Parallel matrix preconditioners library
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16a7f187ff76755a4157ef7ccaf003ee
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.1-r1 b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
index eca96fa25bf2..ce3f415d7ea1 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=7
 HOMEPAGE=https://www.indilib.org/
 IUSE=ogg rtlsdr test websocket
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~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
+_md5_=fe03ae5017ecf4c013448b47c7560d26
diff --git a/metadata/md5-cache/sci-libs/ipopt-3.12.12 b/metadata/md5-cache/sci-libs/ipopt-3.12.12
index 77a00d0b7e9d..32c749680f02 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 6466035584ae..2a41cb28a35f 100644
--- a/metadata/md5-cache/sci-libs/kim-api-2.2.1
+++ b/metadata/md5-cache/sci-libs/kim-api-2.2.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=app-editors/vim-core virtual/fortran
 DESCRIPTION=Application Programming Interface for atomistic simulations
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/libbufr-000405 b/metadata/md5-cache/sci-libs/libbufr-000405
index cd6a23d4c016..2a5b9cedb207 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/libint-1.1.6 b/metadata/md5-cache/sci-libs/libint-1.1.6
index e8923af756c1..005dcc137b6e 100644
--- a/metadata/md5-cache/sci-libs/libint-1.1.6
+++ b/metadata/md5-cache/sci-libs/libint-1.1.6
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure prepare setup
 DEPEND=virtual/fortran
 DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 9eab5b697c58..0d902eea4b58 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r3
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r3
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/boost dev-libs/gmp[cxx(+)] doc? ( dev-texlive/texlive-latex dev-tex/latex2html ) virtual/fortran
 DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 2745fa8d4be3..a28c69c069ca 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r5
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/boost dev-libs/gmp[cxx(+)] doc? ( dev-texlive/texlive-latex dev-tex/latex2html ) virtual/fortran
 DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6646af70bbaedf0e52ea2f7d877bdada
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
index 8dae5441951e..9728bfa91f4e 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_8 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f4846f284983e8c4a5683a6233d289df
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index abd5fb83d59a..00df25c29e56 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=d
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_8 python_targets_python3_9 ) ) ruby? ( cxx || ( ruby_targets_ruby26 ruby_targets_ruby25 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fac3b5f163ea3fee6f6d95793e8b0025
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3
deleted file mode 100644
index a01bcc6af626..000000000000
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API
-EAPI=7
-HOMEPAGE=https://libspatialindex.org/ https://github.com/libspatialindex/libspatialindex
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.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_=9989ba185c9ca20b606d410f3da16eba
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1
index 80bf9384dc47..bd625886182d 100644
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1
+++ b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API
 EAPI=7
 HOMEPAGE=https://libspatialindex.org/ https://github.com/libspatialindex/libspatialindex
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.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_=5e45b537f96658bd6137dc7442489dd1
+_md5_=1b15d8a3302298433a36631f3b9d6ecb
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25 b/metadata/md5-cache/sci-libs/libsvm-3.25
index 3261c1b62fab..c4afce3b0353 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_=94ed343e5ca29f3fc2e82592463b5458
+_md5_=9a3a93e2fd381df4df46e35e0bfabb57
diff --git a/metadata/md5-cache/sci-libs/libxc-5.1.0 b/metadata/md5-cache/sci-libs/libxc-5.1.0
index a9c5de9f96d7..45d063142bd0 100644
--- a/metadata/md5-cache/sci-libs/libxc-5.1.0
+++ b/metadata/md5-cache/sci-libs/libxc-5.1.0
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/fortran
 DESCRIPTION=A library of exchange-correlation functionals for use in DFT
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 62efa9205488..48fc08b538de 100644
--- a/metadata/md5-cache/sci-libs/libxc-5.1.4
+++ b/metadata/md5-cache/sci-libs/libxc-5.1.4
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/fortran
 DESCRIPTION=A library of exchange-correlation functionals for use in DFT
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 b1165c1a413b..f3c0a5b007c2 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 bf8d63c32ab6..fdfd8edbfd75 100644
--- a/metadata/md5-cache/sci-libs/mc-1.5
+++ b/metadata/md5-cache/sci-libs/mc-1.5
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( media-gfx/graphviz app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( media-gfx/graphviz app-doc/doxygen ) 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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=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
 DESCRIPTION=2D/3D AFEM code for nonlinear geometric PDE
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 1f34989dfcbb..059465f89439 100644
--- a/metadata/md5-cache/sci-libs/med-4.1.0
+++ b/metadata/md5-cache/sci-libs/med-4.1.0
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) dev-util/ninja dev-util/cmake
+BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) dev-util/ninja dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) 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] ) ) fortran? ( virtual/fortran )
 DESCRIPTION=A library to store and exchange meshed data or computation results
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 061a905fbbca..e7025b600c44 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r4
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
@@ -2,7 +2,7 @@ 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/
+HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 IUSE=doc openmp
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -10,4 +10,4 @@ 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	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2fd0a1808c648371f8073fbdb984ffe1
+_md5_=eeaf2b07bcbe26d30cff8d477ec707dd
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r5 b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
index 34c8a2bc993b..dced9089235b 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r5
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
@@ -2,7 +2,7 @@ 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/
+HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 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
@@ -10,4 +10,4 @@ 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
+_md5_=67b2791b89d475d86a506f2ef7a5454e
diff --git a/metadata/md5-cache/sci-libs/mumps-5.3.5 b/metadata/md5-cache/sci-libs/mumps-5.3.5
index ae23df55894e..6d6af6ea5a3f 100644
--- a/metadata/md5-cache/sci-libs/mumps-5.3.5
+++ b/metadata/md5-cache/sci-libs/mumps-5.3.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 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
@@ -10,5 +10,5 @@ LICENSE=public-domain
 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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 9b1e8f9f512e..22ce68d6b407 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 bc318f931424..dc40069dc888 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python? ( dev-lang/swig ) virtual/fortran
 DESCRIPTION=Non-linear optimization library
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 39d0732ab169..2243461b475f 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.12-r1
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.12-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 351c12473b17..e840acbc6a0d 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.13
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.13
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 337156cd3bae..8526a624a31e 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.14
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.14
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 f9d33f098ff5..4c495da9c063 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.15
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.15
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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
deleted file mode 100644
index 564621be4657..000000000000
--- a/metadata/md5-cache/sci-libs/openblas-0.3.16
+++ /dev/null
@@ -1,16 +0,0 @@
-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/openblas-0.3.17 b/metadata/md5-cache/sci-libs/openblas-0.3.17
new file mode 100644
index 000000000000..09454235010c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.17
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/fortran
+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.17.tar.gz -> openblas-0.3.17.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r1 b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r1
index c15a958645b9..e48ec31bfbe6 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r1
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=mpi? ( virtual/mpi ) pcre? ( dev-libs/libpcre:= ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Parallel (MPI) unstructured graph partitioning library
 EAPI=6
-HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
+HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
 IUSE=doc double-precision examples int64 mpi openmp pcre static-libs
 KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
@@ -11,4 +11,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz ) examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.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	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a55cd1ab7f2d6828109708916de2a0c7
+_md5_=7d0cb956e1be80cfa9da7b7f1836835c
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2 b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
index d6b9019c80e4..71df303f3ed6 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
@@ -3,7 +3,7 @@ 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/
+HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
 IUSE=doc examples openmp pcre
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
@@ -12,4 +12,4 @@ 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
+_md5_=8f34ee555a5a22c8065760186c15b45b
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 a0e966e3bf49..021e9eef2065 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
@@ -9,5 +9,5 @@ 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 9a0b53c56c7d..6884af4578a4 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.3
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 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/fortran
 DESCRIPTION=Parallel solver for very large sparse linear systems
@@ -10,5 +10,5 @@ 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_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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
index fd4b2062499f..a7cd903e3a6e 100644
--- a/metadata/md5-cache/sci-libs/pastix-6.0.3
+++ b/metadata/md5-cache/sci-libs/pastix-6.0.3
@@ -1,4 +1,4 @@
-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
+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 virtual/fortran
 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
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 b8708dbab8e8..e4829572d716 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 9cfd87f232f1..0f9006163433 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.8:* dev-lang/swig ) lua? ( dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Multi-language scientific plotting library
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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_=8039714da2790eeeea5566850e208150
diff --git a/metadata/md5-cache/sci-libs/profnet-1.0.22 b/metadata/md5-cache/sci-libs/profnet-1.0.22
index f16f3c25910d..ce510641cf3e 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 e33200faf266..7e02a0b32985 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 18238f7012f0..b6922448aead 100644
--- a/metadata/md5-cache/sci-libs/punc-1.5
+++ b/metadata/md5-cache/sci-libs/punc-1.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( media-gfx/graphviz app-doc/doxygen ) 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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=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
 DESCRIPTION=Portable Understructure for Numerical Computing
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 798f9260c114..7848218563a0 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 9097b2bd553b..8523a70ae893 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 e4ffd499618b..d37965c0f011 100644
--- a/metadata/md5-cache/sci-libs/scalapack-2.1.0
+++ b/metadata/md5-cache/sci-libs/scalapack-2.1.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/lapack virtual/mpi virtual/fortran
 DESCRIPTION=Subset of LAPACK routines redesigned for heterogenous (MPI) computing
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/shapely-1.7.1 b/metadata/md5-cache/sci-libs/shapely-1.7.1
deleted file mode 100644
index 4e1a1cfb9e93..000000000000
--- a/metadata/md5-cache/sci-libs/shapely-1.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/geos-3.3 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/geos-3.3 >=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/matplotlib[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/matplotlib[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=Geometric objects, predicates, and operations
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/geos-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Toblerity/Shapely/archive/1.7.1.tar.gz -> shapely-1.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_=06c62baf15ef9af7b972d4c28e84ff5d
diff --git a/metadata/md5-cache/sci-libs/shapely-1.7.1-r1 b/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
index 7a5470da0752..816f99eb5f82 100644
--- a/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
+++ b/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Geometric objects, predicates, and operations
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/geos-3.9 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.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/Toblerity/Shapely/archive/1.7.1.tar.gz -> shapely-1.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_=39f20ea5a1a8070c10fafbe0a5f497fb
+_md5_=ba94a38634adcef786b17d4eb3955707
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 84651537ed97..0194acf2d853 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/sundials-3.2.1 b/metadata/md5-cache/sci-libs/sundials-3.2.1
index 6a53475ff342..0d6007eb6ca5 100644
--- a/metadata/md5-cache/sci-libs/sundials-3.2.1
+++ b/metadata/md5-cache/sci-libs/sundials-3.2.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=Suite of nonlinear solvers
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 a89e9b153b74..07269740b707 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.2.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.2.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake
+BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
 DESCRIPTION=Suite of nonlinear solvers
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 108d454ba284..42dd813b5767 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.7.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.7.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake
+BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
 DESCRIPTION=Suite of nonlinear solvers
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 cab2b9deff1e..45f4693c04b9 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r2
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( app-shells/tcsh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig test? ( app-shells/tcsh ) 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/fortran
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=virtual/blas virtual/fortran
 DESCRIPTION=Sparse LU factorization library
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 e2f22262a90c..8934762d17cc 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.2.2
+++ b/metadata/md5-cache/sci-libs/superlu-5.2.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( app-shells/tcsh ) dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig test? ( app-shells/tcsh ) dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/blas virtual/fortran
 DESCRIPTION=Sparse LU factorization library
@@ -11,5 +11,5 @@ 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/taucs-2.2-r1 b/metadata/md5-cache/sci-libs/taucs-2.2-r1
index 1ad8aec5af21..6e2fb81e75aa 100644
--- a/metadata/md5-cache/sci-libs/taucs-2.2-r1
+++ b/metadata/md5-cache/sci-libs/taucs-2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile configure install setup test
 DEPEND=sci-libs/metis virtual/blas virtual/lapack virtual/fortran
 DESCRIPTION=C library of sparse linear solvers
@@ -11,5 +11,5 @@ 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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f12683a1b61c8d603deff3f671360d8
diff --git a/metadata/md5-cache/sci-libs/udunits-2.2.28 b/metadata/md5-cache/sci-libs/udunits-2.2.28
index 8b2544c63030..bac935cde0d1 100644
--- a/metadata/md5-cache/sci-libs/udunits-2.2.28
+++ b/metadata/md5-cache/sci-libs/udunits-2.2.28
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
 DEPEND=dev-libs/expat virtual/fortran
 DESCRIPTION=Library for manipulating units of physical quantities
@@ -8,5 +9,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f647d0f6d32e2d4d704d433cb4baf769
diff --git a/metadata/md5-cache/sci-libs/votca-tools-2021.1 b/metadata/md5-cache/sci-libs/votca-tools-2021.1
new file mode 100644
index 000000000000..961eced47856
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/votca-tools-2021.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
+DESCRIPTION=Votca tools library
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/tools/archive/v2021.1.tar.gz -> votca-tools-2021.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_=e2aff4c5560c697ca4cf6f895c72d32b
diff --git a/metadata/md5-cache/sci-libs/votca-tools-9999 b/metadata/md5-cache/sci-libs/votca-tools-9999
index 2340ab92cdce..5dca8df0a36c 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-9999
+++ b/metadata/md5-cache/sci-libs/votca-tools-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
 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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a1e41afcfe371591ddb5ead5074e6d6
+_md5_=e2aff4c5560c697ca4cf6f895c72d32b
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0-r4 b/metadata/md5-cache/sci-libs/vtk-8.2.0-r4
index c553b00c21f8..b1a1b6c83cfd 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.2.0-r4
+++ b/metadata/md5-cache/sci-libs/vtk-8.2.0-r4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8.2
 SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9caeb4c4b3538faa9701bd822ed52fbc
+_md5_=2fe849935b2d9b0319acceaf04e0d311
diff --git a/metadata/md5-cache/sci-libs/vtk-9.0.1 b/metadata/md5-cache/sci-libs/vtk-9.0.1
index 8ce62e4d1766..74bf45b136c2 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.0.1
+++ b/metadata/md5-cache/sci-libs/vtk-9.0.1
@@ -13,4 +13,4 @@ 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	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
+_md5_=73350057c0ca226a4389833f8e7b5b12
diff --git a/metadata/md5-cache/sci-libs/xdrfile-1.1.4 b/metadata/md5-cache/sci-libs/xdrfile-1.1.4
index 52cfd7c4e3b6..c7d1e2ed65d0 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 ea5fd6d0a62b..457d18ab2892 100644
--- a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
+++ b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/flex sys-apps/groff
+BDEPEND=sys-devel/flex sys-apps/groff virtual/fortran
 DEFINED_PHASES=compile configure install setup
 DEPEND=x11-libs/libX11 virtual/fortran
 DESCRIPTION=PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System
@@ -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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 1b01bee54caa..b7ae17413262 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/dataplot-20131220 b/metadata/md5-cache/sci-mathematics/dataplot-20131220
index a0777f8ef830..4ed3a0fd68c8 100644
--- a/metadata/md5-cache/sci-mathematics/dataplot-20131220
+++ b/metadata/md5-cache/sci-mathematics/dataplot-20131220
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) virtual/pkgconfig virtual/fortran
 DESCRIPTION=Program for scientific visualization and statistical analyis
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 55424c6efbe1..9ceeb7485a7a 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=dev-util/ninja dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Calculation of some eigenvectors of a large real, symmetrical, matrix
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/maxima-5.45.1-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r1
deleted file mode 100644
index cf0a82176b6a..000000000000
--- a/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) test? ( sci-visualization/gnuplot ) sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 )
-DESCRIPTION=Free computer algebra environment based on Macsyma
-EAPI=7
-HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-2+
-RDEPEND=clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 ) X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] vtk? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sci-libs/vtk[python,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) emacs? ( virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) gui? ( X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/maxima/maxima-5.45.1.tar.gz
-_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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85fcb2f472744d86b906f260bcfd66ee
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2 b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
new file mode 100644
index 000000000000..ff8dee8f5f29
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) test? ( sci-visualization/gnuplot ) sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 )
+DESCRIPTION=Free computer algebra environment based on Macsyma
+EAPI=7
+HOMEPAGE=http://maxima.sourceforge.net/
+IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 GPL-2+
+RDEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 ) X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] vtk? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sci-libs/vtk[python,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) emacs? ( virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) gui? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/maxima/maxima-5.45.1.tar.gz
+_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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b5e459f501b7bd44ea4fc5ab8580ddd1
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
index 71b9879c3d97..ca2f93b140cd 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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 7321af73cc10..3984bf21a547 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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 f45fa8bc2323..2a7615369d59 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
 DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
@@ -10,5 +11,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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 75bbee048068..b380df12f18a 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.14.6
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.14.6
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
 DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
@@ -10,5 +11,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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 7c5f08156ef5..c05d76910a28 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
 DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake sys-apps/which virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
@@ -10,5 +11,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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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/relational-2.5-r2 b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
index 3019eb5258aa..22938032adc0 100644
--- a/metadata/md5-cache/sci-mathematics/relational-2.5-r2
+++ b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/ltworf/relational/releases/download/2.5/relational_2.5.orig.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d83567d0fb3efcc9b516060b60de828f
+_md5_=e3f855a4b1eb10a390eb93909616c269
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.1 b/metadata/md5-cache/sci-mathematics/singular-4.2.1
new file mode 100644
index 000000000000..2b0dedc25df2
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-libs/cddlib dev-lang/perl readline? ( sys-libs/readline )
+DESCRIPTION=Computer algebra system for polynomial computations
+EAPI=7
+HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Sources
+IUSE=emacs examples +readline static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux
+LICENSE=BSD GPL-2 GPL-3
+RDEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-libs/cddlib dev-lang/perl readline? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-1/singular-4.2.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6bb5a626729f3552e9f7d5614d1faa21
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index c814c4b831c5..96749b8a3e4f 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
index f09998107b2a..93b32513dce0 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=edae016613ec9e4f62507b3d986621ec
+_md5_=05af45c171a8fdbaf1181d227509cfbe
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.2 b/metadata/md5-cache/sci-misc/vitables-3.0.2
index 6262a4cbd2c6..b7caab06aeb6 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/V/ViTables/ViTables-3.0.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_=2915683e2ddb920b6c71be22ce3fe241
+_md5_=5623379801d5ef2328b77d4291c30747
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 13b15afed09f..da79ee3103ad 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 e99b3dfb27b1..e3808a1ac305 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.1.3
+++ b/metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -13,4 +13,4 @@ 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	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
+_md5_=2d715f09454eb8c3e9971c50bcc4a018
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index cb6decd31095..3c290495b248 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _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
+_md5_=2d715f09454eb8c3e9971c50bcc4a018
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 e1af28ec0c4a..ba643705d862 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen[dot] ) 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 plugins? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=cgal? ( sci-mathematics/cgal:=[shared(+)] ) plugins? ( sci-physics/siscone:= ) plugins? ( virtual/fortran )
 DESCRIPTION=Fast implementation of several recombination jet algorithms
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 13cad2978a46..8ff5bb180b10 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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 813afe460b72..7376da0feadf 100644
--- a/metadata/md5-cache/sci-physics/lammps-20200303-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20200303-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 virtual/fortran
 DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 919ed84f3d4a..3d8cdb67f2ea 100644
--- a/metadata/md5-cache/sci-physics/looptools-2.15
+++ b/metadata/md5-cache/sci-physics/looptools-2.15
@@ -1,3 +1,4 @@
+BDEPEND=virtual/fortran
 DEFINED_PHASES=install prepare setup
 DEPEND=virtual/fortran
 DESCRIPTION=Tools for evaluation of scalar and tensor one-loop integrals
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 ded26fb958fa..cfa1bdd262e3 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
@@ -1,4 +1,4 @@
-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
+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/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/fortran
 DESCRIPTION=Lund Monte Carlo high-energy physics event generator
@@ -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	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=569005808d84cd5466aaa18abed1c332
diff --git a/metadata/md5-cache/sci-physics/pythia-8.2.45 b/metadata/md5-cache/sci-physics/pythia-8.2.45
index cdf1d17a983c..a14c1f81768d 100644
--- a/metadata/md5-cache/sci-physics/pythia-8.2.45
+++ b/metadata/md5-cache/sci-physics/pythia-8.2.45
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare pretend test
-DEPEND=fastjet? ( sci-physics/fastjet ) gzip? ( sys-libs/zlib ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( sci-physics/lhapdf:= ) test? ( root? ( sci-physics/root:= ) )
+DEPEND=fastjet? ( sci-physics/fastjet ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( sci-physics/lhapdf:= ) zlib? ( sys-libs/zlib ) test? ( root? ( sci-physics/root:= ) )
 DESCRIPTION=Lund Monte Carlo high-energy physics event generator
 EAPI=7
 HOMEPAGE=http://pythia8.hepforge.org/
-IUSE=doc examples fastjet gzip +hepmc lhapdf root test
+IUSE=doc examples fastjet +hepmc lhapdf root test zlib
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=fastjet? ( sci-physics/fastjet ) gzip? ( sys-libs/zlib ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( sci-physics/lhapdf:= )
+RDEPEND=fastjet? ( sci-physics/fastjet ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( sci-physics/lhapdf:= ) zlib? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://home.thep.lu.se/~torbjorn/pythia8/pythia8245.tgz test? ( lhapdf? ( https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/CT10.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/MRST2007lomod.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq66.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq6l1.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/unvalidated/MRST2004qed.tar.gz ) )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=704b44517fdfa607cccc223e5607d725
+_md5_=4ca4ae981aa7032b2fb7bde43324c3ec
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 4e9abb6ef780..09db799ddd78 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.08-r2
+++ b/metadata/md5-cache/sci-physics/root-6.22.08-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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_=52cba8241251c04b47452876828fe9fa
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 af955ba9717e..ad9fe307d147 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.02-r1
+++ b/metadata/md5-cache/sci-physics/root-6.24.02-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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_=c2f71e14d408db375be84886234230f7
diff --git a/metadata/md5-cache/sci-physics/root-6.24.9999 b/metadata/md5-cache/sci-physics/root-6.24.9999
index a82a1a21fcb9..8e260dd8236f 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.9999
+++ b/metadata/md5-cache/sci-physics/root-6.24.9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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_=0eb5a6a12ef343242a6f62382c6ad630
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 3873e6806f2a..d946e3bf6574 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/make dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/make dev-util/cmake fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
@@ -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	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
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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_=0eb5a6a12ef343242a6f62382c6ad630
diff --git a/metadata/md5-cache/sci-physics/xfoil-6.99 b/metadata/md5-cache/sci-physics/xfoil-6.99
index feea76f59777..b8a2769948ca 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index e266aa7a8a7b..6c4d9a0d72a0 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.19 b/metadata/md5-cache/sci-visualization/epix-1.2.19
index f4c2c3f99b26..ed9aa8b5eec8 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.19
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.19
@@ -5,10 +5,10 @@ DESCRIPTION=2- and 3-D plotter for creating images (to be used in LaTeX)
 EAPI=7
 HOMEPAGE=https://mathcs.holycross.edu/~ahwang/current/ePiX.html
 IUSE=doc emacs examples
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 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	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1dc3af2845e8557737d39fd939da7b91
+_md5_=f111e0dfbcfad93ff4edfdcdac67dee9
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 668bedf93e71..7e9ddd5e2a21 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=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= ) fortran? ( virtual/fortran )
 DESCRIPTION=Motif based XY-plotting tool
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 aa6c1c6b5c26..c39f0e9c78e3 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=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= ) fortran? ( virtual/fortran )
 DESCRIPTION=Motif based XY-plotting tool
@@ -9,5 +10,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86e9246638e27e7234470ee407fb34c2
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.8.1 b/metadata/md5-cache/sci-visualization/paraview-5.8.1
index 628b8c98d287..58e191eb9f31 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.8.1
+++ b/metadata/md5-cache/sci-visualization/paraview-5.8.1
@@ -13,4 +13,4 @@ RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://www.paraview.org/files/v5.8/ParaView-v5.8.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67599eebfb934ec83da7a8025bccae16
+_md5_=885abf1a6b89aa16c22922bab70b7c34
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.9.0 b/metadata/md5-cache/sci-visualization/paraview-5.9.0
index 59fb79421fed..9d2a13c7d66c 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.9.0
+++ b/metadata/md5-cache/sci-visualization/paraview-5.9.0
@@ -13,4 +13,4 @@ RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://www.paraview.org/files/v5.9/ParaView-v5.9.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e95f7193a8fe6be3d700d57e9ed79a71
+_md5_=95aef3562808165ec157e29812d0e2f5
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.9.1 b/metadata/md5-cache/sci-visualization/paraview-5.9.1
index 29716c9bc601..e24d646c1c56 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.9.1
+++ b/metadata/md5-cache/sci-visualization/paraview-5.9.1
@@ -13,4 +13,4 @@ RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://www.paraview.org/files/v5.9/ParaView-v5.9.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e95f7193a8fe6be3d700d57e9ed79a71
+_md5_=95aef3562808165ec157e29812d0e2f5
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.30 b/metadata/md5-cache/sci-visualization/pythonprop-0.30
index def7c50325ca..e9ed4ff0a0e6 100644
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.30
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.30
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.30.tar.gz -> pythonprop-0.30.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_=64cfac7fac1505a533e4704ccb3a5bd1
+_md5_=efe210ce83c68e1d4c913e6f4933b515
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 3876d6bb94d4..7b0358603cc7 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 0b46557ad337..5696751cd3b8 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/etckeeper-1.18.16 b/metadata/md5-cache/sys-apps/etckeeper-1.18.16
index 026cfc15e3d4..d1f301342d10 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.16
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.16
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools to let /etc be stored in a repository
 EAPI=7
 HOMEPAGE=https://etckeeper.branchable.com/
 IUSE=cron test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=app-portage/portage-utils cron? ( virtual/cron ) || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) virtual/tmpfiles
 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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf69558ba8900a1bbb7018045bd8d2e1
+_md5_=2d56e0e2ee0a51976c2b41df7c454414
diff --git a/metadata/md5-cache/sys-apps/file-5.40-r3 b/metadata/md5-cache/sys-apps/file-5.40-r3
index 27e18682f790..3ef9cf9d3540 100644
--- a/metadata/md5-cache/sys-apps/file-5.40-r3
+++ b/metadata/md5-cache/sys-apps/file-5.40-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 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_=3d189d4b5f1fd1d58240a1f01dab4375
+_md5_=f15daf248b134c2634f78ea4f2628a6b
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1 b/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
index 05a8c4d2b51e..3f2ca103947e 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.9.tar.gz -> fwupd-1.5.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd76f89f3ca35dbcb699488f27f19c35
+_md5_=ddd491b525a31828d01761c220448e32
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.1-r1 b/metadata/md5-cache/sys-apps/fwupd-1.6.1-r1
index a1358350d2c5..d7101eeb1c0b 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.1-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.1.tar.gz -> fwupd-1.6.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=11e8a1d0458cb0b96c8846c9be7be54b
+_md5_=f47fe46a6aefccac796a099bf1c85007
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1
deleted file mode 100644
index 324fe8dc41e5..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
-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
-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.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fcea1e7f0daa229a00f04c9a5726444b
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r2 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r2
new file mode 100644
index 000000000000..69cd5f736dcf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
+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
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.6.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ad366813d9187537a4b845530f638ca6
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1
deleted file mode 100644
index 808831208750..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
-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
-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_=a54bf0f1cbd3dcdef848f8accd640602
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r2 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r2
new file mode 100644
index 000000000000..6173a84ad8b2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
+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
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[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_=c4cb1762d20505ef4dea5392d69e2607
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.8 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.8
deleted file mode 100644
index 545e41dce004..000000000000
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
-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
-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.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a3b3113745d56fb7d32b50128a3fc45
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.8-r1 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.8-r1
new file mode 100644
index 000000000000..88cc2cfc4887
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+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
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.8.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e9f784d8cac90c11507cdd3e849418e7
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.14-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
index 10048a02aa47..2e8f712e2673 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
 EAPI=7
 HOMEPAGE=http://www.issihosts.com/haveged/
 IUSE=selinux static-libs threads
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.14.tar.gz -> haveged-1.9.14.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ddd8f2247461a28409cdd677072f63d
+_md5_=4cf80f832234701f5a8d04912193ff7e
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.8.0 b/metadata/md5-cache/sys-apps/irqbalance-1.8.0
deleted file mode 100644
index 5f1ee8e9c4a9..000000000000
--- a/metadata/md5-cache/sys-apps/irqbalance-1.8.0
+++ /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=configure install prepare setup
-DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] )
-DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
-EAPI=7
-HOMEPAGE=https://github.com/Irqbalance/irqbalance
-IUSE=caps +numa selinux tui kernel_linux
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] ) selinux? ( sec-policy/selinux-irqbalance )
-SLOT=0
-SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.8.0.tar.gz -> irqbalance-1.8.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43951842f31f10744a0fccc856c1d90f
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1 b/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
new file mode 100644
index 000000000000..98c8902b2ed8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] )
+DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
+EAPI=7
+HOMEPAGE=https://github.com/Irqbalance/irqbalance
+IUSE=caps +numa selinux tui kernel_linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
+SLOT=0
+SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.8.0.tar.gz -> irqbalance-1.8.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9cb5f158ea411ac5f90abe539090a7c0
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index 6462ba13fdb8..ce6ff589d679 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -1,4 +1,4 @@
-BDEPEND=filecaps? ( sys-libs/libcap )
+BDEPEND=filecaps? ( sys-libs/libcap ) fortran? ( virtual/fortran )
 DEFINED_PHASES=compile install postinst preinst prepare setup
 DEPEND=dev-lang/perl lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) fortran? ( virtual/fortran )
 DESCRIPTION=A performance-oriented tool suite for x86 multicore environments
@@ -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	cca0c11947f3e90961771da271435fdb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e45d804ed79ec12750fd4e07c45bd5f
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.5.6 b/metadata/md5-cache/sys-apps/logwatch-7.5.6
new file mode 100644
index 000000000000..1b4513defa34
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/logwatch-7.5.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Analyzes and Reports on system logs
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/logwatch/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://sourceforge/logwatch/logwatch-7.5.6/logwatch-7.5.6.tar.gz
+_eclasses_=tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=b7d0b5c6dbe2b8dffe0e67525834dfc9
diff --git a/metadata/md5-cache/sys-apps/logwatch-9999 b/metadata/md5-cache/sys-apps/logwatch-9999
index 89ced84fa1c4..a8d544b138ca 100644
--- a/metadata/md5-cache/sys-apps/logwatch-9999
+++ b/metadata/md5-cache/sys-apps/logwatch-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=0b84577dc742b59219d820dead9d66ec
+_md5_=b7d0b5c6dbe2b8dffe0e67525834dfc9
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.11 b/metadata/md5-cache/sys-apps/man-pages-5.11
deleted file mode 100644
index 7fa5370951dc..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-5.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=7
-HOMEPAGE=https://www.kernel.org/doc/man-pages/
-IUSE=l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] ) l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] ) l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.11.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.11.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=f4d23a8d3d40f13437f01a9742fe6723
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.11-r1 b/metadata/md5-cache/sys-apps/man-pages-5.11-r1
new file mode 100644
index 000000000000..c874c4bb5f0b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-5.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=7
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] ) l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] ) l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.11.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.11.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=b3588e059f0cafd70d5f09f9f00edb4e
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.12 b/metadata/md5-cache/sys-apps/man-pages-5.12
deleted file mode 100644
index 628712f7263e..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-5.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=7
-HOMEPAGE=https://www.kernel.org/doc/man-pages/
-IUSE=l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] ) l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] ) l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.12.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.12.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=ca205ed5f1e99f006d1ec6de300417b0
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.12-r2 b/metadata/md5-cache/sys-apps/man-pages-5.12-r2
new file mode 100644
index 000000000000..ab5a2db14966
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-5.12-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=7
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( || ( app-i18n/man-pages-l10n[l10n_it(-)] app-i18n/man-pages-it ) ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.12.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.12.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=b4a71c243c968a3d8dc09d8a2444c205
diff --git a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3 b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
index f0871f180e87..83e447419f17 100644
--- a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
+++ b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
@@ -3,8 +3,8 @@ DESCRIPTION=Miscellaneous files
 EAPI=6
 HOMEPAGE=https://savannah.gnu.org/projects/miscfiles/
 IUSE=minimal
-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 ~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 ~x86-solaris
 LICENSE=GPL-2 unicode
 SLOT=0
 SRC_URI=mirror://gnu/miscfiles/miscfiles-1.5.tar.gz https://dev.gentoo.org/~whissi/dist/miscfiles/UnicodeData-10.0.0.txt.xz
-_md5_=23e9e0fb0feebdc222bb84f798512698
+_md5_=15c194468b6230b195a1f8ce1d1df193
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.14 b/metadata/md5-cache/sys-apps/nvme-cli-1.14
index 973c0f9b36d6..f132d4ab17a6 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-1.14
+++ b/metadata/md5-cache/sys-apps/nvme-cli-1.14
@@ -5,11 +5,11 @@ DESCRIPTION=NVM-Express user space tooling for Linux
 EAPI=7
 HOMEPAGE=https://github.com/linux-nvme/nvme-cli
 IUSE=+uuid
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=uuid? ( sys-apps/util-linux:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.14.tar.gz -> nvme-cli-1.14.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=5c87c02c788390f62cc897345a6b8623
+_md5_=ee8677a059d55d8bf78b505edacc3aa1
diff --git a/metadata/md5-cache/sys-apps/onerng-3.6-r3 b/metadata/md5-cache/sys-apps/onerng-3.6-r3
index e1aecf5ada51..4f3a3f95c419 100644
--- a/metadata/md5-cache/sys-apps/onerng-3.6-r3
+++ b/metadata/md5-cache/sys-apps/onerng-3.6-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.6.orig.tar.gz -> onerng-3.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=4f94f2619f4f01fb0be7b20b37bec7a5
+_md5_=4181c8f3afad2a2c68103c5dbcbe9c53
diff --git a/metadata/md5-cache/sys-apps/ripgrep-12.1.1 b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
deleted file mode 100644
index 19799f65c20d..000000000000
--- a/metadata/md5-cache/sys-apps/ripgrep-12.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=pcre? ( dev-libs/libpcre2 ) virtual/pkgconfig >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
-EAPI=7
-HOMEPAGE=https://github.com/BurntSushi/ripgrep
-IUSE=pcre debug
-KEYWORDS=amd64 arm64 ppc64 x86
-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	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 67c416f03c42..4f45a1ef0779 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-13.0.0
+++ b/metadata/md5-cache/sys-apps/ripgrep-13.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=a search tool that combines the usability of ag with the raw speed o
 EAPI=7
 HOMEPAGE=https://github.com/BurntSushi/ripgrep
 IUSE=+pcre debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 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	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fa4ed73760ed547c89b371242f42d936
+_md5_=f19f681a660db462d8304cfef61da81c
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13 b/metadata/md5-cache/sys-apps/rng-tools-6.13
index 4bd95c665353..1f2990957ee0 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-6.13
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.13
@@ -5,10 +5,10 @@ DESCRIPTION=Daemon to use hardware random number generators
 EAPI=7
 HOMEPAGE=https://github.com/nhorman/rng-tools
 IUSE=jitterentropy nistbeacon pkcs11 selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
 SLOT=0
 SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.13.tar.gz -> rng-tools-6.13.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70afbf8204762e4b1f51a624599ffeae
+_md5_=844b449eeff5edf11e489c10ee3c8ee2
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
deleted file mode 100644
index 2f02cedc1a92..000000000000
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libusb:1 input_devices_roccat_ryosmk? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryosmkfx? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryostkl? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Utility for advanced configuration of Roccat devices
-EAPI=7
-HOMEPAGE=http://roccat.sourceforge.net/
-IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kiro input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_konextdoptical input_devices_roccat_kovaplus input_devices_roccat_kova2016 input_devices_roccat_lua input_devices_roccat_nyth input_devices_roccat_pyra input_devices_roccat_ryosmk input_devices_roccat_ryosmkfx input_devices_roccat_ryostkl input_devices_roccat_savu input_devices_roccat_skeltr input_devices_roccat_sova input_devices_roccat_suora input_devices_roccat_tyon lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libusb:1 input_devices_roccat_ryosmk? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryosmkfx? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryostkl? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
-REQUIRED_USE=input_devices_roccat_ryosmk? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryosmkfx? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryostkl? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2fe4d87bba4d278e3d8de6bfa73521b0
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101
new file mode 100644
index 000000000000..e3662de319f5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/roccat dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libusb:1 input_devices_roccat_ryosmk? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryosmkfx? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryostkl? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Utility for advanced configuration of Roccat devices
+EAPI=7
+HOMEPAGE=http://roccat.sourceforge.net/
+IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kiro input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_konextdoptical input_devices_roccat_kovaplus input_devices_roccat_kova2016 input_devices_roccat_lua input_devices_roccat_nyth input_devices_roccat_pyra input_devices_roccat_ryosmk input_devices_roccat_ryosmkfx input_devices_roccat_ryostkl input_devices_roccat_savu input_devices_roccat_skeltr input_devices_roccat_sova input_devices_roccat_suora input_devices_roccat_tyon lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/roccat dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libusb:1 input_devices_roccat_ryosmk? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryosmkfx? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) input_devices_roccat_ryostkl? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
+REQUIRED_USE=input_devices_roccat_ryosmk? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryosmkfx? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryostkl? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=589b5f3c620f72390e476d6ee26610f2
diff --git a/metadata/md5-cache/sys-apps/selinux-python-3.2 b/metadata/md5-cache/sys-apps/selinux-python-3.2
index 9f3809500795..b251a67eebf8 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-3.2
+++ b/metadata/md5-cache/sys-apps/selinux-python-3.2
@@ -1,14 +1,16 @@
-DEFINED_PHASES=compile install prepare
+BDEPEND=test? ( >=sys-libs/libselinux-3.2:=[python] >=sys-libs/libsemanage-3.2:=[python(+)] >=sys-libs/libsepol-3.2:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,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(-)?] >=sys-apps/secilc-3.2 )
+DEFINED_PHASES=compile install prepare test
 DEPEND=>=sys-libs/libselinux-3.2:=[python] >=sys-libs/libsemanage-3.2:=[python(+)] >=sys-libs/libsepol-3.2:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,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(-)?]
 DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-3.2:=[python] >=sys-libs/libsemanage-3.2:=[python(+)] >=sys-libs/libsepol-3.2:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/selinux-python-3.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d62d79f7a30860bb6590128e43f82b44
+_md5_=1c70dbfd4e4770d7a5c63b58b4af0542
diff --git a/metadata/md5-cache/sys-apps/selinux-python-9999 b/metadata/md5-cache/sys-apps/selinux-python-9999
index 3ad9c80fbd05..215ea89662a6 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-9999
+++ b/metadata/md5-cache/sys-apps/selinux-python-9999
@@ -1,14 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+BDEPEND=test? ( >=sys-libs/libselinux-9999:=[python] >=sys-libs/libsemanage-9999:=[python(+)] >=sys-libs/libsepol-9999:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,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(-)?] >=sys-apps/secilc-9999 ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=sys-libs/libselinux-9999:=[python] >=sys-libs/libsemanage-9999:=[python(+)] >=sys-libs/libsepol-9999:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,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(-)?]
 DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-libs/libselinux-9999:=[python] >=sys-libs/libsemanage-9999:=[python(+)] >=sys-libs/libsepol-9999:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6daea52b2104339cb5ae781d7b4ed3b6
+_md5_=8c393a803bc429c8999e5dfb9e354e4d
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8.1-r3 b/metadata/md5-cache/sys-apps/shadow-4.8.1-r3
deleted file mode 100644
index 97c8c05f0950..000000000000
--- a/metadata/md5-cache/sys-apps/shadow-4.8.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils 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 preinst prepare
-DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) >=sys-kernel/linux-headers-4.14
-DESCRIPTION=Utilities to deal with user accounts
-EAPI=7
-HOMEPAGE=https://github.com/shadow-maint/shadow
-IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
-REQUIRED_USE=?? ( cracklib pam )
-SLOT=0
-SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fe1b5107bf53c37e092f8ea1bedfbbd
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8.1-r4 b/metadata/md5-cache/sys-apps/shadow-4.8.1-r4
new file mode 100644
index 000000000000..1524e0997f00
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/shadow-4.8.1-r4
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils 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 preinst prepare
+DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) >=sys-kernel/linux-headers-4.14
+DESCRIPTION=Utilities to deal with user accounts
+EAPI=7
+HOMEPAGE=https://github.com/shadow-maint/shadow
+IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20171215-r1 !=app-i18n/man-pages-ja-20180315-r0 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
+REQUIRED_USE=?? ( cracklib pam )
+SLOT=0
+SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7f4672822791e6f523f5c0dc93a53d54
diff --git a/metadata/md5-cache/sys-apps/smartmontools-7.2 b/metadata/md5-cache/sys-apps/smartmontools-7.2
index d4894e0e4617..9aee7b959361 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-7.2
+++ b/metadata/md5-cache/sys-apps/smartmontools-7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to monitor storage systems to provide advanced warning of disk
 EAPI=6
 HOMEPAGE=https://www.smartmontools.org
 IUSE=caps +daemon selinux static systemd +update-drivedb
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=caps? ( static? ( sys-libs/libcap-ng[static-libs] ) !static? ( sys-libs/libcap-ng ) ) selinux? ( sys-libs/libselinux ) daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) update-drivedb? ( app-crypt/gnupg || ( net-misc/curl net-misc/wget www-client/lynx dev-vcs/subversion ) )
 REQUIRED_USE=( caps? ( daemon ) static? ( !systemd ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-7.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6404779b184ad7fbf5024c3a617004d2
+_md5_=233c0d34c42f2e2694492c7d0fc5fafc
diff --git a/metadata/md5-cache/sys-apps/smartmontools-9999 b/metadata/md5-cache/sys-apps/smartmontools-9999
index f0e4f72829ca..6c99fee57eb5 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-9999
+++ b/metadata/md5-cache/sys-apps/smartmontools-9999
@@ -10,4 +10,4 @@ RDEPEND=caps? ( static? ( sys-libs/libcap-ng[static-libs] ) !static? ( sys-libs/
 REQUIRED_USE=( caps? ( daemon ) static? ( !systemd ) )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	subversion	c500a1b7795f44153bd96fc2597e3c05	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5cb186d0997ae123e659f1fe949b40a
+_md5_=17a1ed548f8395fc50013ac6dfff658d
diff --git a/metadata/md5-cache/sys-apps/systemd-248.3-r1 b/metadata/md5-cache/sys-apps/systemd-248.3-r1
deleted file mode 100644
index cfa15a338703..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-248.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( 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-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd 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 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
-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	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-248.5 b/metadata/md5-cache/sys-apps/systemd-248.5
new file mode 100644
index 000000000000..745802f62fb9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-248.5
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( 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-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd 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 ~mips ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.5/systemd-stable-248.5.tar.gz
+_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_=64738168ce99f3bd9903990034d5a6d9
diff --git a/metadata/md5-cache/sys-apps/systemd-249-r3 b/metadata/md5-cache/sys-apps/systemd-249-r3
deleted file mode 100644
index b0c468398a9d..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-249-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( 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-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( sys-apps/hwids[systemd(+),udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
-_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-249.1 b/metadata/md5-cache/sys-apps/systemd-249.1
new file mode 100644
index 000000000000..2c12cbdbc3c9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-249.1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( 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-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( sys-apps/hwids[systemd(+),udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.1/systemd-stable-249.1.tar.gz
+_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_=8da40a01f46344d471aff9a46944e026
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
index abf8e0a0a7d4..5861bef25cc1 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
@@ -5,11 +5,11 @@ DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and dire
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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_=5612ef3294a27ae80a0f8297f9696038
+_md5_=51775029e010d10685fbdf9d74e13cbe
diff --git a/metadata/md5-cache/sys-apps/tuned-2.15.0-r1 b/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
index 7b617a4eaaaf..b0aab5384712 100644
--- a/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
+++ b/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.15.0.tar.gz -> tuned-2.15.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ea74c662fe9c90b93c5dba538b93c9fd
+_md5_=c5a8441c538f367c5ca111321bf20d78
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-1.0 b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
index 81ab349a51b2..6a1c23c95a31 100644
--- a/metadata/md5-cache/sys-apps/ucspi-unix-1.0
+++ b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/bglibs-2.04
 DESCRIPTION=A UCSPI implementation for Unix domain sockets
 EAPI=7
 HOMEPAGE=https://untroubled.org/ucspi-unix/
-KEYWORDS=amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=!net-analyzer/mk-livestatus
 SLOT=0
 SRC_URI=https://untroubled.org/ucspi-unix/archive/ucspi-unix-1.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=207063438ff6e590db7e49b4fc761002
+_md5_=eae05c392b076bee404878e5826b0709
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.36.2 b/metadata/md5-cache/sys-apps/util-linux-2.36.2
deleted file mode 100644
index 5b1ffe788b31..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.36.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
-DESCRIPTION=Various useful Linux utilities
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
-IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
-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	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.36.2-r1 b/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1
new file mode 100644
index 000000000000..1ead0098992d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DESCRIPTION=Various useful Linux utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+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	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_=4fad999b7d8b684916a2a1af2473c8ce
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37 b/metadata/md5-cache/sys-apps/util-linux-2.37
deleted file mode 100644
index d9b19aead58a..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.37
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
-DESCRIPTION=Various useful Linux utilities
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
-IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
-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	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-2.37-r1 b/metadata/md5-cache/sys-apps/util-linux-2.37-r1
new file mode 100644
index 000000000000..005014db57cb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DESCRIPTION=Various useful Linux utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+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	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_=d8ba890e3c2740fdc4fcd4bc4387e596
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37.1 b/metadata/md5-cache/sys-apps/util-linux-2.37.1
new file mode 100644
index 000000000000..c98388826126
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DESCRIPTION=Various useful Linux utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+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.1.tar.xz
+_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_=c5897c9f64a0e09eae32cd5d54e8b524
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 539c405feb29..09d457d4b2dc 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) dev-ruby/asciidoctor >=app-portage/elt-patches-20170815 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig || ( >=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 test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr 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
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) 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(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _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
+_md5_=c5897c9f64a0e09eae32cd5d54e8b524
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 329730c01cf3..a05a4035433e 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/google-authenticator-wrappers-3 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
deleted file mode 100644
index c1d532f9a562..000000000000
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare pretend test
-DESCRIPTION=Set of scripts to manage google-auth setup on Gentoo Infra
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/google-authenticator-wrappers
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-auth/google-authenticator
-SLOT=0
-SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v3.tar.gz -> google-authenticator-wrappers-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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=47090817313d9e92d9efb93bf698e77d
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1
new file mode 100644
index 000000000000..ca37d5daf13c
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend test
+DEPEND=acct-group/gauth acct-user/gauth
+DESCRIPTION=Set of scripts to manage google-auth setup on Gentoo Infra
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/google-authenticator-wrappers
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=acct-group/gauth acct-user/gauth sys-auth/google-authenticator
+SLOT=0
+SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v3.tar.gz -> google-authenticator-wrappers-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_=53bd4903099877f0dbe3753fde09bf5a
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13-r1 b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
deleted file mode 100644
index 292388f65c7b..000000000000
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An authentication service for creating and validating credentials
-EAPI=6
-HOMEPAGE=https://github.com/dun/munge
-IUSE=debug gcrypt static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bea57c99b5c3621ced98ec80dc9f4f0c
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13-r2 b/metadata/md5-cache/sys-auth/munge-0.5.13-r2
new file mode 100644
index 000000000000..0e119b17492d
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r2
@@ -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 prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
+DESCRIPTION=An authentication service for creating and validating credentials
+EAPI=7
+HOMEPAGE=https://github.com/dun/munge
+IUSE=debug gcrypt static-libs
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) acct-group/munge acct-user/munge
+SLOT=0
+SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6dd1f962282deb095e0ed2a07aa1b33f
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.15.1 b/metadata/md5-cache/sys-auth/nss-mdns-0.15.1
index a90c0b1e2d16..db997bf92868 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.15.1
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Name Service Switch module for Multicast DNS
 EAPI=7
 HOMEPAGE=https://github.com/lathiat/nss-mdns
 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 ~hppa ~mips ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.15.1/nss-mdns-0.15.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23e65aa72258014967ca43f81ba38d59
+_md5_=791598aef30e755fc2c2931b8df8e068
diff --git a/metadata/md5-cache/sys-auth/pam_krb5-4.9 b/metadata/md5-cache/sys-auth/pam_krb5-4.9
index 1b720ac1e5e9..200e31e58cab 100644
--- a/metadata/md5-cache/sys-auth/pam_krb5-4.9
+++ b/metadata/md5-cache/sys-auth/pam_krb5-4.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=virtual/krb5 sys-libs/pam
+DEPEND=virtual/krb5 virtual/libcrypt:= sys-libs/pam
 DESCRIPTION=Kerberos V PAM Authentication Module
 EAPI=7
 HOMEPAGE=https://www.eyrie.org/~eagle/software/pam-krb5/
-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
 LICENSE=|| ( BSD-2 GPL-2 )
-RDEPEND=virtual/krb5 sys-libs/pam
+RDEPEND=virtual/krb5 virtual/libcrypt:= sys-libs/pam
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archives.eyrie.org/software/kerberos/pam-krb5-4.9.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d79edd19b8fc552e9296c16c7eac53b0
+_md5_=84df8e1608471e8590869036a4d3c42a
diff --git a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1 b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
index 5896fb482e59..bd13bb173b71 100644
--- a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Create per-user private temporary directories during login
 EAPI=7
 HOMEPAGE=http://www.openwall.com/pam/
 IUSE=selinux +prevent-removal
-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=BSD-2
 RDEPEND=sys-libs/pam selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb167e805144d5b659b9088bc648d640
+_md5_=67ee2596ff6db317e86b1260fd0f1d52
diff --git a/metadata/md5-cache/sys-auth/seatd-0.5.0 b/metadata/md5-cache/sys-auth/seatd-0.5.0
index 454aa8ed6e5e..94e42d4b1c07 100644
--- a/metadata/md5-cache/sys-auth/seatd-0.5.0
+++ b/metadata/md5-cache/sys-auth/seatd-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Minimal seat management daemon and universal library
 EAPI=7
 HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
 IUSE=elogind systemd
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.5.0.tar.gz -> seatd-0.5.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cf38b7b70cc36c29c01635c6a3df6ad
+_md5_=95e3eb9527cc6b881f65fc9c5fa4c823
diff --git a/metadata/md5-cache/sys-auth/sssd-2.5.0 b/metadata/md5-cache/sys-auth/sssd-2.5.0
deleted file mode 100644
index 11149cdad65f..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=app-crypt/mit-krb5-1.19.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(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( net-fs/samba ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=7
-HOMEPAGE=https://github.com/SSSD/sssd
-IUSE=acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind 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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-crypt/mit-krb5-1.19.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(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( net-fs/samba ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) systemtap? ( dev-util/systemtap ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=pac? ( samba ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( sudo ) valgrind? ( test )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SSSD/sssd/releases/download/2.5.0/sssd-2.5.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd171f3925ffa49b1900dc952304b7ad
diff --git a/metadata/md5-cache/sys-auth/sssd-2.5.2 b/metadata/md5-cache/sys-auth/sssd-2.5.2
new file mode 100644
index 000000000000..7faf6e986e78
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/sssd-2.5.2
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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] ) doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=app-crypt/mit-krb5-1.19.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(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( net-fs/samba ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=System Security Services Daemon provides access to identity and authentication
+EAPI=7
+HOMEPAGE=https://github.com/SSSD/sssd
+IUSE=acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind 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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-crypt/mit-krb5-1.19.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(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( net-fs/samba ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) systemtap? ( dev-util/systemtap ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) pac? ( samba ) test? ( sudo ) valgrind? ( test )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SSSD/sssd/releases/download/2.5.2/sssd-2.5.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=258042e72add5992d38c3d1a361b8bd2
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 25a8bc183f6a..30bf4f89dd54 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/buffer-1.19-r4 b/metadata/md5-cache/sys-block/buffer-1.19-r4
new file mode 100644
index 000000000000..00eb5faf3af0
--- /dev/null
+++ b/metadata/md5-cache/sys-block/buffer-1.19-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=a tapedrive tool for speeding up reading from and writing to tape
+EAPI=7
+HOMEPAGE=http://www.microwerks.net/~hugo/
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/b/buffer/buffer_1.19.orig.tar.gz mirror://debian/pool/main/b/buffer/buffer_1.19-12.debian.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=63f777672fc52c92817250660abdc7f7
diff --git a/metadata/md5-cache/sys-block/gparted-1.3.1 b/metadata/md5-cache/sys-block/gparted-1.3.1
new file mode 100644
index 000000000000..e84b6dd8eadd
--- /dev/null
+++ b/metadata/md5-cache/sys-block/gparted-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.51.0-r2 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( >=sys-auth/polkit-0.102 ) >=dev-cpp/glibmm-2.56.1:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.58.3-r1:2 >=sys-block/parted-3.2:= >=dev-libs/libsigc++-2.10.1:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Partition editor for graphically managing your disk partitions
+EAPI=7
+HOMEPAGE=https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/
+IUSE=kde policykit wayland test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ FDL-1.2+
+RDEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( >=sys-auth/polkit-0.102 ) >=dev-cpp/glibmm-2.56.1:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.58.3-r1:2 >=sys-block/parted-3.2:= >=dev-libs/libsigc++-2.10.1:2 >=sys-apps/util-linux-2.33.2 wayland? ( x11-apps/xhost )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/gparted/gparted-1.3.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=412f17349018b85426b63d0574ccb38e
diff --git a/metadata/md5-cache/sys-block/libzbd-1.2.0-r1 b/metadata/md5-cache/sys-block/libzbd-1.2.0-r1
index 6767f0abdf16..be254b26fe34 100644
--- a/metadata/md5-cache/sys-block/libzbd-1.2.0-r1
+++ b/metadata/md5-cache/sys-block/libzbd-1.2.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Zoned block device manipulation library and tools
 EAPI=7
 HOMEPAGE=https://github.com/westerndigitalcorporation/libzbd
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+
 RDEPEND=>=sys-kernel/linux-headers-4.13 gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://github.com/westerndigitalcorporation/libzbd/archive/v1.2.0.tar.gz -> libzbd-1.2.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=026944acb377855d6cb3726a06c7a9b5
+_md5_=14f338a6bdc0dad70dc355b1c12f4bf9
diff --git a/metadata/md5-cache/sys-block/ndctl-71.1-r1 b/metadata/md5-cache/sys-block/ndctl-71.1-r1
index b686ec1877a5..f14810022e9a 100644
--- a/metadata/md5-cache/sys-block/ndctl-71.1-r1
+++ b/metadata/md5-cache/sys-block/ndctl-71.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Helper tools and libraries for managing non-volatile memory on Linux
 EAPI=7
 HOMEPAGE=https://github.com/pmem/ndctl
 IUSE=bash-completion systemd test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT CC0-1.0
 RDEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
 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	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9107cdeceb066fb281eceb3960efbdcf
+_md5_=b450382c5ae418498128f40e4139ff32
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.13 b/metadata/md5-cache/sys-block/seekwatcher-0.13
index 405ac92ab58a..0ad43a51f6b3 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.13
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.13
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/trofi/seekwatcher/archive/v0.13.tar.gz -> seekwatcher-0.13.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_=7bcc7f24fb11044796a5620a1af63893
+_md5_=2e331c689960b24dd3f1e79787b71844
diff --git a/metadata/md5-cache/sys-block/whdd-3.0.1 b/metadata/md5-cache/sys-block/whdd-3.0.1
deleted file mode 100644
index 7401b16e9e20..000000000000
--- a/metadata/md5-cache/sys-block/whdd-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile unpack
-DEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Diagnostic and recovery tool for block devices
-EAPI=6
-HOMEPAGE=https://whdd.github.io
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
-SLOT=0
-SRC_URI=https://github.com/whdd/whdd/archive/3.0.1.tar.gz -> whdd-3.0.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=bf3943ea9750f642d60020939c9db12e
diff --git a/metadata/md5-cache/sys-block/whdd-3.0.1-r1 b/metadata/md5-cache/sys-block/whdd-3.0.1-r1
new file mode 100644
index 000000000000..1e452008634e
--- /dev/null
+++ b/metadata/md5-cache/sys-block/whdd-3.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile unpack
+DEPEND=dev-util/dialog:= sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Diagnostic and recovery tool for block devices
+EAPI=6
+HOMEPAGE=https://whdd.github.io
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-util/dialog:= sys-libs/ncurses:=[unicode(+)] sys-apps/smartmontools
+SLOT=0
+SRC_URI=https://github.com/whdd/whdd/archive/3.0.1.tar.gz -> whdd-3.0.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=1f5f6e2133a4ef46092e199088956a2b
diff --git a/metadata/md5-cache/sys-block/whdd-9999 b/metadata/md5-cache/sys-block/whdd-9999
index 831f9c1d8fc0..676c5964da24 100644
--- a/metadata/md5-cache/sys-block/whdd-9999
+++ b/metadata/md5-cache/sys-block/whdd-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile unpack
-DEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-util/dialog:= sys-libs/ncurses:=[unicode(+)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Diagnostic and recovery tool for block devices
 EAPI=6
 HOMEPAGE=https://whdd.github.io
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
+RDEPEND=dev-util/dialog:= sys-libs/ncurses:=[unicode(+)] sys-apps/smartmontools
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8192161fcff6551df6e91208021d4c10
+_md5_=5010c32f1b9f544edf93a8e1bca2f3f3
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index bca0d18559ba..637b3b7bc5ca 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-r4 b/metadata/md5-cache/sys-boot/elilo-3.16-r4
deleted file mode 100644
index dc1f55fe7e4b..000000000000
--- a/metadata/md5-cache/sys-boot/elilo-3.16-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-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=6
-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_=6a3e02d74c33f96ac652ac01151f1e6e
diff --git a/metadata/md5-cache/sys-boot/woeusb-5.1.2 b/metadata/md5-cache/sys-boot/woeusb-5.1.2
deleted file mode 100644
index 75629a60b4cb..000000000000
--- a/metadata/md5-cache/sys-boot/woeusb-5.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-boot/woeusb-5.1.2-r1 b/metadata/md5-cache/sys-boot/woeusb-5.1.2-r1
new file mode 100644
index 000000000000..665fcb3ebcec
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/woeusb-5.1.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install 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
+SLOT=0
+SRC_URI=https://github.com/WoeUSB/WoeUSB/archive/v5.1.2.tar.gz -> woeusb-5.1.2.tar.gz
+_md5_=f0b057c6906adfcebf77338eeed6dbe9
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 47fc792a55a3..88f8229ea1c2 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/ceph-16.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
index 8019f12ffbfc..5b5b27d9b070 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
@@ -5,7 +5,7 @@ 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
+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 )
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.4.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
+_md5_=134d2acd6444813fc57555ecae273832
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.23 b/metadata/md5-cache/sys-cluster/charliecloud-0.23
index bf2ffe7dc7d2..e0bf854be42d 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.23
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.23
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.23.tar.gz -> charliecloud-0.23.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa36256d72afe3c3cf38be8b9840db74
+_md5_=9d574ba5b9243b1961e2efde6177f98c
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.24 b/metadata/md5-cache/sys-cluster/charliecloud-0.24
index 524e8977c142..60801c7e9203 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.24
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.24
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.24.tar.gz -> charliecloud-0.24.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=764a21ed5a89bc37d39ab443066ba045
+_md5_=86e2da06f40df62ffbc514d86c32a015
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index e76ad2ffcdc1..6f066ef7f5c6 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56ccd9aebe8a9a2d89a33dddc53a7dc1
+_md5_=890fd959a94c0461dc0ceeb797b1a5ce
diff --git a/metadata/md5-cache/sys-cluster/charm-6.8.2 b/metadata/md5-cache/sys-cluster/charm-6.8.2
index 86e86e64ec0e..c1e5b5eac58c 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.8.2
+++ b/metadata/md5-cache/sys-cluster/charm-6.8.2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig virtual/fortran
 DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=mpi? ( virtual/mpi ) net-libs/libtirpc virtual/pkgconfig virtual/fortran
+DEPEND=mpi? ( virtual/mpi ) net-libs/libtirpc virtual/fortran
 DESCRIPTION=Message-passing parallel language and runtime system
-EAPI=5
+EAPI=8
 HOMEPAGE=http://charm.cs.uiuc.edu/
 IUSE=charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi numa smp static-libs syncft tcp
 KEYWORDS=~amd64 ~x86
@@ -10,5 +11,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	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4fe77d28319a3fab9588722f19e588a
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c3800ee7f2aee0114bb88f8a23395286
diff --git a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1 b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
index 2ed4b659604d..4142fd1d1fa0 100644
--- a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
+++ b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=A debugger for Charm++ applications
-EAPI=5
+EAPI=7
 HOMEPAGE=http://charm.cs.uiuc.edu/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmdebug,-smp] >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/charmdebug/charmdebug_6.2.0.tar.gz
-_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_=a785fd663d9fa265ded620af89fdd84d
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=cf00bdd6e49647ab81a30dbbc58904e4
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
deleted file mode 100644
index 172545193d83..000000000000
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library pack for Heartbeat / Pacemaker
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-IUSE=doc libnet static-libs
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2
-SLOT=0
-SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.11.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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ff8c926627bb5adaca90bf4b8580cdc
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
deleted file mode 100644
index 74b28f9c4771..000000000000
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=app-text/asciidoc app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library pack for Heartbeat / Pacemaker
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-IUSE=doc libnet static-libs
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2
-RDEPEND=app-text/asciidoc app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2
-SLOT=0
-SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6bf2623357409beb55ed057e3ff9968
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
deleted file mode 100644
index 970cb76f397b..000000000000
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-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
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libltdl:= dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )
-DESCRIPTION=Library pack for Heartbeat / Pacemaker
-EAPI=7
-HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-IUSE=doc ipmilan libnet static-libs
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libltdl:= dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-SLOT=0
-SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55a2f788451c58b08c758effaad4a788
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r2 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r2
new file mode 100644
index 000000000000..aa03f7415119
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r2
@@ -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=acct-group/haclient acct-user/hacluster app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libltdl:= dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )
+DESCRIPTION=Library pack for Heartbeat / Pacemaker
+EAPI=7
+HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
+IUSE=doc ipmilan libnet static-libs
+KEYWORDS=amd64 ~hppa x86
+LICENSE=GPL-2
+RDEPEND=acct-group/haclient acct-user/hacluster app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libltdl:= dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+SLOT=0
+SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.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
+_md5_=7b390def3783369dc81b2c0e651843f5
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.6.0 b/metadata/md5-cache/sys-cluster/hpx-1.6.0
deleted file mode 100644
index e479316f7eef..000000000000
--- a/metadata/md5-cache/sys-cluster/hpx-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/breathe[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend 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/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-DESCRIPTION=C++ runtime system for parallel and distributed applications
-EAPI=7
-HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
-IUSE=doc examples jemalloc mpi papi +perftools tbb test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-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/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( jemalloc perftools tbb )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.6.0.tar.gz -> hpx-1.6.0.tar.gz
-_eclasses_=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_=6549033ae69d38e5074deb0f113c4e60
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.7.0 b/metadata/md5-cache/sys-cluster/hpx-1.7.0
new file mode 100644
index 000000000000..6f4917e853e9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/hpx-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+DESCRIPTION=C++ runtime system for parallel and distributed applications
+EAPI=7
+HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
+IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+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-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.7.0.tar.gz -> hpx-1.7.0.tar.gz
+_eclasses_=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_=b8f67e4cc103e10b74fb666cf13aa647
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index df9412583457..52ecc7a01cb0 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] >=dev-python/breathe-4.22[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] >=dev-python/breathe-4.22[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare pretend 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-libs/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+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-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
 DESCRIPTION=C++ runtime system for parallel and distributed applications
 EAPI=7
 HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
-IUSE=doc examples jemalloc mpi papi +perftools tbb test python_single_target_python3_8 python_single_target_python3_9
+IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=Boost-1.0
 PROPERTIES=live
-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/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( jemalloc perftools tbb )
-RESTRICT=!test? ( test )
+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-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
+RESTRICT=test
 SLOT=0
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab0941ae600de2c3a3cf60fb2e165bf5
+_md5_=f22f4b3b5d7d7d9209a09881e34d5269
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.9 b/metadata/md5-cache/sys-cluster/libquo-1.2.9
deleted file mode 100644
index 7a86510054bd..000000000000
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure setup
-DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=6
-HOMEPAGE=https://lanl.github.io/libquo/
-IUSE=fortran static-libs test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
-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	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-1.3.1 b/metadata/md5-cache/sys-cluster/libquo-1.3.1
new file mode 100644
index 000000000000..cc481cadfea0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/libquo-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=fortran? ( virtual/fortran )
+DEFINED_PHASES=configure prepare setup
+DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
+DESCRIPTION=Run-time tuning of process binding policies made easy
+EAPI=8
+HOMEPAGE=https://lanl.github.io/libquo/
+IUSE=fortran static-libs test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.3.1.tar.gz
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1edd7eb8fe07caa9760542a1b4ac9007
diff --git a/metadata/md5-cache/sys-cluster/libquo-9999 b/metadata/md5-cache/sys-cluster/libquo-9999
index 75ed4892116a..2de0ebc13ff2 100644
--- a/metadata/md5-cache/sys-cluster/libquo-9999
+++ b/metadata/md5-cache/sys-cluster/libquo-9999
@@ -1,7 +1,8 @@
+BDEPEND=fortran? ( virtual/fortran ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare setup unpack
-DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran ) 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]
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=6
+DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
+DESCRIPTION=Run-time tuning of process binding policies made easy
+EAPI=8
 HOMEPAGE=https://lanl.github.io/libquo/
 IUSE=fortran static-libs test
 LICENSE=BSD
@@ -9,5 +10,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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1edd7eb8fe07caa9760542a1b4ac9007
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 d2dc650bee18..41f36f53b3ee 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	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
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 bee82cda9c11..ffe9bc2bd9fb 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 aa7d4f9514d7..0ae1544c36b1 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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 a23668c6d6c7..b62c11d68d11 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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 124d5c8605d7..4febaa55cb8a 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.7
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 836f7620d17c..a3eb35f19d5f 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
@@ -10,5 +11,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	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 31106f4c2b82..128dab2bdcef 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
@@ -1,4 +1,4 @@
-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
+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 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix <sys-apps/hwloc-2 dev-libs/libltdl:0 openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
@@ -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	cca0c11947f3e90961771da271435fdb	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	7e39eb204d37699d5f1eaf9f4d61888a	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 1656e7906c4c..37ea96562aa3 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
@@ -1,4 +1,4 @@
-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
+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 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 <sys-apps/hwloc-2 cuda? ( dev-util/nvidia-cuda-toolkit ) 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 ) fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
@@ -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	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
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 e22bdfa9259b..6a9bf7a62119 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 <sys-apps/hwloc-2[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) 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)
@@ -10,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_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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 cef4592aad0e..221a1ca334fa 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 8729584d18a5..ff0b72cf4492 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.1.6
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.1.6
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 03afaf2b3485..be373de03470 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.4
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 8ba8200e24f5..8747011c43ab 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.1.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.1.4
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 c7091d321dc1..c62476a19bb5 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.2
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 e3ccb8d50563..56e2cb72af2f 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.3
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 2d846cbcc951..7429f6891fee 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.4
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-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)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 18d76d924420..3989b0c1e1d4 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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 092d451efe92..f987959ac278 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -1,3 +1,4 @@
+BDEPEND=fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
@@ -10,5 +11,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	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
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	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/rdma-core-30.0-r2 b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
index a1ea4eaddb2e..f378edc7a1f9 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
+++ b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v30.0.tar.gz -> rdma-core-30.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=abf20c2ec637bfdea9cec7c585dd8263
+_md5_=9de6c15a3a89eed034e2ef9c6c1e779f
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-31.0 b/metadata/md5-cache/sys-cluster/rdma-core-31.0
index 38a431f00ff5..6a2c3b551fd7 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-31.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-31.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v31.0.tar.gz -> rdma-core-31.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3f2eda3d98c17cef3c4ca8fe39d8049
+_md5_=fd4d6c6af6fd5932c119ba8993b02d94
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-32.0 b/metadata/md5-cache/sys-cluster/rdma-core-32.0
index 3da073104b42..4fbdcf78af21 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-32.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-32.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v32.0.tar.gz -> rdma-core-32.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cba69a03c32ac930e4ba04d9e86c36ed
+_md5_=4c9b4a7abad58f8e9e81993cfa52196d
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-32.0-r1 b/metadata/md5-cache/sys-cluster/rdma-core-32.0-r1
index c12cfe10ade5..0d97dd1f3b05 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-32.0-r1
+++ b/metadata/md5-cache/sys-cluster/rdma-core-32.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v32.0.tar.gz -> rdma-core-32.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5712ab63aa61175f2abdf191f509fb3f
+_md5_=093592f9aa0187fc66985f51c084f34c
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-33.0 b/metadata/md5-cache/sys-cluster/rdma-core-33.0
index f8b9057db5cf..f586ffda2574 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-33.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-33.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v33.0.tar.gz -> rdma-core-33.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3f2eda3d98c17cef3c4ca8fe39d8049
+_md5_=fd4d6c6af6fd5932c119ba8993b02d94
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-33.0-r1 b/metadata/md5-cache/sys-cluster/rdma-core-33.0-r1
index 1dd3db06e07a..79637aa6787e 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-33.0-r1
+++ b/metadata/md5-cache/sys-cluster/rdma-core-33.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v33.0.tar.gz -> rdma-core-33.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=247da5ede1512f4c06f09dc6123562a2
+_md5_=9ae0a548de8e8b76433a60db19f9eac4
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-34.0 b/metadata/md5-cache/sys-cluster/rdma-core-34.0
index 32dada60072a..051875e12f4c 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-34.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-34.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v34.0.tar.gz -> rdma-core-34.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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=247da5ede1512f4c06f09dc6123562a2
+_md5_=9ae0a548de8e8b76433a60db19f9eac4
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-9999 b/metadata/md5-cache/sys-cluster/rdma-core-9999
index ee2df198236a..57fd3d3080a8 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-9999
+++ b/metadata/md5-cache/sys-cluster/rdma-core-9999
@@ -11,4 +11,4 @@ RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/system
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 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-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8929bc3fd1bf5e3c354a21ed67ef8aec
+_md5_=e893c909017711645ebc16c1e7f647e1
diff --git a/metadata/md5-cache/sys-cluster/singularity-3.7.4 b/metadata/md5-cache/sys-cluster/singularity-3.7.4
deleted file mode 100644
index 0cb6d649b6ae..000000000000
--- a/metadata/md5-cache/sys-cluster/singularity-3.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/libseccomp >=dev-lang/go-1.13.0 app-crypt/gpgme dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup
-DESCRIPTION=Application containers for Linux
-EAPI=7
-HOMEPAGE=https://sylabs.io
-IUSE=examples +network +suid kernel_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.7.4/singularity-3.7.4.tar.gz
-_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=02624628f4339b84a67f96d724829957
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7a32c3e77212..b41fdce3761e 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.37 b/metadata/md5-cache/sys-devel/binutils-2.37
new file mode 100644
index 000000000000..00056c69992e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-2.37
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) 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=cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+REQUIRED_USE=default-gold? ( gold )
+RESTRICT=!test? ( test )
+SLOT=2.37
+SRC_URI=mirror://gnu/binutils/binutils-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37-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_=482509bc5bdab962d8718606b44b768a
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.37 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.37
new file mode 100644
index 000000000000..ca14fd4073ea
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.37
@@ -0,0 +1,15 @@
+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=cet default-gold doc +gold multitarget +nls +plugins static-libs test
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+REQUIRED_USE=default-gold? ( gold )
+RESTRICT=!test? ( test )
+SLOT=2.37
+SRC_URI=mirror://gnu/binutils/binutils-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37-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_=f43599deb645245c37687d08c843cbc2
diff --git a/metadata/md5-cache/sys-devel/bmake-20210621 b/metadata/md5-cache/sys-devel/bmake-20210621
new file mode 100644
index 000000000000..da310d95297d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bmake-20210621
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=NetBSD's portable make
+EAPI=8
+HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210621.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
+_md5_=0df4be9d4232c44b8d91e6e38dbba3d2
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index a40948cd837c..7c4fc880078f 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 5fc285660c6e..08a7a9f19703 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 c6009743180a..f6e217284613 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 8eae17f61101..2a50db114e09 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 da25cabed4c0..4ecd65a0c328 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 c7b5feec86bf..aff58718e998 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	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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 ffdccba81072..86a3560e9491 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	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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 e45305adbfb3..7723ce1afb17 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	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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 07177a1fc4cc..b4c137f64fd2 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	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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 c7fce9865d30..160638cba248 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	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/crossdev-20210718 b/metadata/md5-cache/sys-devel/crossdev-20210718
new file mode 100644
index 000000000000..fc678dbf496e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20210718
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=install
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=8
+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-20210718.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20210718.tar.xz
+_md5_=4c9fa4afed36e462a3ee35b87fc6f9f1
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index b98a037799f2..272cbd54c245 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -1,11 +1,11 @@
 BDEPEND=app-arch/xz-utils >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install unpack
 DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=7
+EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=f54eb4fe1bc41e18be7d8cbb3926e930
+_md5_=b082bfb62d557a19b993b33015c5083b
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0 b/metadata/md5-cache/sys-devel/gcc-10.3.0
index e03f03c925ca..3c68494c23be 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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 5d880a824749..779ed29bbef7 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r1
@@ -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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 13b73095cb7c..b91cddeb6727 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) 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 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d5d722d1074e13bc89b1c5857994e63
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8f08af5b5ad7acfa28ce0e66af481678
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 d29ac168bfc4..1bab3b3432ad 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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e292546d4839eca2e919d2a37705e392
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 52317f996e63..d409637db89b 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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 2a19377fa16d..b214ad3cda65 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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 56d6348c8c26..8a51caaf5ee6 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.0.0_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 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 )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88cb582aeedbbadc222b42381674a088
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 04ac58fe2dc7..9c86ce7b785e 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
@@ -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=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 )
+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 ) sanitize? ( virtual/libcrypt )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8f43a350a54709604645df150d2db6b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
index 15bb09e72683..227e572961dc 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.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=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= )
+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= ) sanitize? ( virtual/libcrypt )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f27156fb5bdc447364253107591e28f1
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0 b/metadata/md5-cache/sys-devel/gcc-8.5.0
index 60b3ca899844..1f3ca3b0fc53 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.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=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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 83bf84db1709..fd9af72dff3c 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -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=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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 6cf60d7a12a4..bee2051d900f 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
@@ -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=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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 bf80a052eb6d..95f515c885e2 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-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=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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 a0a652e686fb..3c4b46cf2389 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 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 )
+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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
-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=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=9.4.0
 SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dd04a33798fd4ec0cc37613f55fc6c1
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5fe50a64cae44bc9172da457968a4006
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 d3b20c7339c5..82b2b8eb36e8 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test ) strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	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
+_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	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe049e2fdb356ee5ec3a248f2b5445a8
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
deleted file mode 100644
index adfac2f691ea..000000000000
--- a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prerm setup
-DEPEND=sys-libs/libcap-ng
-DESCRIPTION=Distributed compiling of C(++) code across several machines; based on distcc
-EAPI=6
-HOMEPAGE=https://github.com/icecc/icecream
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/libcap-ng dev-util/shadowman
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=76667bbf6d70edfc12d8a8ef56946635
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r3 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r3
new file mode 100644
index 000000000000..13f23b10f873
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/icecream-1.0.0-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst prerm
+DEPEND=sys-libs/libcap-ng
+DESCRIPTION=Distributed compiling of C(++) code across several machines; based on distcc
+EAPI=7
+HOMEPAGE=https://github.com/icecc/icecream
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/libcap-ng acct-group/icecream acct-user/icecream dev-util/shadowman
+SLOT=0
+SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
+_md5_=5724fff31c1f8e9ea9c0858f5012add9
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index 018b09cb0290..40d0bbccee4c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 ef5b3159da5d..e39fd889eac6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.1.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	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 ae239313ab46..570ec12d4c40 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 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	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	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	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3aeb65e537bc37427af84e711e14e1d8
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1 b/metadata/md5-cache/sys-devel/lld-10.0.1
index 6b6b2bf4f0d5..d5b06360b0d8 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=6aa8a05853f11822769b10904526cf58
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1-r1 b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
index 51deaeb7b0a7..fc256b739fae 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=85b48d908ea9813bb0eaaf8ca2c77ad0
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0 b/metadata/md5-cache/sys-devel/lld-11.1.0
index 11b71fa56032..b429a05d15e2 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-11.1.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=1f251fe5c4229a54e0a9a80aecf8f36c
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0-r1 b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
index 8ebc1ba05894..c5fc978a17cf 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0-r1
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-11.1.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=14f976791bad7b06b11d2c453da8f86e
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.0 b/metadata/md5-cache/sys-devel/lld-12.0.0
index ddac08dbdf3a..ae30754cd621 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.0
+++ b/metadata/md5-cache/sys-devel/lld-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-12.0.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=6df2c6086a4c7dba2f3c7569a547f49c
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.1 b/metadata/md5-cache/sys-devel/lld-12.0.1
index 8efffacae70b..cc6ed40c7a85 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.1
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-12.0.1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=49e08269babaf1f564d0bf61f8e291dd
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0.9999 b/metadata/md5-cache/sys-devel/lld-13.0.0.9999
index 501f0a96df50..bdc7a067aee0 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-13.0.0.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1 b/metadata/md5-cache/sys-devel/llvm-10.0.1
index f08c6671ec63..92c10d8c77c6 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 fccead61bb6c..bdebda318628 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 c322df5e2650..6612d7bb554a 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 d0f5889b9833..1b797135a908 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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 97b573d15152..55b1e9c0adc1 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	fce6ad998516159787b92e8043167889	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	e3da6859d62ca2f32d0438304c9c77c4	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-devel/llvm-common-10.0.1 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
index a9b12ce50b2f..08e4d182d24d 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=4c75f8014998cb50a9cc323b3a17d65a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.1.0 b/metadata/md5-cache/sys-devel/llvm-common-11.1.0
index 43955e1e1f82..bc9630541c5e 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.1.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=480a5379341a27dc6bd5c84f6c1fbc78
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.0 b/metadata/md5-cache/sys-devel/llvm-common-12.0.0
index 8424710ea860..d592b3f027c9 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=c65cec41b6a9c0ff3c5b366c37b5b99d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.1 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
index 36574a3336e4..4039f116c94f 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=a8b59d835aeee72041f3863f0ede30ba
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
index eceaaa7f8350..564fae56f1eb 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 5549c8483e60..020d735fbf92 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 acd8953dda1e..6a38c67f81fa 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1
@@ -13,4 +13,4 @@ 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	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=137b17aeadb501771880e82c8d182d10
+_md5_=c2098c29b1edb1595f1845aea3af2ec3
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 65492d387362..3dcc0ab83465 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
@@ -13,4 +13,4 @@ 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	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=beef567f825ef5a46025410d6dd7aac1
+_md5_=144f4abe24d7083d13f52144f6619a00
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.13 b/metadata/md5-cache/sys-fs/btrfs-progs-5.13
index ceb6d9ca3270..2b41bcb8ed3d 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.13
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.13
@@ -13,4 +13,4 @@ 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
+_md5_=144f4abe24d7083d13f52144f6619a00
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 2c6d65e7b5be..fbe343c55896 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 _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
+_md5_=144f4abe24d7083d13f52144f6619a00
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.99.11 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
index dbe64c256ec7..c309f537bc52 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
@@ -5,10 +5,10 @@ DESCRIPTION=Similar to dd but can copy from source with errors
 EAPI=7
 HOMEPAGE=http://www.garloff.de/kurt/linux/ddrescue/
 IUSE=cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.11.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
-_md5_=686d5ec0f7391a89c34877121885a505
+_md5_=1e01bf75c0bb814d3d4d7d28f53e35e4
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.10 b/metadata/md5-cache/sys-fs/eudev-3.2.10
index 57acef17e746..50e2b26b62b6 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.10
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,9 +7,9 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=6307331ac3fbf2c109c65f1bb24e5ed7
+_md5_=c7a3d4064368201a1a7c4ef1ea84525f
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.10-r1 b/metadata/md5-cache/sys-fs/eudev-3.2.10-r1
new file mode 100644
index 000000000000..392bb68a1820
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/eudev
+IUSE=+hwdb +kmod introspection rule-generator selinux static-libs 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=1155ce502c2953f61ab322ac521a6d17
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index 0cc6516a6abc..29c07b6227ec 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,9 +7,9 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=4a02a72a4e9c0528fd51a5edb8b2f4f6
+_md5_=9b7c081607a0b86b478fedc7706a2992
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2 b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
index fdd1c7b77b98..0f848ca21571 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,9 +7,9 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=3fc23fbe7287c00e58e8545a153fc200
+_md5_=f21f394c9153233093be4b3b1ac5684e
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.8 b/metadata/md5-cache/sys-fs/eudev-3.2.8
index 661af0eb53e8..615ba6cdfb61 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.8
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,9 +7,9 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=3fc23fbe7287c00e58e8545a153fc200
+_md5_=f21f394c9153233093be4b3b1ac5684e
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.9 b/metadata/md5-cache/sys-fs/eudev-3.2.9
index 7e15d792dd05..99aa6aa16a8d 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.9
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,9 +7,9 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=6307331ac3fbf2c109c65f1bb24e5ed7
+_md5_=c7a3d4064368201a1a7c4ef1ea84525f
diff --git a/metadata/md5-cache/sys-fs/eudev-4.9999 b/metadata/md5-cache/sys-fs/eudev-4.9999
index f7f6c6b9a946..210ca5c228ee 100644
--- a/metadata/md5-cache/sys-fs/eudev-4.9999
+++ b/metadata/md5-cache/sys-fs/eudev-4.9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.20 kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,8 +7,8 @@ IUSE=+blkid efi +hwdb +kmod selinux smack test kernel_linux abi_x86_32 abi_x86_6
 LICENSE=LGPL-2.1 GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 PROPERTIES=live
-RDEPEND=>=sys-apps/util-linux-2.20 kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=f782dcbae6339f4ba56a2d768c195ea7
+_md5_=38b8e6a3812c9406075229d1b4e9efb3
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index 6f13131e53a0..b30c76c9d80b 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 >=dev-util/intltool-0.50 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 test? ( app-text/tree dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/eudev
@@ -7,8 +7,8 @@ IUSE=+hwdb +kmod introspection rule-generator selinux static-libs test kernel_li
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 PROPERTIES=live
-RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	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_=3fc23fbe7287c00e58e8545a153fc200
+_md5_=b4e4ff3a8dfbfb45a259add1a67393b4
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.9 b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
new file mode 100644
index 000000000000..1ac9f343c632
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man 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=configure install prepare test unpack
+DEPEND=dev-libs/glib:2 sys-fs/fuse:3
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
+IUSE=verify-sig
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:2 sys-fs/fuse:3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=1d6238d7930048e34bcfd13f038c78db
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.27 b/metadata/md5-cache/sys-fs/mtools-4.0.27
deleted file mode 100644
index 9f696486d3f3..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-IUSE=X elibc_glibc
-KEYWORDS=~alpha amd64 arm ~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.27.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6729ef9cc5d6d2cc7f36a6205dce1f7a
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.32 b/metadata/md5-cache/sys-fs/mtools-4.0.32
deleted file mode 100644
index e5774156eca3..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-IUSE=X elibc_glibc
-KEYWORDS=~alpha ~amd64 ~arm ~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.32.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=33622ddcb9e63ddd9adba1ad8e2e7bd8
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.33 b/metadata/md5-cache/sys-fs/mtools-4.0.33
new file mode 100644
index 000000000000..96454ce96f02
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.33
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+IUSE=X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~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.33.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=33622ddcb9e63ddd9adba1ad8e2e7bd8
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.34 b/metadata/md5-cache/sys-fs/mtools-4.0.34
new file mode 100644
index 000000000000..1e2b7c1ec09b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+IUSE=X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~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.34.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=33622ddcb9e63ddd9adba1ad8e2e7bd8
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.15.1 b/metadata/md5-cache/sys-fs/ncdu-1.15.1
deleted file mode 100644
index a71fd72fd00d..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-1.15.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
-DESCRIPTION=NCurses Disk Usage
-EAPI=7
-HOMEPAGE=https://dev.yorhel.nl/ncdu/
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-1.15.1.tar.gz
-_md5_=2b77d464fe6ea4991acf27f3868064b5
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.15.1-r1 b/metadata/md5-cache/sys-fs/ncdu-1.15.1-r1
new file mode 100644
index 000000000000..45bc2d055ca4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/ncdu-1.15.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:=[unicode(+)] virtual/pkgconfig
+DESCRIPTION=NCurses Disk Usage
+EAPI=7
+HOMEPAGE=https://dev.yorhel.nl/ncdu/
+KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://dev.yorhel.nl/download/ncdu-1.15.1.tar.gz
+_md5_=cb372661c09c103a33391fb6b43d891e
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.16 b/metadata/md5-cache/sys-fs/ncdu-1.16
deleted file mode 100644
index ffd1d2894f39..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=sys-libs/ncurses:0=[unicode]
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-1.16.tar.gz
-_md5_=fac0fc311fb175ef6ebfebbf28a5354d
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.16-r1 b/metadata/md5-cache/sys-fs/ncdu-1.16-r1
new file mode 100644
index 000000000000..b6dcf7f699fc
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/ncdu-1.16-r1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=NCurses Disk Usage
+EAPI=8
+HOMEPAGE=https://dev.yorhel.nl/ncdu/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://dev.yorhel.nl/download/ncdu-1.16.tar.gz
+_md5_=17bf61b022217e7417fcf77f2964b413
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.5 b/metadata/md5-cache/sys-fs/squashfs-tools-4.5
new file mode 100644
index 000000000000..7007dc58954b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
+DESCRIPTION=tools to create and extract Squashfs filesystems
+EAPI=8
+HOMEPAGE=https://github.com/plougher/squashfs-tools/
+IUSE=debug lz4 lzma lzo xattr zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
+SLOT=0
+SRC_URI=https://github.com/plougher/squashfs-tools/archive/4.5.tar.gz -> squashfs-tools-4.5.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b429fc98a2e02065811ac69bd6339767
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.1 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.1
index 5cc98416d569..fb120b595158 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.1
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A new set of tools for working with SquashFS images
 EAPI=7
 HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
-IUSE=lz4 lzo selinux +tools +xz zstd
+IUSE=lz4 +lzma lzo selinux +tools zstd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-3+ tools? ( GPL-3+ )
-RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://infraroot.at/pub/squashfs/squashfs-tools-ng-1.1.1.tar.xz
-_md5_=0a9574281289db9df753095a0a7197d4
+_md5_=32efdc0172c56120ff318292bf2c8d50
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.2 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.2
index 42763c7cfd0e..396576e75b46 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.2
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A new set of tools for working with SquashFS images
 EAPI=7
 HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
-IUSE=lz4 lzo selinux +tools +xz zstd
+IUSE=lz4 +lzma lzo selinux +tools zstd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-3+ tools? ( GPL-3+ )
-RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://infraroot.at/pub/squashfs/squashfs-tools-ng-1.1.2.tar.xz
-_md5_=201cb448b58acbc763fc80e6d36b43ee
+_md5_=32efdc0172c56120ff318292bf2c8d50
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
index 58d5e626a69c..513a378f72ff 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
@@ -1,13 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A new set of tools for working with SquashFS images
 EAPI=7
 HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
-IUSE=lz4 lzo selinux +tools +xz zstd
+IUSE=lz4 +lzma lzo selinux +tools zstd
 LICENSE=LGPL-3+ tools? ( GPL-3+ )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a9574281289db9df753095a0a7197d4
+_md5_=32efdc0172c56120ff318292bf2c8d50
diff --git a/metadata/md5-cache/sys-fs/udev-245.5-r1 b/metadata/md5-cache/sys-fs/udev-245.5-r1
index fe869e8aadaf..6f6b6de3178d 100644
--- a/metadata/md5-cache/sys-fs/udev-245.5-r1
+++ b/metadata/md5-cache/sys-fs/udev-245.5-r1
@@ -1,6 +1,6 @@
 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
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,9 +8,9 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 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-26
-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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
 _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
+_md5_=9cce8336d79fe0ee5558fa4091600a84
diff --git a/metadata/md5-cache/sys-fs/udev-246-r1 b/metadata/md5-cache/sys-fs/udev-246-r1
index fef03bf1afd1..6728e73365a0 100644
--- a/metadata/md5-cache/sys-fs/udev-246-r1
+++ b/metadata/md5-cache/sys-fs/udev-246-r1
@@ -1,6 +1,6 @@
 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
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,9 +8,9 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246/systemd-246.tar.gz
 _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
+_md5_=3b6e3a2106451e7103b102152a9546a4
diff --git a/metadata/md5-cache/sys-fs/udev-247.2 b/metadata/md5-cache/sys-fs/udev-247.2
index a4554cf44b63..9e3916b703f8 100644
--- a/metadata/md5-cache/sys-fs/udev-247.2
+++ b/metadata/md5-cache/sys-fs/udev-247.2
@@ -1,6 +1,6 @@
 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
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,9 +8,9 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
 _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
+_md5_=06fc2ed8be0af33dd6f7056ba59495d9
diff --git a/metadata/md5-cache/sys-fs/udev-248 b/metadata/md5-cache/sys-fs/udev-248
index f907493e70c4..408a8b78968b 100644
--- a/metadata/md5-cache/sys-fs/udev-248
+++ b/metadata/md5-cache/sys-fs/udev-248
@@ -1,6 +1,6 @@
 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
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,9 +8,9 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v248/systemd-248.tar.gz
 _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
+_md5_=95fe649690ffc57658ab49ba3f70baef
diff --git a/metadata/md5-cache/sys-fs/udev-249-r1 b/metadata/md5-cache/sys-fs/udev-249-r1
index df66d45e3a8b..ad5bb4a61aee 100644
--- a/metadata/md5-cache/sys-fs/udev-249-r1
+++ b/metadata/md5-cache/sys-fs/udev-249-r1
@@ -1,6 +1,6 @@
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,9 +8,9 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
 _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
+_md5_=c29386efc5752820190b39becc6cc079
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index ceb4cd5554ea..230e2d8c3e79 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -1,6 +1,6 @@
 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
+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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
@@ -8,8 +8,8 @@ IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x3
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
 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
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 _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
+_md5_=b171d175cc308c3bd95e5181a8d2ff22
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5d2d52ab0978..ddd0eeaaab02 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/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index cb8cdd7ee30f..eb7dd88fcd1d 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
index 48f7642a7233..637046f60fb6 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.51-FB.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8170537a4890872f8e6fe40afe25e141
diff --git a/metadata/md5-cache/sys-kernel/dracut-050-r2 b/metadata/md5-cache/sys-kernel/dracut-050-r2
deleted file mode 100644
index bb6b63f02961..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-050-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
-DESCRIPTION=Generic initramfs generation tool
-EAPI=7
-HOMEPAGE=https://dracut.wiki.kernel.org
-IUSE=selinux kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-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
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-050.tar.xz
-_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
deleted file mode 100644
index 8675c1c6399c..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-051-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
-DESCRIPTION=Generic initramfs generation tool
-EAPI=7
-HOMEPAGE=https://dracut.wiki.kernel.org
-IUSE=selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-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
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-051.tar.xz
-_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-055 b/metadata/md5-cache/sys-kernel/dracut-055
deleted file mode 100644
index 3d3f1fac6143..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-055
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup test
-DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
-DESCRIPTION=Generic initramfs generation tool
-EAPI=7
-HOMEPAGE=https://dracut.wiki.kernel.org
-IUSE=selinux test kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-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
-SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-055.tar.xz
-_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-055-r1 b/metadata/md5-cache/sys-kernel/dracut-055-r1
new file mode 100644
index 000000000000..857255eb5f12
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-055-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup test
+DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
+DESCRIPTION=Generic initramfs generation tool
+EAPI=7
+HOMEPAGE=https://dracut.wiki.kernel.org
+IUSE=selinux test kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+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
+SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-055.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2bbd54a200518406d855594895f70c8
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3 b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
deleted file mode 100644
index ba2bd6f3f021..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend
-DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=cryptsetup ibm +firmware selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-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	d3a60385655d9b402be765a6de333245	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21cdb7378e3b430b8e0675e2d3707fde
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47
deleted file mode 100644
index 15d0a206d696..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47
+++ /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.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
-REQUIRED_USE=arm? ( savedconfig )
-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_=52966c4de0e50a109703b1b62c6363d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.48
deleted file mode 100644
index 7cf6d29fe5de..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.48
+++ /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.48
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.48 || ( 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.48
-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 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_=4dc6493736a361449f7edcfe71f854a3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.49
deleted file mode 100644
index 14a5a27e6f63..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.49
+++ /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.49
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.49 || ( 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.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-54.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-54.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_=bd1bf184b41c909a22abb2067e3bb719
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50
deleted file mode 100644
index d5552e3e2259..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50
+++ /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.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.10.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.52
new file mode 100644
index 000000000000..75054b10a8b1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.52
@@ -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.52
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.52 || ( 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.52
+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-58.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.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	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd8d9253782ba45af0d453239e4ea255
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.22 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.22
deleted file mode 100644
index e30f3fc07699..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.22
+++ /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.11.22
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.22 || ( 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.11.22
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-25.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-25.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/8b43a43382cabcf6d64266565ccc052c6e5d58a6/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/8b43a43382cabcf6d64266565ccc052c6e5d58a6/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/8b43a43382cabcf6d64266565ccc052c6e5d58a6/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/8b43a43382cabcf6d64266565ccc052c6e5d58a6/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.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_=be0b9cb3a0de723a703d7308247168a2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.15
deleted file mode 100644
index 5477ea7f2ca1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.15
+++ /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.15
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.15 || ( 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.15
-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 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.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.16
deleted file mode 100644
index 0789ae0e7d75..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.16
+++ /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.16
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.16 || ( 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.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-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-19.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
deleted file mode 100644
index 7df56ac9b3dd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.17
+++ /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.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.12.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.19
new file mode 100644
index 000000000000..ebca44d91dd8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.19
@@ -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.19
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.19 || ( 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.19
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.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	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=38c55dfc3f25a8bcaa0b9f6e135c6e3a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.4
new file mode 100644
index 000000000000..b3a5c62b8d37
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.4
@@ -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.13.4
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.13.4 || ( 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.13.4
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2a7793d909a407657529f3dd473005e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129
deleted file mode 100644
index 731f4cbaf719..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129
+++ /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.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
-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_=5b186dfc4c1585348ee7ca5f08b1d988
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.130 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.130
deleted file mode 100644
index 41d48d09ac89..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.130
+++ /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.130
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.130 || ( 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.130
-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 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-5.4.131 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.131
deleted file mode 100644
index c789faa62db5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.131
+++ /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.131
-RDEPEND=!sys-kernel/gentoo-kernel-bin: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-135.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.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-5.4.132 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.132
deleted file mode 100644
index da782ce9d090..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.132
+++ /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.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-5.4.134 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.134
new file mode 100644
index 000000000000..c2c3d52d15b0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.134
@@ -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.134
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.134 || ( 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.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.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	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd39ac13d6ddc393dfe80af2af5d469c
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
deleted file mode 100644
index ef380166302b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47
+++ /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.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
-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_=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
deleted file mode 100644
index 518fa6cba0da..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47-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.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
-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_=b003d06d924fb794fca5ce42d472a8cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.48
deleted file mode 100644
index 90704887d098..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.48
+++ /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.48
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.48 || ( 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.48
-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 amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.48-1.xpak -> gentoo-kernel-5.10.48-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.48-1.xpak -> gentoo-kernel-5.10.48-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.48-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.48-r1
deleted file mode 100644
index 618a82595b3d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.48-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.48
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.48 || ( 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.48
-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 arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.48-1.xpak -> gentoo-kernel-5.10.48-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.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49
deleted file mode 100644
index 925a56516816..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49
+++ /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.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-54.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-54.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49-1.xpak -> gentoo-kernel-5.10.49-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49-1.xpak -> gentoo-kernel-5.10.49-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=358b00f9677eb0741cc07f6a0acce206
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
deleted file mode 100644
index 2161d9d2dd6a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49-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.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
deleted file mode 100644
index f0840bdf7890..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50
+++ /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.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
deleted file mode 100644
index 3c2149c5f683..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50-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.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.10.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.52
new file mode 100644
index 000000000000..0098805ba28b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.52
@@ -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.52
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.52 || ( 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.52
+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-58.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52-1.xpak -> gentoo-kernel-5.10.52-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52-1.xpak -> gentoo-kernel-5.10.52-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8a573dcf17b110e8e08361dc953707b0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.52-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.52-r2
new file mode 100644
index 000000000000..c76b87605bff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.52-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.52
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.52 || ( 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.52
+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-58.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52-1.xpak -> gentoo-kernel-5.10.52-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=517c921c173a9fb54f9fc5c5b58a8d85
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.15
deleted file mode 100644
index 6dfcc5124f9d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.15
+++ /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.15
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.15 || ( 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.15
-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 amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.15-1.xpak -> gentoo-kernel-5.12.15-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.15-1.xpak -> gentoo-kernel-5.12.15-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.15-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.15-r1
deleted file mode 100644
index 0d6d11a13df9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.15-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.15
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.15 || ( 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.15
-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 arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.15-1.xpak -> gentoo-kernel-5.12.15-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 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16
deleted file mode 100644
index 800a9d17104f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16
+++ /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.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-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-19.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16-1.xpak -> gentoo-kernel-5.12.16-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16-1.xpak -> gentoo-kernel-5.12.16-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.16-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16-r1
deleted file mode 100644
index 47535fb12355..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16-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.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
deleted file mode 100644
index 574c1361ffe6..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17
+++ /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.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
deleted file mode 100644
index 618660be9166..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17-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.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.12.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.19
new file mode 100644
index 000000000000..dde3721287d1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.19
@@ -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.19
+RDEPEND=!sys-kernel/gentoo-kernel:5.12.19 || ( 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.19
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19-1.xpak -> gentoo-kernel-5.12.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19-1.xpak -> gentoo-kernel-5.12.19-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.19-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.19-r2
new file mode 100644
index 000000000000..aa969549137b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.19-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.19
+RDEPEND=!sys-kernel/gentoo-kernel:5.12.19 || ( 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.19
+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-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-22.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19-1.xpak -> gentoo-kernel-5.12.19-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a5ff97354159ccf8d551a5000c4af896
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4
new file mode 100644
index 000000000000..1de76822092b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4
@@ -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.13.4
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.4 || ( 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.13.4
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4-2.xpak -> gentoo-kernel-5.13.4-2.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4-2.xpak -> gentoo-kernel-5.13.4-2.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4692af13ce7790ce040bf209bae81fe
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
deleted file mode 100644
index 21c3b8d25cfd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129
+++ /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.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
-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_=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
deleted file mode 100644
index b6da6e552c69..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129-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.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
-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_=b003d06d924fb794fca5ce42d472a8cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.130 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.130
deleted file mode 100644
index 991552d46e02..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.130
+++ /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.130
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.130 || ( 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.130
-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 amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130-1.xpak -> gentoo-kernel-5.4.130-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130-1.xpak -> gentoo-kernel-5.4.130-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.130-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.130-r1
deleted file mode 100644
index 751950754278..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.130-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.130
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.130 || ( 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.130
-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 arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130-1.xpak -> gentoo-kernel-5.4.130-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.131 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131
deleted file mode 100644
index a437db7f606e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131
+++ /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.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-135.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131-1.xpak -> gentoo-kernel-5.4.131-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131-1.xpak -> gentoo-kernel-5.4.131-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.131-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131-r1
deleted file mode 100644
index 094c11351f07..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131-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.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
deleted file mode 100644
index e692d9113aa9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132
+++ /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.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
deleted file mode 100644
index 74d3df7b0d83..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132-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.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-kernel-bin-5.4.134 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.134
new file mode 100644
index 000000000000..2beb9b9f36a2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.134
@@ -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.134
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.134 || ( 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.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134-1.xpak -> gentoo-kernel-5.4.134-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134-1.xpak -> gentoo-kernel-5.4.134-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fb315b4b06c3fff111fa4d5b2ee78451
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.134-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.134-r2
new file mode 100644
index 000000000000..e67aeb89ee14
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.134-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.134
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.134 || ( 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.134
+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-138.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134-1.xpak -> gentoo-kernel-5.4.134-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f6ce2cd6653399bc4f1d6f00b17a0c72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
deleted file mode 100644
index dca45a6ad5ff..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
+++ /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.228
-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-238.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-238.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-238.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bae3253751071047e5198ee5bcb7791f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.237 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.237
deleted file mode 100644
index 753198e33d8b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.237
+++ /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.237
-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-247.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-247.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-247.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-247.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-247.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-247.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-247.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-247.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-247.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73421e91fb4f652a6d911338ce655706
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238
deleted file mode 100644
index 7c099013d206..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238
+++ /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.238
-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-248.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-248.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-248.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d71b111e5d4cd56b8d800489f044418
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239
deleted file mode 100644
index ff248e423382..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239
+++ /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.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_=314549768780bf7049fdf15744b73f58
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240
new file mode 100644
index 000000000000..2ae41461e00c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.240
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=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.240
+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-250.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-250.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-250.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-250.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-250.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2154edd07ed438d7a6c0236d010c333
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
deleted file mode 100644
index 166815aa6fdf..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
+++ /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.184
-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-183.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-183.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-183.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdb5335d66f2907ce55bc72594620a60
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.195 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.195
deleted file mode 100644
index dcffc1b97173..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.195
+++ /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.195
-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-194.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-194.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-194.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-194.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-194.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-194.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-194.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-194.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-194.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c1d3bbed0fb0f6a1fb12c3806f26cf0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196
deleted file mode 100644
index a66fb1c175d2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196
+++ /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.196
-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-195.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-195.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-195.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=392f9a886179177756de3d7683c3775a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197
deleted file mode 100644
index 2bca4a79e0c8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197
+++ /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.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_=3f0ba049c4797cb26f207ec030518868
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198
new file mode 100644
index 000000000000..53f3fbe0d6c6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.198
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=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.198
+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-197.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-197.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-197.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-197.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-197.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d54a834c057192918c8fefe50bc40c9d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
deleted file mode 100644
index 93b164279bd6..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
+++ /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.264
-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-266.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-266.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-266.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79f69c2e22802a17303504a3c0f5bf81
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.273 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.273
deleted file mode 100644
index a4d1c933b0af..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.273
+++ /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.273
-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-275.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-275.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-275.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-275.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-275.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-275.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-275.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-275.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-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.4.274 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.274
deleted file mode 100644
index dcd0af15c7be..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.274
+++ /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.274
-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-276.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-276.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-276.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-276.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-276.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-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.4.275 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275
deleted file mode 100644
index bc888ed2aff4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275
+++ /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.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_=f9087580d3cf2b95bde2fecb595aba9e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276
new file mode 100644
index 000000000000..3497cb05c94e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.276
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=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.276
+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-278.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-278.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-278.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-278.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-278.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=269c8fb5cb60ef54cfbb20cdb7d3bc23
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
deleted file mode 100644
index 9fd484514cce..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
+++ /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.264
-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-268.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-268.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-268.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b2fa91ae1d5c87c66431cb83d9f50f9c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.273 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.273
deleted file mode 100644
index 1c6d8d0fe441..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.273
+++ /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.273
-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-277.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-277.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-277.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-277.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-277.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-277.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-277.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-277.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-277.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2ac761fca23274c402a8cd93786e9c1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274
deleted file mode 100644
index 3bb6d178f019..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274
+++ /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.274
-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-278.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-278.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-278.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc827f2e91c83ab7accfcd188d33069a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275
deleted file mode 100644
index 34085185d148..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275
+++ /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.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_=0231e6d32c0a8e1a5ab21c281006cc51
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276
new file mode 100644
index 000000000000..0924d748431c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.276
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=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.276
+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-280.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-280.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-280.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-280.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-280.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=654326db145b8d2066bb60a2217502de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
deleted file mode 100644
index e4769aee235d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
+++ /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.27
-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-30.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-30.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-30.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a20525df8766f45b1ab99d9f9555358
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47
deleted file mode 100644
index d39d6ead7aa1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47
+++ /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.47
-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-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-51.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-51.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b993531ce457051c73d85c3fb2948ad8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48
deleted file mode 100644
index cd06fa5442eb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48
+++ /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.48
-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-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-52.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-52.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-52.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-52.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-52.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-52.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-52.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-52.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81244263cabc17971673ae1d34357d29
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48-r1
deleted file mode 100644
index e3c3e7e5c618..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.48-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.48-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-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-53.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-53.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-53.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-53.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-53.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-53.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-53.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-53.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76ae97e47412c2b585c27704bea0f1fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49
deleted file mode 100644
index fae451502c2a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49
+++ /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.49
-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-54.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-54.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-54.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-54.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-54.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-54.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-54.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-54.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-54.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f53b362890014fb00fb32064c818e70
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
deleted file mode 100644
index 63e04df5e015..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49-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.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
deleted file mode 100644
index a1ac89f1c7e0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.50
+++ /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.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.10.52 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52
new file mode 100644
index 000000000000..e80ce36fd3fd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.52
@@ -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.52
+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-58.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-58.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-58.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-58.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00646fa96c765a7ca65a793d8b350406
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.13
deleted file mode 100644
index 2c48ba980496..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.13
+++ /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.13
-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-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-16.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06363ddff1653ab01c1625a106123aac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.14
deleted file mode 100644
index 69c12010116f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.14
+++ /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.14
-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-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-17.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=170c66fe59afdad55fbc1aa78474f642
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.15
deleted file mode 100644
index bdddb1a36fc0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.15
+++ /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.15
-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-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-18.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52fda4e24c848dbc5846fab812a3716e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.16
deleted file mode 100644
index 80b1074b50ff..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.16
+++ /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.16
-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-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-19.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ab4da16961d8cb41929607160c1288c5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17
deleted file mode 100644
index 6c3afc78bdef..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17
+++ /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.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.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.19
new file mode 100644
index 000000000000..fb785be8ad93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.19
@@ -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.19
+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-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-22.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-22.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-22.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-22.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-22.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-22.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-22.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49c3e79666dd39a91e247aa99017e684
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-r1
deleted file mode 100644
index a3cd1f037ee9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-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.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-r1
-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-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=122011d8970827dbee59460c66feb2b6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.1
deleted file mode 100644
index 03f9e7e020ef..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.1
+++ /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.1
-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-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-3.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ff4667baae2939b4a538b4eeb2b6634
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2
deleted file mode 100644
index 77d3217e8828..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2
+++ /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.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.13.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.4
new file mode 100644
index 000000000000..96166997e123
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.4
@@ -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.4
+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-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-6.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bcc03a5037a8d56a3695196ec98165eb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
deleted file mode 100644
index 6d23954ff6bb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
+++ /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.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
-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.109
-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-112.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e886bbb89d7c0aec453cf8d0feff0c73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129
deleted file mode 100644
index ea9c1c3cc408..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129
+++ /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.129
-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-133.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-133.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-133.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a2d70a15fdcdbaa33bad0e97110abf4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.130 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.130
deleted file mode 100644
index c7aa7fc26516..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.130
+++ /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.130
-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-134.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-134.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-134.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-134.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-134.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-134.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-134.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-134.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-134.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ccb117cec1e0b6087be3758f34af00b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131
deleted file mode 100644
index 3c3db4df7597..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131
+++ /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.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_=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
deleted file mode 100644
index a72883266e8a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.132
+++ /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.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/gentoo-sources-5.4.134 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134
new file mode 100644
index 000000000000..58c701f7afbc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.134
@@ -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.134
+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-138.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-138.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-138.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-138.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0c2b070e80c92ae778f31223963a6eed
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
index 1b3146e4e4b5..08a84fb73e3f 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.14_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc1/v5.13 -> patch-5.14-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2
new file mode 100644
index 000000000000..d54f4a6845fb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc2
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc2/v5.13 -> patch-5.14-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 3f20eb5602c7..3023ac55621b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3cceb0baa1fed5fcf441163c3d03fa0
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index 9a11db48d4ab..1d8271d3909d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index 1e1313cf513e..98010896bf32 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f94fe07d7b0d149023b365c0c9fe057
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index 2a4a242ae516..aec530dc0446 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 258be31a0e3a..1eadc839ff5a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8509ec7db12dfecf2382d994c36199f5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.10 b/metadata/md5-cache/sys-kernel/linux-headers-5.10
index 59a8e0ac90c6..0f3081ec6162 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz mirror://gentoo/gentoo-headers-5.10-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.10-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=edea2cbdd96ccb0747d400a7b3963c4c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.11 b/metadata/md5-cache/sys-kernel/linux-headers-5.11
index 18025c0eebeb..35b1473ed0eb 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz mirror://gentoo/gentoo-headers-5.11-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.11-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eea262901a4c15f69ce7b322dfe70a96
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.12 b/metadata/md5-cache/sys-kernel/linux-headers-5.12
index 318835d7c9ec..a3340f560a1d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.12
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz mirror://gentoo/gentoo-headers-5.12-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.12-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7314057f325faaa27ebef28d8b5a600
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.13 b/metadata/md5-cache/sys-kernel/linux-headers-5.13
index ee91db331006..aeb84e6dc900 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~soap/distfiles/gentoo-headers-5.13-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff18c1904a399c31c898965c53ddb2ef
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index 9c8093520187..08a9b7010ff2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96bc6a851eeb0c4dc18c4e5bec7561d4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.9 b/metadata/md5-cache/sys-kernel/linux-headers-5.9
index 519da9960ac0..fb63fa6eb32e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz mirror://gentoo/gentoo-headers-5.9-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.9-1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eea262901a4c15f69ce7b322dfe70a96
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.237 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.237
index a9b54d993b78..fb6f3df018f5 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.237
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.237
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.237
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.237.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cba2c1d35de50502ec728d53d4685c65
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.195 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.195
index 44f50701f68b..0e968a289a9f 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.195
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.195
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.195
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.195.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71cb69e700b957c1f109cd62cab18b7e
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.127 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.127
index a2b97aa25faf..4855a20c15de 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-5.4.127
+++ b/metadata/md5-cache/sys-kernel/mips-sources-5.4.127
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.127
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.127.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v6.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15ca8f29a8b6c85ed63b2aa0ae1e86ca
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
index e67042279aa4..7ca78e5a427a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf8.diff -> pf-sources-5.11_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
index a7f6ac1a8911..cab74eef2164 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf1.diff -> pf-sources-5.12_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
index 5c47bebb1507..5f060fa2b072 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf2.diff -> pf-sources-5.12_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
index e599969f1a91..ced76b12ff29 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf3.diff -> pf-sources-5.12_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b80cd6c61b9e74c40d2aa4bd378bbfa3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
index 610888e4a327..fbc504cd5080 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf4.diff -> pf-sources-5.12_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28eb43615ee2e75fd85e2f5accb57740
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
index 39189640afde..168f9d71c769 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf5.diff -> pf-sources-5.12_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28eb43615ee2e75fd85e2f5accb57740
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
index b274cff5f45c..187a4352d927 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf6.diff -> pf-sources-5.12_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5022_BMQ-and-PDS-compilation-fix.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74d012e6b1e9108b5fd69c56d9c2055c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
index 88053d88d1b0..055701f9d2e7 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
new file mode 100644
index 000000000000..a8025a788921
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
@@ -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_p3
+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-pf3.diff -> pf-sources-5.13_p3.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	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index a7be7d17d866..7badeb95f472 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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.9999
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
index dea658093443..e73edcb48d7c 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.11_p20210201
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20210201-1.tar.gz -> linux-5.10.11_p20210201-raspberrypi.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0380caac1d34c67e6098390a73074bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
index 0f5212ec74e0..8fbdb7b534cb 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.79_p20201201-r1
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20201201-1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ba6316e29200e170550333f6501eded
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
index 235eca58a32e..a4309e5e2fb7 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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.9999
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
deleted file mode 100644
index cb555897f133..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.214_p104
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.214.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.214-rt104.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.214-rt104.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
index d14242f3874d..5deeafee5c6c 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.226_p109
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.226.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.226-rt109.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.226-rt109.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119
new file mode 100644
index 000000000000..d3128887d905
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.239_p119
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+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_p119
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.239.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.239-rt119.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.239-rt119.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
deleted file mode 100644
index 3a758e5e3e0f..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.165_p70
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.165.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.165-rt70.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.165-rt70.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
index 3eed4048da47..24684fda1156 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.188_p77
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.188.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.188-rt77.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.188-rt77.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83
new file mode 100644
index 000000000000..7ab4d648b0bc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.196_p83
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+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.196_p83
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.196-rt83.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.196-rt83.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
deleted file mode 100644
index 5613f5df12ef..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( 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.249_p212
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.249.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.249-rt212.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.249-rt212.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
index 1d10fbddc3b2..62e4b2eb07f3 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.267_p221
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.267.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.267-rt221.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.267-rt221.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222
new file mode 100644
index 000000000000..3438ecb32eed
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.270_p222
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2 !deblob? ( 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_p222
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.270.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.270-rt222.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.270-rt222.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
deleted file mode 100644
index 2c55d5e5cd2f..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 !deblob? ( 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.247_p162
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.247.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.247-rt162.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.247-rt162.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
index 4d4ddaadf989..fb110d7719dd 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.263_p177
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.263.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.263-rt177.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.263-rt177.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184
new file mode 100644
index 000000000000..0100ca625537
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.275_p184
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2 !deblob? ( 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_p184
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.275.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.275-rt184.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.275-rt184.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
index 7959adcee265..148e8ac171ca 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.30_p37
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.30.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.30-rt37.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.30-rt37.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46
new file mode 100644
index 000000000000..817e816887f6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.47_p46
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 5.10 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+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.47_p46
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.47.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.47-rt46.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.47-rt46.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
deleted file mode 100644
index 9f5e94746f09..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.10 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.4_p22
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.4-rt22.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.4-rt22.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11 b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
index 29791997294f..2a141ef75f91 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11.4_p11
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-5.11 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-check -> deblob-check-5.11 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/patch-5.11.4-rt11.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/older/patch-5.11.4-rt11.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
index 0f0eea706a99..e3c88e4e5fb1 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.109_p56
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.109.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.109-rt56.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.109-rt56.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61
new file mode 100644
index 000000000000..29634257767d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.129_p61
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+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.129_p61
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.129.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.129-rt61.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.129-rt61.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
deleted file mode 100644
index ca0b5239c63c..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-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.84_p47
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.84.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.84-rt47.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.84-rt47.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.47
deleted file mode 100644
index b7efa64fb764..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.47
+++ /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.47
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.47 || ( 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.47
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.47.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.47.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.48 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.48
deleted file mode 100644
index 584e63b233d2..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.48
+++ /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.48
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.48 || ( 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.48
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.48.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.48.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.49 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.49
deleted file mode 100644
index bf43a4e8df07..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.49
+++ /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.49
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.49 || ( 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.49
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.49.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.49.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
deleted file mode 100644
index d7fdeaa209fe..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.50
+++ /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.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.10.52 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52
new file mode 100644
index 000000000000..462c51c6cd24
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52
@@ -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.52
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.52 || ( 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.52
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.52.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.52.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	60c931461e0011104e6500c61d106a45	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.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.15
deleted file mode 100644
index 865171d50396..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.15
+++ /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.15
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.15 || ( 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.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.15.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.15.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.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.16
deleted file mode 100644
index 59c24e58ba16..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.16
+++ /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.16
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.16 || ( 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.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.16.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.16.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
deleted file mode 100644
index bee6b1fefe42..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.17
+++ /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.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.12.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19
new file mode 100644
index 000000000000..cda20c4a90dc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19
@@ -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.19
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.19 || ( 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.19
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.19.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.19.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	60c931461e0011104e6500c61d106a45	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.13.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4
new file mode 100644
index 000000000000..d617c9fc71be
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4
@@ -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.13.4
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.13.4 || ( 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.13.4
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.4.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.4.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.129 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.129
deleted file mode 100644
index 5eaf94572b63..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.129
+++ /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.129
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.129 || ( 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.129
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.129.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.129.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.130 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.130
deleted file mode 100644
index f131cdaab7cb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.130
+++ /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.130
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.130 || ( 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.130
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.130.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.130.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.131 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.131
deleted file mode 100644
index c970eb567773..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.131
+++ /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.131
-RDEPEND=!sys-kernel/vanilla-kernel-bin: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.131.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.131.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
deleted file mode 100644
index eb458b9fd69b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.132
+++ /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.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-kernel-5.4.134 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134
new file mode 100644
index 000000000000..089c066e52f5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134
@@ -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.134
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.134 || ( 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.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.134.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.134.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	60c931461e0011104e6500c61d106a45	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-4.14.239 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.239
deleted file mode 100644
index b65132190ed5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.239
+++ /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=4.14.239
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.239.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.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-4.14.240 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.240
new file mode 100644
index 000000000000..b74410b07fa1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.240
@@ -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=4.14.240
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.240.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.197 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.197
deleted file mode 100644
index 0bc34e65442a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.197
+++ /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=4.19.197
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.197.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.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-4.19.198 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.198
new file mode 100644
index 000000000000..38ade7f03751
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.198
@@ -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=4.19.198
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.198.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.275 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.275
deleted file mode 100644
index d4e20f8b85d1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.275
+++ /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 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/patch-4.4.275.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.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-4.4.276 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.276
new file mode 100644
index 000000000000..72af9fbc6b9d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.276
@@ -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 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.276
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.276.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.275 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.275
deleted file mode 100644
index 193ba4360ef3..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.275
+++ /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 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/patch-4.9.275.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.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-4.9.276 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.276
new file mode 100644
index 000000000000..f56ec4f5fb65
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.276
@@ -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 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.276
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.276.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	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
deleted file mode 100644
index cc0cc5f95e2d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.50
+++ /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.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.10.52 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.52
new file mode 100644
index 000000000000..e2b9be55a65b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.52
@@ -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.52
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.52.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	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
deleted file mode 100644
index 7f456c6fff8a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.17
+++ /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.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.12.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18
new file mode 100644
index 000000000000..cbe7dd7c5a1a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.18
@@ -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.18
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.12.18.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	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
deleted file mode 100644
index d5f3c25e03ed..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.2
+++ /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.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.13.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.4
new file mode 100644
index 000000000000..7691f448e752
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.4
@@ -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.4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	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
deleted file mode 100644
index 10a3dc678043..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.132
+++ /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.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-kernel/vanilla-sources-5.4.134 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.134
new file mode 100644
index 000000000000..73143fa21580
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.134
@@ -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.134
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.134.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.12.15 b/metadata/md5-cache/sys-kernel/zen-sources-5.12.15
deleted file mode 100644
index 3d282526a811..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.12.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=6
-HOMEPAGE=https://github.com/zen-kernel
-IUSE=symlink build
-KEYWORDS=~amd64 ~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.15
-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-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.12.15-zen1/v5.12.15-zen1.patch.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8bb216e718225a26e69b38539a7f01a
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.13.4 b/metadata/md5-cache/sys-kernel/zen-sources-5.13.4
new file mode 100644
index 000000000000..81886151221d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=The Zen Kernel Live Sources
+EAPI=6
+HOMEPAGE=https://github.com/zen-kernel
+IUSE=symlink build
+KEYWORDS=~amd64 ~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.4
+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 https://github.com/zen-kernel/zen-kernel/releases/download/v5.13.4-zen1/v5.13.4-zen1.patch.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f8bb216e718225a26e69b38539a7f01a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0a9d103128a6..216948094c79 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/binutils-libs-2.37 b/metadata/md5-cache/sys-libs/binutils-libs-2.37
new file mode 100644
index 000000000000..47c0335a80a6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.37
@@ -0,0 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+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(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=64-bit-bfd cet multitarget 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
+LICENSE=|| ( GPL-3 LGPL-3 )
+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(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.37
+SRC_URI=mirror://gnu/binutils/binutils-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37-patches-1.tar.xz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=62c25c2c62be8f37f704b6d9ff9c5a2c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
index e2b0d351a3f8..a0f9be6fd9dd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz 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	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=9d80785fa02434c813ed7747e241a961
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
index 7f8a929f1e38..b9d96d945a0e 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz 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	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=0239213f7acaea92ec4d0265b8a7202a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
index b2e47aa83804..778672405fe6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz 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	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=a460b74756e45927134a052925c44e04
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
index 831f2d56dfff..e02d1f34a693 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=560f9c08abe4053f35f9a670c6bbac0d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
index 788148d396a6..2981c36c8085 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=13.0.0
 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	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	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=82ec3c36f177593d737c4442c5602192
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
index 907898baaa71..363bacea218f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=e3fa140400891876cff0f11994c246b8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
index d1d5d1574707..2452499b21d1 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=df52bb64510a8c85d18909d3bda211e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
index aa464ae0e647..7e1f0a1739a9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) test !test? ( test )
 SLOT=12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=4f64306de1ce10fa8a62a0a3763e063a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
index 7633d7807d1c..77a700b51839 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=ddd4fee6f55de9ec23820c2feb21bd85
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
index 4c70ff0d8fba..2d74e345f204 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=13.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	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_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	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_=3959272b2f1ac12e7348d60a60d91519
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r2 b/metadata/md5-cache/sys-libs/glibc-2.33-r2
deleted file mode 100644
index 983a7d67783c..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-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
index 5e64b710e32e..5f4f474c2647 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r3
@@ -5,6 +5,7 @@ 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 )
@@ -12,4 +13,4 @@ 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
+_md5_=39dd114da18235d8b076ef41e4a241c8
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r4 b/metadata/md5-cache/sys-libs/glibc-2.33-r4
new file mode 100644
index 000000000000..13731e8af908
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r4
@@ -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 systemd 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-5.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 ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210724.tar.gz )
+_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_=f32a868e7ddd9cc8e1975550cba50b4b
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index daa25a138abb..62fb74208191 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,16 +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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-1.3.3 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 >=dev-vcs/git-1.8.2.1[curl]
 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
+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 ) 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
+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 systemd systemtap test vanilla
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
-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 )
+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 ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 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 )
+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 ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210724.tar.gz )
 _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
+_md5_=585e80830020114a684607a7fd858b3d
diff --git a/metadata/md5-cache/sys-libs/ldb-2.2.1 b/metadata/md5-cache/sys-libs/ldb-2.2.1
deleted file mode 100644
index a795dfb49dc9..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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.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(-)?] 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.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(-)?] 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.2.1
-SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.2.1.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_=7ab14203a8a8da4686d683ed9974d6a3
diff --git a/metadata/md5-cache/sys-libs/ldb-2.2.1-r1 b/metadata/md5-cache/sys-libs/ldb-2.2.1-r1
new file mode 100644
index 000000000000..7b741d50e23f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.2.1-r1
@@ -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.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(-)?] 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.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(-)?] 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.2.1
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.2.1.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_=c6402de002e8e6572b2b6427d857b21d
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0 b/metadata/md5-cache/sys-libs/ldb-2.3.0
deleted file mode 100644
index f4a56613a70e..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-2.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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.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(-)?] 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.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(-)?] 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.3.0
-SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.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_=2c075dc5d27e7ece11e9962598825f2f
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1 b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
new file mode 100644
index 000000000000..8ddba426068e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
@@ -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.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(-)?] 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 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.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(-)?] 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.3.0
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.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_=cb61f0d8a4baec7c39751acf5ab296bb
diff --git a/metadata/md5-cache/sys-libs/ldb-2.4.0 b/metadata/md5-cache/sys-libs/ldb-2.4.0
deleted file mode 100644
index 294bf37476ea..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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/ldb-2.4.0-r1 b/metadata/md5-cache/sys-libs/ldb-2.4.0-r1
new file mode 100644
index 000000000000..6c0f35009f53
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.0-r1
@@ -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 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.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_=141a18de5768906df14276839b5e8ce1
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1 b/metadata/md5-cache/sys-libs/libcxx-10.0.1
index 28bfa688f17a..fc282986b991 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=a03eb428c81c1dc7f762f7e8bfa902fb
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.1.0 b/metadata/md5-cache/sys-libs/libcxx-11.1.0
index 40c7ecbba9d3..7e5020281a47 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxx-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=d9879a2ef9a3d4c1c9277b6abbfca934
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.0 b/metadata/md5-cache/sys-libs/libcxx-12.0.0
index 7a7b0b93f0e4..f14925b1f296 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=35fa54ec31b59d645e43cff57bf0c57e
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.1 b/metadata/md5-cache/sys-libs/libcxx-12.0.1
index 98ba467af64f..64510111b3ae 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=5976bacc7f9a11eea8cebc470dddb4a0
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
index cdb2d29a5c16..205bda85c3c7 100644
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=32fba6facf88f60b12eb8d57799d0357
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
index 100ad81f057a..7e0f4238069b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=8ae40d2a63267f3c1d664cceee0f0c9f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0 b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
index 15a6d42fffff..2538072c1fbc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=fe1f6668bb28c4102ab467dffe9d089f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
index 4f7de8e5b494..e52edcd60b5d 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=b1d97c49d565681770068617eda4b6ac
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
index 524b65d7b528..b19b5088fc22 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=6b0a46f66d48fec325618a29c75d281e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
index 37b7f4f45c8c..a18c5744ce01 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=010c1a2681af81cafdaa9b63848a5574
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1 b/metadata/md5-cache/sys-libs/libomp-10.0.1
index e47d72bc091c..b7407495ac85 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=fb0fe7a1427178d3fce2af3995f868a7
diff --git a/metadata/md5-cache/sys-libs/libomp-11.1.0 b/metadata/md5-cache/sys-libs/libomp-11.1.0
index 70e455b7fcf9..e519fb0725aa 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.1.0
+++ b/metadata/md5-cache/sys-libs/libomp-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=890dd5a7b0c2f8e4f3c5c2cd44442336
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.0 b/metadata/md5-cache/sys-libs/libomp-12.0.0
index 686204beafdd..69fce0cf3e6d 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=e42b3ce6e2396fed96b4e636a3754c62
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.1 b/metadata/md5-cache/sys-libs/libomp-12.0.1
index cd099acbf947..65115939506a 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=5d4dbd2a5facb904b696c364d5e1320f
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
index 59cb7e8c4b56..e3917369548d 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=82459bc0e8f154380f8dca9d0255402e
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
index 62beaec75fb0..4d14039559f4 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( static-libs || ( python_targets_python3_8 python_targets_
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.1/libseccomp-2.5.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=671d9e30d4f126003e9cf7e13e8253ca
+_md5_=740ec7aeb33a0bebed50bfb724d8eaa0
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
index 13bb873e4bef..97b38e6adcdb 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.1/libseccomp-2.5.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e7887840a4306992e56e4d95bf799094
+_md5_=61a747ff0794933b4694736264d98895
diff --git a/metadata/md5-cache/sys-libs/libseccomp-9999 b/metadata/md5-cache/sys-libs/libseccomp-9999
index f8bebdb77929..3c385b51aaff 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-9999
+++ b/metadata/md5-cache/sys-libs/libseccomp-9999
@@ -11,4 +11,4 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	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_=e7887840a4306992e56e4d95bf799094
+_md5_=61a747ff0794933b4694736264d98895
diff --git a/metadata/md5-cache/sys-libs/liburing-2.0 b/metadata/md5-cache/sys-libs/liburing-2.0
index c0662055de0f..d2b081880c08 100644
--- a/metadata/md5-cache/sys-libs/liburing-2.0
+++ b/metadata/md5-cache/sys-libs/liburing-2.0
@@ -3,10 +3,10 @@ DESCRIPTION=Efficient I/O with io_uring
 EAPI=7
 HOMEPAGE=https://github.com/axboe/liburing
 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RESTRICT=test
 SLOT=0/2.0.0
 SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.0.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b2d923af3a8b2a92422026bd2c2aa1a1
+_md5_=944a11cb73ba62e07577d9d47d137f43
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.20 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
index c6922f162e14..95a5137471db 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.20
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.20-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_=64bc9772992fe6644acbc61b5139555a
+_md5_=a3fc657103fe990cea0e33576167241e
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23
index 5171bfc8813a..ac6dd718762c 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23
@@ -13,4 +13,4 @@ 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_=adedd146598dbae50f6d98b4906979d2
+_md5_=cd224b63bb8707c4c131fee8a3558e14
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
deleted file mode 100644
index bedf1a02de1a..000000000000
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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
index 553e2e5a91ed..3595f5ca77e5 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r2
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r2
@@ -5,6 +5,7 @@ DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
 EAPI=7
 HOMEPAGE=https://github.com/besser82/libxcrypt
 IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~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/glibc[crypt(+)] ) !sys-libs/musl )
 REQUIRED_USE=split-usr? ( system )
@@ -12,4 +13,4 @@ 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
+_md5_=784de514471bf1aa5b570bb19055da0e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
index 3aafd25ac8e4..ca916c887034 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=b9a789af973371589143f0f6967637bc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
index 7e26ffe91e72..e613a3b9e49e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=e8d16b641be8589b718b495300ac753b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
index 9326272bffbd..2eeb544df413 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=e40867fc3666d3400df4d7471ec1d15c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
index a40c1fa7c8ee..3e03dc374826 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=49e0ff60cd1da27c611eb5ef871594b4
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
index 8423203c101b..7dc1faa3477e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	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	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	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_=2c255bb8da5a1f40da1daae37f58fdcc
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.2_p20210619 b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210619
new file mode 100644
index 000000000000..4536c277503c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210619
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=gpm? ( sys-libs/gpm[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 display library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+IUSE=ada +cxx debug doc gpm minimal profile static-libs test tinfo trace 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=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_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-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.2.tar.gz ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20210619-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.2/ncurses-6.2-20210619-patch.sh.bz2
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=a5dc351f43ae5e2596b2f85ad05471c2
diff --git a/metadata/md5-cache/sys-libs/pam-1.5.1_p20210622 b/metadata/md5-cache/sys-libs/pam-1.5.1_p20210622
new file mode 100644
index 000000000000..8e297eac3950
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam-1.5.1_p20210622
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc 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 filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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/libintl-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) nis? ( 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(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] )
+DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
+EAPI=7
+HOMEPAGE=https://github.com/linux-pam/linux-pam
+IUSE=audit berkdb debug nis selinux +filecaps split-usr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+PDEPEND=>=sys-auth/pambase-20200616
+RDEPEND=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/libintl-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) nis? ( 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(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] ) filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/linux-pam/linux-pam/archive/fe1307512fb8892b5ceb3d884c793af8dbd4c16a.tar.gz -> pam-1.5.1_p20210622.tar.gz https://dev.gentoo.org/~zlogene/distfiles/sys-libs/pam/pam-doc-1.5.1_p20210610.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=ffb2340182c9b1c3e351d5cc72c934e1
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p1 b/metadata/md5-cache/sys-libs/readline-8.1_p1
deleted file mode 100644
index 94f76d7c1bcb..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.1_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs +unicode 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 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=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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/8
-SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 mirror://gnu/readline/readline-8.1-patches/readline81-001
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06faffbafecdf9f6653d373dc8e8aa6f
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
new file mode 100644
index 000000000000..e3c651885572
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,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=Another cute console display library
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
+IUSE=static-libs +unicode 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 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=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,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/8
+SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 mirror://gnu/readline/readline-8.1-patches/readline81-001
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3c878405db7b20181d058af83397a40b
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.4 b/metadata/md5-cache/sys-libs/tdb-1.4.4
index bd1f04ca4fde..e7b2bfd3f66d 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.4
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.4
@@ -5,7 +5,7 @@ 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 )
@@ -13,4 +13,4 @@ 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
+_md5_=342bc01fabd20dd06984852d79d81dec
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index f2df635e36a3..a19c49aa92a5 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/powertop-2.13-r1 b/metadata/md5-cache/sys-power/powertop-2.13-r1
deleted file mode 100644
index d7de583f4cbf..000000000000
--- a/metadata/md5-cache/sys-power/powertop-2.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=7
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-IUSE=nls unicode X kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a40049aff5f22c7d94398cce1942b52f
diff --git a/metadata/md5-cache/sys-power/powertop-2.13-r2 b/metadata/md5-cache/sys-power/powertop-2.13-r2
new file mode 100644
index 000000000000..02d1df114d27
--- /dev/null
+++ b/metadata/md5-cache/sys-power/powertop-2.13-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?]
+DESCRIPTION=tool to diagnose issues with power consumption and power management
+EAPI=7
+HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
+IUSE=nls unicode X kernel_linux
+KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
+SLOT=0
+SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=91cf36bed8d8ecf6375c1893e5c08367
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index 6a1b55a0f190..c1360830c696 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare setup unpack
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=tool to diagnose issues with power consumption and power management
 EAPI=7
 HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
 IUSE=nls unicode X kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
+RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4c47c4060f0d397033fc57592d5678b
+_md5_=67111ee653a3332df14a1d605e154322
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index cdc363e8402a..2ef8edee8b2e 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/anacron-2.3-r4 b/metadata/md5-cache/sys-process/anacron-2.3-r4
index beb76f0087c6..6953104c35d8 100644
--- a/metadata/md5-cache/sys-process/anacron-2.3-r4
+++ b/metadata/md5-cache/sys-process/anacron-2.3-r4
@@ -3,10 +3,10 @@ DEPEND=sys-process/cronbase
 DESCRIPTION=a periodic command scheduler
 EAPI=6
 HOMEPAGE=http://anacron.sourceforge.net/
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ppc ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=sys-process/cronbase virtual/mta
 SLOT=0
 SRC_URI=mirror://sourceforge/anacron/anacron-2.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b645ed5f6dd206f4e2c9b62394f30f12
+_md5_=bb674f2d2af17b8a1bf78c12ad8d6d49
diff --git a/metadata/md5-cache/sys-process/bcron-0.11 b/metadata/md5-cache/sys-process/bcron-0.11
index edb4bac6715f..52a8aa6c89b2 100644
--- a/metadata/md5-cache/sys-process/bcron-0.11
+++ b/metadata/md5-cache/sys-process/bcron-0.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/bglibs-2.04 sys-apps/ucspi-unix sys-process/cronbase virtual/d
 DESCRIPTION=A new cron system designed with secure operations in mind by Bruce Guenter
 EAPI=7
 HOMEPAGE=https://untroubled.org/bcron/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/bglibs-2.04 sys-apps/ucspi-unix sys-process/cronbase virtual/daemontools virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://untroubled.org/bcron/archive/bcron-0.11.tar.gz
 _eclasses_=cron	be3d08eb2cdfb330f694bb07c6affc03	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ecfe6e0ce879ac508111518ea852630
+_md5_=656d9c708dd6dd40a9670fc681f3e084
diff --git a/metadata/md5-cache/sys-process/below-0.2.0 b/metadata/md5-cache/sys-process/below-0.2.0
deleted file mode 100644
index 9db5e279d4e9..000000000000
--- a/metadata/md5-cache/sys-process/below-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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/below-0.2.0-r1 b/metadata/md5-cache/sys-process/below-0.2.0-r1
new file mode 100644
index 000000000000..cbef60b80237
--- /dev/null
+++ b/metadata/md5-cache/sys-process/below-0.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/rust[rustfmt] dev-lang/rust-bin[rustfmt] ) sys-devel/clang 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_=690f7f4b9ca44ce654edfcf5d9fc608a
diff --git a/metadata/md5-cache/sys-process/criu-3.15 b/metadata/md5-cache/sys-process/criu-3.15
index 96a1a4a6ae7d..0f67649eeaf2 100644
--- a/metadata/md5-cache/sys-process/criu-3.15
+++ b/metadata/md5-cache/sys-process/criu-3.15
@@ -4,7 +4,7 @@ DESCRIPTION=utility to checkpoint/restore a process tree
 EAPI=7
 HOMEPAGE=https://criu.org/
 IUSE=doc selinux setproctitle static-libs kernel_linux python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ppc64
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.15.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=845826e2da06b0d3fbeaef98715ebded
+_md5_=3f86379df5a26c31643976cee55673f0
diff --git a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6 b/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
deleted file mode 100644
index 981247c471e1..000000000000
--- a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=base for all cron ebuilds
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=44d3f848dfcae16cb63d3de00f75867f
diff --git a/metadata/md5-cache/sys-process/cronbase-0.3.7-r8 b/metadata/md5-cache/sys-process/cronbase-0.3.7-r8
new file mode 100644
index 000000000000..e17e9e7880cd
--- /dev/null
+++ b/metadata/md5-cache/sys-process/cronbase-0.3.7-r8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=acct-group/cron
+DESCRIPTION=Base for all cron ebuilds
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/cron acct-user/cron
+SLOT=0
+_md5_=eef1fa9525c47a9c592a50ede7554fb3
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r8 b/metadata/md5-cache/sys-process/daemontools-0.76-r8
index 737e0f57fd39..7bc6651f262d 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 ~riscv ~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_=8e8c7aa486c4bc3ad459baf3983fcf04
+_md5_=d00c228cf0c3f22a179d4666ff41884d
diff --git a/metadata/md5-cache/sys-process/dcron-4.5-r2 b/metadata/md5-cache/sys-process/dcron-4.5-r2
index 506b0796f915..06429a7f6293 100644
--- a/metadata/md5-cache/sys-process/dcron-4.5-r2
+++ b/metadata/md5-cache/sys-process/dcron-4.5-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A cute little cron from Matt Dillon
 EAPI=6
 HOMEPAGE=http://www.jimpryor.net/linux/dcron.html http://apollo.backplane.com/FreeSrc/
-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=GPL-2
 RDEPEND=>=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/fcron
 SLOT=0
 SRC_URI=http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz
 _eclasses_=cron	be3d08eb2cdfb330f694bb07c6affc03	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd3b45a0424563e7668d387319fe7b11
+_md5_=f1f8cd6536e44ce7a736eb13ebb564df
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r5 b/metadata/md5-cache/sys-process/fcron-3.2.1-r5
index 1074743bf1c2..c1277da6a3f5 100644
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r5
+++ b/metadata/md5-cache/sys-process/fcron-3.2.1-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
 EAPI=6
 HOMEPAGE=http://fcron.free.fr/
 IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cron	be3d08eb2cdfb330f694bb07c6affc03	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf3610832ea3eafd64d310e3bb9df7cb
+_md5_=3ee47d0ed2c5797fe5f20f669dd9ce21
diff --git a/metadata/md5-cache/sys-process/htop-3.0.2 b/metadata/md5-cache/sys-process/htop-3.0.2
deleted file mode 100644
index d0ae3c3fdd0d..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.0.2
+++ /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
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] || ( dev-lang/python:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=7
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.0.2.tar.gz -> htop-3.0.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43ed14d0a3a6f178ed58321339d92f21
diff --git a/metadata/md5-cache/sys-process/htop-3.0.2-r1 b/metadata/md5-cache/sys-process/htop-3.0.2-r1
new file mode 100644
index 000000000000..ac348cd9116c
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-3.0.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-libs/ncurses:=[unicode(+)?] || ( dev-lang/python:3.8 )
+DESCRIPTION=interactive process viewer
+EAPI=7
+HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
+IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?]
+SLOT=0
+SRC_URI=https://github.com/htop-dev/htop/archive/3.0.2.tar.gz -> htop-3.0.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0265d4239658c7d3157de5833b973f54
diff --git a/metadata/md5-cache/sys-process/htop-3.0.4-r1 b/metadata/md5-cache/sys-process/htop-3.0.4-r1
deleted file mode 100644
index 0757a4057403..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.0.4-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
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=7
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-IUSE=debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors )
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.0.4.tar.gz -> htop-3.0.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adcfa6d8adfdce40950b5271d583af23
diff --git a/metadata/md5-cache/sys-process/htop-3.0.4-r2 b/metadata/md5-cache/sys-process/htop-3.0.4-r2
new file mode 100644
index 000000000000..99dddf52a7fd
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-3.0.4-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
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=interactive process viewer
+EAPI=7
+HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
+IUSE=debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors )
+SLOT=0
+SRC_URI=https://github.com/htop-dev/htop/archive/3.0.4.tar.gz -> htop-3.0.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=318c87b2c89a8104cfda1b261fb5b024
diff --git a/metadata/md5-cache/sys-process/htop-3.0.5 b/metadata/md5-cache/sys-process/htop-3.0.5
deleted file mode 100644
index e1dca3c0978e..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.0.5
+++ /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
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=7
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-IUSE=debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors )
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.0.5.tar.gz -> htop-3.0.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6181415e21cfb21514931db9219d6b1e
diff --git a/metadata/md5-cache/sys-process/htop-3.0.5-r1 b/metadata/md5-cache/sys-process/htop-3.0.5-r1
new file mode 100644
index 000000000000..1c8ae6396395
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-3.0.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=interactive process viewer
+EAPI=7
+HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
+IUSE=debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors )
+SLOT=0
+SRC_URI=https://github.com/htop-dev/htop/archive/3.0.5.tar.gz -> htop-3.0.5.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=68827a47057be2b830d131b5ca19d881
diff --git a/metadata/md5-cache/sys-process/parallel-20210722 b/metadata/md5-cache/sys-process/parallel-20210722
new file mode 100644
index 000000000000..193688707e17
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20210722
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20210722.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210722.tar.bz2.sig )
+_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=0976998ba221b7e275f6fbc75bde284b
diff --git a/metadata/md5-cache/sys-process/procps-3.3.17 b/metadata/md5-cache/sys-process/procps-3.3.17
deleted file mode 100644
index b24cb90885ba..000000000000
--- a/metadata/md5-cache/sys-process/procps-3.3.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install test
-DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) 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(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Standard informational utilities and process-handling tools
-EAPI=7
-HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
-IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode 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 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) 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(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<app-i18n/man-pages-l10n-4.2.0-r1 !<app-i18n/man-pages-de-2.12-r1 !<app-i18n/man-pages-pl-0.7-r1
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.17.tar.xz
-_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	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03a99f65d57592bc3b918ece3795ac65
diff --git a/metadata/md5-cache/sys-process/procps-3.3.17-r1 b/metadata/md5-cache/sys-process/procps-3.3.17-r1
new file mode 100644
index 000000000000..666ab28b0826
--- /dev/null
+++ b/metadata/md5-cache/sys-process/procps-3.3.17-r1
@@ -0,0 +1,15 @@
+BDEPEND=elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install test
+DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] ) 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(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Standard informational utilities and process-handling tools
+EAPI=7
+HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
+IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode 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 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] ) 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(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<app-i18n/man-pages-l10n-4.2.0-r1 !<app-i18n/man-pages-de-2.12-r1 !<app-i18n/man-pages-pl-0.7-r1
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.17.tar.xz
+_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	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1a3e4f3c7318e58a72275b54700dea5f
diff --git a/metadata/md5-cache/sys-process/time-1.9 b/metadata/md5-cache/sys-process/time-1.9
index 1ecb76e7842d..ce91c62193f7 100644
--- a/metadata/md5-cache/sys-process/time-1.9
+++ b/metadata/md5-cache/sys-process/time-1.9
@@ -3,8 +3,8 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Displays info about resources used by a program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/directory/time.html
-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-3+
 SLOT=0
 SRC_URI=http://ftp.gnu.org/pub/gnu/time/time-1.9.tar.gz
-_md5_=caacf65afc62713d87a1edc7ff50bf90
+_md5_=2279ad1825848d88e96b104dd300f621
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7694d9615447..872ba550762b 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/daemontools-0 b/metadata/md5-cache/virtual/daemontools-0
index c4799cf89236..023a8c56a925 100644
--- a/metadata/md5-cache/virtual/daemontools-0
+++ b/metadata/md5-cache/virtual/daemontools-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for daemontools
 EAPI=7
-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
 RDEPEND=|| ( sys-process/daemontools sys-process/daemontools-encore )
 SLOT=0
-_md5_=5d3727378e1888225f2f175b94da8fd3
+_md5_=8e6eef080e8d982843973a1a2665a666
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.47 b/metadata/md5-cache/virtual/dist-kernel-5.10.47
deleted file mode 100644
index dc674456eb8d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.47
+++ /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.47 ~sys-kernel/gentoo-kernel-bin-5.10.47 ~sys-kernel/vanilla-kernel-5.10.47 )
-SLOT=0/5.10.47
-_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.48 b/metadata/md5-cache/virtual/dist-kernel-5.10.48
deleted file mode 100644
index fbbb2d770b1e..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.48
+++ /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.48 ~sys-kernel/gentoo-kernel-bin-5.10.48 ~sys-kernel/vanilla-kernel-5.10.48 )
-SLOT=0/5.10.48
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.49 b/metadata/md5-cache/virtual/dist-kernel-5.10.49
deleted file mode 100644
index 6f8bbe0ed636..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.49
+++ /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.49 ~sys-kernel/gentoo-kernel-bin-5.10.49 ~sys-kernel/vanilla-kernel-5.10.49 )
-SLOT=0/5.10.49
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.50 b/metadata/md5-cache/virtual/dist-kernel-5.10.50
deleted file mode 100644
index 60c6c5211f2f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.50
+++ /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.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.10.52 b/metadata/md5-cache/virtual/dist-kernel-5.10.52
new file mode 100644
index 000000000000..124fc9a451eb
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.52
@@ -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.52 ~sys-kernel/gentoo-kernel-bin-5.10.52 ~sys-kernel/vanilla-kernel-5.10.52 )
+SLOT=0/5.10.52
+_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.22 b/metadata/md5-cache/virtual/dist-kernel-5.11.22
deleted file mode 100644
index 0784f30504ff..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.22
+++ /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.11.22 ~sys-kernel/gentoo-kernel-bin-5.11.22 ~sys-kernel/vanilla-kernel-5.11.22 )
-SLOT=0/5.11.22
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.15 b/metadata/md5-cache/virtual/dist-kernel-5.12.15
deleted file mode 100644
index 67dd01ebadc7..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.15
+++ /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.15 ~sys-kernel/gentoo-kernel-bin-5.12.15 ~sys-kernel/vanilla-kernel-5.12.15 )
-SLOT=0/5.12.15
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.16 b/metadata/md5-cache/virtual/dist-kernel-5.12.16
deleted file mode 100644
index 10c380a9035e..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.16
+++ /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.16 ~sys-kernel/gentoo-kernel-bin-5.12.16 ~sys-kernel/vanilla-kernel-5.12.16 )
-SLOT=0/5.12.16
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.17 b/metadata/md5-cache/virtual/dist-kernel-5.12.17
deleted file mode 100644
index b5862e89a982..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.17
+++ /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.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.12.19 b/metadata/md5-cache/virtual/dist-kernel-5.12.19
new file mode 100644
index 000000000000..cf5e762a0f3f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.12.19
@@ -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.19 ~sys-kernel/gentoo-kernel-bin-5.12.19 ~sys-kernel/vanilla-kernel-5.12.19 )
+SLOT=0/5.12.19
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.13.4 b/metadata/md5-cache/virtual/dist-kernel-5.13.4
new file mode 100644
index 000000000000..0aa38241846d
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.13.4
@@ -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.13.4 ~sys-kernel/gentoo-kernel-bin-5.13.4 ~sys-kernel/vanilla-kernel-5.13.4 )
+SLOT=0/5.13.4
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.129 b/metadata/md5-cache/virtual/dist-kernel-5.4.129
deleted file mode 100644
index 1d05a5a52def..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.129
+++ /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.129 ~sys-kernel/gentoo-kernel-bin-5.4.129 ~sys-kernel/vanilla-kernel-5.4.129 )
-SLOT=0/5.4.129
-_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.130 b/metadata/md5-cache/virtual/dist-kernel-5.4.130
deleted file mode 100644
index ca3eb05653a9..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.130
+++ /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.130 ~sys-kernel/gentoo-kernel-bin-5.4.130 ~sys-kernel/vanilla-kernel-5.4.130 )
-SLOT=0/5.4.130
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.131 b/metadata/md5-cache/virtual/dist-kernel-5.4.131
deleted file mode 100644
index 876dd8f5e0ad..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.131
+++ /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.131 ~sys-kernel/gentoo-kernel-bin-5.4.131 ~sys-kernel/vanilla-kernel-5.4.131 )
-SLOT=0/5.4.131
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.132 b/metadata/md5-cache/virtual/dist-kernel-5.4.132
deleted file mode 100644
index 640b476c281a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.132
+++ /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.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/dist-kernel-5.4.134 b/metadata/md5-cache/virtual/dist-kernel-5.4.134
new file mode 100644
index 000000000000..5a4c4475e109
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.134
@@ -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.134 ~sys-kernel/gentoo-kernel-bin-5.4.134 ~sys-kernel/vanilla-kernel-5.4.134 )
+SLOT=0/5.4.134
+_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/fortran-0 b/metadata/md5-cache/virtual/fortran-0
index 5bb39f051da0..3f23773d1f1b 100644
--- a/metadata/md5-cache/virtual/fortran-0
+++ b/metadata/md5-cache/virtual/fortran-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Fortran Compiler
-EAPI=6
+EAPI=8
 IUSE=openmp
 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
 RDEPEND=|| ( sys-devel/gcc[fortran,openmp?] sys-devel/gcc-apple[fortran,openmp?] )
 SLOT=0
-_md5_=b0305c7a54de1ade34765ab34ca95bcb
+_md5_=3d21f51f5fa951d81e3b9a3bae2e6698
diff --git a/metadata/md5-cache/virtual/libudev-249 b/metadata/md5-cache/virtual/libudev-249
new file mode 100644
index 000000000000..89a25d9e4a61
--- /dev/null
+++ b/metadata/md5-cache/virtual/libudev-249
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libudev providers
+EAPI=7
+IUSE=static-libs systemd 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
+RDEPEND=!systemd? ( || ( >=sys-fs/udev-249:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] >=sys-fs/eudev-3.2.9:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] ) ) systemd? ( >=sys-apps/systemd-249:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
+SLOT=0/1
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=726eddb0abfcc0aeba91d9cd1a203518
diff --git a/metadata/md5-cache/virtual/mailx-3 b/metadata/md5-cache/virtual/mailx-3
index c9f10f8e5b5f..a51dc989f219 100644
--- a/metadata/md5-cache/virtual/mailx-3
+++ b/metadata/md5-cache/virtual/mailx-3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for mail implementations
 EAPI=7
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/s-nail )
 SLOT=0
-_md5_=cdca541d5b640893f77cbe7ed71b2d03
+_md5_=86d9d66a9f9a09b9a23489a3658b56af
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0
index d1ae16a615bf..c410708cdb4f 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Archive-Tar-2.380.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.380.0 !>perl-core/Archive-Tar-2.380.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.280.0 b/metadata/md5-cache/virtual/perl-CPAN-2.280.0
index 086894ebe453..8ae35dfd2901 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.280.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.280.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/CPAN-2.280.0 ) dev-lang/perl:= !<perl-core/CPAN-2.280.0 !>perl-core/CPAN-2.280.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.520.0-r1 b/metadata/md5-cache/virtual/perl-Carp-1.520.0-r1
index e735d502c6aa..9a395b81f339 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.520.0-r1
+++ b/metadata/md5-cache/virtual/perl-Carp-1.520.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Carp-1.520.0 ) dev-lang/perl:= !<perl-core/Carp-1.520.0 !>perl-core/Carp-1.520.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0
index 686927a8b7cf..3e6bbd44ef27 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.101.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Compress-Raw-Bzip2-2.101.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.101.0 !>perl-core/Compress-Raw-Bzip2-2.101.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0
index 4a1a38d9295b..07a0e67caa67 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.101.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Compress-Raw-Zlib-2.101.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.101.0 !>perl-core/Compress-Raw-Zlib-2.101.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.855.0 b/metadata/md5-cache/virtual/perl-DB_File-1.855.0
index 2f44fb6d620b..a7317deb5216 100644
--- a/metadata/md5-cache/virtual/perl-DB_File-1.855.0
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.855.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for DB_File
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34*[berkdb] ~perl-core/DB_File-1.855.0 ) dev-lang/perl:= !<perl-core/DB_File-1.855.0 !>perl-core/DB_File-1.855.0-r999
 SLOT=0
-_md5_=ad0adccc774d47441e097183300fec2b
+_md5_=cfe9b03e3ddbcfbffdee0900771125e0
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.179.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.179.0
index ba62d4cf30b2..70f1be4761e4 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.179.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.179.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Data-Dumper-2.179.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.179.0 !>perl-core/Data-Dumper-2.179.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.620.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.620.0
index a6363138f744..0fb357a3e18e 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.620.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Devel-PPPort-3.620.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.620.0 !>perl-core/Devel-PPPort-3.620.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Digest-1.190.0 b/metadata/md5-cache/virtual/perl-Digest-1.190.0
index 0574c9f9ea68..c8b921839e3c 100644
--- a/metadata/md5-cache/virtual/perl-Digest-1.190.0
+++ b/metadata/md5-cache/virtual/perl-Digest-1.190.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Digest-1.190.0 ) dev-lang/perl:= !<perl-core/Digest-1.190.0 !>perl-core/Digest-1.190.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.580.0 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.580.0
index 80fc81679aa8..fb1993d517fd 100644
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.580.0
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.580.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-MD5
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Digest-MD5-2.580.0 ) dev-lang/perl:= !<perl-core/Digest-MD5-2.580.0 !>perl-core/Digest-MD5-2.580.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Encode-3.80.0 b/metadata/md5-cache/virtual/perl-Encode-3.80.0
index 481884baf460..28c68ebcc9b5 100644
--- a/metadata/md5-cache/virtual/perl-Encode-3.80.0
+++ b/metadata/md5-cache/virtual/perl-Encode-3.80.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Encode-3.80.0 ) dev-lang/perl:= !<perl-core/Encode-3.80.0 !>perl-core/Encode-3.80.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.760.0 b/metadata/md5-cache/virtual/perl-Exporter-5.760.0
index 6afedd10e95d..9e2643248e3f 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.760.0
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.760.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Exporter
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Exporter-5.760.0 ) dev-lang/perl:= !<perl-core/Exporter-5.760.0 !>perl-core/Exporter-5.760.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.236 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.236
index ad6e07d6fec8..354bf3901e06 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.236
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.236
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-CBuilder
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/ExtUtils-CBuilder-0.280.236 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.236 !>perl-core/ExtUtils-CBuilder-0.280.236-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.200.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.200.0
index 3a09f3e05d83..822750f88ed4 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.200.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.200.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/ExtUtils-Install-2.200.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.200.0 !>perl-core/ExtUtils-Install-2.200.0-r999
 SLOT=0
-_md5_=50644e49c71b72ea36bedc3c469c74ba
+_md5_=ee0e975726df745896b9fa78fbcf66df
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.620.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.620.0
index 775da7568be7..74475b8d57e7 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.620.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/ExtUtils-MakeMaker-7.620.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.620.0 !>perl-core/ExtUtils-MakeMaker-7.620.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.730.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.730.0
index 1592b33cf6d9..8e4e96300160 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.730.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.730.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Manifest
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/ExtUtils-Manifest-1.730.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Manifest-1.730.0 !>perl-core/ExtUtils-Manifest-1.730.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.430.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.430.0
index ee05cdfee608..fb7e757cf8f5 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.430.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.430.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/ExtUtils-ParseXS-3.430.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.430.0 !>perl-core/ExtUtils-ParseXS-3.430.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.180.0 b/metadata/md5-cache/virtual/perl-File-Path-2.180.0
index 4572909d25fb..2fe43f0d734a 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.180.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.180.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/File-Path-2.180.0 ) dev-lang/perl:= !<perl-core/File-Path-2.180.0 !>perl-core/File-Path-2.180.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.800.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.800.0
index 757ef0e5ba14..fc0ee39a09d6 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.800.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.800.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/File-Spec-3.800.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.800.0 !>perl-core/File-Spec-3.800.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.231.100 b/metadata/md5-cache/virtual/perl-File-Temp-0.231.100
index 70febeb90b83..ee9e3ba1c8fc 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.231.100
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.231.100
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Temp-0.231.100 dev-lang/perl:=
 SLOT=0
-_md5_=da7b2f432dcf5e7cfce336b13a5968bc
+_md5_=c518776789dc5edb830428f6affc67c1
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.520.0 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.520.0
index f21253f8c844..a9b36130fe57 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.520.0
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.520.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Getopt-Long-2.520.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.520.0 !>perl-core/Getopt-Long-2.520.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.450.0 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.450.0
index af871ab5c982..540623ee4887 100644
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.450.0
+++ b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.450.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for I18N-LangTags
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/I18N-LangTags-0.450.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.450.0 !>perl-core/I18N-LangTags-0.450.0-r999
 SLOT=0
-_md5_=333ecbae9381e1472324e97f4fe8ee05
+_md5_=4a88721ad090a6a2dbada9817284b2ed
diff --git a/metadata/md5-cache/virtual/perl-IO-1.460.0 b/metadata/md5-cache/virtual/perl-IO-1.460.0
index a2bf065a156e..12b470d848fe 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.460.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.460.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/IO-1.460.0 ) dev-lang/perl:= !<perl-core/IO-1.460.0 !>perl-core/IO-1.460.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0
index 13dddbee0f46..fcdd3f66b846 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.102.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/IO-Compress-2.102.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.102.0 !>perl-core/IO-Compress-2.102.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.101.0 >=virtual/perl-Compress-Raw-Bzip2-2.101.0
 SLOT=0
-_md5_=f26924189f8e14433968f83642311de6
+_md5_=153c0fa8d961c7ecd6e1709abcfe6d9f
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.410.0 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.410.0
index 1bde7fc5375e..f22908a8298d 100644
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.410.0
+++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.410.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Socket-IP
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/IO-Socket-IP-0.410.0 ) dev-lang/perl:= !<perl-core/IO-Socket-IP-0.410.0 !>perl-core/IO-Socket-IP-0.410.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-IO-Zlib-1.110.0 b/metadata/md5-cache/virtual/perl-IO-Zlib-1.110.0
index b887b628c8e6..2d45e377d1fa 100644
--- a/metadata/md5-cache/virtual/perl-IO-Zlib-1.110.0
+++ b/metadata/md5-cache/virtual/perl-IO-Zlib-1.110.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Zlib
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/IO-Zlib-1.110.0 ) dev-lang/perl:= !<perl-core/IO-Zlib-1.110.0 !>perl-core/IO-Zlib-1.110.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-4.60.0 b/metadata/md5-cache/virtual/perl-JSON-PP-4.60.0
index 04735b9e8709..f136c7eb8688 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-4.60.0
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-4.60.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/JSON-PP-4.60.0 ) dev-lang/perl:= !<perl-core/JSON-PP-4.60.0 !>perl-core/JSON-PP-4.60.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-MIME-Base64-3.160.0 b/metadata/md5-cache/virtual/perl-MIME-Base64-3.160.0
index 430850e7897b..e3cf343c7b3d 100644
--- a/metadata/md5-cache/virtual/perl-MIME-Base64-3.160.0
+++ b/metadata/md5-cache/virtual/perl-MIME-Base64-3.160.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for MIME-Base64
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/MIME-Base64-3.160.0 ) dev-lang/perl:= !<perl-core/MIME-Base64-3.160.0 !>perl-core/MIME-Base64-3.160.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.200 b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.200
index 343f89270a37..d46e56666ee9 100644
--- a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.200
+++ b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.200
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-Complex
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Math-Complex-1.590.200 ) dev-lang/perl:= !<perl-core/Math-Complex-1.590.200 !>perl-core/Math-Complex-1.590.200-r999
 SLOT=0
-_md5_=c8621edbc626e19cb6808a22f95df8ce
+_md5_=556fd52c7a3bb04163f6ff468be96181
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
index 76aaffbfdf13..784b01548a0b 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34.0* ~perl-core/Module-CoreList-5.202.105.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.105.200 !>perl-core/Module-CoreList-5.202.105.200-r999
 SLOT=0
-_md5_=14eeea2cd6d77541c79798562a4b0707
+_md5_=815f68e83f96ed0aba68fcb47a97a1c7
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-0.360.0-r1 b/metadata/md5-cache/virtual/perl-Module-Load-0.360.0-r1
index 4e06daa23836..a79ec11b33c6 100644
--- a/metadata/md5-cache/virtual/perl-Module-Load-0.360.0-r1
+++ b/metadata/md5-cache/virtual/perl-Module-Load-0.360.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Load
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Module-Load-0.360.0 ) dev-lang/perl:= !<perl-core/Module-Load-0.360.0 !>perl-core/Module-Load-0.360.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.740.0 b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.740.0
index 9d7fd41f41ef..fe7aa02679c9 100644
--- a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.740.0
+++ b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.740.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Load-Conditional
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Module-Load-Conditional-0.740.0 ) dev-lang/perl:= !<perl-core/Module-Load-Conditional-0.740.0 !>perl-core/Module-Load-Conditional-0.740.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.740.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.740.0
index a793538c0bac..cd4742fedeae 100644
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.740.0
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.740.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Net-Ping
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Net-Ping-2.740.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.740.0 !>perl-core/Net-Ping-2.740.0-r999
 SLOT=0
-_md5_=cff7b4f7cffbdc7f8e5e6f727f8b6e32
+_md5_=f0898556c581fb75bee5111f31bd8ee2
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.420.0 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.420.0
index 697e90b60bc5..baaae7359708 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Simple-3.420.0
+++ b/metadata/md5-cache/virtual/perl-Pod-Simple-3.420.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Simple
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Pod-Simple-3.420.0 ) dev-lang/perl:= !<perl-core/Pod-Simple-3.420.0 !>perl-core/Pod-Simple-3.420.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.430.0 b/metadata/md5-cache/virtual/perl-Safe-2.430.0
index 3082febc821e..da8808a3cea4 100644
--- a/metadata/md5-cache/virtual/perl-Safe-2.430.0
+++ b/metadata/md5-cache/virtual/perl-Safe-2.430.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Safe
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Safe-2.430.0 ) dev-lang/perl:= !<perl-core/Safe-2.430.0 !>perl-core/Safe-2.430.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.31.0 b/metadata/md5-cache/virtual/perl-Socket-2.31.0
index db23ac3694eb..e6b1fccd32a3 100644
--- a/metadata/md5-cache/virtual/perl-Socket-2.31.0
+++ b/metadata/md5-cache/virtual/perl-Socket-2.31.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Socket
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Socket-2.31.0 ) dev-lang/perl:= !<perl-core/Socket-2.31.0 !>perl-core/Socket-2.31.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Storable-3.230.0 b/metadata/md5-cache/virtual/perl-Storable-3.230.0
index 109f7efe0293..e0f69a994a5b 100644
--- a/metadata/md5-cache/virtual/perl-Storable-3.230.0
+++ b/metadata/md5-cache/virtual/perl-Storable-3.230.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Storable-3.230.0 ) dev-lang/perl:= !<perl-core/Storable-3.230.0 !>perl-core/Storable-3.230.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.430.0 b/metadata/md5-cache/virtual/perl-Test-Harness-3.430.0
index ec8580ba0cf2..b3e69077e9c1 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.430.0
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.430.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Test-Harness-3.430.0 ) dev-lang/perl:= !<perl-core/Test-Harness-3.430.0 !>perl-core/Test-Harness-3.430.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.183 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.183
index 8c3cc169cd89..f359b22c7d55 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.183
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.183
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Test-Simple-1.302.183 ) dev-lang/perl:= !<dev-perl/Test-Tester-0.114.0 !<dev-perl/Test-use-ok-0.160.0
 SLOT=0
-_md5_=986b4ac5add50e4c2d92e7188bd4f402
+_md5_=f6a1f377ed00489d0b69b3959b651f6b
diff --git a/metadata/md5-cache/virtual/perl-Text-Balanced-2.40.0 b/metadata/md5-cache/virtual/perl-Text-Balanced-2.40.0
index 0ac72e52a5c3..1f7e5260d2ce 100644
--- a/metadata/md5-cache/virtual/perl-Text-Balanced-2.40.0
+++ b/metadata/md5-cache/virtual/perl-Text-Balanced-2.40.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Text-Balanced
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Text-Balanced-2.40.0 ) dev-lang/perl:= !<perl-core/Text-Balanced-2.40.0 !>perl-core/Text-Balanced-2.40.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.400.0 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.400.0
index c9af753d586c..6386b5d93663 100644
--- a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.400.0
+++ b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.400.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Tie-RefHash
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Tie-RefHash-1.400.0 ) dev-lang/perl:= !<perl-core/Tie-RefHash-1.400.0 !>perl-core/Tie-RefHash-1.400.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.700 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.700
index ba0c29348d59..d2b069c36675 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.700
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.700
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-HiRes
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Time-HiRes-1.976.700 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.976.700 !>perl-core/Time-HiRes-1.976.700-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.300.0 b/metadata/md5-cache/virtual/perl-Time-Local-1.300.0
index cfc2ba806322..34059cb88a95 100644
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.300.0
+++ b/metadata/md5-cache/virtual/perl-Time-Local-1.300.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Local
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Time-Local-1.300.0 ) dev-lang/perl:= !<perl-core/Time-Local-1.300.0 !>perl-core/Time-Local-1.300.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.280.0 b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.280.0
index 3df732511c14..145c5d2201f5 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.280.0
+++ b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.280.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Normalize
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Unicode-Normalize-1.280.0 ) dev-lang/perl:= !<perl-core/Unicode-Normalize-1.280.0 !>perl-core/Unicode-Normalize-1.280.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.340.0 b/metadata/md5-cache/virtual/perl-autodie-2.340.0
index 144dc19af1bc..f06ec586e9d1 100644
--- a/metadata/md5-cache/virtual/perl-autodie-2.340.0
+++ b/metadata/md5-cache/virtual/perl-autodie-2.340.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for autodie
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/autodie-2.340.0 ) dev-lang/perl:= !<perl-core/autodie-2.340.0 !>perl-core/autodie-2.340.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.900 b/metadata/md5-cache/virtual/perl-if-0.60.900
index 36640d67cc6e..ac1373fc7e3d 100644
--- a/metadata/md5-cache/virtual/perl-if-0.60.900
+++ b/metadata/md5-cache/virtual/perl-if-0.60.900
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for if
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/if-0.60.900 ) dev-lang/perl:= !<perl-core/if-0.60.900 !>perl-core/if-0.60.900-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.130.0 b/metadata/md5-cache/virtual/perl-libnet-3.130.0
index 828acd7d0e81..7b60aedf608e 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.130.0
+++ b/metadata/md5-cache/virtual/perl-libnet-3.130.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=7
 IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 PDEPEND=ssl? ( >=dev-perl/IO-Socket-SSL-2.7.0 )
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/libnet-3.130.0 ) dev-lang/perl:= !<perl-core/libnet-3.130.0 !>perl-core/libnet-3.130.0-r999
 SLOT=0
-_md5_=de8f0e61cddf9839434eaf9231d45d6a
+_md5_=ec8c0165e1ba40c330894ce3c63366a1
diff --git a/metadata/md5-cache/virtual/perl-threads-2.260.0 b/metadata/md5-cache/virtual/perl-threads-2.260.0
index cfed7d1f6de6..f107f42dbc0f 100644
--- a/metadata/md5-cache/virtual/perl-threads-2.260.0
+++ b/metadata/md5-cache/virtual/perl-threads-2.260.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34*[ithreads] ~perl-core/threads-2.260.0 ) dev-lang/perl:= !<perl-core/threads-2.260.0 !>perl-core/threads-2.260.0-r999
 SLOT=0
-_md5_=2f45617e0106ad78be61395fa9af32fb
+_md5_=5d2d3675a866ca1e8dbd82efae50088e
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.620.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.620.0
index 2789e9107ae8..20a620f12d3b 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.620.0
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/threads-shared-1.620.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.620.0 !>perl-core/threads-shared-1.620.0-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/perl-version-0.992.800 b/metadata/md5-cache/virtual/perl-version-0.992.800
index 55d579fe7a69..e62a9b610375 100644
--- a/metadata/md5-cache/virtual/perl-version-0.992.800
+++ b/metadata/md5-cache/virtual/perl-version-0.992.800
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/version-0.992.800 ) dev-lang/perl:= !<perl-core/version-0.992.800 !>perl-core/version-0.992.800-r999
 SLOT=0
-_md5_=fdd13f031637934bca0407a32b465d97
+_md5_=90d6927cdf12f4d473ae82b879d4406a
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index ba506686fb65..487e02c0ca84 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=6
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[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_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d81f7434d2e5f393965bec604a60c5f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f099f9ae00bcd97e1d2d17c9e4fac55d
diff --git a/metadata/md5-cache/virtual/rubygems-15 b/metadata/md5-cache/virtual/rubygems-15
index 37ac91e73b72..60d906613252 100644
--- a/metadata/md5-cache/virtual/rubygems-15
+++ b/metadata/md5-cache/virtual/rubygems-15
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linu
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[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 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20d2e44b7d4871b6ee52fdc81c162ba0
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index bf590ed7de5c..15e12652a9e3 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -4,9 +4,9 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=7
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_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 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=948d9e99744b8883f5932a217a90b33f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17e92feb5ef93a37b018f803f1a1d9e9
diff --git a/metadata/md5-cache/virtual/udev-249 b/metadata/md5-cache/virtual/udev-249
new file mode 100644
index 000000000000..8f9c03e06923
--- /dev/null
+++ b/metadata/md5-cache/virtual/udev-249
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to select between different udev daemon providers
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+RDEPEND=|| ( >=sys-fs/udev-249 >=sys-fs/eudev-2.1.1 >=sys-apps/systemd-249 )
+SLOT=0
+_md5_=dbbc1d70484c184ceff16388f714119e
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4afacb7014e8..e6408ef93f94 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_h2-1.15.23 b/metadata/md5-cache/www-apache/mod_h2-1.15.23
new file mode 100644
index 000000000000..9a08b4afe0fd
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* 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=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/archive/v1.15.23.tar.gz -> mod_h2-1.15.23.tar.gz
+_eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	autotools	2a36908d5f63f41614b450a2459567da	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	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_=e30ce881968f22448f1ddb3e2e49b702
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.10 b/metadata/md5-cache/www-apache/passenger-6.0.10
index ffc5792f0951..c7bdd6817086 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.10
+++ b/metadata/md5-cache/www-apache/passenger-6.0.10
@@ -12,5 +12,5 @@ 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
+_eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ffd088cbb0aa43837bc81e35480a6d6
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.10-r1 b/metadata/md5-cache/www-apache/passenger-6.0.10-r1
new file mode 100644
index 000000000000..ba415b4ce91c
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-6.0.10-r1
@@ -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	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=634cd8c8c99b28581eb673654af2c280
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.8 b/metadata/md5-cache/www-apache/passenger-6.0.8
index c400f855e24b..3412378c9218 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.8
+++ b/metadata/md5-cache/www-apache/passenger-6.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.8.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
+_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	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31b13d821b42605a49e47c8392b967dd
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.9 b/metadata/md5-cache/www-apache/passenger-6.0.9
index ac5c30dd865d..9fe50a19065d 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.9
+++ b/metadata/md5-cache/www-apache/passenger-6.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.9.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
+_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	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4729355cc73215b7cb8e825eac47f195
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 5bccf8cf5ba3..501878a59eb8 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-91.0.4472.101 b/metadata/md5-cache/www-apps/chromedriver-bin-91.0.4472.101
deleted file mode 100644
index 3f7c31adbb38..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-91.0.4472.101
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_linux64.zip -> chromedriver-bin-91.0.4472.101.linux64.zip )
-_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.43 b/metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.43
new file mode 100644
index 000000000000..df63a9a7c278
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.43
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=7
+HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
+KEYWORDS=~amd64
+LICENSE=google-chrome
+RDEPEND=!www-client/chromium www-client/google-chrome
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/92.0.4515.43/chromedriver_linux64.zip -> chromedriver-bin-92.0.4515.43.linux64.zip )
+_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/element-1.7.33 b/metadata/md5-cache/www-apps/element-1.7.33
new file mode 100644
index 000000000000..06e3454445ab
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.7.33
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=7
+HOMEPAGE=https://element.io/
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-admin/webapp-config-1.50.15
+SLOT=1.7.33
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.7.33/element-v1.7.33.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/hugo-0.84.4 b/metadata/md5-cache/www-apps/hugo-0.84.4
deleted file mode 100644
index 11ca5fabe9e5..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.84.4
+++ /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.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	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bcf7db235c52dae75505af941bf35fa7
diff --git a/metadata/md5-cache/www-apps/hugo-0.86.0 b/metadata/md5-cache/www-apps/hugo-0.86.0
new file mode 100644
index 000000000000..40722d9621ef
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.86.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.86.0.tar.gz -> hugo-0.86.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/jekyll-4.1.1 b/metadata/md5-cache/www-apps/jekyll-4.1.1
index 0afa8a39bc75..c9f0cfef1735 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.1.1
+++ b/metadata/md5-cache/www-apps/jekyll-4.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.1.1.tar.gz -> jekyll-4.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81bdfb689d8ace8db9770399f0d6ca04
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.0 b/metadata/md5-cache/www-apps/jekyll-4.2.0
index d2043e9c460d..a759cfe593b4 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.0
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz -> jekyll-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cae9f7dca05c3fbc2f411a2ae832237b
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.0-r1 b/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
index d5daa1c3ea72..76256ec7e674 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz -> jekyll-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7867c592d59f625ac40606a95b76f6a6
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0 b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
index dbf9a1bd94e0..8ab1c63806ed 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v2.0.0.tar.gz -> jekyll-coffeescript-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1066b81d4ba870485bd9d5ee1f9c7c3b
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
index ca9f60565f55..1ee346653cc7 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v2.1.0.tar.gz -> jekyll-sass-converter-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e977c737dc7f1f5c94c91a333b5d7a3
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
index fa9f5674adfe..d2f49660ebfd 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v1.4.0.tar.gz -> jekyll-sitemap-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83975df9f34ff2c2766810daf81781b7
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1 b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
index a966fd907bc2..3af050e4fbd2 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v2.2.1.tar.gz -> jekyll-watch-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=faa3481cc57531afe75f91288c8b5f9b
diff --git a/metadata/md5-cache/www-apps/moodle-3.10.4 b/metadata/md5-cache/www-apps/moodle-3.10.4
deleted file mode 100644
index 63ea7961ec45..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.10.4
-SRC_URI=https://download.moodle.org/stable310/moodle-3.10.4.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.10.5 b/metadata/md5-cache/www-apps/moodle-3.10.5
new file mode 100644
index 000000000000..6f0e78cc5083
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.10.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.10.5
+SRC_URI=https://download.moodle.org/stable310/moodle-3.10.5.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.11-r1 b/metadata/md5-cache/www-apps/moodle-3.11-r1
deleted file mode 100644
index ec579f402abc..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.3[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.11-r1
-SRC_URI=https://download.moodle.org/stable311/moodle-3.11.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=92988cc126bef4f59135158196356ef4
diff --git a/metadata/md5-cache/www-apps/moodle-3.11.1 b/metadata/md5-cache/www-apps/moodle-3.11.1
new file mode 100644
index 000000000000..da2e068cf627
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.3[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.11.1
+SRC_URI=https://download.moodle.org/stable311/moodle-3.11.1.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=92988cc126bef4f59135158196356ef4
diff --git a/metadata/md5-cache/www-apps/moodle-3.9.7 b/metadata/md5-cache/www-apps/moodle-3.9.7
deleted file mode 100644
index 8150b9afbe20..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.9.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.9.7
-SRC_URI=https://download.moodle.org/stable39/moodle-3.9.7.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.9.8 b/metadata/md5-cache/www-apps/moodle-3.9.8
new file mode 100644
index 000000000000..c8eaa303b418
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.9.8
+SRC_URI=https://download.moodle.org/stable39/moodle-3.9.8.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/nanoc-4.11.12 b/metadata/md5-cache/www-apps/nanoc-4.11.12
index a199bbe91a9a..835bc0a8018f 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.11.12
+++ b/metadata/md5-cache/www-apps/nanoc-4.11.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.12.tar.gz -> nanoc-4.11.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00b115d4e9692e1db9a75091e947596e
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.2 b/metadata/md5-cache/www-apps/nanoc-4.12.2
index ef5589886718..9d5b9f9a432f 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dedad9787f298166afdde6668e19f045
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
index 7a8eddd2f058..480edc428069 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4010153055d73d94bfa4b902f8c6faa4
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
index 6d36e4a7802f..e16f1f480b19 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a971ab8c8ab2e0f6b1fa676f3422f5b
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.11.12 b/metadata/md5-cache/www-apps/nanoc-core-4.11.12
index fbc13923d7d9..77df38e9f85f 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.11.12
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.11.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.12.tar.gz -> nanoc-core-4.11.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa47af58425809a1d7096da0b01506aa
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.2 b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
index 864eaab93fdd..c219b54f16d3 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-core-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2279824a1c7c62af1df1192c60d5e37
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
index f91d280e3bc4..352ad076e1f5 100644
--- a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4adf53e07aa0d4b42cf72a367e2f15ee
diff --git a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2 b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
index 35b2bfdf5569..4d2aaeb7fc64 100644
--- a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanoc-spec-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ae54e6953c801a8f01f4e0e36e987b4
diff --git a/metadata/md5-cache/www-apps/nextcloud-20.0.10 b/metadata/md5-cache/www-apps/nextcloud-20.0.10
deleted file mode 100644
index be3caa57672b..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-20.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=20.0.10
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-20.0.10.tar.bz2
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=2a094c91528dc6b7687fa45a37c0ae57
diff --git a/metadata/md5-cache/www-apps/nextcloud-21.0.2 b/metadata/md5-cache/www-apps/nextcloud-21.0.2
deleted file mode 100644
index f65000440824..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-21.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=21.0.2
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-21.0.2.tar.bz2
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a09e2eb0f38ccb7d17832856088d7d81
diff --git a/metadata/md5-cache/www-apps/nextcloud-21.0.3 b/metadata/md5-cache/www-apps/nextcloud-21.0.3
index 386761114f15..0576a353782a 100644
--- a/metadata/md5-cache/www-apps/nextcloud-21.0.3
+++ b/metadata/md5-cache/www-apps/nextcloud-21.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Personal cloud that runs on your own server
 EAPI=7
 HOMEPAGE=https://nextcloud.com/
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=AGPL-3
 RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=21.0.3
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-21.0.3.tar.bz2
 _eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a09e2eb0f38ccb7d17832856088d7d81
+_md5_=ac81300ece1011c8bfc89f996fccefa5
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.4 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
new file mode 100644
index 000000000000..ab80e84ad969
--- /dev/null
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A customizable PHP script that displays information about your system nicely
+EAPI=7
+HOMEPAGE=https://rk4an.github.com/phpsysinfo/
+IUSE=vhosts
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=3.3.4
+SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.4.tar.gz -> phpsysinfo-3.3.4.tar.gz
+_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=daec0c467f1c75b277048b12aa25d652
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.9 b/metadata/md5-cache/www-apps/postfixadmin-3.3.9
deleted file mode 100644
index 2f26d7500da9..000000000000
--- a/metadata/md5-cache/www-apps/postfixadmin-3.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
-EAPI=7
-HOMEPAGE=http://postfixadmin.sourceforge.net
-IUSE=+mysql postgres +vacation vhosts
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres )
-SLOT=3.3.9
-SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.9.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=af5d4c66f66b146328b46e1d31b165f1
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1 b/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1
new file mode 100644
index 000000000000..7a89da8834b7
--- /dev/null
+++ b/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
+EAPI=7
+HOMEPAGE=http://postfixadmin.sourceforge.net
+IUSE=+mysql postgres +vacation vhosts
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=3.3.9-r1
+SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.9.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=91b171640bb361ba904ce15bc7dfec5f
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.2 b/metadata/md5-cache/www-apps/redmine-4.1.2
index 28609bf80197..b8d4ce32659f 100644
--- a/metadata/md5-cache/www-apps/redmine-4.1.2
+++ b/metadata/md5-cache/www-apps/redmine-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby25? ( dev-lang/rub
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-4.1.2.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0bfe7aee75fff2593268868dfa9c1b6a
diff --git a/metadata/md5-cache/www-apps/wordpress-5.7.2 b/metadata/md5-cache/www-apps/wordpress-5.7.2
deleted file mode 100644
index c08da9ae06fc..000000000000
--- a/metadata/md5-cache/www-apps/wordpress-5.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
-EAPI=7
-HOMEPAGE=https://wordpress.org/
-IUSE=+akismet examples +themes vhosts vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
-SLOT=5.7.2
-SRC_URI=https://wordpress.org/wordpress-5.7.2.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=09f4f50e148a87236ba2a2098fb9da57
diff --git a/metadata/md5-cache/www-apps/wordpress-5.8 b/metadata/md5-cache/www-apps/wordpress-5.8
new file mode 100644
index 000000000000..af46c6ebd7fb
--- /dev/null
+++ b/metadata/md5-cache/www-apps/wordpress-5.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
+EAPI=7
+HOMEPAGE=https://wordpress.org/
+IUSE=+akismet examples +themes vhosts vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
+SLOT=5.8
+SRC_URI=https://wordpress.org/wordpress-5.8.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=09f4f50e148a87236ba2a2098fb9da57
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d1954a4b6204..454210e91c6a 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.164 b/metadata/md5-cache/www-client/chromium-91.0.4472.164
index 89e2d07c077a..21ccef42ac49 100644
--- a/metadata/md5-cache/www-client/chromium-91.0.4472.164
+++ b/metadata/md5-cache/www-client/chromium-91.0.4472.164
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon +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
+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
+_md5_=538bca738d962e3af8b6f00fcb9b28d2
diff --git a/metadata/md5-cache/www-client/firefox-78.12.0 b/metadata/md5-cache/www-client/firefox-78.12.0
index 17154f302b34..62d656169fb9 100644
--- a/metadata/md5-cache/www-client/firefox-78.12.0
+++ b/metadata/md5-cache/www-client/firefox-78.12.0
@@ -5,11 +5,11 @@ 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
+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
+_md5_=f5716837ac49ff39b3fe69d045f91c0d
diff --git a/metadata/md5-cache/www-client/firefox-90.0.1 b/metadata/md5-cache/www-client/firefox-90.0.1
new file mode 100644
index 000000000000..5bcba8e6c910
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-90.0.1
@@ -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.1/source/firefox-90.0.1.source.tar.xz -> firefox-90.0.1.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.1/linux-x86_64/xpi/ach.xpi -> firefox-90.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/af.xpi -> firefox-90.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/an.xpi -> firefox-90.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ar.xpi -> firefox-90.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ast.xpi -> firefox-90.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/az.xpi -> firefox-90.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/be.xpi -> firefox-90.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bg.xpi -> firefox-90.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bn.xpi -> firefox-90.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/br.xpi -> firefox-90.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bs.xpi -> firefox-90.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ca.xpi -> firefox-90.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cak.xpi -> firefox-90.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cs.xpi -> firefox-90.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cy.xpi -> firefox-90.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/da.xpi -> firefox-90.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/de.xpi -> firefox-90.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/el.xpi -> firefox-90.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/eo.xpi -> firefox-90.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/et.xpi -> firefox-90.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/eu.xpi -> firefox-90.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fa.xpi -> firefox-90.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ff.xpi -> firefox-90.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fi.xpi -> firefox-90.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fr.xpi -> firefox-90.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gd.xpi -> firefox-90.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gl.xpi -> firefox-90.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gn.xpi -> firefox-90.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/he.xpi -> firefox-90.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hr.xpi -> firefox-90.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hu.xpi -> firefox-90.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ia.xpi -> firefox-90.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/id.xpi -> firefox-90.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/is.xpi -> firefox-90.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/it.xpi -> firefox-90.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ja.xpi -> firefox-90.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ka.xpi -> firefox-90.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kab.xpi -> firefox-90.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kk.xpi -> firefox-90.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/km.xpi -> firefox-90.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kn.xpi -> firefox-90.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ko.xpi -> firefox-90.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lij.xpi -> firefox-90.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lt.xpi -> firefox-90.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lv.xpi -> firefox-90.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/mk.xpi -> firefox-90.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/mr.xpi -> firefox-90.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ms.xpi -> firefox-90.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/my.xpi -> firefox-90.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nl.xpi -> firefox-90.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/oc.xpi -> firefox-90.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pl.xpi -> firefox-90.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/rm.xpi -> firefox-90.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ro.xpi -> firefox-90.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ru.xpi -> firefox-90.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/si.xpi -> firefox-90.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sk.xpi -> firefox-90.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sl.xpi -> firefox-90.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/son.xpi -> firefox-90.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sq.xpi -> firefox-90.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sr.xpi -> firefox-90.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.1-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/szl.xpi -> firefox-90.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ta.xpi -> firefox-90.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/te.xpi -> firefox-90.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/th.xpi -> firefox-90.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/tl.xpi -> firefox-90.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/tr.xpi -> firefox-90.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/trs.xpi -> firefox-90.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/uk.xpi -> firefox-90.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ur.xpi -> firefox-90.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/uz.xpi -> firefox-90.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/vi.xpi -> firefox-90.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/xh.xpi -> firefox-90.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.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	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-90.0.2 b/metadata/md5-cache/www-client/firefox-90.0.2
new file mode 100644
index 000000000000..047c6fbd0fb3
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-90.0.2
@@ -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.2/source/firefox-90.0.2.source.tar.xz -> firefox-90.0.2.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.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/szl.xpi -> firefox-90.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.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	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
deleted file mode 100644
index 2e0fb93240a5..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-78.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare 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
-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.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	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a6dc0753e28af35a2034105b44ced6e1
diff --git a/metadata/md5-cache/www-client/firefox-bin-89.0 b/metadata/md5-cache/www-client/firefox-bin-89.0
deleted file mode 100644
index 6e641436dd61..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-89.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare 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
-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/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	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
deleted file mode 100644
index 37e95f44179e..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-89.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare 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
-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/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	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
deleted file mode 100644
index 7a316b2dda0c..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-89.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare 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
-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/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	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
deleted file mode 100644
index b289ed6a2142..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-90.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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/firefox-bin-90.0.1 b/metadata/md5-cache/www-client/firefox-bin-90.0.1
new file mode 100644
index 000000000000..6d7653a8b322
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-90.0.1
@@ -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.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2 -> firefox-bin_x86_64-90.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2 -> firefox-bin_i686-90.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ach.xpi -> firefox-90.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/af.xpi -> firefox-90.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/an.xpi -> firefox-90.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ar.xpi -> firefox-90.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ast.xpi -> firefox-90.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/az.xpi -> firefox-90.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/be.xpi -> firefox-90.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bg.xpi -> firefox-90.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bn.xpi -> firefox-90.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/br.xpi -> firefox-90.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/bs.xpi -> firefox-90.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ca.xpi -> firefox-90.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cak.xpi -> firefox-90.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cs.xpi -> firefox-90.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/cy.xpi -> firefox-90.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/da.xpi -> firefox-90.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/de.xpi -> firefox-90.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/el.xpi -> firefox-90.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/eo.xpi -> firefox-90.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/et.xpi -> firefox-90.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/eu.xpi -> firefox-90.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fa.xpi -> firefox-90.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ff.xpi -> firefox-90.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fi.xpi -> firefox-90.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fr.xpi -> firefox-90.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gd.xpi -> firefox-90.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gl.xpi -> firefox-90.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gn.xpi -> firefox-90.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/he.xpi -> firefox-90.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hr.xpi -> firefox-90.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hu.xpi -> firefox-90.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ia.xpi -> firefox-90.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/id.xpi -> firefox-90.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/is.xpi -> firefox-90.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/it.xpi -> firefox-90.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ja.xpi -> firefox-90.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ka.xpi -> firefox-90.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kab.xpi -> firefox-90.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kk.xpi -> firefox-90.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/km.xpi -> firefox-90.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/kn.xpi -> firefox-90.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ko.xpi -> firefox-90.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lij.xpi -> firefox-90.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lt.xpi -> firefox-90.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/lv.xpi -> firefox-90.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/mk.xpi -> firefox-90.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/mr.xpi -> firefox-90.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ms.xpi -> firefox-90.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/my.xpi -> firefox-90.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nl.xpi -> firefox-90.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/oc.xpi -> firefox-90.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pl.xpi -> firefox-90.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/rm.xpi -> firefox-90.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ro.xpi -> firefox-90.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ru.xpi -> firefox-90.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/si.xpi -> firefox-90.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sk.xpi -> firefox-90.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sl.xpi -> firefox-90.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/son.xpi -> firefox-90.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sq.xpi -> firefox-90.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sr.xpi -> firefox-90.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ta.xpi -> firefox-90.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/te.xpi -> firefox-90.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/th.xpi -> firefox-90.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/tl.xpi -> firefox-90.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/tr.xpi -> firefox-90.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/trs.xpi -> firefox-90.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/uk.xpi -> firefox-90.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/ur.xpi -> firefox-90.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/uz.xpi -> firefox-90.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/vi.xpi -> firefox-90.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/xh.xpi -> firefox-90.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.1-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/firefox-bin-90.0.2 b/metadata/md5-cache/www-client/firefox-bin-90.0.2
new file mode 100644
index 000000000000..6436dcdf388a
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-90.0.2
@@ -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.2/linux-x86_64/en-US/firefox-90.0.2.tar.bz2 -> firefox-bin_x86_64-90.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-US/firefox-90.0.2.tar.bz2 -> firefox-bin_i686-90.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.2-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.164 b/metadata/md5-cache/www-client/google-chrome-91.0.4472.164
deleted file mode 100644
index ddb62d8a8099..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-91.0.4472.164
+++ /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.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-92.0.4515.107 b/metadata/md5-cache/www-client/google-chrome-92.0.4515.107
new file mode 100644
index 000000000000..89e7c3e1b907
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-92.0.4515.107
@@ -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_92.0.4515.107-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
deleted file mode 100644
index 438b53a94600..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.101
+++ /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.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.107 b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.107
new file mode 100644
index 000000000000..9aba8d7583e9
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.107
@@ -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.107-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-unstable-93.0.4573.0 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4573.0
deleted file mode 100644
index 17e5b62458d0..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4573.0
+++ /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.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/google-chrome-unstable-93.0.4577.8 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.8
new file mode 100644
index 000000000000..240c2fd8f5d4
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.8
@@ -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.4577.8-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/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index 72d76f1c479d..f9c114a38b24 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6a75a08dbe6186203a72cf58cc5034de
+_md5_=9d75c44fc9a5b82f520a00c38d96ccc1
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r1 b/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r1
deleted file mode 100644
index 2461ca8180aa..000000000000
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=An excellent console-based web browser with ssl support
-EAPI=7
-HOMEPAGE=https://lynx.invisible-island.net/
-IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= )
-SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.6.tar.bz2
-_md5_=d474c80e176b6fd455a864d852a2c626
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2 b/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
new file mode 100644
index 000000000000..50dbf57c27d3
--- /dev/null
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=An excellent console-based web browser with ssl support
+EAPI=7
+HOMEPAGE=https://lynx.invisible-island.net/
+IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= )
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.6.tar.bz2
+_md5_=61ab3228a9fe40c2c387dc4907072e09
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
deleted file mode 100644
index 11e6352acb96..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.15-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_=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
deleted file mode 100644
index 7e6f22a82e24..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.22-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_=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
deleted file mode 100644
index c7812be08fd4..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.30-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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45
new file mode 100644
index 000000000000..f7a2df8e7bd9
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45
@@ -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 Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.45-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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49
new file mode 100644
index 000000000000..dd76732ada17
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49
@@ -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 Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.49-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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.55 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.55
new file mode 100644
index 000000000000..213330d65bf8
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.55
@@ -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 Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.55-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_=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
deleted file mode 100644
index 988c54df8a31..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.916.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.916.1-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_=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
deleted file mode 100644
index d8755c79076e..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.926.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.926.1-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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1
new file mode 100644
index 000000000000..c0df3086562b
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1
@@ -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 Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.946.1-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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.0
new file mode 100644
index 000000000000..928cd0546a42
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.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 Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.957.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_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/netrik-1.16.1-r2 b/metadata/md5-cache/www-client/netrik-1.16.1-r2
deleted file mode 100644
index 1d927b1f4a32..000000000000
--- a/metadata/md5-cache/www-client/netrik-1.16.1-r2
+++ /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 prepare
-DEPEND=>=sys-libs/ncurses-5.1:=[unicode] sys-libs/readline:=
-DESCRIPTION=A text based web browser with no ssl support
-EAPI=7
-HOMEPAGE=http://netrik.sourceforge.net/
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:=[unicode] sys-libs/readline:=
-SLOT=0
-SRC_URI=mirror://sourceforge/netrik/netrik-1.16.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e0abf5e1a5425c01447928941415fe2
diff --git a/metadata/md5-cache/www-client/netrik-1.16.1-r3 b/metadata/md5-cache/www-client/netrik-1.16.1-r3
new file mode 100644
index 000000000000..1c4a2460d2c9
--- /dev/null
+++ b/metadata/md5-cache/www-client/netrik-1.16.1-r3
@@ -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=install prepare
+DEPEND=>=sys-libs/ncurses-5.1:=[unicode(+)] sys-libs/readline:=
+DESCRIPTION=A text based web browser with no ssl support
+EAPI=7
+HOMEPAGE=http://netrik.sourceforge.net/
+KEYWORDS=amd64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.1:=[unicode(+)] sys-libs/readline:=
+SLOT=0
+SRC_URI=mirror://sourceforge/netrik/netrik-1.16.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3706a79d8fc990e71ee2df9e6797180
diff --git a/metadata/md5-cache/www-client/opera-77.0.4054.146 b/metadata/md5-cache/www-client/opera-77.0.4054.146
deleted file mode 100644
index 56d44cf86931..000000000000
--- a/metadata/md5-cache/www-client/opera-77.0.4054.146
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/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	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d17979a5c4b36fa9bc46c4217dfcc983
diff --git a/metadata/md5-cache/www-client/opera-77.0.4054.277 b/metadata/md5-cache/www-client/opera-77.0.4054.277
new file mode 100644
index 000000000000..e58e8a3401b3
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-77.0.4054.277
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/77.0.4054.277/linux/opera-stable_77.0.4054.277_amd64.deb https://download2.operacdn.com/pub/opera/desktop/77.0.4054.277/linux/opera-stable_77.0.4054.277_amd64.deb https://download3.operacdn.com/pub/opera/desktop/77.0.4054.277/linux/opera-stable_77.0.4054.277_amd64.deb https://download4.operacdn.com/pub/opera/desktop/77.0.4054.277/linux/opera-stable_77.0.4054.277_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	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
deleted file mode 100644
index c3de481c2174..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-77.0.4054.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/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	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
deleted file mode 100644
index 534d30402c43..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/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	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
deleted file mode 100644
index e058b9c9a8f3..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-78.0.4093.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/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	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.46 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.46
new file mode 100644
index 000000000000..8f4542c3471d
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-78.0.4093.46
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_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	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.68 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.68
new file mode 100644
index 000000000000..7e142b5e999a
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-78.0.4093.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.68/linux/opera-beta_78.0.4093.68_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.68/linux/opera-beta_78.0.4093.68_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.68/linux/opera-beta_78.0.4093.68_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.68/linux/opera-beta_78.0.4093.68_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	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.79 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.79
new file mode 100644
index 000000000000..01668cc29aed
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-78.0.4093.79
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.79/linux/opera-beta_78.0.4093.79_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.79/linux/opera-beta_78.0.4093.79_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.79/linux/opera-beta_78.0.4093.79_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.79/linux/opera-beta_78.0.4093.79_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	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
deleted file mode 100644
index cab5473868f1..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-78.0.4093.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-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	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.4114.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4114.0
new file mode 100644
index 000000000000..0fa180ae2191
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-79.0.4114.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4114.0/linux/opera-developer_79.0.4114.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4114.0/linux/opera-developer_79.0.4114.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4114.0/linux/opera-developer_79.0.4114.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4114.0/linux/opera-developer_79.0.4114.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4549.4.tar.xz )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3aa7db8e9072367c4b5c906aeb8bcfa8
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.8.1 b/metadata/md5-cache/www-client/seamonkey-2.53.8.1
new file mode 100644
index 000000000000..b1ceb919567e
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.8.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip app-arch/zip >=dev-lang/nasm-2.13 dev-lang/perl sys-apps/findutils >=sys-devel/binutils-2.16.1 virtual/pkgconfig >=virtual/rust-1.34.0 amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) x86? ( >=dev-lang/yasm-1.1 ) 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 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 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 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=7
+HOMEPAGE=https://www.seamonkey-project.org/
+IUSE=+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack lto pulseaudio +roaming selinux startup-notification test wifi +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-sqlite custom-cflags custom-optimization l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 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 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.8.1/source/seamonkey-2.53.8.1.source.tar.xz -> seamonkey-2.53.8.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.8.1/source/seamonkey-2.53.8.1.source-l10n.tar.xz -> seamonkey-2.53.8.1.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	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-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 3f01dad343cc..766b5e924ef1 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.164 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.164
deleted file mode 100644
index 6b99f639dec0..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.164
+++ /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.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
deleted file mode 100644
index 11f6c9a07d52..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.101_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.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.107 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107
new file mode 100644
index 000000000000..3504c3eed18c
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107
@@ -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_92.0.4515.107-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.107_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107_beta
new file mode 100644
index 000000000000..77ebb7265df8
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107_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.107-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
deleted file mode 100644
index 46d86f664a3e..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4573.0_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.4573.0-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.4577.8_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.8_alpha
new file mode 100644
index 000000000000..be2d17190ccf
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.8_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.4577.8-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 cf76bcc0a7ad..4c4d11f1700b 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.3 b/metadata/md5-cache/www-servers/adsf-1.4.3
index 8f35d74aa2f9..d70a0c71105f 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.3
+++ b/metadata/md5-cache/www-servers/adsf-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.3.tar.gz -> adsf-1.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c454e31df1dc1ba75765500bd74cf48
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.5 b/metadata/md5-cache/www-servers/adsf-1.4.5
index 7ddb13165b05..0991b6398e2e 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.5
+++ b/metadata/md5-cache/www-servers/adsf-1.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.5.tar.gz -> adsf-1.4.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c97d2de6872157110bad48ad96fab9d6
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.6 b/metadata/md5-cache/www-servers/adsf-1.4.6
index e681e307b2fd..0f87258e9f41 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.6
+++ b/metadata/md5-cache/www-servers/adsf-1.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.6.tar.gz -> adsf-1.4.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c97d2de6872157110bad48ad96fab9d6
diff --git a/metadata/md5-cache/www-servers/apache-2.4.46-r7 b/metadata/md5-cache/www-servers/apache-2.4.46-r7
deleted file mode 100644
index e7bac64bb3de..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.46-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile 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 ssl? ( dev-libs/openssl:0 ) 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/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DESCRIPTION=The Apache Web Server
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=ssl 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_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_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_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
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.46
-RDEPEND=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
-REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.46.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
-_eclasses_=apache-2	2ac8b88289753f6ba063ef5f5c99b369	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	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cfea6d45b0068448dd618f8498d8d211
diff --git a/metadata/md5-cache/www-servers/apache-2.4.46-r8 b/metadata/md5-cache/www-servers/apache-2.4.46-r8
deleted file mode 100644
index 2031a3facc9a..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.46-r8
+++ /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 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) )
-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_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
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.46
-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
-REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.46.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_=1a8dadcf1e82a58ce77847cdd3bed84e
diff --git a/metadata/md5-cache/www-servers/apache-2.4.47-r1 b/metadata/md5-cache/www-servers/apache-2.4.47-r1
deleted file mode 100644
index 58df070e31ae..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.47-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 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) )
-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_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
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.47
-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
-REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.47.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_=1a8dadcf1e82a58ce77847cdd3bed84e
diff --git a/metadata/md5-cache/www-servers/apache-2.4.48-r1 b/metadata/md5-cache/www-servers/apache-2.4.48-r1
deleted file mode 100644
index 2747d79af5fb..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.48-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 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) )
-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
-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
-REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
-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_=223220d801f50a3b5c22295bd5d8bb7e
diff --git a/metadata/md5-cache/www-servers/apache-2.4.48-r2 b/metadata/md5-cache/www-servers/apache-2.4.48-r2
new file mode 100644
index 000000000000..bb365aa04d5f
--- /dev/null
+++ b/metadata/md5-cache/www-servers/apache-2.4.48-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 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/apache acct-user/apache 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 ) )
+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
+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 ) ) acct-group/apache acct-user/apache 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
+REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
+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	6414223cbb4f77f012abe764460a29ea	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	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=223220d801f50a3b5c22295bd5d8bb7e
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.6 b/metadata/md5-cache/www-servers/h2o-2.2.6
deleted file mode 100644
index d559197a2151..000000000000
--- a/metadata/md5-cache/www-servers/h2o-2.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= libh2o? ( virtual/pkgconfig ) mruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
-EAPI=6
-HOMEPAGE=https://h2o.examp1e.net/
-IUSE=libh2o +mruby
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= !sci-libs/libh2o
-SLOT=0
-SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.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	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2491907d833c9d8ddc499d021fd56195
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.6-r1 b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
new file mode 100644
index 000000000000..75623c1b99dd
--- /dev/null
+++ b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= libh2o? ( virtual/pkgconfig ) mruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison virtual/pkgconfig )
+DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
+EAPI=7
+HOMEPAGE=https://h2o.examp1e.net/
+IUSE=libh2o +mruby
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= !sci-libs/libh2o
+SLOT=0
+SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0dae20b8d78a950c15ffabd6503fbf47
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index c5253ce5e9c2..d9110dd2ce9e 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= libh2o? ( virtual/pkgconfig ) mruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=sys-devel/make dev-util/cmake >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= libh2o? ( virtual/pkgconfig ) mruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison virtual/pkgconfig )
 DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
-EAPI=6
+EAPI=7
 HOMEPAGE=https://h2o.examp1e.net/
 IUSE=libh2o +mruby
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= !sci-libs/libh2o
+RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= !sci-libs/libh2o
 SLOT=0
-_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	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90d7216f6da56849546959f6fc8dca5e
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=72197093cbd52a592d2c4129937d915c
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1 b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
deleted file mode 100644
index e4113081d283..000000000000
--- a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= )
-DESCRIPTION=A small, fast, and scalable web server
-EAPI=5
-HOMEPAGE=http://www.monkey-project.com/
-IUSE=cgi debug fastcgi php static-plugins monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
-REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
-SLOT=0
-SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.9.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_=c224182a15dc9ffbd4ce8f6d34fd1a34
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r2 b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r2
new file mode 100644
index 000000000000..c052bd2cdef0
--- /dev/null
+++ b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= )
+DESCRIPTION=A small, fast, and scalable web server
+EAPI=7
+HOMEPAGE=http://www.monkey-project.com/
+IUSE=cgi debug fastcgi php static-plugins monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-group/monkeyd acct-user/monkeyd php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
+REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
+SLOT=0
+SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e9305e2701294ad8a6cc19b294831ed7
diff --git a/metadata/md5-cache/www-servers/monkeyd-9999 b/metadata/md5-cache/www-servers/monkeyd-9999
index 890632bcb09e..3bf4285c6462 100644
--- a/metadata/md5-cache/www-servers/monkeyd-9999
+++ b/metadata/md5-cache/www-servers/monkeyd-9999
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= )
 DESCRIPTION=A small, fast, and scalable web server
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.monkey-project.com/
 IUSE=cgi debug fastcgi php static-plugins monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
+RDEPEND=acct-group/monkeyd acct-user/monkeyd php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
 REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6ef55647747515ed0998fa088553756
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=65066dd23f2765c888b894f20a9e3c86
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 6828912c1b43..1024735ef1b1 100644
--- a/metadata/md5-cache/www-servers/puma-5.3.2-r1
+++ b/metadata/md5-cache/www-servers/puma-5.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 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
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7052b16ab7df080f0b24b434a6ca34d4
diff --git a/metadata/md5-cache/www-servers/thttpd-2.27.1-r1 b/metadata/md5-cache/www-servers/thttpd-2.27.1-r1
deleted file mode 100644
index e098ef15481a..000000000000
--- a/metadata/md5-cache/www-servers/thttpd-2.27.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libcrypt:= 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=Fork of thttpd, a small, fast, multiplexing webserver
-EAPI=6
-HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=virtual/libcrypt:=
-SLOT=0
-SRC_URI=https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz -> thttpd-2.27.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=66f4f6e7a71106b0310aca71fcd36e1e
diff --git a/metadata/md5-cache/www-servers/thttpd-2.27.1-r2 b/metadata/md5-cache/www-servers/thttpd-2.27.1-r2
new file mode 100644
index 000000000000..70bfbbd26534
--- /dev/null
+++ b/metadata/md5-cache/www-servers/thttpd-2.27.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=configure install prepare
+DEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
+DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
+EAPI=7
+HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz -> thttpd-2.27.1.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_=d20b0edfe918a8c75fd8b379b7a8f8a4
diff --git a/metadata/md5-cache/www-servers/thttpd-9999 b/metadata/md5-cache/www-servers/thttpd-9999
index 2f513aa2249a..ce6d16cb4351 100644
--- a/metadata/md5-cache/www-servers/thttpd-9999
+++ b/metadata/md5-cache/www-servers/thttpd-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=virtual/libcrypt:= 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-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
+DEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
 DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
 LICENSE=BSD GPL-2
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:=
+RDEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	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_=0263a914b18f144336699cb815a974b0
+_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_=ded99a9ec85fa1714eb7f4789aad8b50
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 7c08feb73028..8ee7bf9b480a 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	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
+_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	ab9b21d1b0a24b6afdd489885350e82e	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 869c40c9ed44..b0cd63cbd46e 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
@@ -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_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	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
+_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	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f7b227ea5931075d08f8460254506d3
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 5c74fc7f7b49..83b5466252e6 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/xprop-1.2.5 b/metadata/md5-cache/x11-apps/xprop-1.2.5
index 26700d52e3ac..e64aea10863b 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.5
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.5
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=property displayer for X
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xprop
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xprop-1.2.5.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_=df07302ecba52aa48687b5bb83602653
+_md5_=29ea8e0b7c2643aa680ccd1ae06aeda9
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.5.1 b/metadata/md5-cache/x11-apps/xrandr-1.5.1
index 4166a6f4707a..8776002ae68b 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.5.1
+++ b/metadata/md5-cache/x11-apps/xrandr-1.5.1
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11 x11-base/xor
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrandr
-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
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xrandr-1.5.1.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	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=b1f1aa9375629034754e2332bb119de3
+_md5_=f127a055cfc255c6f04084ab1a705c45
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.4-r1 b/metadata/md5-cache/x11-apps/xset-1.2.4-r1
index 2edd78e2270d..fe8c35e8877e 100644
--- a/metadata/md5-cache/x11-apps/xset-1.2.4-r1
+++ b/metadata/md5-cache/x11-apps/xset-1.2.4-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-base/xorg-proto
 DESCRIPTION=X.Org xset application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xset
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.4.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_=85991aedbef84664217982b971b101ef
+_md5_=383f80b6c07029662d0073edb231296d
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
index a6ddb2c40f3f..6b566645188c 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps x11
 DESCRIPTION=X.Org xsetroot application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
-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
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xsetroot-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_=92b4d9d6d1a7b569520f6b7d4e9d8e0f
+_md5_=49796d48c79a87f507fd3da133da9243
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 22d7a6582a8b..2dcb925f295f 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 5bef34cee39a..137ffec4f651 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) wayland? ( x11-base/xwayland )
+DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
 DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
@@ -13,4 +13,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elog
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _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	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=f745838691fd72dcb18c24672f1f8bb3
+_md5_=4ddf1d310b8c891e6363701c9db0e38e
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 42ed5c7645b7..f0bbf2002293 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r2
deleted file mode 100644
index 787d29bb3868..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2 MIT NVIDIA-r2
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/390
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run ) https://github.com/NVIDIA/nvidia-installer/archive/390.141.tar.gz -> nvidia-installer-390.141.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/390.141.tar.gz -> nvidia-modprobe-390.141.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/390.141.tar.gz -> nvidia-persistenced-390.141.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/390.141.tar.gz -> nvidia-settings-390.141.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/390.141.tar.gz -> nvidia-xconfig-390.141.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c53b8951771ef3bf02d882d2d23f7c4
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1
index e541c57bbb39..c507361813a2 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1
@@ -5,10 +5,10 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2 MIT NVIDIA-r2
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.143/NVIDIA-Linux-x86_64-390.143.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.143/NVIDIA-Linux-x86-390.143.run ) https://github.com/NVIDIA/nvidia-installer/archive/390.143.tar.gz -> nvidia-installer-390.143.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/390.143.tar.gz -> nvidia-modprobe-390.143.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/390.143.tar.gz -> nvidia-persistenced-390.143.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/390.143.tar.gz -> nvidia-settings-390.143.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/390.143.tar.gz -> nvidia-xconfig-390.143.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be38258209f7373252fdda4c82a8b681
+_md5_=a31a3f1da640e067f78d0f2d31ee3ac8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
new file mode 100644
index 000000000000..97e7ed321f53
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2 MIT NVIDIA-r2
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/390
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144.run ) x86? ( https://download.nvidia.com/XFree86/Linux-aarch64/390.144/NVIDIA-Linux-x86-390.144.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.144.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1f79d69b739a414b5546d4c7bbfdb896
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1
deleted file mode 100644
index f3111f210be1..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/450
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/450.102.04/NVIDIA-Linux-x86_64-450.102.04.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/450.102.04/NVIDIA-Linux-aarch64-450.102.04.run ) https://github.com/NVIDIA/nvidia-installer/archive/450.102.04.tar.gz -> nvidia-installer-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/450.102.04.tar.gz -> nvidia-modprobe-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/450.102.04.tar.gz -> nvidia-persistenced-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/450.102.04.tar.gz -> nvidia-settings-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/450.102.04.tar.gz -> nvidia-xconfig-450.102.04.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48d08fcd96744bdb155293ef00dfe478
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.119.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.119.03
deleted file mode 100644
index 7938d99bd0e3..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.119.03
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/450
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/450.119.03/NVIDIA-Linux-x86_64-450.119.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/450.119.03/NVIDIA-Linux-aarch64-450.119.03.run ) https://github.com/NVIDIA/nvidia-installer/archive/450.119.03.tar.gz -> nvidia-installer-450.119.03.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/450.119.03.tar.gz -> nvidia-modprobe-450.119.03.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/450.119.03.tar.gz -> nvidia-persistenced-450.119.03.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/450.119.03.tar.gz -> nvidia-settings-450.119.03.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/450.119.03.tar.gz -> nvidia-xconfig-450.119.03.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d18d05b2bd6595cdbbd0a4577b77dfbf
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
index 19eb5cabb0ba..84fbab444a09 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.67/NVIDIA-Linux-aarch64-460.67.run ) https://github.com/NVIDIA/nvidia-installer/archive/460.67.tar.gz -> nvidia-installer-460.67.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/460.67.tar.gz -> nvidia-modprobe-460.67.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/460.67.tar.gz -> nvidia-persistenced-460.67.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/460.67.tar.gz -> nvidia-settings-460.67.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/460.67.tar.gz -> nvidia-xconfig-460.67.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ccb2df79acabdc97719d3988d67909a
+_md5_=2c24e8024cb20aa2301c7e44e46d42da
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84
index b6f768e048de..c868b98b2edc 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84
@@ -5,10 +5,10 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.84/NVIDIA-Linux-x86_64-460.84.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.84/NVIDIA-Linux-aarch64-460.84.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.84.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=22889c2726c05aa028bd4b3bceefee3e
+_md5_=e82f9c9c9c0271e4dac1902ba4e4555e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
new file mode 100644
index 000000000000..0990ab11f870
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/460
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f942c4f5fc7df908a98109847cdedadb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-465.31 b/metadata/md5-cache/x11-drivers/nvidia-drivers-465.31
deleted file mode 100644
index e83f93f62f4d..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-465.31
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/465
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/465.31/NVIDIA-Linux-x86_64-465.31.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/465.31/NVIDIA-Linux-aarch64-465.31.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-465.31.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-465.31.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-465.31.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-465.31.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-465.31.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=282dcc158f4c92c448314e0114d3dd5d
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.42.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.42.01
deleted file mode 100644
index 1f2bb0a5e575..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.42.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/470
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.42.01/NVIDIA-Linux-x86_64-470.42.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.42.01/NVIDIA-Linux-aarch64-470.42.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.42.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.42.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.42.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.42.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.42.01.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b0f1144ea2506568a4cb4da313ce483
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
new file mode 100644
index 000000000000..4c2aca02f518
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X +driver static-libs +tools wayland kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/470
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.57.02/NVIDIA-Linux-x86_64-470.57.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.57.02/NVIDIA-Linux-aarch64-470.57.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.57.02.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4ea9b24d583e96f36783abfa01e67c4b
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index 70fbe747a137..fc4a219613a7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -5,10 +5,10 @@ DESCRIPTION=Generic Linux input driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
 IUSE=kernel_linux
-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=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 _eclasses_=autotools	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_=65c1ce9ca6cc409c0cdba2599c463538
+_md5_=d51cf5c0b12c4a9be4b86f2e35697477
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
index a5a5939d55b0..0dc837685a5a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=video driver for framebuffer device
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
-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=MIT
 RDEPEND=x11-base/xorg-proto x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-fbdev-0.5.0.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_=4f99888ca664c06432a1fb0201ae621a
+_md5_=339f431b73c34271cc2e6b8aa9976714
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
index 04563c330289..a878492f6a44 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.1
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=7
 HOMEPAGE=https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nouveau-1.0.17.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_=4373c687559351aff82d9a6824edf98a
+_md5_=60df6fdd8dc042adfb071a7031b5e78a
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index cba53fc6c28e..fad360c9985c 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/fltk-1.3.5-r4 b/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
index 1c461c02b53a..463cc54537c2 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
@@ -5,10 +5,10 @@ DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=7
 HOMEPAGE=https://www.fltk.org/
 IUSE=cairo debug doc examples games +opengl static-libs +threads +xft +xinerama 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=FLTK LGPL-2
 RDEPEND=>=media-libs/libpng-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[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/libSM[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/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[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[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] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=1
 SRC_URI=https://www.fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.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	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5b1de4bbaf649953b30fa2d9b77844ae
+_md5_=71ff22155fbfc07847d7bbdd236307e3
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
index 2a660766a8a5..74a917103317 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Xxf86dga library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86dga
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=>=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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86dga-1.1.5.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_=365db478ff6409e47be10632b7cd5c25
+_md5_=b9ab00c642f59fd0b708ccd39a15c2d1
diff --git a/metadata/md5-cache/x11-libs/libfm-1.3.2 b/metadata/md5-cache/x11-libs/libfm-1.3.2
index c3c76c6a5941..0e9134a74c8c 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.3.2
+++ b/metadata/md5-cache/x11-libs/libfm-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for file management
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
 IUSE=+automount debug doc examples exif gtk udisks vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1:= ~x11-libs/libfm-extra-1.3.2 gtk? ( x11-libs/gtk+:3 ) udisks? ( dev-libs/dbus-glib ) !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/5.3.1
 SRC_URI=https://github.com/lxde/libfm/archive/1.3.2.tar.gz -> libfm-1.3.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=685ed6b59353cbf45e5c563cec4c15dc
+_md5_=7c0d6f04e100d842867d474628fdc521
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.3.2 b/metadata/md5-cache/x11-libs/libfm-extra-1.3.2
index 12d78be578ee..41c3ef501315 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.3.2
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.3.2
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.18:2 dev-util/desktop-file-utils x11-misc/shared-mime-i
 DESCRIPTION=Library for file management
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2
 SLOT=0/5.3.1
 SRC_URI=https://github.com/lxde/libfm/archive/1.3.2.tar.gz -> libfm-1.3.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6fec576ede6f57265c845b79d3fa944e
+_md5_=d4c5dcd0159661876e54147395cf007f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5ac74b370e82..6cab70e7015d 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/obconf-2.0.4_p20150213 b/metadata/md5-cache/x11-misc/obconf-2.0.4_p20150213
index 82bb1128cd73..02c2b34d571d 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4_p20150213
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4_p20150213
@@ -5,10 +5,10 @@ DESCRIPTION=Tool for configuring the Openbox window manager
 EAPI=7
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
 IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/startup-notification >=x11-wm/openbox-3.5.2
 SLOT=0
 SRC_URI=http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39;sf=tgz -> obconf-2.0.4_p20150213.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=308fbd9b84ef2f70d56f5ae3ba030ae1
+_md5_=aa355c77b31d50c46a2d51cef3ea3d43
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
index 2edd5df0c917..6ec587faa0b5 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Fast lightweight tabbed filemanager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/PCManFM
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 sys-apps/util-linux virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2:=[gtk] x11-libs/libX11 x11-libs/pango x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.2.tar.xz
 _eclasses_=readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d0ed55e5a0f2f3150f9a0d3e61871cb5
+_md5_=26ba61b4be6c78c0b8deb971133d344b
diff --git a/metadata/md5-cache/x11-misc/polybar-3.5.5 b/metadata/md5-cache/x11-misc/polybar-3.5.5
index b1f4052889ba..760bb2f567af 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.5.5
+++ b/metadata/md5-cache/x11-misc/polybar-3.5.5
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.5.5.tar.gz -> polybar-3.5.5.tar.gz https://github.com/polybar/xpp/archive/044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz -> xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz https://github.com/polybar/i3ipcpp/archive/cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz -> i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz
 _eclasses_=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_=288492f7cefb2762da8f19b9cd42bec6
+_md5_=1e30787412136555d21e798575e75ecf
diff --git a/metadata/md5-cache/x11-misc/polybar-3.5.6 b/metadata/md5-cache/x11-misc/polybar-3.5.6
index c70745dda835..ef62aac5a5d0 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.5.6
+++ b/metadata/md5-cache/x11-misc/polybar-3.5.6
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.5.6.tar.gz -> polybar-3.5.6.tar.gz https://github.com/polybar/xpp/archive/044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz -> xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz https://github.com/polybar/i3ipcpp/archive/86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz -> i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz
 _eclasses_=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_=eb60e56db776ee6cf9ec140859881e8e
+_md5_=88719ce3d9e03f4a78e75b306f29366b
diff --git a/metadata/md5-cache/x11-misc/shutter-0.97 b/metadata/md5-cache/x11-misc/shutter-0.97
index 34a2f0041ffc..9bfa4aa00cce 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.97
+++ b/metadata/md5-cache/x11-misc/shutter-0.97
@@ -3,10 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Feature-rich screenshot program
 EAPI=7
 HOMEPAGE=https://shutter-project.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.97.tar.gz -> shutter-0.97.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b06edc3cb1cb6b2140d4891d6ece9560
+_md5_=cb4a5c4edb66808b6966212d5fa17c2b
diff --git a/metadata/md5-cache/x11-misc/slock-1.4-r1 b/metadata/md5-cache/x11-misc/slock-1.4-r1
index e764d6541cfe..928674ad6736 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_=352a9b8d338854e9fbba9712cd11a11e
+_md5_=1b7517b2b9db95388f58f1d3c98243ac
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.6.2 b/metadata/md5-cache/x11-misc/sxhkd-0.6.2
index 6c4f585b143b..c8bfedbbdad7 100644
--- a/metadata/md5-cache/x11-misc/sxhkd-0.6.2
+++ b/metadata/md5-cache/x11-misc/sxhkd-0.6.2
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util
 DESCRIPTION=Simple X hotkey daemon
 EAPI=7
 HOMEPAGE=https://github.com/baskerville/sxhkd/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
 SLOT=0
 SRC_URI=https://github.com/baskerville/sxhkd/archive/0.6.2.tar.gz -> sxhkd-0.6.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e705f638bc6eece35d2cbcb7e41153fe
+_md5_=cd1c2070ac6936a682d1ad2b642462d4
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6-r1 b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
index 08b36018b8e2..dcb7af269eae 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_=28357ff121418e46864d87f7ec4b29b4
+_md5_=7446c72054f8c8ee0d41e2e6a5613449
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r7 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r7
index d59ad8a0eaee..802495f1ada9 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r7
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r7
@@ -5,10 +5,10 @@ DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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=GPL-2+-with-openssl-exception
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 virtual/libcrypt:= ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=807d91e38a3109f1e63873fd2b432685
+_md5_=2d8f579111a3b2ffdf1d2e3f9ef5ed44
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
index 475c8cc29a9b..915d013dd0fb 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop intero
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=dbus doc gnome
-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
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dbus? ( sys-apps/dbus gnome? ( dev-perl/Net-DBus dev-perl/X11-Protocol ) ) x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
 REQUIRED_USE=gnome? ( dbus )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=581e745075a41eab5b9ce97b710dc2f3
+_md5_=6d464704dc35dcd2b62c9043359d859a
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2 b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2
new file mode 100644
index 000000000000..5ca4199b2fbd
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2
@@ -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 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=modular screen saver and locker for the X Window System
+EAPI=7
+HOMEPAGE=https://www.jwz.org/xscreensaver/
+IUSE=elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD fonts? ( MIT Apache-2.0 )
+RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) media-gfx/fbida perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+REQUIRED_USE=gdk-pixbuf? ( gtk ) elogind? ( !systemd )
+SLOT=0
+SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.01.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=56f389a981a017fb0433e9d544139255
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3 b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3
new file mode 100644
index 000000000000..5362f9ad689f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext xft? ( x11-libs/libXft ) x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:= ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=modular screen saver and locker for the X Window System
+EAPI=7
+HOMEPAGE=https://www.jwz.org/xscreensaver/
+IUSE=elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD fonts? ( MIT Apache-2.0 )
+RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext xft? ( x11-libs/libXft ) x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:= ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) media-gfx/fbida perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+REQUIRED_USE=gdk-pixbuf? ( gtk ) gtk? ( png ) opengl? ( png ) elogind? ( !systemd )
+SLOT=0
+SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.01.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e7a5fec084f42dd39e64e68198a4d257
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
index 1b404522f4a7..a11e89bde4c0 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
+++ b/metadata/md5-cache/x11-misc/xvfb-run-1.20.10.3
@@ -3,9 +3,9 @@ DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.10-3.diff.gz
-_md5_=ccfc51a0ad327f9bdda4e96632070e2a
+_md5_=f4786b0666903b9076e537f81ee3aac1
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.6.6 b/metadata/md5-cache/x11-misc/xwallpaper-0.6.6
deleted file mode 100644
index 752d7d57333d..000000000000
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.6.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
-DEFINED_PHASES=configure prepare
-DEPEND=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 ) virtual/pkgconfig
-DESCRIPTION=Wallpaper setting utility for X
-EAPI=7
-HOMEPAGE=https://github.com/stoeckmann/xwallpaper
-IUSE=jpeg png seccomp xpm
-KEYWORDS=amd64 ~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.6.6/xwallpaper-0.6.6.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=215f10fc5de1cb7b02de64d0b22d688d
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.1 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
index 7e7ed63df8de..d1ab78789d2d 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_=6853746ed89710f3de48f0fefc752520
+_md5_=791e064a3a2eeda086dd03c20b5199a7
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.2 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.2
new file mode 100644
index 000000000000..16a74f023c73
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.7.2
@@ -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 prepare
+DEPEND=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 )
+DESCRIPTION=Wallpaper setting utility for X
+EAPI=7
+HOMEPAGE=https://github.com/stoeckmann/xwallpaper
+IUSE=+jpeg +png seccomp xpm
+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.2/xwallpaper-0.7.2.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b973083bc7f8eb3c9cc3c76ddce1a757
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.1 b/metadata/md5-cache/x11-misc/zim-0.73.1
index 73e757fbf35f..c004dc0344e6 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.1
+++ b/metadata/md5-cache/x11-misc/zim-0.73.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.1.tar.gz -> zim-0.73.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7652eee68dceb0b678d637e0d6c18d91
+_md5_=67417ee15dd0b3e7a7e548993e8ec629
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.2 b/metadata/md5-cache/x11-misc/zim-0.73.2
index d7ce7d0ac7df..a34641bda1ac 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.2
+++ b/metadata/md5-cache/x11-misc/zim-0.73.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.2.tar.gz -> zim-0.73.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	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f13603d2a32ed200cfcbcd108a51752c
+_md5_=cfdbaa86e64e93acdc7c4972a270e807
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.3 b/metadata/md5-cache/x11-misc/zim-0.73.3
index afdd8835fb1c..a9e3bb23ad3e 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.3
+++ b/metadata/md5-cache/x11-misc/zim-0.73.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.3.tar.gz -> zim-0.73.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f13603d2a32ed200cfcbcd108a51752c
+_md5_=cfdbaa86e64e93acdc7c4972a270e807
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.4 b/metadata/md5-cache/x11-misc/zim-0.73.4
index ba31d8ece638..2302055e4d0b 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.4
+++ b/metadata/md5-cache/x11-misc/zim-0.73.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.4.tar.gz -> zim-0.73.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22bfb18a80f7b514f7acb04e71e831aa
+_md5_=1401e893a6991d8e25975419188fa7fe
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.5 b/metadata/md5-cache/x11-misc/zim-0.73.5
index 0284021d698c..6b7a707b07f6 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.5
+++ b/metadata/md5-cache/x11-misc/zim-0.73.5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.5.tar.gz -> zim-0.73.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ec9e1c604950319c9e43fb11dd100e67
+_md5_=4ee9bf5ad8b59df4ab44f6bb5c7e0181
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 09e9a1a0880e..0f5b0bbd0651 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-sipe-1.25.0-r1 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
index 0f969db699da..87d1e6fcd109 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
 EAPI=7
 HOMEPAGE=http://sipe.sourceforge.net/
 IUSE=dbus debug kerberos ocs2005-message-hack openssl telepathy voice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmime:2.6 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:1.0 net-libs/farstream:0.2 ) !voice? ( >=dev-libs/glib-2.12.0:2 ) net-im/pidgin[dbus?] telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.25.0.tar.gz
-_md5_=e67e037d88c4ad7b3183ac8d51d5dda7
+_md5_=56d005dc269c9959383ba94237a33fb4
diff --git a/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7 b/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7
new file mode 100644
index 000000000000..b1291432bff3
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.7
@@ -0,0 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=net-im/pidgin sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( dev-libs/openssl:0= ) png? ( media-libs/libpng:0= ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=A libpurple protocol plugin that adds support for the Telegram messenger
+EAPI=7
+HOMEPAGE=https://github.com/majn/telegram-purple
+IUSE=gcrypt +nls +png +webp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=net-im/pidgin sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( dev-libs/openssl:0= ) png? ( media-libs/libpng:0= ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=https://github.com/majn/telegram-purple/releases/download/v1.4.7/telegram-purple_1.4.7.orig.tar.gz
+_md5_=960c7a40f81868b0d5b13304d0950cbd
diff --git a/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3 b/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3
deleted file mode 100644
index 5eb0b66b5d90..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=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=6
-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_=cca8a73aab2265b7b2b92efda147ab39
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 05b960b338fb..7496f60680f1 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.8.0 b/metadata/md5-cache/x11-terms/alacritty-0.8.0
index 6d26c04e3fd4..1dbb07e1e3d6 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.8.0
+++ b/metadata/md5-cache/x11-terms/alacritty-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=GPU-accelerated terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/alacritty/alacritty
 IUSE=wayland +X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
 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
 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	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
+_md5_=3cc833b158b2ce4e621f9c68357fc6c9
diff --git a/metadata/md5-cache/x11-terms/guake-3.7.0 b/metadata/md5-cache/x11-terms/guake-3.7.0
index 069c10cfc1a1..a4bedc9fce88 100644
--- a/metadata/md5-cache/x11-terms/guake-3.7.0
+++ b/metadata/md5-cache/x11-terms/guake-3.7.0
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://pypi/g/guake/guake-3.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=167e914270acfacee143e984a9408698
+_md5_=4e2b2ef282b1512dcfeeca5270489a5e
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index 513f0bbd06d0..d580dc5e08df 100644
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ b/metadata/md5-cache/x11-terms/guake-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e9faa9ae24de2ec8f52de414a47dd1f2
+_md5_=898d8cea70d11b725f5b65209208fc2d
diff --git a/metadata/md5-cache/x11-terms/kitty-0.19.3 b/metadata/md5-cache/x11-terms/kitty-0.19.3
index 1e203dac6c14..238126be0bee 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.19.3
+++ b/metadata/md5-cache/x11-terms/kitty-0.19.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e2239503f9a856fccb436d7f5cbb9aa2
+_md5_=a583bd712eaebc08d2fd7ce0119d367c
diff --git a/metadata/md5-cache/x11-terms/kitty-0.20.1 b/metadata/md5-cache/x11-terms/kitty-0.20.1
index 4cc01d1c3cd9..731ebb7430d4 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.20.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.20.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.1/kitty-0.20.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3f7b87f79e915ce454b8222c2d422dfd
+_md5_=141d39183bedd446f369a653483412fb
diff --git a/metadata/md5-cache/x11-terms/kitty-0.20.3 b/metadata/md5-cache/x11-terms/kitty-0.20.3
index ff0a8f78e1cb..c0d8aeae29cf 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.20.3
+++ b/metadata/md5-cache/x11-terms/kitty-0.20.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.3/kitty-0.20.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62615b0e482c9dd17c5be3f5dc0c18a9
+_md5_=70b351d45bc0bf2b2c7e1452bd39c992
diff --git a/metadata/md5-cache/x11-terms/kitty-0.21.2 b/metadata/md5-cache/x11-terms/kitty-0.21.2
index 5f0834a51319..2867a693ae98 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.21.2
+++ b/metadata/md5-cache/x11-terms/kitty-0.21.2
@@ -12,4 +12,4 @@ 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
+_md5_=e3bf57ee9c27d79960bc856157bfa7e4
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index e55b29415d4d..46db6873a8b0 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_=5c548f9373bebe212e7d637cff228604
+_md5_=b8da6c893c915a7c20c9ad0bca96436c
diff --git a/metadata/md5-cache/x11-terms/st-0.8.4 b/metadata/md5-cache/x11-terms/st-0.8.4
index cabad8bb8512..796db10ad538 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_=9e411094c7a38090a6665a63d136bc6f
+_md5_=67e1593f9bdb419a8d777157b58b9d9e
diff --git a/metadata/md5-cache/x11-terms/zutty-0.9 b/metadata/md5-cache/x11-terms/zutty-0.9
index 965bbe021f43..f843ecca393b 100644
--- a/metadata/md5-cache/x11-terms/zutty-0.9
+++ b/metadata/md5-cache/x11-terms/zutty-0.9
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype:2 media-libs/libglvnd[X] x11-libs/libXmu
 DESCRIPTION=X terminal emulator rendering through OpenGL ES Compute Shaders
 EAPI=7
 HOMEPAGE=https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=media-libs/freetype:2 media-libs/libglvnd[X] x11-libs/libXmu
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/zutty/archive/refs/tags/0.9.tar.gz -> zutty-0.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=237f3d44e6b89594fdbda03fedb8cff7
+_md5_=7f2f86bc912ccbf56eab4c1ab298ddcf
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 2b8ede365c84..267bf92628e1 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/arc-theme-20201013 b/metadata/md5-cache/x11-themes/arc-theme-20201013
deleted file mode 100644
index 7123bd14ac35..000000000000
--- a/metadata/md5-cache/x11-themes/arc-theme-20201013
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=cinnamon? ( dev-lang/sassc gnome-extra/cinnamon ) gnome-shell? ( dev-lang/sassc >=gnome-base/gnome-shell-3.18 ) gtk2? ( !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) ) gtk3? ( dev-lang/sassc !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) virtual/pkgconfig >=x11-libs/gtk+-3.18:3 ) xfce? ( !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure prepare
-DESCRIPTION=A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell
-EAPI=7
-HOMEPAGE=https://github.com/jnsh/arc-theme
-IUSE=cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=gtk2? ( x11-themes/gnome-themes-standard x11-themes/gtk-engines-murrine )
-SLOT=0
-SRC_URI=https://github.com/jnsh/arc-theme/releases/download/20201013/arc-theme-20201013.tar.xz pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/arc-theme-20201013-pngs.tar.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4176356ad6a8f4cc685685b93d37d0fc
diff --git a/metadata/md5-cache/x11-themes/arc-theme-20210127 b/metadata/md5-cache/x11-themes/arc-theme-20210127
deleted file mode 100644
index 5fc488ac4f25..000000000000
--- a/metadata/md5-cache/x11-themes/arc-theme-20210127
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 cinnamon? ( dev-lang/sassc gnome-extra/cinnamon ) gnome-shell? ( dev-lang/sassc >=gnome-base/gnome-shell-3.18 ) gtk2? ( !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) ) gtk3? ( dev-lang/sassc !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) virtual/pkgconfig =x11-libs/gtk+-3.24*:3 ) xfce? ( !pre-rendered? ( media-gfx/inkscape media-gfx/optipng ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell
-EAPI=7
-HOMEPAGE=https://github.com/jnsh/arc-theme
-IUSE=cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=gtk2? ( x11-themes/gnome-themes-standard x11-themes/gtk-engines-murrine )
-SLOT=0
-SRC_URI=https://github.com/jnsh/arc-theme/releases/download/20210127/arc-theme-20210127.tar.xz pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/arc-theme-20210127-pngs.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90dd7d72d0d31933638553037ebd51b2
diff --git a/metadata/md5-cache/x11-themes/arc-theme-20210412 b/metadata/md5-cache/x11-themes/arc-theme-20210412
index 119cd4b8e1ff..cdf8a8b4a949 100644
--- a/metadata/md5-cache/x11-themes/arc-theme-20210412
+++ b/metadata/md5-cache/x11-themes/arc-theme-20210412
@@ -4,10 +4,10 @@ DESCRIPTION=A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Sh
 EAPI=7
 HOMEPAGE=https://github.com/jnsh/arc-theme
 IUSE=cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=gtk2? ( x11-themes/gnome-themes-standard x11-themes/gtk-engines-murrine )
 SLOT=0
 SRC_URI=https://github.com/jnsh/arc-theme/releases/download/20210412/arc-theme-20210412.tar.xz pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/arc-theme-20210412-pngs.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c7574f6c1ac58853dc4967d1fc2313a
+_md5_=c3bb7f1b5b464e18a0774942611e35f8
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1 b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
index 8f84fe7d6ff7..15dea8d957e0 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
@@ -1,6 +1,6 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEFINED_PHASES=install postinst postrm preinst prepare
 DESCRIPTION=Colorized icons shared between all gnome-colors iconsets
-EAPI=6
+EAPI=7
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 IUSE=+branding
 KEYWORDS=amd64 x86
@@ -9,5 +9,5 @@ RDEPEND=x11-themes/adwaita-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.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_=b845252d86eefea14dfe77ef5cb0c324
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=48f90ea57b14cf757937e907b2cbdacb
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1 b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
index 24309a42c09c..409ebcdbd810 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
@@ -1,6 +1,6 @@
-DEFINED_PHASES=compile install postinst postrm preinst
+DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Some gnome-colors iconsets including a Gentoo one
-EAPI=6
+EAPI=7
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 public-domain
@@ -8,5 +8,5 @@ RDEPEND=x11-themes/gnome-colors-common
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz https://dev.gentoo.org/~pacho/gnome-gentoo-5.5.1.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_=8c2355ee162db75347195c482f024be3
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b324b1e7dd5b39a1a9a67304e49a92e6
diff --git a/metadata/md5-cache/x11-themes/murrine-themes-0.98.0-r1 b/metadata/md5-cache/x11-themes/murrine-themes-0.98.0-r1
index fa8f5e41c3ad..27aaf559c1fa 100644
--- a/metadata/md5-cache/x11-themes/murrine-themes-0.98.0-r1
+++ b/metadata/md5-cache/x11-themes/murrine-themes-0.98.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Themes for the Murrine GTK+2 Cairo Engine
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.cimitan.com/murrine/
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-themes/gtk-engines-murrine-0.98.0
 SLOT=0
 SRC_URI=http://www.cimitan.com/murrine/files/MurrinaAquaIsh.tar.bz2 http://www.cimitan.com/murrine/files/MurrinaBlu-0.32.tar.gz http://www.cimitan.com/murrine/files/MurrinaCandido.tar.gz http://www.cimitan.com/murrine/files/MurrinaGilouche.tar.bz2 http://www.cimitan.com/murrine/files/MurrinaFancyCandy.tar.bz2 http://www.cimitan.com/murrine/files/MurrinaLoveGray.tar.bz2 http://www.cimitan.com/murrine/files/MurrineThemePack.tar.bz2 http://www.cimitan.com/murrine/files/MurrinaVerdeOlivo.tar.bz2 http://www.cimitan.com/murrine/files/MurrineXfwm.tar.bz2 http://www.cimitan.com/murrine/files/MurrinaCream.tar.gz http://www.cimitan.com/murrine/files/NOX-svn-r22.tar.gz http://gnome-look.org/CONTENT/content-files/93558-Murreza.tar.gz
-_md5_=6d2685fbcede709e4588fda19d0a99cc
+_md5_=fd6eb55db56baab27b86abc2add9e391
diff --git a/metadata/md5-cache/x11-themes/shiki-colors-4.6 b/metadata/md5-cache/x11-themes/shiki-colors-4.6
index 10d9b68c4647..c355add809e3 100644
--- a/metadata/md5-cache/x11-themes/shiki-colors-4.6
+++ b/metadata/md5-cache/x11-themes/shiki-colors-4.6
@@ -1,6 +1,6 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=install
 DESCRIPTION=Mixes the elegance of a dark theme with the usability of a light theme
-EAPI=5
+EAPI=7
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -8,4 +8,4 @@ RDEPEND=|| ( x11-wm/muffin x11-wm/mutter xfce-base/xfwm4 ) x11-themes/gtk-engine
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/shiki-colors-4.6.tar.gz https://dev.gentoo.org/~pacho/Shiki-Gentoo-4.6.tar.bz2
-_md5_=d586b0d3b5dda4d13c1653fe17241874
+_md5_=212a744cfdd29d5fb79df2b339c487a2
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 35d71caca44c..06c924851da1 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/bspwm-0.9.10 b/metadata/md5-cache/x11-wm/bspwm-0.9.10
index 1d1706e0448d..0c5f68d1a6fc 100644
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.10
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.10
@@ -4,10 +4,10 @@ DESCRIPTION=Tiling window manager based on binary space partitioning
 EAPI=7
 HOMEPAGE=https://github.com/baskerville/bspwm/
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
 SLOT=0
 SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.10.tar.gz -> bspwm-0.9.10.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81a9676c210ca1be40cb5467d83a531f
+_md5_=a7f325cc9cfe6c541b0203de6ea1d9c4
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3 b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
index 347aeee28124..4ad2a3d678de 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_8 python_single_target_pyt
 SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.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_=a52f04d38796f410d3c7d17482cac5cf
+_md5_=de0d2446ab82c24990d513b86ddc7573
diff --git a/metadata/md5-cache/x11-wm/openbox-9999 b/metadata/md5-cache/x11-wm/openbox-9999
index bfdba0c57f7a..317451de1fbe 100644
--- a/metadata/md5-cache/x11-wm/openbox-9999
+++ b/metadata/md5-cache/x11-wm/openbox-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_8 python_single_target_pyt
 SLOT=3
 SRC_URI=branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=910bd94a1747efd4e29b6b5e4728e067
+_md5_=e451b6d30d8fefb2f347a479a67bd88f
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r1 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r1
deleted file mode 100644
index 85798c02bf62..000000000000
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=window manager without mouse dependency
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/ratpoison/
-IUSE=debug emacs +history sloppy +xft +xrandr
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	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_=00806760887f0cc695c576402fa2b3e9
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2
new file mode 100644
index 000000000000..b04ba3d48176
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=window manager without mouse dependency
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/ratpoison/
+IUSE=debug emacs +history sloppy +xft +xrandr
+KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	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_=e2490d51f0a4b4cb2b9971bf2c11cfb3
diff --git a/metadata/md5-cache/x11-wm/ratpoison-9999 b/metadata/md5-cache/x11-wm/ratpoison-9999
index ee26c0bbf876..a5275897654c 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-9999
+++ b/metadata/md5-cache/x11-wm/ratpoison-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=window manager without mouse dependency
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/ratpoison/
 IUSE=debug emacs +history sloppy +xft +xrandr
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) dev-perl/Pod-Parser x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e44b6705591778453593e0586be72810
+_md5_=7c417b5cfeb38de16b221e5427c0e14e
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244 b/metadata/md5-cache/x11-wm/subtle-0.11.3244
index 964d2a585ee8..fa74644775d5 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58af8881943b5be9628c8b24d712201b
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1 b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
new file mode 100644
index 000000000000..ba9d995402e0
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( ruby_targets_ruby26? ( dev-ruby/minitar[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitar[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/minitar[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] doc? ( dev-ruby/rdoc[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=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+DESCRIPTION=A manual tiling window manager
+EAPI=7
+HOMEPAGE=https://subforge.org/projects/subtle/wiki
+IUSE=debug doc +xft xinerama xpm +xrandr +xtest test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby26? ( dev-ruby/minitar[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitar[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/minitar[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49a1326fcd33328d94a226525b20afa0
diff --git a/metadata/md5-cache/x11-wm/subtle-9999 b/metadata/md5-cache/x11-wm/subtle-9999
deleted file mode 100644
index 26b2776438af..000000000000
--- a/metadata/md5-cache/x11-wm/subtle-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( ruby_targets_ruby25? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) dev-vcs/mercurial
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=A manual tiling window manager
-EAPI=7
-HOMEPAGE=https://subforge.org/projects/subtle/wiki
-IUSE=debug doc +xft xinerama xpm +xrandr +xtest test ruby_targets_ruby25 ruby_targets_ruby26
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby25? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/archive-tar-minitar[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 ) !test? ( test )
-SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58af8881943b5be9628c8b24d712201b
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2 b/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
deleted file mode 100644
index 29107237d6db..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,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 csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python3_8? ( dev-lang/python: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=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=6
-HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,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 csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rencode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/opencv[python] dev-python/pyinotify[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( client server ) cups? ( dbus ) opengl? ( client ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://xpra.org/src/xpra-3.0.5.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed559b56c2367fcd783a885c4e1a0425
diff --git a/metadata/md5-cache/x11-wm/xpra-4.1.3 b/metadata/md5-cache/x11-wm/xpra-4.1.3
deleted file mode 100644
index fe1294183350..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-4.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-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 +lz4 lzo minimal opengl pillow 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 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.1.3.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_=2425aa5f7fcfdd8c9384d194dbfe21d7
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2 b/metadata/md5-cache/x11-wm/xpra-4.2
index 776414d99dae..fe5a941f0cb4 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.2
@@ -5,7 +5,7 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 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
+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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.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
+_md5_=7b1fcf193a61312e8c45ee1714c6d929
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 60491ecbde17..e5ec105dfe33 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/libxfce4util-4.17.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.17.1
new file mode 100644
index 000000000000..d19b05e78712
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.17.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) )
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.56 introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=A basic utility library for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
+IUSE=+introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.56 introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/7
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.17/libxfce4util-4.17.1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dae2a4c49e4b05c5b87fc8ace377e686
diff --git a/metadata/md5-cache/xfce-base/thunar-4.17.4 b/metadata/md5-cache/xfce-base/thunar-4.17.4
new file mode 100644
index 000000000000..1ef82482d492
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-4.17.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.0:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.0:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.17/thunar-4.17.4.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5d8ffbe655b7b2cce39d6cd8fed1fd38
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9a0777f62270..81cba1f8f3eb 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
index b63dce9033fc..62be29e8ea49 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
+++ b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.12.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5fe07af2cc9e55dcdd6cf47af0e9e87
+_md5_=a88f34de6e4d92cb57b6bb0f8bcab4ab
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
index 7fab00a98a9d..99010dbabb7a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
+++ b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.13.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=88bc08bb33f841421385aead61d4123a
+_md5_=a88f34de6e4d92cb57b6bb0f8bcab4ab
diff --git a/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.en.txt b/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.en.txt
deleted file mode 100644
index 16b5596c9978..000000000000
--- a/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.en.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Title: migrating from glibc[crypt] to libxcrypt in ~arch
-Author: Andreas K. Hüttel <dilfridge@gentoo.org>
-Author: Sam James <sam@gentoo.org>
-Posted: 2021-06-30
-Revision: 1
-News-Item-Format: 2.0
-
-The implementation of libcrypt.so within glibc has been deprecated
-for a long time and will be removed in the near future.
-
-For this reason, we are following other distributions (where
-this has been tested for years already) and switching to the 
-external libxcrypt implementation, starting with ~arch 
-installations.
-
-This will be a regular update, and in nearly all cases you
-will not have to take any action and not observe any problems.
-
-We do recommend, however, that your system is *fully* up
-to date first. This is a standard recommendation but in this
-specific case, it is useful to have a simplified depgraph
-to ensure that Portage is able to smoothly calculate
-an upgrade path.
-
-That is, please take the opportunity to fully upgrade your
-systems now, before the migration occurs, to simplify matters.
-
-This change will occur on 2021-07-14 for ~arch users. Stable
-users will update at a later date.
-
-If for whatever reason you do *not* wish to switch now -
-which is only delaying the inevitable - you
-need to take the following steps:
-* unmask and enable the crypt USE flag of sys-libs/glibc
-* mask the system USE flag of sys-libs/libxcrypt
-* mask >=virtual/libcrypt-2
-
-If you wish to manually migrate now, there are a series
-of steps described on the wiki (see below), but the outline is:
-* unforce the crypt USE flag of sys-libs/glibc and disable it
-* unmask the system and split-usr (if applicable) USE flag of sys-libs/libxcrypt
-and enable it
-* unmask ~virtual/libcrypt-2
-
-For more information, please see:
-* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
-* https://bugs.gentoo.org/699422
diff --git a/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt b/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt
deleted file mode 100644
index d52db1143a5a..000000000000
--- a/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Title: Миграци� в ~arch � glibc[crypt] на libxcrypt
-Author: Andreas K. Hüttel <dilfridge@gentoo.org>
-Author: Sam James <sam@gentoo.org>
-Translator: Alexey Sokolov <alexey+gentoo@asokolov.org>
-Posted: 2021-06-30
-Revision: 1
-News-Item-Format: 2.0
-
-Реализаци� библиотеки libcrypt.so в glibc давно у�тарела и �коро
-будет удалена.
-
-Прочие ди�трибутивы годы назад уже переключили�ь на внешнюю
-реализацию под названием libxcrypt. Мы решили по�ледовать их примеру
-и тоже переключить�� на libxcrypt. Вначале изменени� затронут �и�темы
-на ~arch.
-
-Это будет обычное обновление, и, �корее в�его, вам не нужно будет
-предпринимать никаких дей�твий, и проблем возникнуть не должно.
-
-Однако, мы рекомендуем �перва *полно�тью* обновить �и�тему.
-Это �тандартна� рекомендаци�, но в �том конкретном �лучае
-более про�той граф зави�имо�тей поможет portage вычи�лить
-пор�док обновлений.
-
-Так что, чтобы упро�тить проце�� обновлени�, пожалуй�та,
-обновите �и�тему �ейча�, до начала �амой миграции.
-
-Дл� пользователей ~arch изменение произойдёт 14 июл� 2021,
-пользователи �табильной ветки перейдут на libxcrypt позже.
-
-Е�ли по какой-либо причине вы *не* хотите пока переходить
-на libxcrypt (в�его лишь отлага� неизбежное), выполните
-�ледующие дей�тви�:
-* разма�кируйте и включите USE-флаг crypt пакета sys-libs/glibc
-* зама�кируйте USE-флаг system пакета sys-libs/libxcrypt
-* зама�кируйте >=virtual/libcrypt-2
-
-Е�ли вы хотите перейти на libxcrypt уже, точна� процедура
-опи�ана в wiki (�м. ниже), но �уть така�:
-* принудительно выключите USE-флаг crypt пакета sys-libs/glibc
-* разма�кируйте USE-флаги system и, е�ли требует��, split-usr
-  пакета sys-libs/libxcrypt
-* разма�кируйте ~virtual/libcrypt-2
-
-Дополнительные �ведени� можно найти зде�ь:
-* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
-* https://bugs.gentoo.org/699422
diff --git a/metadata/news/2021-07-17-new-ppc64-profiles/2021-07-17-new-ppc64-profiles.en.txt b/metadata/news/2021-07-17-new-ppc64-profiles/2021-07-17-new-ppc64-profiles.en.txt
new file mode 100644
index 000000000000..63449633166e
--- /dev/null
+++ b/metadata/news/2021-07-17-new-ppc64-profiles/2021-07-17-new-ppc64-profiles.en.txt
@@ -0,0 +1,78 @@
+Title: new ppc64 profiles
+Author: Georgy Yakovlev <gyakovlev@gentoo.org>
+Posted: 2021-07-17
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Profile: default/linux/powerpc/ppc64/17.0/64bit-userland
+Display-If-Profile: default/linux/powerpc/ppc64/17.0/64bit-userland/desktop
+Display-If-Profile: default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome
+Display-If-Profile: default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd
+Display-If-Profile: default/linux/powerpc/ppc64/17.0/64bit-userland/developer
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/metadata/news/2021-07-20-perl-5_34-upgrade/2021-07-20-perl-5_34-upgrade.en.txt b/metadata/news/2021-07-20-perl-5_34-upgrade/2021-07-20-perl-5_34-upgrade.en.txt
new file mode 100644
index 000000000000..bc1baa111ece
--- /dev/null
+++ b/metadata/news/2021-07-20-perl-5_34-upgrade/2021-07-20-perl-5_34-upgrade.en.txt
@@ -0,0 +1,46 @@
+Title: Perl 5.34 upgrade now stable
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-07-20
+Revision: 1
+News-Item-Format: 2.0
+
+The Perl project in Gentoo has begun stabilisation of Perl 5.34 [0]
+which is the latest stable version released upstream.
+
+While the package manager usually handles this upgrade cleanly, 
+there are some bugs [1][2][3] which affect Portage's dependency resolution
+that sometimes mean rebuilds occur in the wrong order - this is
+exacerbated by the packaging model used for Perl (but not its fault).
+
+We therefore recommend the following procedure for users:
+1. Sync your tree:
+# emerge --sync
+
+2. Perform a full world upgrade, e.g.:
+# emerge -a -uvDU @world --keep-going=y
+
+3. If any failures occur, please run perl-cleaner --all, then try again:
+# perl-cleaner --all
+
+4. Perform a world upgrade again.
+
+5. Once complete, depclean:
+# emerge -a --depclean
+
+If the upgrade fails with conflicts, please try --backtrack=1000 or some
+other large number.
+
+Rarely, it may be necessary to perform a one-off installation of a package,
+but usually `perl-cleaner` will resolve the issue. If an error message occurs
+after running perl-cleaner, try e.g. for a fictional package dev-perl/foo:
+# emerge -a --oneshot --verbose dev-perl/foo
+
+If you have any issues, please consult the standard support channels [4]
+(such as our forums or IRC channels) and we will do our best to get your
+system working well again.
+
+[0] https://bugs.gentoo.org/802639
+[1] https://bugs.gentoo.org/592880
+[2] https://bugs.gentoo.org/793992
+[3] https://bugs.gentoo.org/199856
+[4] https://www.gentoo.org/support/
diff --git a/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.en.txt b/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.en.txt
new file mode 100644
index 000000000000..824919824ee9
--- /dev/null
+++ b/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.en.txt
@@ -0,0 +1,65 @@
+Title: migrating from glibc[crypt] to libxcrypt in ~arch
+Author: Andreas K. Hüttel <dilfridge@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-07-23
+Revision: 1
+News-Item-Format: 2.0
+
+The implementation of libcrypt.so within glibc has been deprecated
+for a long time and will be removed in the near future.
+
+For this reason, we are following other distributions (where
+this has been tested for years already) and switching to the 
+external libxcrypt implementation, starting with ~arch 
+installations.
+
+This will be a regular update, and in nearly all cases you
+will not have to take any action and not observe any problems.
+
+We do recommend, however, that your system is *fully* up
+to date first. This is a standard recommendation but in this
+specific case, it is useful to have a simplified depgraph
+to ensure that Portage is able to smoothly calculate
+an upgrade path.
+
+That is, please take the opportunity to fully upgrade your
+systems now, before the migration occurs, to simplify matters.
+
+This change will occur on 2021-07-14 for ~arch users. Stable
+users will update at a later date.
+
+If for whatever reason you do *not* wish to switch now -
+which is only delaying the inevitable - you
+need to take the following steps:
+* unmask and enable the crypt USE flag of sys-libs/glibc
+* mask the system USE flag of sys-libs/libxcrypt
+* mask >=virtual/libcrypt-2
+
+If you wish to manually migrate now, there are a series
+of steps described on the wiki (see below), but the outline is:
+* unforce the crypt USE flag of sys-libs/glibc and disable it
+* unmask the system and split-usr (if applicable) USE flag of sys-libs/libxcrypt
+and enable it
+* unmask ~virtual/libcrypt-2
+
+Please note that if you last changed your password before ~2008,
+it may be using md5crypt or similar other weak mechanisms in /etc/shadow;
+a bug in PAM [0][1] may mean that you were unable to login. We recommend
+using "passwd" to change/refresh your password so it is using modern
+methods. A new version of PAM has been added to the tree to resolve this issue.
+
+In some cases, Portage may schedule a rebuild of certain packages in an
+incorrect order [2]. If building a package fails, please try upgrading
+libcrypt and libxcrypt first:
+
+# emerge -v1 virtual/libcrypt sys-libs/libxcrypt
+
+And then continue the world upgrade with Portage's "--keep-going=y".
+
+For more information or troubleshooting tips, please see:
+* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
+* https://bugs.gentoo.org/699422
+
+[0] https://bugs.gentoo.org/802267
+[1] https://bugs.gentoo.org/802807
+[2] https://bugs.gentoo.org/802210
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e97dcc6f525c..297d58cf9bf7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12937 BLAKE2B b67d6f5f22884e63e4c0f83264d7e6d68fc0526ff33c69a3576e0e5e9c8efccb1907d22d356ee4a397aa70ba9113cb0088e5398317a03fa33db8ae72b561b19e SHA512 5c063a98b2f883695d6c90f6ac28151f0416e3f5c5e1b57359c01ada17f290c7119a2d0d7ca51484bfbc33ddaa124c9524490aa328265bca01129ccefee350c4
-TIMESTAMP 2021-07-17T17:39:10Z
+MANIFEST Manifest.files.gz 13127 BLAKE2B 48dcdc744faac295d7e940945e2b94bc36fdb9280374bfc294be22c17310f4955e8cf9ed86e79377561110355907e899de6dbb881be09a380095cf3f459a4d0c SHA512 1e3e0397f22b3a604da99aad6077f9ef3eab37fc45ead99cd2477203abb00c21ec19cfd941874474dcdfe39c72bb1da6fc88446968c21e2b8cd07dd690e2c3d2
+TIMESTAMP 2021-07-24T00:39:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD7YSZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-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
+klCayA/+KUiBWkfrNUKi46VKG4I3enb24cLRmQxGG1k613hdph7uMdjaklTEQcAn
+iI/Ce8zu+T7sAP6ezBpRSoUGwHste/TOlJiVZKxq8SUnhXEQ88vHsAd+IutdgrDO
+Wz2M6DKzSq+KpuTmx40FuPUsq2L2suoZDKpF8K3ikoBKudwJy9XwehqVEOGv4Riz
+EfLEEDtATt61gMmzOJPC/rsGvXyV6aVy7LKup0hpulxHgcf//7j/UpRpcAWNHcWS
+W8DGg7MmYqP6d9YMM5Uqx6GgtjQgG5YGnTVEUts+uD+d7ADw3Ck9EHCK86rAkCe/
+gJPQa8nGupcreNDOC62O77yXb2H2JQA4BRSGbOpIaC89CoOP4q55GQcBGi8zD7mb
+bZpOMieiTJ5JVgyPsrVyUT/TnH4urChesX+8GvVa9cp+Evs/P1Nr+6tcU8AyVidy
+Hkn+LSDh6SNK5pRI5+/b7+sYs9pyLaMKC/CCBhNQ2NfNs8fGjxfQ2LsvEoKNbCsC
+/pYdh37QPQlzEOrkM0TjNxrs/OJiMAUrP4ny8SB73ktUV/wDnhZt4Ck7L7T+CO3B
+trcSTXs1WwNraqT7ZMHFwik79bkNY3DiC+hzbc71HCWkGCCS3UkKtIc81ne2ZDA9
+7RFoF35NgnbNtGkK5xBGmOHNtTGcuf10Ab/6+Y9moh6sgthLMC4=
+=DKbm
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 06b2346a272b..f3814ce251db 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 598a38ee3e84..33f7bb267cb6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jul 2021 17:39:07 +0000
+Sat, 24 Jul 2021 00:38:58 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 0e28f3af939d..a853494374d0 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-39030e75ff64153246c72edd13c30e5295b8a0ff 1626435584 2021-07-16T11:39:44+00:00
+0d11e58acccb28e8371d53ed53806a8a2d7b16be 1626997272 2021-07-22T23:41:12+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 7790cafe8170..c037e918f71e 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2373,6 +2373,10 @@
       <name>Conrad Kostecki</name>
     </member>
     <member>
+      <email>flow@gentoo.org</email>
+      <name>Florian Schmaus</name>
+    </member>
+    <member>
       <email>gyakovlev@gentoo.org</email>
       <name>Georgy Yakovlev</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index a6dbe2309a84..f99f0c4175a2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul 17 05:39:07 PM UTC 2021
+Sat Jul 24 12:38:58 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8e449a55ecfa..a0755a563663 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jul 2021 17:45:02 +0000
+Sat, 24 Jul 2021 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f592de6cc4d2..1d86977218a2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-50621430eec12294296e278150b450391cea1278 1626543065 2021-07-17T17:31:05+00:00
+62bc1225babc0d30ecb50ba29647a377ce921f27 1627083398 2021-07-23T23:36:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7395fd20a713..79ca8865a1a1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1626543301 Sat 17 Jul 2021 05:35:01 PM UTC
+1627086901 Sat 24 Jul 2021 12:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 598a38ee3e84..33f7bb267cb6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jul 2021 17:39:07 +0000
+Sat, 24 Jul 2021 00:38:58 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f98129d66ca2..4dfd8772849d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 4c5b152221f3..c55251b004d4 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,4 +1,4 @@
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
-EBUILD goaccess-1.4.2.ebuild 1138 BLAKE2B 4bc60e39d245994ad844166cf2b1fbf2d3c9e1b55b4596ca86d95a31bc99f94436b3313bd019f1497a2335730135fdb55e48d617781e63280f20648b51c8223f SHA512 fa1676129f1ce9e137bb9dff9882f71f3d71364773632b592cbaca24c735340c71c3586702349d22450ba1e48f0ee2b2fefe7ae36e17b3a0f3e2cc020bba7edc
-EBUILD goaccess-9999.ebuild 1138 BLAKE2B 4bc60e39d245994ad844166cf2b1fbf2d3c9e1b55b4596ca86d95a31bc99f94436b3313bd019f1497a2335730135fdb55e48d617781e63280f20648b51c8223f SHA512 fa1676129f1ce9e137bb9dff9882f71f3d71364773632b592cbaca24c735340c71c3586702349d22450ba1e48f0ee2b2fefe7ae36e17b3a0f3e2cc020bba7edc
+EBUILD goaccess-1.4.2-r1.ebuild 1140 BLAKE2B 2877e909e432af6a45c27832272820448195ad934fa4413a1a1745e1de617d21a788b7ea4d27c20dc2cfaaf585d653d62a482abab6e35c6d7cc7b27810948eff SHA512 afe67cb040bd1ef09d53d758492e481b4c2d7948893305f8fef2913a766e90a7f62c5341afcd560721e3312158dbd38a4005272af2cfe9f8d20e178805a60c7a
+EBUILD goaccess-9999.ebuild 1140 BLAKE2B 2877e909e432af6a45c27832272820448195ad934fa4413a1a1745e1de617d21a788b7ea4d27c20dc2cfaaf585d653d62a482abab6e35c6d7cc7b27810948eff SHA512 afe67cb040bd1ef09d53d758492e481b4c2d7948893305f8fef2913a766e90a7f62c5341afcd560721e3312158dbd38a4005272af2cfe9f8d20e178805a60c7a
 MISC metadata.xml 967 BLAKE2B 7f8a5a613fad521ba3379e0b034173cbe1b3847c737d0b6f17f9b7ed5f4c95af11c1702049c7c6fa23cf1fbed0f0a615c4ac8c130f8c8399d923a43d41d3853c SHA512 2ccfb0fefddfd0e116983e1129b02638879b313c4c494a6c3e99dfb5443728b3929b36d6dcdacc72898dff17186850c7adf87d660ddbf4d894a9c1633e8fe290
diff --git a/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild b/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..4f3beee63c9e
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.4.2-r1.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
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="https://goaccess.io"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="debug geoip geoipv2 getline ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+	geoip? (
+		!geoipv2? ( dev-libs/geoip )
+		geoipv2? ( dev-libs/libmaxminddb:0= )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Change path to GeoIP bases in config
+	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		"$(use_enable debug)" \
+		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
+		"$(use_enable unicode utf8)" \
+		"$(use_with getline)" \
+		"$(use_with ssl openssl)"
+}
diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
deleted file mode 100644
index 21f627fb297d..000000000000
--- a/net-analyzer/goaccess/goaccess-1.4.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
-
-inherit autotools
-
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="https://goaccess.io"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug geoip geoipv2 getline ssl unicode"
-REQUIRED_USE="geoipv2? ( geoip )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# Change path to GeoIP bases in config
-	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		"$(use_enable debug)" \
-		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-		"$(use_enable unicode utf8)" \
-		"$(use_with getline)" \
-		"$(use_with ssl openssl)"
-}
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index 21f627fb297d..4f3beee63c9e 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
 	geoip? (
 		!geoipv2? ( dev-libs/geoip )
 		geoipv2? ( dev-libs/libmaxminddb:0= )
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index 3ec2c4129d83..fdff84ffbb15 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,5 +1,5 @@
-DIST nagios-plugins-linux-madrisan-27.tar.xz 385324 BLAKE2B ef207e365d044fefa8c0dbef7aae8a50ec9b6c70d60d069574ed423646d1e936e0bd6bbb316070d94f354236f815e508da4ec1b298e89958c8393a041f98a908 SHA512 5d93912f2237449e29e963cca260fbe7a735f47e7c2752402e2f371289e2875e4fea35f191705d7a2f01ac49381e039b720f43c8c794e85ee0bbbb01d212a10a
 DIST nagios-plugins-linux-madrisan-28.tar.xz 390428 BLAKE2B bc41fb7d3b639fe2d133c2ff6643562ce94e5523b13aa18045d7265ae8d9d80873b0611aaee0f0fa8b959e0da3e2c350868574a8986c0d9436b6bd4e4154d908 SHA512 c72065ade12ec60c86479276370215bc0dc419ae9681d7260c550f8985300c39c1c8e39537c51c56e0c1ae61283befc5d111ffd47394de7dc7f7daa5993254fc
-EBUILD nagios-plugins-linux-madrisan-27.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
+DIST nagios-plugins-linux-madrisan-29.tar.xz 392700 BLAKE2B edc93bfb113cb12ce8a345e38627881decb952cb1e7a948dcdced2aaa9c940956b75a7c8f7ad1b72daac132236ab27762b6f8b14a5098eaac648bafae6dfdb33 SHA512 412464b894fe2a0953e495c7c87604ed6b282f65fd1988043757b162ba4fecf9e8f9740e7e09ec2dad8ba8d80fa928df4d7e644260538117d19776f4883045f6
 EBUILD nagios-plugins-linux-madrisan-28.ebuild 1108 BLAKE2B f72e33a87c21f0f18630990cdceb46991b0d2e9de3a0d6395b87fc901fd29bccdff04b5eb2e27b174c860ef45cb97ef33ce74062c4e8cb784e05ca6d87f2b2e4 SHA512 ddababf0001ba44e92ba35a68ae3514425291733fd195fbd3e6ae7101ed246e6e4f5c127844957678e61179772b150396a18ebf7809da4c6a2e358804d4393ff
+EBUILD nagios-plugins-linux-madrisan-29.ebuild 1108 BLAKE2B 82f0b4ba52bb68891df6ff166782c6948f3a8c109376d50a16a31e1823e27876153defd68dae5178c662fac00b7c2fd94473dc553861ffc86eb30b59a54a26ca SHA512 b8e953be6c382e79dca6fb973d816881d35b3de68906fcebfe137ada6004483a3f7ea4290bd86b756b654a4ed428771cfcc569dff0ee0ec7d87e38f4c4a16dae
 MISC metadata.xml 612 BLAKE2B 0766fb1263f00a86cb3a04f1214193d59cf52b49738299389cfafd6fbb179c359387cf0267f7cef083cf6b416db39733c30426f8240ffa4d3944d90c7da1fb43 SHA512 990649aed9420b40d725e3a4a78bfe7e9504e216292835c55bdd634310840f85609fe13d35ebe351a9f66ea1b7de12d823bdec42fc91cd1ea797cc7098370e7f
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild
deleted file mode 100644
index f76ea708a821..000000000000
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PN="nagios-plugins-linux"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Additional and alternative Nagios plugins for Linux"
-HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
-SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl varlink"
-
-DEPEND="
-	curl? ( net-misc/curl:0= )
-	varlink? ( dev-libs/libvarlink:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# Avoid collision with net-analyzer/monitoring-plugins
-	# and net-analyzer/nagios-plugins
-	sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins"
-		# Most options are already defaults for Gentoo
-		--disable-hardening
-		$(use_enable curl libcurl)
-		$(use_enable varlink libvarlink)
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake check VERBOSE=1
-}
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-29.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-29.ebuild
new file mode 100644
index 000000000000..7d39abb43437
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-29.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN="nagios-plugins-linux"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Additional and alternative Nagios plugins for Linux"
+HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
+SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl varlink"
+
+DEPEND="
+	curl? ( net-misc/curl:0= )
+	varlink? ( dev-libs/libvarlink:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# Avoid collision with net-analyzer/monitoring-plugins
+	# and net-analyzer/nagios-plugins
+	sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins"
+		# Most options are already defaults for Gentoo
+		--disable-hardening
+		$(use_enable curl libcurl)
+		$(use_enable varlink libvarlink)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 2fa9bade5092..b69431113db9 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-8.2.5-es8.x86_64.rpm 14635568 BLAKE2B 677f0655c05024f61340a5b9e9189717881b9df3b5f495ca871d48ad62a51ec1e3416357853b13aebfdc183127ef4706c6dcf288544cb955d6673068cf536982 SHA512 aefe4215bcc71b7648210b746b0259c5dba902a0e96df4e1ca4816bcc1031c17d3b6c481a51bef40b3dadfa06067c0042101e2749b517ecb07913a5f5c263429
-EBUILD nessus-agent-bin-8.2.5.ebuild 2358 BLAKE2B 6371e2be15cb82123aff81165b12d64c11188e3aa551cbbb92ac53c2f1087fd1f3febb309f72c5936ae9a1ec6c506a1ffd50199f2ab091372f19616c311a73fc SHA512 be4fdcfc50f9d61d726c0088792b6aa52ca723519cbca08abcab93da9f91bd1fcb21cd72bbcb83c39f19da0d25d8e66c3ba992a72514dd09a349f3c356a35e6d
+DIST NessusAgent-8.3.0-es8.x86_64.rpm 14569612 BLAKE2B 2b9589320ee19eb8f9353cc6cc017c54107c78e68619806c3111f873ae74a925e462dad08e11d1af360cd4a4aa2f87de14edd2f41aef706a2af4af0f8173100b SHA512 7cb6b467c0c202f694ebcf93187b46396ee6b16fb1a03f853b9f8004b00ef14ef6b698c8ae17716f7b04e5b745a9c410c74723f17aa547d33b5b8c663b9aec11
+EBUILD nessus-agent-bin-8.3.0.ebuild 2358 BLAKE2B 6371e2be15cb82123aff81165b12d64c11188e3aa551cbbb92ac53c2f1087fd1f3febb309f72c5936ae9a1ec6c506a1ffd50199f2ab091372f19616c311a73fc SHA512 be4fdcfc50f9d61d726c0088792b6aa52ca723519cbca08abcab93da9f91bd1fcb21cd72bbcb83c39f19da0d25d8e66c3ba992a72514dd09a349f3c356a35e6d
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.5.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.0.ebuild
index 4ea733b95d14..4ea733b95d14 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.5.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.0.ebuild
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 0c0d977ec8cc..28d2a0db0123 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r4.ebuild 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
+EBUILD net-snmp-5.9-r4.ebuild 5621 BLAKE2B 4e7a0bcacd7d35addc863f2527cb8ce9c6c777ecfe2fc336b072b2b25eed7a388eeff3be3e3a52abb9c705f6bfbe17446e7ed2153867f29174c3093692bfb6f9 SHA512 c7d3fbb129a6c79675a002c0bd96728a60ed4d8d94d51f6c1b82d381c3df30cd9e86d76701bec87cfd1dae0cd7e2c7500ada0b07e7f311083bcab64088f78063
+EBUILD net-snmp-5.9-r5.ebuild 5660 BLAKE2B 4e06816e0f73142b1910c6e887c130e2ef60d8bdbcc948740fb4a330229152655da1dc04bb5bed5d6c505b15172d55daf304a4bd06ca1d560e67b1a4e70b78ad SHA512 fda3983d5c28f2bab36aa11b197990605f5677dfd698dcb398957085261aa7a30a4bac9cdffa89cddb8c263475c09f94ddd6fef320afb333dee18f2c03effcb3
+EBUILD net-snmp-5.9.1-r1.ebuild 5632 BLAKE2B a0288c33c6f4aec424f3e39fe40a4c05e63c98ee36affcad30afdfc0622d64ff5723ff975a729cb1a0325d427c04cdef0df13160efccdde886e70450f1e9bf34 SHA512 d6a9d844ceb5c0d8f16ba61bddbac4e04415f561b7bede2ea1ebce208ac047436c9b1f146427afdf24783db64de64f70deafb3f081ffd7c5198c89e34a6b77e2
+EBUILD net-snmp-99999999.ebuild 5567 BLAKE2B f2398dac2eec806c1a25335c3345220394eb26de535a9253c53c6690469727cbf6148a7e46a67193189678be6794e634a8627aca152d24166fe1658db2fd3cd3 SHA512 50ce4be6511a7a70f9f4e0e48101774fa4a4ceb1f39a0b3c615264a02b0f01049855f50822bac6e5cfabc312e6404570476667d3455c11627eba565cec864fff
 MISC metadata.xml 1383 BLAKE2B 66b4b2fb72a10c172e0ccdc89aa8903176393f381762e467b1bf7f16be20896b94ea68c67d125f5db7c42c85093f8b4208ded932afebee4a52e47bb691cf708b SHA512 6468e1fcfcbf83104c6165728825d36160e8df8975bc88a8933b6bfd4b28185ba08608e01d7721858760d47bb70d637ca36c6a3e443f02fb799a27fd89a60627
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
index 85e04734976d..c2fac1bf01c8 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=yesplz
 DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
 PATCHSET=3
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WANT_AUTOMAKE=none
 inherit autotools distutils-r1 perl-module systemd
 
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	perl? ( dev-lang/perl:= )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
 	)
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
index 2446c7771b5c..790f91e2ff2d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index ac38c56a767e..8199e35e5069 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 5517dfe32065..3d8752a4e2c9 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 git-r3 perl-module systemd
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index ad7315f28166..f691dd192d27 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -4,12 +4,12 @@ DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc54
 DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
 DIST netdata-1.30.1.tar.gz 7153879 BLAKE2B 68553c000ee3a63cbd79cce5fe4daf75239cd76572160e1903f8325548d0cc4222f0c5e43f1488c31087b40de5222115bbe491cc00e36aea331992fc87b9f1ec SHA512 c3d116bf3459ca6224f5cd8341933c2696581178262a37887c532e09e98e5d075217fcd66574e00cc644fc16ec583b7e2fe54be95c98c477fb20fbe7ad9ed1a9
 DIST netdata-1.31.0.tar.gz 12528280 BLAKE2B 739538b26a07f9f607a2f63f50225ce6ea50feaae8bbb2a60e6a2548ebdf36e4bd37f28d43d414cac44eec4ad9459f40e9532ac61f62f947bd0bd61e64803114 SHA512 62deba75e41fca44015a4e36b6791f7f10ea0a2658bcbd640e231abbbdbf56c7317c9fa72218fbd22a3312b33e7ec7886ea254cba331da9b3a51923e45393576
-EBUILD netdata-1.29.0.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
-EBUILD netdata-1.29.1.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
-EBUILD netdata-1.29.2.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
-EBUILD netdata-1.29.3.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
-EBUILD netdata-1.30.1-r1.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
-EBUILD netdata-1.31.0-r1.ebuild 3588 BLAKE2B a41572ff941ceadac8f14131da58ca5057d8d439b5ce5fa75437157268b9847f131d6a1a0c68e9068d44d7b934dd09401ab5640c124115436edc74bba20a3e28 SHA512 d32d76075fedb66d7cf96d9c71be12318cfeb33213a39493b9668330e686d0f3aed88d8883f828bf799d9a8f1a57db23e9b22f3ad53a765cf84570f05192e1bd
-EBUILD netdata-1.31.0.ebuild 3491 BLAKE2B ff5bbd8306c08adbd46c9aebd3a59407c7384dc926efda89da52f585959aabcc730458b156c2e8cb83681d4034046a211e32bd98bcc4dce6b1d4b66828519693 SHA512 5bda381e787ac5527d5fa15512e8168db758cb0161b1d07f6b2408099e9cad7a54d596ce26921827aac256a2ce6e44a78d27b9774d285b40698219b9a2222cdb
-EBUILD netdata-9999.ebuild 3588 BLAKE2B a41572ff941ceadac8f14131da58ca5057d8d439b5ce5fa75437157268b9847f131d6a1a0c68e9068d44d7b934dd09401ab5640c124115436edc74bba20a3e28 SHA512 d32d76075fedb66d7cf96d9c71be12318cfeb33213a39493b9668330e686d0f3aed88d8883f828bf799d9a8f1a57db23e9b22f3ad53a765cf84570f05192e1bd
+EBUILD netdata-1.29.0.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
+EBUILD netdata-1.29.1.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
+EBUILD netdata-1.29.2.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
+EBUILD netdata-1.29.3.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
+EBUILD netdata-1.30.1-r1.ebuild 3456 BLAKE2B a11fb3094aea689d1b3e637967c6ef8e31f0055dd324556b421b4fa26e573c51028c6a1f8c132030582ea87a949df8b46816f4e6e25e521af1b4bb41274d806a SHA512 ac0fc905b45771c2566ab0f1fa9b5d4a6f6f39ade1489483a92cf770516859d43784ed0b3e4a0eb007aa5029cf01f5ae521272efcee6003fb3d5c66f13efafb1
+EBUILD netdata-1.31.0-r1.ebuild 3560 BLAKE2B a9e13b381407f3dcfe7838edaeb5b9ae8395e7f901d44c5d53f7d8f3645e347d73acc9b9108f23b61eba7240fae3879be5b031a0cc1f270bac7a6057be0ec934 SHA512 5a329c86ab57e02f109483477244d4a114eb9625788c856f7efd70c63ceeeb430be009b7689c318601b58c57fdb1451436f1838056bee1cdcf6b8aa47b38ea95
+EBUILD netdata-1.31.0.ebuild 3463 BLAKE2B 1d037e46b9e988c5c6db463f28b28f7ffef76628b85340fefb1f2f6307edaea3a7362e857fd92a54defdca5203a6bf57e59e596d2f33ffb12fea13cab60c45b2 SHA512 44eca85269f4d4335873640d9367ab56670ddb11fe2ba5a0ce2e013f620a275782cb2c9ccb6f0ec6bc7cafb061aeb39f8bd03a001f44d96b36c0fd3bb635e928
+EBUILD netdata-9999.ebuild 3560 BLAKE2B a9e13b381407f3dcfe7838edaeb5b9ae8395e7f901d44c5d53f7d8f3645e347d73acc9b9108f23b61eba7240fae3879be5b031a0cc1f270bac7a6057be0ec934 SHA512 5a329c86ab57e02f109483477244d4a114eb9625788c856f7efd70c63ceeeb430be009b7689c318601b58c57fdb1451436f1838056bee1cdcf6b8aa47b38ea95
 MISC metadata.xml 1288 BLAKE2B 33251404c09ccdd7ba653dae7204cf262201fdfc058766eb6b12bd4eacd99be5482867110726ced371a89db6ff022f0c89cf62425ef14f5a2e13734ad1caf70d SHA512 27087ff277f6bec908d23a66183344dfed06761a9b344a3c0d8ec2048e56ac0cb542c3d30bc22fa71cd91aee5d396b4786b546556ce7d64ea394781e05644220
diff --git a/net-analyzer/netdata/netdata-1.29.0.ebuild b/net-analyzer/netdata/netdata-1.29.0.ebuild
index 8d690b9c0539..039fb3e3c07f 100644
--- a/net-analyzer/netdata/netdata-1.29.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.29.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -64,10 +64,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.29.1.ebuild b/net-analyzer/netdata/netdata-1.29.1.ebuild
index 8d690b9c0539..039fb3e3c07f 100644
--- a/net-analyzer/netdata/netdata-1.29.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.29.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -64,10 +64,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.29.2.ebuild b/net-analyzer/netdata/netdata-1.29.2.ebuild
index 8d690b9c0539..039fb3e3c07f 100644
--- a/net-analyzer/netdata/netdata-1.29.2.ebuild
+++ b/net-analyzer/netdata/netdata-1.29.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -64,10 +64,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.29.3.ebuild b/net-analyzer/netdata/netdata-1.29.3.ebuild
index 8d690b9c0539..039fb3e3c07f 100644
--- a/net-analyzer/netdata/netdata-1.29.3.ebuild
+++ b/net-analyzer/netdata/netdata-1.29.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -64,10 +64,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.30.1-r1.ebuild b/net-analyzer/netdata/netdata-1.30.1-r1.ebuild
index 64c8c68c5aa7..7719143cc0dc 100644
--- a/net-analyzer/netdata/netdata-1.30.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.30.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -65,10 +65,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.31.0-r1.ebuild b/net-analyzer/netdata/netdata-1.31.0-r1.ebuild
index 863b92006031..7d3cc3a14ed7 100644
--- a/net-analyzer/netdata/netdata-1.31.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.31.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -65,10 +65,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-1.31.0.ebuild b/net-analyzer/netdata/netdata-1.31.0.ebuild
index 250ba90c1511..490e2fdc191a 100644
--- a/net-analyzer/netdata/netdata-1.31.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.31.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -65,10 +65,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 863b92006031..7d3cc3a14ed7 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9} )
 
 inherit autotools fcaps linux-info python-single-r1 systemd
 
@@ -65,10 +65,10 @@ RDEPEND="
 	)
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
 	)
 	xen? (
 		app-emulation/xen-tools
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index d3680aa28a44..419af4b6479a 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,5 +1,5 @@
 AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
 AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
-EBUILD sngrep-1.4.7.ebuild 908 BLAKE2B bf8b48c00b23caff10bf05744ab80da5dafddf914fee49a3b942b517848bc80aab853d89bcbc7faab05f4385ac99c6487199d95fc4070e372242e77f313959c9 SHA512 894f00d5cd0f73851cf9a9193def3293d0ade731212340e66f3630a1146747a3d6fd3dc198f86edf36a43b519397f369bf3a069aa776fe5dfdf65c30eafcf58d
+EBUILD sngrep-1.4.7-r1.ebuild 910 BLAKE2B d2a839a65c30f662def7cecf6c2dd3816a97d1affa8c23ac67f5ef04b881a4bda243ef7e9acaffcc6995015ab01b5a6f209dbfa743d594b0e13bf7ff54c15596 SHA512 000db85ac51346367bfe39630367839711aa31100e2725db8cca54f36b47e24ce136705d7a13d03d20ebbb81697c074a390df12540693f8b7f261fb90d1978d8
 MISC metadata.xml 468 BLAKE2B a6188410ca42f6552dd8c1bba6ebe2fe427e345f94308d23b98ee8566937256e765e4de9cf4ababdc02cd7d57215673ff0e160c2c56ea17fdcf962bee3fc28c6 SHA512 9adcfea9b56a062815ebb0aeea72302edd9029fb827b28c73414d9bf9c1f2f0643478ba5e32e1398d19d9d68dfc553eeb71902dd31ead7176dd758b259dc8adb
diff --git a/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..3af1d0702e40
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.4.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls ipv6 openssl pcre unicode"
+REQUIRED_USE="
+	gnutls? ( !openssl )
+"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[unicode(+)?]
+	openssl? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
+	"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable eep) \
+		$(use_enable ipv6) \
+		$(use_enable unicode) \
+		$(use_with gnutls) \
+		$(use_with openssl) \
+		$(use_with pcre)
+}
diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild b/net-analyzer/sngrep/sngrep-1.4.7.ebuild
deleted file mode 100644
index 06cb387dae9b..000000000000
--- a/net-analyzer/sngrep/sngrep-1.4.7.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
-inherit autotools
-
-DESCRIPTION="Ncurses SIP Messages flow viewer"
-HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="eep gnutls ipv6 openssl pcre unicode"
-REQUIRED_USE="
-	gnutls? ( !openssl )
-"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=[unicode?]
-	openssl? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.7-tinfo.patch
-	"${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable eep) \
-		$(use_enable ipv6) \
-		$(use_enable unicode) \
-		$(use_with gnutls) \
-		$(use_with openssl) \
-		$(use_with pcre)
-}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 0dee5dd858d0..7bc0031d90e9 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 2327 BLAKE2B aa7b320f779d6f686fd9d966182615887795c24c714fd5919ea9b34ac87f3d02bfb10e3bb349a8702e3779cdb66f9a0f7103267a69162340fad4baa89eac552a SHA512 820f8ce08e064cf52cd7a652eacfa27c2fcf5b93c9ddb2041fce5cecd32ab6fc11db47cd2f253f16e50e31a0945dc27b119dd98d2b721336171cbe6b34f3d916
+EBUILD tcpdump-4.99.1.ebuild 2334 BLAKE2B 7ec3017043221b173eb62ad5d824bc3f2d520d8a48de773d5497ff9992b6ac93b5722ec7512ac4490db6720ad82ced3de68a8925bac4ba1e04ac6164f4df7bab SHA512 bccac4cde5f83a40fcc30b947db4b5605d96d3dc55d99f67ce52a0a030a02dc76f5f52e28caeb77a429e12df701c4b5975c784bc201f5098e1263911d38f463f
 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 d23c0f647d4e..722dbc5dde2e 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2cef3cd98047..52c124f2cf9f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 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-3.4.7.ebuild 7208 BLAKE2B e66b2de0af20698b0e8af9aa9f3103436324c39a4f0f48856d6e3ab06bc94bd7ff458a0bea76f0b22709d5d3225334070f0ea1f1f5fb5399e4b5a34eae89e688 SHA512 26fc3ac8e210b0c6039a6fa50bbdee27fa27eb31f5f10ea96e2aa3b313ea5d2b228d603842898af8c0874075eaf7f08ad56e192a2335dc33e1280a903f7bdb9c
 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.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index 7fd9e324e1a4..1a9a1653a897 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 3206a01e7fdb..8ab7ee2d23bc 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -269,16 +269,16 @@ DIST zabbix-4.0.31.tar.gz 17600018 BLAKE2B 6b3dd8bdc465fc610756b93cd033e0ade607a
 DIST zabbix-4.0.32.tar.gz 17606713 BLAKE2B 48d0f8fdc3f538701383f0c246152df8d000aeb194669edf855dd96f0ee4b0a27d14a373d555cdda4f3ca9057f4abbb51d5184167bc4858ce798bf17284e0c74 SHA512 af3c3306c2ed1d47d980f0581324274b4bee6fe6bac657e7cba90d6079ad1a83d57d5279aeed54e63f28764d02476be881972667e84e1c8a85d90c659384766a
 DIST zabbix-5.0.12.tar.gz 20404121 BLAKE2B b458f8dfae5f1c2cc0b8d4d06a41633f00ab0749288e36e50fc13377a544ee01634f2b603cda901fe35600eb883caf084e1d0f72931561996336022e0c8d33ff SHA512 e26012c177d72bc75e63653b6ce4e1c21cf83e123edc0931635887002dbe713637177d95d15e493923416d1f277dd373bf9f568ea31ac9b1b93dc6bbb59ed15c
 DIST zabbix-5.0.13.tar.gz 21076927 BLAKE2B 4c5a503fba87fbb0882a60378721e9156a9ffc374b5a127fbaa08aeb23d40aefbf4324b6a00d9c53d65714eb88e04730dc9f43bbc6baedd8b844b29359aca76a SHA512 846607e9c409cb996eb6aed0beaa29fa37450ca61a2e533e477b3bb16fd3c3fd90a59cff1e7234e0dc47276cce052e022f1663c1928e0e4295bff44002720e47
-DIST zabbix-5.2.6.tar.gz 20602665 BLAKE2B 656645ece453564f2f2c58b50e9bfb3df86aeb74fdfef88cc4b597268ebaf9a9db41e1acdcd1253871dbd9a0032f973bbb1b25139ee1a083bef779a1b66ac2fc SHA512 be48fd46bf151ad2618f5136559c7027e64e178001921adefc66a0597b24b6929e52d4b0f575e8bddec1e9db01276dd5993d4500f4df4a1716a1a008e09b41f1
-DIST zabbix-5.2.7.tar.gz 20971531 BLAKE2B b67de705dce1252a4dfd6f1ab1b1d5183b3bb1f6706a7cb3acd4bf6b540a06b00bc8df47b43043fd069f20f3cc760ad9f335795e08530aa244eab13da7e8c410 SHA512 4479d8945b8384a3f4a34dd30223a496f7d335be323fb99d72068402829b3c305b9c35651a91e594c9ea7c7579a7265eaa9c91eba18337dba9b2030be2e333d5
+DIST zabbix-5.0.14.tar.gz 21159722 BLAKE2B 627e64138335b2a3b679a69f21d778df1eb5bbf5455d8d2b0244f6194d3c79d2afe2227cc5093f34b783f63a7bc5c8e204ba39f4474493b67c3e91f7aafbc97b SHA512 9b373592918755174c33e0e348d5fcc21076903abe9149dec48a1b8779435e7afd7bc3db77deed98765ee4205253ee1314301d49db80cd103c730435f5299989
 DIST zabbix-5.4.1.tar.gz 23830541 BLAKE2B 93d39c69798dd593a77f2cd0046818763bda6d07ea43295d0fd9cd6d21a974d46f3783649fa63878e85c70e6b7cc6284ea88df2503d5011365641cd58dba9cbb SHA512 d9533bc2fac816a6c5e18462c509fb6307409528979f56cdf03085801c01d6ff17251cbcae83cc2158f944dd9302d429746e39ca669483e442474c51d6caab33
 DIST zabbix-5.4.2.tar.gz 24085572 BLAKE2B 0a2f7d645906b7df4dfbd3846de483ad5a9f8e9328daa212cbceb139d71418bea3b7af3a4426a6e2b3a55bbb8d42817ffc79d948152a2eb06ec97ec264efa8bd SHA512 c5ceaecc77d641ba656b52ab335fab664eba093779cbb882dea7de6e2e70be3c5d50f8035f1c709a8e244729f7d2181204e1337ae96b078ec3f08c9adb10bb1b
+DIST zabbix-5.4.3.tar.gz 24190581 BLAKE2B c757739b4ed4b8ab233c41b1311a2b7055530b7b19ec3296265cbbd04ad298e24c46605e4f996758021c74526fbfbcf9a58c7aa00a746f50a2f35bf67130b9ed SHA512 8efa043237a9e7cab3c26c300ca177746241602bf156e01ee6fa31d15d71677d6b4efe9bf9cffadc419e98c44ff3a179370b851b55a78dce9b4b4ee4d8c287c1
 EBUILD zabbix-4.0.31-r1.ebuild 9437 BLAKE2B f57c675a872a6a0c176b91086ba7b816ca835a887d8592ffd914e36d8a91a59c16b8025f59895163ca0a5125c7208f8eeb1541abb1f6df75d004a5a09522bdf8 SHA512 6275f6e866202146f148d903b982acd326c52aa802833cc4fcc3da653cfd3ed4ab637ff65857cf73e08f91dfa9dde64fada3ad8ab5aec766078f6a9d1768d6a3
 EBUILD zabbix-4.0.32.ebuild 9439 BLAKE2B 5b8105ee5c68df610474eeec87401927952c673f6f0da783d45a7e75af1df7541ac0a51a2e5db29052f6e1355a0d359c4b7c955827703689c133986cd256958e SHA512 0ca31665694b83574eaa9cfaa267ccf20d0bd3dfe00e2805a480a53c67d2a4d0d98aca25ae673c0ebbece2fca5115ded640d41a70832e9661b919a129ed66564
 EBUILD zabbix-5.0.12-r1.ebuild 32434 BLAKE2B 39beaba2d48e9257397db5fe115e1619af9974c4eecebe8d718fb63c6a8368b6bc944d3d0c8b933e7dea0a3266266c5568fc3c223821a4cdc124b89c9dcd6bc0 SHA512 2adff1e020386cbea1faade1b04eb9bc124476919bfe8e17e5a303d3b3a31905ba1a02a86b062b1afeb61bd06d480cf355396668f30f4807735ca2e5d099641a
 EBUILD zabbix-5.0.13.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
-EBUILD zabbix-5.2.6-r1.ebuild 33287 BLAKE2B c174b19ec3728417ff2214bb85ef416dd7b540f4f7296e3c49b4002e9ac79a00d9fe54dab8ac54203802d6f11bd6fd7ccff8687f1e53c8597af2049bee263015 SHA512 2b38b4be3cf2604c154f78f17ad344c908098c673ed69727b50bb69bea437235c4c5f1bfcf7b517fe87ce73b33359cd0d75569a7a0a7593c017e2d3a844091c9
-EBUILD zabbix-5.2.7.ebuild 33289 BLAKE2B af7cb591b0744b36febe6785732380a05f65125e1863f2bb99f62887ea84fdbdb567a06755c41e683f49b16f8acb8f9ff1ad21c3511dbfcda91a727eecbc1534 SHA512 fb828e60a82ff8499ca68e0248124c1257856c71e4e4babaa8fa860301a7f245c333307fee59d7bff7e9e7cd012eb6f99f78e7178180ff728c638b4cc3ddfe38
+EBUILD zabbix-5.0.14.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
 EBUILD zabbix-5.4.1-r1.ebuild 34748 BLAKE2B 8b3124f4a161e0155d5c9822876fd18acd09dbd37395f76af3bbf454b9680f49001bab94f73fbfbea32ce90d7ea9bd3437f58df73c97f5dba7ee25253ce423ff SHA512 7f15082a553f0f510947872a111ba2ea8044d06728ee6054e0eb84cff098dd9a69d39a369130a34d467729843f0798493f3ba1b605468845c2e6dc66ba97a57e
 EBUILD zabbix-5.4.2.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
+EBUILD zabbix-5.4.3.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
 MISC metadata.xml 1519 BLAKE2B 3ee4cfb156b8bf0378378f73ac7584b16e3cf7b824a43350a77889bd17ceb470240206ee3b3412e826477417be9bb07920d0ef944a7c49d3a56fc2b0f2a9082f SHA512 6bd6020054a9be205b9805fd757f3f71bf3e6334a41c71c1c59d9e760638a51f6a12ae84274ae9be87ed23c0942abdeacb539343643cae33615ee87e20613464
diff --git a/net-analyzer/zabbix/zabbix-5.0.14.ebuild b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
new file mode 100644
index 000000000000..b921c70a4e01
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
@@ -0,0 +1,604 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
+	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
+	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
+	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
+	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
+	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
+	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
+	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
+	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
+	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
+	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
+	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
+	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
+	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
+	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
+	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
+	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
+	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
+	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
+	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
+	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
+	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
+	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
+	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
+	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
+	"github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o="
+	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
+	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
+	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
+	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
+	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
+	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
+	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M="
+	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
+	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
+	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
+	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
+	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
+	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
+	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
+	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
+	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
+	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
+	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
+	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU="
+	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
+	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
+	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
+	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0="
+	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
+	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
+	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
+	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
+	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U="
+	"github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc="
+	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
+	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
+	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
+	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
+	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
+	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
+	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
+	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
+	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
+	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
+	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
+	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
+	"github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4="
+	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
+	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
+	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
+	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
+	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
+	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
+	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
+	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
+	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
+	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
+	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
+	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
+	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
+	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
+	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
+)
+go-module_set_globals
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( ${EGO_SUM_SRC_URI} )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.3.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.3.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.30.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
deleted file mode 100644
index e9c3135b3aac..000000000000
--- a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
+++ /dev/null
@@ -1,613 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-# content of src/go/go.sum
-EGO_SUM=(
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
-	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
-	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
-	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
-	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
-	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
-	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
-	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
-	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
-	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
-	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
-	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
-	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
-	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
-	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
-	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
-	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
-	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
-	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
-	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
-	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
-	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
-	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
-	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
-	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
-	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
-	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
-	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
-	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
-	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
-	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
-	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
-	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
-	"github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o="
-	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
-	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
-	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
-	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
-	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
-	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
-	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M="
-	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
-	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
-	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
-	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
-	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
-	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
-	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
-	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
-	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
-	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
-	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
-	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU="
-	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
-	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
-	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
-	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
-	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
-	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
-	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0="
-	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
-	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
-	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
-	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
-	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
-	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
-	"github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U="
-	"github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc="
-	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
-	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
-	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
-	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
-	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
-	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
-	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
-	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
-	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
-	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
-	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
-	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
-	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
-	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
-	"github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4="
-	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
-	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
-	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
-	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
-	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
-	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
-	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
-	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
-	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
-	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
-	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
-	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
-	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
-	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
-	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
-	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
-	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
-	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
-)
-go-module_set_globals
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( ${EGO_SUM_SRC_URI} )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
-
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
-	ssl? ( ^^ ( gnutls openssl ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		"$(use_enable agent)" \
-		"$(use_enable agent2)" \
-		"$(use_enable ipv6)" \
-		"$(use_enable java)" \
-		"$(use_enable proxy)" \
-		"$(use_enable server)" \
-		"$(use_enable static)" \
-		"$(use_with curl libcurl)" \
-		"$(use_with gnutls)" \
-		"$(use_with ldap)" \
-		"$(use_with libxml2)" \
-		"$(use_with mysql)" \
-		"$(use_with odbc unixodbc)" \
-		"$(use_with openipmi openipmi)" \
-		"$(use_with openssl)" \
-		"$(use_with oracle)" \
-		"$(use_with postgres postgresql)" \
-		"$(use_with snmp net-snmp)" \
-		"$(use_with sqlite sqlite3)" \
-		"$(use_with ssh ssh2)"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.3.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.3.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.30.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.2.7.ebuild b/net-analyzer/zabbix/zabbix-5.2.7.ebuild
deleted file mode 100644
index 1b9cb96ff6ed..000000000000
--- a/net-analyzer/zabbix/zabbix-5.2.7.ebuild
+++ /dev/null
@@ -1,613 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-# content of src/go/go.sum
-EGO_SUM=(
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
-	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
-	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
-	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
-	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
-	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
-	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
-	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
-	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
-	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
-	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
-	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
-	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
-	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
-	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
-	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
-	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
-	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
-	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
-	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
-	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
-	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
-	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
-	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
-	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
-	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
-	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
-	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
-	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
-	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
-	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
-	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
-	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
-	"github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o="
-	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
-	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
-	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
-	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
-	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
-	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
-	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M="
-	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
-	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
-	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
-	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
-	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
-	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
-	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
-	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
-	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
-	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
-	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
-	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU="
-	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
-	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
-	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
-	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
-	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
-	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
-	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0="
-	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
-	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
-	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
-	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
-	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
-	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
-	"github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U="
-	"github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc="
-	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
-	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
-	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
-	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
-	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
-	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
-	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
-	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
-	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
-	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
-	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
-	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
-	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
-	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
-	"github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4="
-	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
-	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
-	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
-	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
-	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
-	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
-	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
-	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
-	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
-	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
-	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
-	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
-	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
-	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
-	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
-	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
-	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
-	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
-)
-go-module_set_globals
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( ${EGO_SUM_SRC_URI} )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
-
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
-	ssl? ( ^^ ( gnutls openssl ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		"$(use_enable agent)" \
-		"$(use_enable agent2)" \
-		"$(use_enable ipv6)" \
-		"$(use_enable java)" \
-		"$(use_enable proxy)" \
-		"$(use_enable server)" \
-		"$(use_enable static)" \
-		"$(use_with curl libcurl)" \
-		"$(use_with gnutls)" \
-		"$(use_with ldap)" \
-		"$(use_with libxml2)" \
-		"$(use_with mysql)" \
-		"$(use_with odbc unixodbc)" \
-		"$(use_with openipmi openipmi)" \
-		"$(use_with openssl)" \
-		"$(use_with oracle)" \
-		"$(use_with postgres postgresql)" \
-		"$(use_with snmp net-snmp)" \
-		"$(use_with sqlite sqlite3)" \
-		"$(use_with ssh ssh2)"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.3.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.3.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.30.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.4.3.ebuild b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
new file mode 100644
index 000000000000..8a3157cfa587
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+# content of src/go/go.sum
+EGO_SUM=(
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
+	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 h1:XeGYLuu3Yu3/2/FLDXyObe6lBYtUFDTJgjjNPcfcU40="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0="
+	"github.com/chromedp/chromedp v0.6.0 h1:jjzHzXW5pNdKt1D9cEDAKZM/yZ2EwL/hLyGbCUFldBI="
+	"github.com/chromedp/chromedp v0.6.0/go.mod h1:Yay7TUDCNOQBK8EJDUon6AUaQI12VEBOuULcGtY4uDY="
+	"github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic="
+	"github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww="
+	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
+	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
+	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
+	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
+	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
+	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
+	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
+	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
+	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
+	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
+	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
+	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
+	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
+	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
+	"github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU="
+	"github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM="
+	"github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og="
+	"github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw="
+	"github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs="
+	"github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM="
+	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
+	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
+	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
+	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
+	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
+	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
+	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
+	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
+	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
+	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
+	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
+	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
+	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
+	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
+	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
+	"github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o="
+	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
+	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
+	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
+	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
+	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
+	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
+	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M="
+	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
+	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
+	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
+	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
+	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
+	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
+	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
+	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
+	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
+	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
+	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
+	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU="
+	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY="
+	"github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y="
+	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
+	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
+	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
+	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0="
+	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
+	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA="
+	"github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc="
+	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
+	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
+	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
+	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U="
+	"github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc="
+	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
+	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
+	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
+	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
+	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
+	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
+	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
+	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
+	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
+	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
+	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
+	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
+	"github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4="
+	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
+	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
+	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
+	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
+	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
+	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
+	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
+	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
+	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
+	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
+	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad h1:MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
+	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
+	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
+	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
+)
+go-module_set_globals
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( ${EGO_SUM_SRC_URI} )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		"$(use_enable agent)" \
+		"$(use_enable agent2)" \
+		"$(use_enable ipv6)" \
+		"$(use_enable java)" \
+		"$(use_enable proxy)" \
+		"$(use_enable server)" \
+		"$(use_enable static)" \
+		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
+		"$(use_with ldap)" \
+		"$(use_with libxml2)" \
+		"$(use_with mysql)" \
+		"$(use_with odbc unixodbc)" \
+		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
+		"$(use_with oracle)" \
+		"$(use_with postgres postgresql)" \
+		"$(use_with snmp net-snmp)" \
+		"$(use_with sqlite sqlite3)" \
+		"$(use_with ssh ssh2)"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.3.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.3.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.30.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 605c464f5cf2..36353ef1d8c8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 67b91333ecde..69c09d8f68d6 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,5 @@
 DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
-EBUILD bind-tools-9.16.15.ebuild 3397 BLAKE2B beb66258b1045a35f74a7dfd4f52bb453ad5698a3fc2c61ae0d4e9276adca1ee7112d8e680f251c47861119cce6b48ef57b2f513c87d1d0b37c7e81e3e745774 SHA512 d4dfc28973e12410e1e41f8922239adc6e7efe7638b3486d2b48fb2aaee23e389efd22d2a2757e2f597df3d89419e521c765b0e641687e5eea9d1a7a73231db3
+DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa01c48569d3cf5c122944319fbb88299a193ce06cc0aa67f6085fd80e29472fc7adc845e4bbb7ff6896dae87ed6 SHA512 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9
+EBUILD bind-tools-9.16.15.ebuild 3404 BLAKE2B 366a20661af50d30017201916c796e8ffda13d6621909e2df2e28e5834623699c5e27d7b3e12f603b2b9eeb5ac5b38e06f67b5c1750a57dfb3b2f645795b3097 SHA512 53cdf632ed2c18e4f39692d35c5d51fff1d1c944d576365f287a5f0176c24df090430342f601efbf59301faa6a7f512f69e112fef481d3cf70ac6addff5f3631
+EBUILD bind-tools-9.16.18.ebuild 3404 BLAKE2B 51b4dfcf08d3419270d844e606409f1c9a28346e5ce9ef870f02a7277e74de51e24692a8362e8f35fa09897a9c0571af14d2a26c6afff1d7cff9b530981eee81 SHA512 637dbeff0759f3247738d97a8ffb43dc715197a2a5bd33f10154fda1d5d66eb34961cd53335c41b452284564d2b8a1952c8cff740cee81203285c3e0d70ebf3f
 MISC metadata.xml 423 BLAKE2B 210c34f4faa1fa53d06d31b1bb401711c82102eeb319739ac85dd80d118a2cf6af7b3145e31a942b41afa56633265e5e950183e9421d9885a8278d55374ad889 SHA512 74d175fa11c79732223d09f91a8ead2d32140a508e05a45a897c85704a4c016701b4147f1c590eb3982eb01bcb14f33f51582b51564504505080e18953983b85
diff --git a/net-dns/bind-tools/bind-tools-9.16.15.ebuild b/net-dns/bind-tools/bind-tools-9.16.15.ebuild
index 18d30a0f166f..892235add429 100644
--- a/net-dns/bind-tools/bind-tools-9.16.15.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.16.18.ebuild b/net-dns/bind-tools/bind-tools-9.16.18.ebuild
new file mode 100644
index 000000000000..9a10170e22ca
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.18.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+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="+caps doc gssapi idn ipv6 libedit readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	caps? ( sys-libs/libcap )
+	dev-libs/openssl:=
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 4ee7b1403d47..3e7fcc0a864a 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -6,9 +6,11 @@ AUX named.cache-r3 3316 BLAKE2B 09a17fbb29f2122a61c7e17a8dfc8eef3b0fdaa94e8dbe17
 AUX named.conf 32 BLAKE2B 15548145717b526be3d7898a0c2144a13e29b0595a3c27d220cc45646156cc8ddae954cb3b3907ca845765fc8ce30508d8e570c0a492b965027531a0f6df43ac SHA512 c344fd4949eb80114d0c157517ece3f4b9505b94e3de00489d4b2b23beb74612f38cf3443f2f3b98fe01d98ad1842f45ff1d1826d67937e72e4629bbdf683a59
 AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63b22f6f50df2644d583d4fc504f55710f6549142bf6bfaa7c9fb3097202276135b9bbdb69af32f90 SHA512 60ab117e488604810a6e42a627eae465f6241208e726e763127f84102d05a661cceeddd00bc9d8d92c3da7d73d034ef876ace6744a0516b2bcadbaff1d9c82ad
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
-AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
+AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0fe9ef5e55de19f2e1ee3abe2c0f9fbff0a958ce751361c5faa690970d31a935aa2854a765a224c03 SHA512 65c65f261b950559487a6ac1d589cc51e6a4800aa9801c84aeb18083b7f587ff0ca6ce9e2994b1c58586d96a9181c05ca47ffef93fa210ffc53f4e9af21f4d1b
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
+DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa01c48569d3cf5c122944319fbb88299a193ce06cc0aa67f6085fd80e29472fc7adc845e4bbb7ff6896dae87ed6 SHA512 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.15-r1.ebuild 10946 BLAKE2B 2cc8b3b882ed36933e8bb13f59e88954b18bf20c5205bafbe48ac51f936edd6a627783c3647e4d4f8107d281914a004d2807bff00a580a42f07e5440b7c4825e SHA512 5ddd345e4c8ad379256664a546870f01534a1d6a0f1d5b0db1dcc8a2da0f6646aa6e1e9939e79467949f07d0bef4b2794733c5d10688f78c588521c462fb0791
+EBUILD bind-9.16.15-r2.ebuild 11030 BLAKE2B a9d6493aab1cea25ca0439e699b5d378dc54591aec121050b8a833584cdd949bed3a22df624e5be86ed2d8f934786a4c4f654c6461b1e2397b72bcaecd5eda64 SHA512 bbb0e6d934d31ccd2a3518b4a50e28136cbf2f1c3d6c3d4e4244710bcf94099aafabceb6bb3dabd2754c1eae6a591c94cbe410ecff6d83f05d059cb8ee896bba
+EBUILD bind-9.16.18.ebuild 10981 BLAKE2B 5bb750d517b143317420cf19068d4f42ac35bcfd9032ff930091364994e605a6c7ed3b9328dcdaf1e0218db7da586b12761bac3c1a2bb1b4666f54df359ab199 SHA512 990bcbbabdd98ca05c32b04dfabd6ed7df485eb6d7e33faef5ed20e8a0dbcdffcddf22b301e0acfa70eac3cbec8f77f985404ca3794397bc34175f6e991b6532
 MISC metadata.xml 973 BLAKE2B 9e2cd4d34c8cd9f6bc860c667d2440e7916dfa7ca343e578d7c089b3f45db3b1fbdd79d14ccf1af7fc25115316c42304dc635f1aec78d47eee1fec5c1a09aa43 SHA512 87ee75e39604d9839f849763f2b1675e6d13835dc482bcecd729e6c8416ef90d76edd8e5c5ec87b9e4eb0aa416fb7dc74143bc29cbce02ac3a83eaaa5a88f012
diff --git a/net-dns/bind/bind-9.16.15-r1.ebuild b/net-dns/bind/bind-9.16.15-r1.ebuild
deleted file mode 100644
index 35e114e47df0..000000000000
--- a/net-dns/bind/bind-9.16.15-r1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1 autotools toolchain-funcs flag-o-matic  db-use systemd tmpfiles
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-# -berkdb by default re bug 602682
-IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-# Upstream dropped the old geoip library, but the BIND configuration for using
-# GeoIP remained the same.
-REQUIRED_USE="
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	dnsrps? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	acct-group/named
-	acct-user/named
-	berkdb? ( sys-libs/db:= )
-	dev-libs/openssl:=[-bindist(-)]
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( dev-libs/libmaxminddb )
-	geoip2? ( dev-libs/libmaxminddb )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)
-	dev-libs/libuv:=
-"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
-)
-
-# bug 479092, requires networking
-# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
-#RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	bind_configure --without-python
-	use python && python_foreach_impl python_configure
-}
-
-bind_configure() {
-	local myeconfargs=(
-		AR="$(type -P $(tc-getAR))"
-		--prefix="${EPREFIX}"/usr
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		--without-cmocka
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json json-c)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-		"${@}"
-	)
-	# This is for users to start to migrate back to USE=geoip, rather than
-	# USE=geoip2
-	if use geoip ; then
-		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
-	elif use geoip2 ; then
-		# Added 2020/09/30
-		# Remove USE=geoip2 support after 2020/03/01
-		ewarn "USE=geoip2 is deprecated; update your USE flags!"
-		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
-	else
-		myeconfargs+=( --without-maxminddb --disable-geoip )
-	fi
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-python_configure() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	bind_configure --with-python
-	popd >/dev/null || die
-}
-
-src_compile() {
-	default
-	use python && python_foreach_impl python_compile
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
-	emake
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	# don't create /var/run
-	rmdir "${ED}"/var/run || die
-
-	dodoc CHANGES README
-
-	if use doc; then
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	use python && python_foreach_impl python_install
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-	dosym ../../var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn} /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	dotmpfiles "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-python_install() {
-	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_scriptinto /usr/sbin
-	python_doscript dnssec-{checkds,coverage}
-	python_optimize
-	popd >/dev/null || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${FILESDIR}"/named.conf
-
-	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
-		einfo "Using /dev/urandom for generating rndc.key"
-		/usr/sbin/rndc-confgen -a
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		if use geoip; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-		elif use geoip2; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
-		fi
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.16.15-r2.ebuild b/net-dns/bind/bind-9.16.15-r2.ebuild
new file mode 100644
index 000000000000..9beac1bb8860
--- /dev/null
+++ b/net-dns/bind/bind-9.16.15-r2.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-r1 autotools toolchain-funcs flag-o-matic  db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug 602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+#RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${EPREFIX}"/usr
+		--without-cmocka
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	# don't create /var/run
+	rmdir "${ED}"/var/run || die
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${FILESDIR}"/named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.16.18.ebuild b/net-dns/bind/bind-9.16.18.ebuild
new file mode 100644
index 000000000000..b7e24261c206
--- /dev/null
+++ b/net-dns/bind/bind-9.16.18.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-r1 autotools toolchain-funcs flag-o-matic  db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug 602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+#RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${EPREFIX}"/usr
+		--without-cmocka
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${FILESDIR}"/named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/files/named.init-r13 b/net-dns/bind/files/named.init-r13
deleted file mode 100644
index 4240a09176b8..000000000000
--- a/net-dns/bind/files/named.init-r13
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig checkzones"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-NAMED_CONF=${CHROOT}/etc/bind/named.conf
-
-OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
-MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60}
-
-_mount() {
-	local from
-	local to
-	local opts
-	local ret=0
-
-	if [ "${#}" -lt 3 ]; then
-		eerror "_mount(): to few arguments"
-		return 1
-	fi
-
-	from=$1
-	to=$2
-	shift 2
-
-	opts="${*}"
-	shift $#
-
-	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
-		einfo "mounting ${from} to ${to}"
-		mount ${from} ${to} ${opts}
-		ret=$?
-
-		eend $ret
-		return $ret
-	fi
-
-	return 0
-}
-
-_umount() {
-	local dir=$1
-	local ret=0
-
-	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
-		ebegin "umounting ${dir}"
-		umount ${dir}
-		ret=$?
-
-		eend $ret
-		return $ret
-	fi
-
-	return 0
-}
-
-_get_pidfile() {
-	# as suggested in bug #107724, bug 335398#c17
-	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
-			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
-	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid
-}
-
-check_chroot() {
-	if [ -n "${CHROOT}" ]; then
-		[ ! -d "${CHROOT}" ] && return 1
-		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
-		[ ! -d "${CHROOT}/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
-		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
-		[ ! -d "${CHROOT}/var/log/named" ] && return 1
-		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
-		[ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ -d "/usr/lib64" ]; then
-				[ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
-			elif [ -d "/usr/lib" ]; then
-				[ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
-			fi
-		fi
-	fi
-
-	return 0
-}
-
-checkconfig() {
-	ebegin "Checking named configuration"
-
-	if [ ! -f "${NAMED_CONF}" ] ; then
-		eerror "No ${NAMED_CONF} file exists!"
-		return 1
-	fi
-
-	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || {
-		eerror "named-checkconf failed! Please fix your config first."
-		return 1
-	}
-
-	eend 0
-	return 0
-}
-
-checkzones() {
-	ebegin "Checking named configuration and zones"
-	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}}
-	eend $?
-}
-
-start() {
-	local piddir
-
-	ebegin "Starting ${CHROOT:+chrooted }named"
-
-	if [ -n "${CHROOT}" ]; then
-		if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ ! -e /usr/lib/engines/libgost.so ]; then
-				eend 1
-				eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
-				return 1
-			fi
-			cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
-				eend 1
-				eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
-				return 1
-			}
-		fi
-		cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
-
-		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-			einfo "Mounting chroot dirs"
-			_mount /etc/bind ${CHROOT}/etc/bind -o bind
-			_mount /var/bind ${CHROOT}/var/bind -o bind
-			_mount /var/log/named ${CHROOT}/var/log/named -o bind
-			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
-			fi
-		fi
-
-		# On initial startup, if piddir inside the chroot /var/run/named
-		# Then the .../var/run part might not exist yet
-		checkpath -q -d -o root:root -m 0755 "${piddir}/.."
-	fi
-
-	checkconfig || { eend 1; return 1; }
-
-	# create piddir (usually /run/named) if necessary, bug 334535
-	_get_pidfile
-	piddir="${PIDFILE%/*}"
-	checkpath -q -d -o root:named -m 0770 "${piddir}" || {
-		eerror "Failed to create PID directory at $piddir"
-		eend 1
-		return 1
-	}
-
-	# In case someone have $CPU set in /etc/conf.d/named
-	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
-		CPU="-n ${CPU}"
-	fi
-
-	start-stop-daemon --start --pidfile ${PIDFILE} \
-		--nicelevel ${NAMED_NICELEVEL:-0} \
-		--exec /usr/sbin/named \
-		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
-	eend $?
-}
-
-stop() {
-	local reported=0
-
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-
-	# Workaround for now, until openrc's restart has been fixed.
-	# openrc doesn't care about a restart() function in init scripts.
-	if [ "${RC_CMD}" = "restart" ]; then
-		if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		checkconfig || { eend 1; return 1; }
-	fi
-
-	# -R 10, bug 335398
-	_get_pidfile
-	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
-		--exec /usr/sbin/named
-
-	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-		ebegin "Umounting chroot dirs"
-
-		# just to be sure everything gets clean
-		while fuser -s ${CHROOT} 2>/dev/null; do
-			if [ "${reported}" -eq 0 ]; then
-				einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)"
-			elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then
-				eerror "Waiting until all named processes are stopped failed!"
-				eend 1
-				break
-			fi
-			sleep 1
-			reported=$((reported+1))
-		done
-
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
-		_umount ${CHROOT}/etc/bind
-		_umount ${CHROOT}/var/log/named
-		_umount ${CHROOT}/var/bind
-	fi
-
-	eend $?
-}
-
-reload() {
-	local ret
-
-	ebegin "Reloading named.conf and zone files"
-
-	checkconfig || { eend 1; return 1; }
-
-	_get_pidfile
-	if [ -n "${PIDFILE}" ]; then
-		start-stop-daemon --pidfile $PIDFILE --signal HUP
-		ret=$?
-	else
-		ewarn "Unable to determine the pidfile... this is"
-		ewarn "a fallback mode. Please check your installation!"
-
-		$RC_SERVICE restart
-		ret=$?
-	fi
-
-	eend $ret
-}
diff --git a/net-dns/bind/files/named.init-r14 b/net-dns/bind/files/named.init-r14
new file mode 100644
index 000000000000..ff6ab216abc1
--- /dev/null
+++ b/net-dns/bind/files/named.init-r14
@@ -0,0 +1,252 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig checkzones"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use logger
+	provide dns
+}
+
+NAMED_CONF=${CHROOT}/etc/bind/named.conf
+
+OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
+MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60}
+
+_mount() {
+	local from
+	local to
+	local opts
+	local ret=0
+
+	if [ "${#}" -lt 3 ]; then
+		eerror "_mount(): to few arguments"
+		return 1
+	fi
+
+	from=$1
+	to=$2
+	shift 2
+
+	opts="${*}"
+	shift $#
+
+	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
+		einfo "mounting ${from} to ${to}"
+		mount ${from} ${to} ${opts}
+		ret=$?
+
+		eend $ret
+		return $ret
+	fi
+
+	return 0
+}
+
+_umount() {
+	local dir=$1
+	local ret=0
+
+	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
+		ebegin "umounting ${dir}"
+		umount ${dir}
+		ret=$?
+
+		eend $ret
+		return $ret
+	fi
+
+	return 0
+}
+
+_get_pidfile() {
+	# as suggested in bug #107724, bug 335398#c17
+	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
+			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
+	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid
+}
+
+check_chroot() {
+	if [ -n "${CHROOT}" ]; then
+		[ ! -d "${CHROOT}" ] && return 1
+		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
+		[ ! -d "${CHROOT}/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
+		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
+		[ ! -d "${CHROOT}/var/log/named" ] && return 1
+		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
+		[ ! -c "${CHROOT}/dev/urandom" ] && return 1
+		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
+		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+			if [ -d "/usr/lib64" ]; then
+				[ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
+			elif [ -d "/usr/lib" ]; then
+				[ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
+			fi
+		fi
+	fi
+
+	return 0
+}
+
+checkconfig() {
+	ebegin "Checking named configuration"
+
+	if [ ! -f "${NAMED_CONF}" ] ; then
+		eerror "No ${NAMED_CONF} file exists!"
+		return 1
+	fi
+
+	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || {
+		eerror "named-checkconf failed! Please fix your config first."
+		return 1
+	}
+
+	eend 0
+	return 0
+}
+
+checkzones() {
+	ebegin "Checking named configuration and zones"
+	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}}
+	eend $?
+}
+
+start() {
+	local piddir
+
+	ebegin "Starting ${CHROOT:+chrooted }named"
+
+	if [ -n "${CHROOT}" ]; then
+		if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+			check_chroot || {
+				eend 1
+				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+				return 1
+			}
+		fi
+
+		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+			if [ ! -e /usr/lib/engines/libgost.so ]; then
+				eend 1
+				eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
+				return 1
+			fi
+			cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
+				eend 1
+				eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
+				return 1
+			}
+		fi
+		cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
+
+		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
+			einfo "Mounting chroot dirs"
+			_mount /etc/bind ${CHROOT}/etc/bind -o bind
+			_mount /var/bind ${CHROOT}/var/bind -o bind
+			_mount /var/log/named ${CHROOT}/var/log/named -o bind
+			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
+			fi
+		fi
+
+		# On initial startup, if piddir inside the chroot /var/run/named
+		# Then the .../var/run part might not exist yet
+		checkpath -q -d -o root:root -m 0755 "${piddir}/.."
+	fi
+
+	checkconfig || { eend 1; return 1; }
+
+	# create piddir (usually /run/named) if necessary, bug 334535
+	_get_pidfile
+	piddir="${PIDFILE%/*}"
+	checkpath -q -d -o root:named -m 0770 "${piddir}" || {
+		eerror "Failed to create PID directory at $piddir"
+		eend 1
+		return 1
+	}
+
+	# In case someone have $CPU set in /etc/conf.d/named
+	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
+		CPU="-n ${CPU}"
+	fi
+
+	start-stop-daemon --start --pidfile ${PIDFILE} \
+		--nicelevel ${NAMED_NICELEVEL:-0} \
+		--exec /usr/sbin/named \
+		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
+	eend $?
+}
+
+stop() {
+	local reported=0
+
+	ebegin "Stopping ${CHROOT:+chrooted }named"
+
+	# Workaround for now, until openrc's restart has been fixed.
+	# openrc doesn't care about a restart() function in init scripts.
+	if [ "${RC_CMD}" = "restart" ]; then
+		if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+			check_chroot || {
+				eend 1
+				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+				return 1
+			}
+		fi
+
+		checkconfig || { eend 1; return 1; }
+	fi
+
+	# -R 10, bug 335398
+	_get_pidfile
+	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
+		--exec /usr/sbin/named
+
+	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
+		ebegin "Umounting chroot dirs"
+
+		# just to be sure everything gets clean
+		while fuser -s ${CHROOT} 2>/dev/null; do
+			if [ "${reported}" -eq 0 ]; then
+				einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)"
+			elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then
+				eerror "Waiting until all named processes are stopped failed!"
+				eend 1
+				break
+			fi
+			sleep 1
+			reported=$((reported+1))
+		done
+
+		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
+		_umount ${CHROOT}/etc/bind
+		_umount ${CHROOT}/var/log/named
+		_umount ${CHROOT}/var/bind
+	fi
+
+	eend $?
+}
+
+reload() {
+	local ret
+
+	ebegin "Reloading named.conf and zone files"
+
+	checkconfig || { eend 1; return 1; }
+
+	_get_pidfile
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --pidfile $PIDFILE --signal HUP
+		ret=$?
+	else
+		ewarn "Unable to determine the pidfile... this is"
+		ewarn "a fallback mode. Please check your installation!"
+
+		$RC_SERVICE restart
+		ret=$?
+	fi
+
+	eend $ret
+}
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 4d12d9ed9634..113d7cae703f 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -16,6 +16,5 @@ AUX string_length_255.patch 299 BLAKE2B 083d963d8d67baec402321c7fb8be2e485985ce0
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 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 3565 BLAKE2B 042fd688e007c1cf25403283d657cae13b7d335995ec4df44ff3e0d2a8eaaf88c66bceecbc388eea7ffa7fde3ccc2a12dcd0f6b5ee0dab2eea6fcfde7d6ec9f1 SHA512 8ab1fbecd6ee931dca4f8752ec57c63249c0b1c7fd70fe423f34b5d9dc396f7b49d139e5baa1dffad87db10f21d5b804cef9a56c72b85d7280bc370e00e287f4
+EBUILD djbdns-1.05-r35.ebuild 3564 BLAKE2B d4cd41577de6d5639b8ac7cdc58850677ecef30e9d4147d0972d28a2624b2aabf2ab2249dfb3a8ff7b7795895f00dc38adce23a4cb260a65fce587e1986f853b SHA512 fc9235c3a2aca2b304888e107ef922a5b9abbc2d78087bc5082d021f6bbce3011446d0dd472e97574f9cd50b6e0c7e914042a10950a1dc2bd859664638db686a
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild b/net-dns/djbdns/djbdns-1.05-r33.ebuild
deleted file mode 100644
index ca8d5bbf314b..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test28"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-	virtual/daemontools
-	selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack() {
-	# Unpack both djbdns and its man pages to separate directories.
-	default
-
-	# Now move the man pages under ${S} so that user patches can be
-	# applied to them as well in src_prepare().
-	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-PATCHES=(
-	"${FILESDIR}/headtail-r1.patch"
-	"${FILESDIR}/dnsroots.patch"
-	"${FILESDIR}/dnstracesort.patch"
-	"${FILESDIR}/string_length_255.patch"
-	"${FILESDIR}/srv_record_support.patch"
-	"${FILESDIR}/increase-cname-recustion-depth.patch"
-	"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-	"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-)
-
-src_prepare() {
-	if use ipv6; then
-		PATCHES=(${PATCHES[@]}
-			# The big ipv6 patch.
-			"${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-			# Fix CVE2008-4392 (ipv6)
-			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
-			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
-			"${FILESDIR}/makefile-parallel-test25.patch"
-		)
-	else
-		PATCHES=(${PATCHES[@]}
-			# Fix CVE2008-4392 (no ipv6)
-			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
-			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-			# Later versions of the ipv6 patch include this
-			"${FILESDIR}/${PV}-errno-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "/usr" > conf-home || die
-	emake
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	if use ipv6; then
-		dobin dnsip6 dnsip6q
-	fi
-
-	dodoc CHANGES README
-
-	doman man/*.[158]
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# The nofiles group is no longer provided by baselayout.
-	# Share it with qmail if possible.
-	enewgroup nofiles 200
-
-	enewuser dnscache -1 -1 -1 nofiles
-	enewuser dnslog -1 -1 -1 nofiles
-	enewuser tinydns -1 -1 -1 nofiles
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS='
-To configure djbdns, please follow the instructions at,
-
-	http://cr.yp.to/djbdns.html
-
-Of particular interest are,
-
-	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
-	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
-	tinydns : http://cr.yp.to/djbdns/run-server.html
-
-Portage has created users for axfrdns, dnscache, and tinydns; the
-commands to configure these programs are,
-
-	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
-	2. dnscache-conf dnscache dnslog /var/dnscache $ip
-	3. tinydns-conf tinydns dnslog /var/tinydns $ip
-
-(replace $ip with the ip address on which the server will run).
-
-If you wish to configure rbldns or walldns, you will need to create
-those users yourself (although you should still use the "dnslog"
-user for the logs):
-
-	4. rbldns-conf $username dnslog /var/rbldns $ip $base
-	5. walldns-conf $username dnslog /var/walldns $ip
-'
diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 6b06f4f1eebe..b9430c86fb90 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/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index f2d607461b5b..da92abf805e0 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,3 +1,3 @@
 DIST hash-slinger-3.1.tar.gz 38224 BLAKE2B 35d60b648704e1aa96fbec000ff07c06a31a1f45c58f708fdad1bab464849d4de60963acde9f2c26eb4304454ed1406f698c8007dbf471794f16f26b8ebdb080 SHA512 04ad33b718f716cfd08bd52ee50db81372b7dc13895695e1b23cf904306166b73e388285c7cce8a0a0e5003e783bc61dea4c9ede7a44f22c16e24e2411c7f427
-EBUILD hash-slinger-3.1.ebuild 1167 BLAKE2B a511f5882fd1fbb7c65b78ab317a1f83e077e6a7ce81041d0c5a72d7b3cebe7569708ccab8b2065b284bff16ebb3569d867bf1bfa751f3b0e34fb197b0411a5b SHA512 b278f9532a1603908d3a32fddfd3d754619220788b5d4a3a6343e6cf5ccc23aeedcd643ac88c2308624d53c3b48af4b0c15c3bd9cb806a41c1fcb95575de0112
+EBUILD hash-slinger-3.1.ebuild 1141 BLAKE2B eea3180f3469e15f115441dd203967872fc56c84acbaa0a4552a2f481748636f74e022dc24feb5ae51d82d74e430f180d2c38b5a0b76fac33c2172bc73b4fa33 SHA512 3445cf13cfe7fad2ae0a948436dffa1678b127928be1c86128bd96a173e20327974198574082b76aa2c33e6c8d765ea9c24749ebc322b50d05b73b4cc70aba8f
 MISC metadata.xml 512 BLAKE2B 6038437e45983e453f8738a081665affeb3a7293e0abe727fa7e61f91b9e1a6cb27f799037079b9ae49a94a38c082e48f984c5735988102bd8b5665ab37adb32 SHA512 126df24bc6c1129888d66dc1ecae7b6cf86a3b1f7589a09c08312b89f2edf6f3ed6257c7e78bcc0bb7cfe8cfffdc819c1b725c0f7302152f7f542c79eb04f4de
diff --git a/net-dns/hash-slinger/hash-slinger-3.1.ebuild b/net-dns/hash-slinger/hash-slinger-3.1.ebuild
index 2f14f5b8fea7..330f6cc1075e 100644
--- a/net-dns/hash-slinger/hash-slinger-3.1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-single-r1
 
@@ -21,13 +21,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
-		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+		dev-python/m2crypto[${PYTHON_USEDEP}]
 	')
 	net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}]
 	ipsec? ( net-vpn/libreswan[dnssec] )
-	openpgp? ( $(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]') )
+	openpgp? ( $(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') )
 	ssh? ( net-misc/openssh )
 "
 
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 01a05b844405..5d9dc97c51d7 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,5 +1,8 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
 DIST libidn-1.37.tar.gz 2603177 BLAKE2B 2f55644b8e521ae75638e6b660f7a7e457957b783bfa359de497a475f70372d46557d9abd1263588cf8aecbaa713f24e5baf460b4aa663d3ead7326f296a58dc SHA512 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c
 DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c188c2487ea3c7677a56c7821f02ac39404581bb033a23860e8b07251efabefd85a1f2be91461f2bd27162869 SHA512 6fc3543d32d2a2b730ee22c04098420200292c95582a625cbd05729b3df40f87faa35aaceb9fa45245fa891971a10f47281f490eb7bc3099910e349c643360a2
+DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419
+DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe
 EBUILD libidn-1.37.ebuild 2798 BLAKE2B 6ba3a5a3a6699f45d9e52d54df7933f26e97290fd2a957f90b4be22fee8f13de5e722fae7991b9d88fcf422f84fc0bbeac93d02eb0f28ac80540c32a4c13e3e9 SHA512 7b6fa387a4177cad5ec1b5f5d102da90deb641570c20d59aae90172b318faf6865431cf7142f3606bc8ef75c9c23389a1a22c0a448968abdb0cd3f89c94e23c7
+EBUILD libidn-1.38-r1.ebuild 2748 BLAKE2B e38276943a8c10a8703b0e9b18af8d57f61c5d2500e1229403e4de797692d9457c5ac4b4c73ebccf04bbaaebdee9e4f564fd3b941ab0dfedea196eefcd0ac480 SHA512 f51f55b72ace2e6d4f5b364cae58cc975c69bbaf31f8e08441fcd28a0ee31243b961b48a5b60f16569c5c03dc5bce76482bfec86eec0fae0b9bd3bf817819d22
 MISC metadata.xml 347 BLAKE2B 293e4cc6e22f51f47bf25f9be723ae443dd92138e6ddac7bfa4bbeb314a823dcf62429551125167fdc41e1031050f5baf034f493daa1cfa0aaa3fd824a4ddea7 SHA512 8fc22ee1c8de823f07c90e20c8075ef00ad130c07f5e556f61b501e4b162992050cbbfd6ad492b551464370f8d90382f3243d93830be92ccef6bd54481dd6bdd
diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild
new file mode 100644
index 000000000000..f5700cc22cb1
--- /dev/null
+++ b/net-dns/libidn/libidn-1.38-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz
+	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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="doc emacs java mono nls"
+
+DEPEND="mono? ( >=dev-lang/mono-0.95 )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( >=sys-devel/gettext-0.17 )
+	verify-sig? ( app-crypt/openpgp-keys-libidn )"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Bundled and with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+
+	# For Solaris shared objects
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local -x GJDOC=javadoc
+
+	local args=(
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_enable mono csharp mono)
+		$(use_enable nls)
+		--disable-static
+		--disable-valgrind-tests
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+		--with-packager-bug-reports="https://bugs.gentoo.org"
+		--with-packager-version="r${PR}"
+		--with-packager="Gentoo Linux"
+	)
+
+	ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		use emacs && elisp-compile "${S}"/src/*.el
+		use java && use doc && emake -C java/src/main/java javadoc
+	fi
+}
+
+multilib_src_test() {
+	# Only run libidn specific tests and not gnulib tests (bug #539356)
+	emake -C tests check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/${P}.jar ${PN}.jar
+
+		rm -r "${ED}"/usr/share/java || die
+
+		use doc && java-pkg_dojavadoc "${S}"/doc/java
+	fi
+}
+
+multilib_src_install_all() {
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} "${S}"/src/*.elc
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	else
+		rm -r "${ED}"/usr/share/emacs || die
+	fi
+
+	einstalldocs
+
+	use doc && dodoc -r doc/reference/html
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 6346a3cc2137..ba044b339c7d 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,4 +1,7 @@
 DIST libidn2-2.3.1.tar.gz 2188338 BLAKE2B 323840b0d84f41cc746ca9b5a24169a374e95bd4669b96d7b62ac3304f6d78195acef7739628cf7e31cf7b230ffb60f74961c3e22693571fd2fc7cbb35f1ac23 SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4
 DIST libidn2-2.3.1.tar.gz.sig 488 BLAKE2B 2e1428ec240964fcdc1dbe96afa69920e5f5439ebf9c58e134832ceab932aef57176744a8fdf76ca29e73650c18406ec894b8e92dd95d52cb712bf7f823ca820 SHA512 2db4bb3a11562634276664fb857306271c6ebc96cf5e90b39b404c3fe47190ec65ce3866cebcfa0c1216d29d7aed8c7907b869e602a722db1cf8f6ab94da9c78
+DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
+DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
 EBUILD libidn2-2.3.1.ebuild 1483 BLAKE2B 1ff3a3ebdcfa331ca560505ff5f9347bc3936f65e55b384a46def83079e8de58dde6090938a95545cba8fae8e2ea53d706c595195ca726e57b5d2f2d39f5c28c SHA512 678b749b553f5b10c63768471858825ad42abaab422829c946c4c2c1a413ccf8c5a85300499b80b1353ad38bc37a9c85c97ce34f41f32730d7166434047eb9d3
+EBUILD libidn2-2.3.2.ebuild 1491 BLAKE2B 1e8bed08c6b8d76bd85cb25ea4a372531887dbc1de267288e51dd2ec8ca31fb2ed9d5b40ff9215e1530804e7ba688975668499182889299c8b2ccb5467ad8b1c SHA512 4f9fc2eaa29080ab07c7f5e5ff4487a1143acae876cf193829d0be8fb55d2e03207b23e036992a1dbc98d12b94ff70c764c7025892b0b5b2bb82f5744153d87d
 MISC metadata.xml 561 BLAKE2B 074256567a8f1b82c825d213cf6ea2030ab7b08151d7c14b35396abaa1043974808deba8ef4bbf48dfda4d2f68f832a2c9342090aae38b8e30b73ed91f17c846 SHA512 96d7ffcaa48c2bfb6273f7ec4ea99e4accc7c615d08c9aba892c7eacb7429c1b0ec8d330152cc88ad165cfd4ff5b1062db3f5df43b7e33bfcf5296d19376f654
diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild
new file mode 100644
index 000000000000..ca045ed9ec8c
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )
+"
+S="${WORKDIR}"/${P/a/}
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+	verify-sig? ( app-crypt/openpgp-keys-libidn )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gcc-warnings \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 51b4571f2061..1b74cb7e681e 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,8 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
-DIST nsd-4.3.5.tar.gz 1184220 BLAKE2B 0ded84d9a0c25b86af6c05a7ab3ffb680177142b79a96f952cdeb92d87d9d0f306fb3c864b8f3cb769b05b0a863a7470df9407e6f3f5f0bc9a32891185d32b6f SHA512 bd031da779ff7b9b53fb4ea4d038a51f3b8f7b59a2927f674def46ca775f30afa059b471fed7d8ebcd2b7d02968945972b98856198eafbc4263d3064dae01029
 DIST nsd-4.3.6.tar.gz 1197835 BLAKE2B 943ae0700a2f49fffa9414f1d2718fef5e6a2f181373cc0a17ebe04433bce22d3863c8f17bd4d0412264503a80720d6dea9ce0d3ad6305f54dc3a2496118c90f SHA512 d87837b483ab37fde5d3eae7dca4c9e2672a718a1f49847db13232358108a5e0d6395c07d3fac72092a949d3c9861cd1dbed3e9bd0342ba6cbe7ca32feba09d0
-EBUILD nsd-4.3.4.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
-EBUILD nsd-4.3.5.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
-EBUILD nsd-4.3.6.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
+DIST nsd-4.3.7.tar.gz 1221215 BLAKE2B 79bd49324f62812a7f0f5800a686d09600620d1dc87ed9e7d4c1f2822c68700b73f5c58c328927fdf7f4af61a401033e39a8e59e054e53c564acfefc86d68bde SHA512 ef5fbcbeccba7e90cc7eed32c6a6f61f5471e13bfb74e5dd072cc9be7af67ebf97c93c0902e115efeda89489399e0543566a6847788ea7bebf13b9007f2c6193
+EBUILD nsd-4.3.6.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
+EBUILD nsd-4.3.7.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
 MISC metadata.xml 1160 BLAKE2B bd724c7485cbabe2738d0439b442c28858f66200acd237ec2a79f0b583fe4fbd0c82a68efd3af277a4e7d5333fc371b8150cea742373100d5b3667cb7d161145 SHA512 8576175fa8c53b3f7c2c588fb467ca633f6a628c90d7c08cb0d9414a5e721ab57c29c012f8021a7710aeac9be8d4d1ccd69acd6cb7309804460638ca6b51aa1d
diff --git a/net-dns/nsd/nsd-4.3.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
deleted file mode 100644
index 21733815a1e3..000000000000
--- a/net-dns/nsd/nsd-4.3.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.3.6.ebuild b/net-dns/nsd/nsd-4.3.6.ebuild
index 729d48122082..21733815a1e3 100644
--- a/net-dns/nsd/nsd-4.3.6.ebuild
+++ b/net-dns/nsd/nsd-4.3.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.3.5.ebuild b/net-dns/nsd/nsd-4.3.7.ebuild
index 729d48122082..729d48122082 100644
--- a/net-dns/nsd/nsd-4.3.5.ebuild
+++ b/net-dns/nsd/nsd-4.3.7.ebuild
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index a0d0a0ad4950..23c645dd0936 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,3 @@
 DIST openresolv-3.12.0.tar.xz 21008 BLAKE2B 1609d8e97a9abe82f9ead7179727dd4323571e92b36aa2ca2a1177972f3a61946f612dd0cf81a804087f1c71bda25e78dab8b085ad2be55ce21214dc9870fdf6 SHA512 60348ca35114b105c8b3121e5f2d301311fcc7251a9be60c45fedc27267cfd94e413e77c7d5c91d0a0ccb8f1b4288bc147582b0ac9be64afcaa96ad3d833f26f
-EBUILD openresolv-3.12.0.ebuild 1054 BLAKE2B f3d5751724ab8ae7ae3696529dda12f5de6f64bafea6cab8fcb9d85004895ec4dcd9415541f23d12d2b3f7b205d59f75b2bcd0d5916e54073393c13b91689861 SHA512 7581367618108f4406c422d3adf829568d5795648f3cd03f96d8fca7a4ae6d3afa5cfd5ac27b366bb84092cb6d2d71dbc5b5a6af728c19a1f702d00fd2147f57
+EBUILD openresolv-3.12.0.ebuild 1085 BLAKE2B f953b2b16a7035a5919ed83242081bea2476a77a365278db7d1c864e7c255d38c09efe1731106afd5c456ae71032d5a28cff6f8acfd79a9a729b24ef213ba7b9 SHA512 a34c1bfb3a50654f65e3587d100867f4c8c9e8746157a800993e209e17d5728e477000e9990d158b9b898536c7940daf88821e1d3a2ea90eefaa5325072b9df9
 MISC metadata.xml 268 BLAKE2B 64bd35ab0734da264061b8946fa2d38f03b25ae7fb2aafbbe8c51c63f58c98ae052e49f5854c711895c0b81b46be7bbef8525408883b7fcdcd5a975295c92eab SHA512 dd949ae4aac3d786ce9127771b07178f1044f5611b9aa0ed59235dc0f3f7f75eea71c0ccde661bf5149773f9c4c9ebbc81940c01260a456ee578351bf935e68b
diff --git a/net-dns/openresolv/openresolv-3.12.0.ebuild b/net-dns/openresolv/openresolv-3.12.0.ebuild
index 2cc9fb729890..74668adebd0a 100644
--- a/net-dns/openresolv/openresolv-3.12.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.12.0.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="selinux"
 
-RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
+RDEPEND="!sys-apps/systemd[resolvconf]
+	selinux? ( sec-policy/selinux-resolvconf )"
 
 src_configure() {
 	local myeconfargs=(
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ba69cf28326a..285214dee389 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 79ed2e3c50cf..6b3a541f433e 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -3,8 +3,8 @@ DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
-EBUILD firewalld-0.7.1-r3.ebuild 3252 BLAKE2B 359feb9be1d3e07b487f88461260b440c4fecd77b1c3a4e53bfe57d9d3a8948af3f893c1bc74d8c247f97eda67f462af178a1c746722358832774a725e97ac8a SHA512 8a1e5724736aaa5135e529230e2636fe0ee24bb5eb711d325cb3e6ef5572d4848da986798ab3abdcfa35ee3ff784efd78a2b559c195998580d7162797bc49338
-EBUILD firewalld-0.7.3-r1.ebuild 3255 BLAKE2B e1ee150f40a9cb4462a63acc6e200e3e03681f7616b26f3b8d9c4944f8bcfc963c1579a745253f65bbd43b3f7b4d95248d4c0af19f63b2f65264c37e777af1ce SHA512 b517268487e4286017dd86f25ebb3a0267d10c7202b919286e3f05117b1434025c69a6bf257b70629d1d897315326d7297936379d31f92205893db5fe6e6e90a
-EBUILD firewalld-0.9.1-r1.ebuild 3197 BLAKE2B b4cfefba08d239d0dffc64f43173bfdc2d25fb642cb328546c1a884aab0d5ed628724aec1ba6ef9599501ab65569e3d64035e05db7bab7e0d756002cb23e91fd SHA512 a3ed188cb1b6537c184248900440fa34bd8bde1e55c0e55e20503bbf3daae128c25a215c650ac0b958f789e3d6f4f02650d379038399ea1539b0ef94203c4bc7
-EBUILD firewalld-0.9.3-r1.ebuild 3200 BLAKE2B 96bfc05546f0520a593bffe78c745d7c2da291e47e3df6fa041b0c4e220e0bb71446e6a255bb32de031f162dd656f9f8e6451d5f7bc7ad4f1756fef9da4fec55 SHA512 07402b18d95625be24ec4a8b3e11d96b8d86ddf041d20b181e82e3e84bf07a769b9d1fc65d436d04e188d1aaf038151f6649878b9ae08bf278257fe8322c1ad4
+EBUILD firewalld-0.7.1-r3.ebuild 3220 BLAKE2B 3bc079c30540420da1f62aac363837eff13187c4b727dd47ee7f8512bb31ccfd2198a28226ef89abfdb6aa4aacecd75d618edeaa38836f6146034d77f007dc7b SHA512 77a9cf6d7ffade8bd151bdfa85d51c6962174faf63a5dbd5bc7bf1f610273a4044996ff93814845dbac9998d004973fcaa91fa9bbb38b21dcd5092aaa456cc2c
+EBUILD firewalld-0.7.3-r1.ebuild 3223 BLAKE2B 2409755e06f8b5def3fadc59f90bea9e9b9af57de0abd4ccbe5c65729b38c5f864f5d79e113b9289d553cd6f4f79fde47423c5acf1ab86542a4f51a9dcd52826 SHA512 99ac981b9d029ee17482d8299bd67005eab980ab41193d1cecf39c3fe17f9a73024ede67390ba86fbea631be82a7802772329e16d16a0c58394b2ace0fedb99b
+EBUILD firewalld-0.9.1-r1.ebuild 3165 BLAKE2B ee5f4f02f1dd911bd55b7f001ae416657cdb873205e916f7c5e16941699831f91918360ced1712d41153e7342f57a4f3f0362ed99e4ee4a5d07907b3da3b6cb1 SHA512 676409b0d329f4c9d5549819059141cad6fb99861bca58351e27ff5e44ac9d69b85d1ddba953658be319db7f5fdc43e8fbda7f2b093cfc21645ada32f095e10a
+EBUILD firewalld-0.9.3-r1.ebuild 3168 BLAKE2B fe0bdce016a97fb2cbde02072a5ff1ea8e956b2cac1822aeed355d3879704ef41e22463c62e0a27b9b08860b7cfcd3887d6e582cab1637ecf6a7504dcb62e329 SHA512 22b3f035114456c27be23534b785673d83e0b6d76577e9c29a3f24e8d240d0609ddd47de0e59cb8d83bb1c0cefb9d8e63ecf5142f1f09d25d715888ca366ee52
 MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0
diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index 0803ec72a634..05546297f4b9 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
@@ -27,13 +27,13 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gui? (
 			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 		)
 	')"
 DEPEND="${RDEPEND}
diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 4c32e1152ae2..d926073fdf74 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
@@ -27,13 +27,13 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gui? (
 			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 		)
 	')"
 DEPEND="${RDEPEND}
diff --git a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
index 571c2e6a669a..eece123f46f9 100644
--- a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
@@ -27,13 +27,13 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gui? (
 			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 10845818f9b9..527e4ba823e5 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
@@ -27,13 +27,13 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gui? (
 			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 5c554a5d2cc0..14cc2bc855e9 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -8,5 +8,5 @@ AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a
 AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 DIST iptables-1.8.7.tar.bz2 717862 BLAKE2B fd4dcff142eaadde2a14ce3eb5e45d41c326752553b52900c77fd2e2a20c0685d0a04b95755995e914df47658834d52216d6465c2ae9cd6abc6eb122b95cc976 SHA512 c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75
-EBUILD iptables-1.8.7.ebuild 4643 BLAKE2B f254508c031b2083431a7f13e71d23e74ffcc274bca8a714334ef0e96b8928f023b3968d6ef067e5ea683c8ee1cf0beedc0b696fb2ea024171e0b2dda0dd8d9a SHA512 d1f130f71f45567a333b8f30a1c991ef6d9ed1c6c677aaf7b974c83a10da05565ae71f91382a34fa248ddfc705de04712f3c6c497b710943c3c14ac8c64778f4
+EBUILD iptables-1.8.7.ebuild 4691 BLAKE2B 830cc6dafd78ff98e69dbd56dbddef4cb9c67a1c859c26a0ef3b1c74d6ad4bcd29126d3a90f6bec5cc0a92929a3d357ca04cc8f881480b91f0371990c64ef239 SHA512 6f8d5e8c2633d25abac9ac50296f09588e63e1f75c261e3c3ceb4dd683a0fb240d84064dac63b21cbacaef96929964e4d9d638c7cfe3b2b3698d30cc68ba8362
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/iptables-1.8.7.ebuild b/net-firewall/iptables/iptables-1.8.7.ebuild
index a6ba56cb3543..079e1fb2cbaf 100644
--- a/net-firewall/iptables/iptables-1.8.7.ebuild
+++ b/net-firewall/iptables/iptables-1.8.7.ebuild
@@ -155,8 +155,10 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
-	elog "Unsetting iptables symlinks before removal"
-	eselect iptables unset
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		elog "Unsetting iptables symlinks before removal"
+		eselect iptables unset
+	fi
 
 	if ! has_version 'net-firewall/ebtables'; then
 		elog "Unsetting ebtables symlinks before removal"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 586859877a7d..b25f0f78ec24 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 3f593343a0aa..3f8db9773433 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -4,5 +4,5 @@ AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672
 DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e
 DIST cifs-utils-6.12.tar.bz2 413393 BLAKE2B 54d9f8cc5c7aac8157baac4bd0f742fea27f7141adc183a99ba276888b6aa8ec87150983cfa677ebd96bcfe8a019038199fef8dfe464c82bbdbaf07c0a7b35dd SHA512 2f2e1cba8d56c9039fc28236fa63812a09f07f14931c3bd7bd5ae3e6aeb372130c5a059569d8714fb973bea87eba394fd30228fbaeabe700961bba400dd01ca6
 EBUILD cifs-utils-6.11.ebuild 3212 BLAKE2B a87a72d144e834998197802c23e3ad2c8f94f10fb54adc5654b1cde63d0a13104e3993ff250df710c710e5b0873a55fa823b7baa75f3f0fc04871ee32a56b50c SHA512 a4a06f59ae9f0c37c0084df205345647d1e9803e5973b54922803c5c8016607940669ed5a23ca11ae52fcef01a08d6da9c53bd809c2bc29807a357e4962941b3
-EBUILD cifs-utils-6.12.ebuild 3379 BLAKE2B ffe11a5376f1bb9cb623ca30d7c6b224bd54c9a8a04f0694944db1c7c9911b783d231fdb3323823c781fc5711f70f09c78abd39b10b8ecc7db78c441fb9f8120 SHA512 c98cdd2fa1f2973792e4f654dab5c55fade64dbc54d42c76dfdd55c903967a86d19191d762a01f784a62aaac45b18540344b9b0c77a10432e5970a66b5456658
+EBUILD cifs-utils-6.12.ebuild 3386 BLAKE2B d635d471051e6aab6560643f7a1090aa957022917333c9d146cb2fe3f5dd177d36ae12dbea18776605d4024ea982948e6af720792217ae75b6805a074098db33 SHA512 c66d780991631e2f634ee6b2f2fa6fb79ae9c0720029211100cab22d5c0a6c8457433fd164266b47af65ee31f7cdb689ae21826caf1e014266ce09576bd45f6e
 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b
diff --git a/net-fs/cifs-utils/cifs-utils-6.12.ebuild b/net-fs/cifs-utils/cifs-utils-6.12.ebuild
index 9ee2844f1159..da0c06f1d4f5 100644
--- a/net-fs/cifs-utils/cifs-utils-6.12.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam systemd"
 
 RDEPEND="
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7c6b6739bba5..9a4e15fb01a5 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,10 +9,10 @@ DIST samba-4.14.4.tar.gz 18645552 BLAKE2B 4fbf4b000496b66c7c464a4b522108fde12df3
 DIST samba-4.14.5.tar.gz 18653694 BLAKE2B 6c8fdafb20d6a42797a2f55f29e9f4a239845fd802c0384c0cb88d916f240a1ed18fb3e9a041eb70e8c2f56abb6c63f3229d40d710ab5ddf3697e0161d61726f SHA512 ef50aae93141a41034a10eb0b1a135d4b8b28c63663b930d24d6199d9ffd1fd139b6443d1859df19d3299b507a4a1c2810de057e2affd4e8b8cfc7175fdd7b39
 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
+EBUILD samba-4.13.10-r1.ebuild 9919 BLAKE2B 3e0578d885b2b5522fd1c73f5866da9e569b3af48c0f0dc73615d34a4660c6667c69ed5c4ee402d794f6e1fe760a30239f4054d38a3ea2a5ca331f7c0cd1a8b1 SHA512 902db52a306abbb05da7cc038982b34ec5eb7f8caf76df8425595cda00b8370810b5a8e8eb28a53bfb4802b1de6c3aaeaf8b3358af3f4668e01d572b160709a0
+EBUILD samba-4.13.9-r2.ebuild 9912 BLAKE2B 553eab8ba3baf011c1dff4850012d060d2654859327d24769ec8f3445f53ae3e7ac7534e70dae2b0f6d9753a3fa5ecb782e1288198ff6fc2ba6c58b238d83204 SHA512 f9cf86b0d7fc531994da8a79e5de2fd203cce55cb246682567af8ab81b363d5afd8a192c9695ca51109fe345dc928ec7cfb0a3dfc13e969e22c64658aae01985
+EBUILD samba-4.14.4-r2.ebuild 10020 BLAKE2B 44726dca2766df9be4de0f6be825bdd3193557984dce22c1bab88b3c63d2b346a7e020d854570a3d8085d94f77b867f4fd284ec1ec5ff07e90aaa5c3a84b11bc SHA512 112486c07184b2c03603377c6e8177944be098609fe9a1101e86526ece343a37bac135959b790949e0af5d86c1574f506ad8cadd422009f025519121a2e598bc
+EBUILD samba-4.14.5-r2.ebuild 10039 BLAKE2B 8909c26b317252584cbf09b526147c49ff6318607a67cbaf5c6e20b8303abcad0aa70dcae38865019103f0cf97c2693a7f60744ab89f229f811b3567e26bf8a6 SHA512 19cfe814c8efcee282441c038a20ea46dc333aa8cb15fa56aa2b7335b536872f91c6b579a6dda87fc769485e9e4c9b2988bba532f54f5b81ba77e46b4da39802
+EBUILD samba-4.14.6-r1.ebuild 10020 BLAKE2B 44726dca2766df9be4de0f6be825bdd3193557984dce22c1bab88b3c63d2b346a7e020d854570a3d8085d94f77b867f4fd284ec1ec5ff07e90aaa5c3a84b11bc SHA512 112486c07184b2c03603377c6e8177944be098609fe9a1101e86526ece343a37bac135959b790949e0af5d86c1574f506ad8cadd422009f025519121a2e598bc
+EBUILD samba-4.15.0_rc1-r1.ebuild 9938 BLAKE2B a0be1105cfb464bd51bacc83671280b820b6a0ee01d959e0947a6d49503122839cd804475c9c2df1ddcc903bf0ca185046b285353d8bf8d1c9bd684f49d75ae9 SHA512 4da059efc87c1218bc0a0fb7fd56afda2d563eb7bb8f836362f4ed6f046783bc64b2b3d9e2b8b4009ecd4176d2bc3a0ad7082b485950721c527890a0b6aed64e
 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
index 11a2973e57fe..c5eb38eb2f50 100644
--- a/net-fs/samba/samba-4.13.10-r1.ebuild
+++ b/net-fs/samba/samba-4.13.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -82,7 +82,7 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
diff --git a/net-fs/samba/samba-4.13.9-r2.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild
index 4f9c3873ee67..1042fb9c1b7f 100644
--- a/net-fs/samba/samba-4.13.9-r2.ebuild
+++ b/net-fs/samba/samba-4.13.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -82,7 +82,7 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
diff --git a/net-fs/samba/samba-4.14.4-r2.ebuild b/net-fs/samba/samba-4.14.4-r2.ebuild
index fb2a26e35c4f..8c1e9a652efc 100644
--- a/net-fs/samba/samba-4.14.4-r2.ebuild
+++ b/net-fs/samba/samba-4.14.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -82,11 +82,11 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
 		)
 		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
diff --git a/net-fs/samba/samba-4.14.5-r2.ebuild b/net-fs/samba/samba-4.14.5-r2.ebuild
index fb2a26e35c4f..39f4db758764 100644
--- a/net-fs/samba/samba-4.14.5-r2.ebuild
+++ b/net-fs/samba/samba-4.14.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -16,7 +16,7 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -82,15 +82,15 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
 		)
 		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
index fb2a26e35c4f..8c1e9a652efc 100644
--- a/net-fs/samba/samba-4.14.6-r1.ebuild
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -82,11 +82,11 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
 		)
 		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
diff --git a/net-fs/samba/samba-4.15.0_rc1-r1.ebuild b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
index 1921330d5a32..6f9535c6ca1b 100644
--- a/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
+++ b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
@@ -16,7 +16,7 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -80,15 +80,15 @@ COMMON_DEPEND="
 	virtual/libiconv
 	$(python_gen_cond_dep "
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
 		)
 		ads? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index 2938a9c8790a..04a7157a9e7c 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -1,4 +1,4 @@
 AUX smbnetfs-0.6.1-docdir.patch 432 BLAKE2B e58dd4835d816b6908fb4f0198bf1f6a7a9de8bbedb1736f5137c6ea7ae2f271420c3afceda6b30739403a010c0c917153a82233873cdf8a4b301cdbfc910c8a SHA512 3c75db469adad6d6e69fd7406a17fbd7d60d1ee43371a1f9b4780dbaa51c0e893cd3bcbcd3c96c5c5a81c8616267c4fbc921f04bf2bd14368f47c5c93bfed598
 DIST smbnetfs-0.6.3.tar.bz2 187460 BLAKE2B d6906fa1e513253ae423031486e3be31308254506fd218f15395ac30591ecdc3179fd0998ec1e717ba4d787e7d6d8e951bc417b1c68d89193408a333d90a693c SHA512 19b1ec6a9cc9722e5e80c26ff4bd8b62dcdf7f3bb71a3c7b2a0b2b32af6902fd3fb95c27188a51b2a1f0df20fadad799ca685db28daba101f1e3b2c03ee295cc
 EBUILD smbnetfs-0.6.3.ebuild 867 BLAKE2B 539efcf54ea39a707dcdb56ea770f7387ca5cd53b4b5656123987838cc3ea2ba7c812557e2f827149218630cd0ef4a5cdc38f750504a1fd57e9b7b22a9fe1b72 SHA512 00321941e483c751f283099f0f5bf4457d1fdd02c8acb759416efc329b24849c36c511d29ffc2adc4e6eab72952576e21cc144e065392b1b17897185fca6fd64
-MISC metadata.xml 1149 BLAKE2B 420bbe890fc54b92ac4a3bb91e45649c775b3a1f7b593e78f3b9afb6e3f765369da3d0460fa10a336b542f94024961bd2c2954cd7ed6517b4671d240ed236c70 SHA512 1984bb9a158582347cd4ec4ab6a0277848db9c5e2c2d59a6f0e63301f3cc0fd86439c9be1eb3dc2bfd18d400712350573010a16b333b9675425ccc5da1e73544
+MISC metadata.xml 1065 BLAKE2B 216996bb472edf8e63715a9867f50f5b145631ef5586b8a39dc8b96fc2a3d4c5f2bb3b3b31b4ce7f9b53dec6a7b378b170e2c7b84f37a556627cc8a7ebcb33d5 SHA512 722f359cc55eaab6657191e96435b171c25def543f663b4512d80be7a3868a1e397ea3c2a4d92a63a996c72bda7a45ecb651ce483a604578bb4ce9283da54b09
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index 0b271c50ccec..50fafa14e58c 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.
 
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 9588392645f6..226edb7ef4f9 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index e5da67d5c8df..564be75b3280 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,7 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
+AUX ftp.service 278 BLAKE2B 8c0c636297d60c3d9fb8baaf9e3a9d545fbe56a6a6031c50fa202292fcf747a4c14621a8e34529617c5b3f0d1a89d5c151f1c90cc8e5f1af5d85b9c85194f3e3 SHA512 fcba0f31adf681bc67ce206dcabcd94486ecafdf96c348ec9ef3597f6f040a99e20a00db9757d5f077105e5fcb9183291585568b7edb0676ef9d522be56f6d6e
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
 EBUILD ftpbase-0.01-r4.ebuild 738 BLAKE2B 270a30abcd61bd75664da4a1ead38bff0eb60d0ecf23b6e7cbca43858cfb531709e7fa2f8224faaa8cf4522c534d293b90642266debfcb66cd72608f2b771afa SHA512 02ea902cc72ca5cad4d110f4e7027b495e5f5fa40ac6c4845c76fb04995975f82b20fcc55569f1b5d4976c85c0f08c12c0d18d90fa04b11854540ca717651f3b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD ftpbase-0.01-r5.ebuild 792 BLAKE2B b6dd31b522adb103ff5c96a5b352de8c0f3a1ca5727dd900a2f763672dbbac84a1378309daad5faf208b1bdb0b3300ce83044078aafcfbdd483bb8dcb15eb860 SHA512 a14d90e70852ef606a189324dc568fd32da09393b4ecc0aa6a289d973053cc7f7d6c38330df47af796b02c629b46a79c092d7a2e3564fab5877d078c44adaf29
+MISC metadata.xml 380 BLAKE2B 277dc1c8940d7a57eeec5466fb008bc1833f97e5446b46012d3d3c2727711e019ce96bf374cdafb9507e3f8d1a0d3dcdad897400c2e39f5deab1c4ac03440af7 SHA512 f563d7650ab3cca05eb8d855105b300961dc4e8af03b29598d4b14986b9729eeefdf54cd56a4175966ec4e362ce8d45532d28fad63c1e03d9df9dca139b1bcd5
diff --git a/net-ftp/ftpbase/files/ftp.service b/net-ftp/ftpbase/files/ftp.service
new file mode 100644
index 000000000000..9194b45a8364
--- /dev/null
+++ b/net-ftp/ftpbase/files/ftp.service
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+
+<service-group>
+	<name replace-wildcards="yes">File Transfer Protocol (FTP) on %h</name>
+	<service>
+		<port>21</port>
+		<type>_ftp._tcp</type>
+	</service>
+</service-group>
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
new file mode 100644
index 000000000000..526756b0ee02
--- /dev/null
+++ b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam
+
+DESCRIPTION="File Transfer Protocol (FTP) base layout"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="pam zeroconf"
+
+DEPEND="
+	pam? ( sys-libs/pam )
+	zeroconf? ( net-dns/avahi )
+"
+
+RDEPEND="
+	acct-group/ftp
+	acct-user/ftp
+"
+
+src_install() {
+	# The ftpusers file is a list of people who are NOT allowed
+	# to use the ftp service.
+	insinto /etc
+	doins "${FILESDIR}/ftpusers"
+
+	use pam	&& newpamd "${FILESDIR}"/ftp-pamd-include ftp
+
+	if use zeroconf; then
+		insinto /etc/avahi/services
+		doins "${FILESDIR}/ftp.service"
+	fi
+}
diff --git a/net-ftp/ftpbase/metadata.xml b/net-ftp/ftpbase/metadata.xml
index 7a38bb900964..ecab8ef815c6 100644
--- a/net-ftp/ftpbase/metadata.xml
+++ b/net-ftp/ftpbase/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="zeroconf">Enable support for zero-configuration networking via Avahi.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 494750c536bf..2447da750a04 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -20,4 +20,4 @@ DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a
 DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f38cdb63033804c72d7482666f7e1a400777e2cff4170f0999d79f9d384339ade3ad48f2a7567b2e684e48817 SHA512 a4c3b28ef7bd762dcfe53f5c9b68fc1bb371d2eb61dc88038959cc9f5efba8cc2c45a15956a7fddbac3b1ce03d8555df8fb7b86300e273a78e632f3dac15c2e3
 EBUILD vsftpd-3.0.3-r3.ebuild 3633 BLAKE2B 08c7a3d97316b3e11f828c68cd45d93748b8d8bf152ff18b0209330ea12a4431202b5f0afdcd77ee05a7d4b40ebbed603b4171d6daaa7794455dbdaddfd1f02c SHA512 08c61ab1b145df8218af695eae82331a76f8609805175aa721183973554e1fb7ab2bbffbf37052c0db12afc47c4cfa2b71282d1ca327e973607b8bb8a6bafa73
 EBUILD vsftpd-3.0.4.ebuild 3624 BLAKE2B 1b48db1411cbf50b05e576417e07228d7aee860fd33bc1f5c1c8d118e13cf74ff620ca3b3a885512ba1eac57473bd4d34aececac63dba115710b3c729721a2dc SHA512 f58d8653f8a141337168d3cca1d6608c32eaf97c73ad703f5316032448f6d0445dbe778d32564b1e4899c9913bb5ab7a8be890dc7d62dff4869b6709009ff7a4
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 218 BLAKE2B aa65c9ff8920bcfbaafb2744343f4f32a9b33aaf3d0f7d4487354d5fa625e5a8c183791da4ce7ff237f7a490567a3c2a833470efd7231d5111c41704da93a668 SHA512 cfc42ad64ce3592cf7606ec9a7f04120b3f3667c0ca6c059ac6a0a8cf4158594a8814e03f8a3746ef0ea97382b6b078a8557b720000a7e5fb3cffca9f2977dd2
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 7a38bb900964..70159fd6e1e8 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b189fec04ba9..70d7b8680b06 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 2a26896c81bd..b47cfada6531 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,4 +1,4 @@
 DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
-EBUILD ekg2-0.4_pre20190315.ebuild 2560 BLAKE2B ecf8bcd9bb4f9b3a82beebdadab8f450c3feaad23e93dd77b72cee6cb598d1acb98fe7c0bf95cb75b39beea34152685c0779a2ee79432788a0649517a5d5ddcd SHA512 1dd125ea8a170e4fed1d32d1ffc18d85a63964e37e377547aa27c29e23c1bf840778af81e34cb9b4c15b78c748d23d33b71693dc1f65fffb18a49b3061bd8555
-EBUILD ekg2-9999.ebuild 2421 BLAKE2B 6fbf8d13f7b3719bac089e325c72f4b5b10e659ae54d3034b995a2b99b057464367dc083fb4eb49ce16016e61a8c0e900db736c803a13b472e3927c6f369903e SHA512 1918e71293fa657da19e1ed00c1d7935094c0a367d09fa7956fe2c89d8460b9735380d9b252113336c68b39c87e88776c7d43a0bec7f8a05cf5358f30da1d41f
+EBUILD ekg2-0.4_pre20190315-r1.ebuild 2562 BLAKE2B 5f70dfc40838b5b3bc5ad0917a275c7017386e3735196fdd4f25e340baea01ca0236e4d609f7cdb68aab1b401dcaf0da7ee3536dd05d9a8cd5cec726f30169a3 SHA512 a96beb077027f9b79b247867a1c6dfbd3c0cf35dbc3936cdc6eaf6e153dda2d46c98e70d0de6e0fa720fe6c0be5788caff3efda39a4ca00f8376a9dac3253ccd
+EBUILD ekg2-9999.ebuild 2423 BLAKE2B a8e61ca7fffbae8d50a79aad4f0830b7aae190d760466b733fc9e78c3fb3e4d131444e45182ef77739aee7ee6ef0430a9174d4da8290348f50b1eda2272c2b26 SHA512 2c7c091d5039cd29e559875c9f407b8cdce64a98c8f91bdd27c3613b750b251cd5ec378bba0d9c7ac34b101a5499803b748a74ec7e35772c57a4a730fdf2c645
 MISC metadata.xml 710 BLAKE2B 1967d906b644580b49cfc5fb42488d14604de37150a1dd5fb78495e801499daf9e3709ca7b00aa4e1624be7f9d371eaacc77ea2b6c8fcdb2e0d6cd7bbdf62d26 SHA512 a606056720a8186f0353c44530ec838f2583c11d2235a43d84e00e0b6334326c8e76f8690c194e743a103bf6b3fa906eb3636d57159bae4d3d4e819f9b04141f
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
new file mode 100644
index 000000000000..f1e09d360c6b
--- /dev/null
+++ b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="f427d083ee899d42532c046100490a915b0e8a82"
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="https://github.com/ekg2/ekg2/"
+SRC_URI="https://github.com/ekg2/ekg2/archive/${EGIT_COMMIT}.tar.gz
+	-> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
+	perl readline rss spell sqlite ssl xmpp unicode zlib"
+
+RDEPEND="dev-libs/glib:2
+	gadu? ( <net-libs/libgadu-1.12:0= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl:0= )
+	openssl? ( dev-libs/openssl:0= )
+	perl? ( dev-lang/perl:0= )
+	readline? ( sys-libs/readline:0= )
+	rss? ( dev-libs/expat:0= )
+	ssl? ( net-libs/gnutls:0= )
+	xmpp? ( dev-libs/expat:0= )
+	zlib? ( sys-libs/zlib:0= )
+
+	ncurses? ( sys-libs/ncurses:=[unicode(+)=]
+		gpm? ( sys-libs/gpm:0= )
+		spell? ( app-text/aspell:0= ) )
+	sqlite? ( dev-db/sqlite:3= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+DOCS=(
+	AUTHORS README.md docs/README docs/TODO
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+	docs/themes.txt docs/themes-en.txt
+	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses && ! use readline; then
+		ewarn 'ekg2 is being compiled without any frontend. You should consider'
+		ewarn 'enabling at least one of following USEflags:'
+		ewarn '  gtk, ncurses, readline.'
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# direct plugin references
+		$(use_enable gadu gg)
+		$(use_enable gpg)
+		$(use_enable gtk)
+		$(use_enable ncurses)
+		$(use_enable nntp)
+		$(use_enable openssl sim)
+		$(use_enable perl)
+		--disable-python
+		$(use_enable readline)
+		$(use_enable rss)
+		$(use_enable sqlite logsqlite)
+		$(use_enable xmpp jabber)
+
+		$(use_enable !minimal autoresponder)
+		$(use_enable !minimal jogger)
+		$(use_enable !minimal mail)
+		$(use_enable !minimal polchat)
+		$(use_enable !minimal rivchat)
+		$(use_enable !minimal sms)
+
+		# sqlite switch
+		--with-sqlite3
+
+		# optional deps
+		$(use_with gpm)
+		# do not pass --with-inotify as it will fail if check fails
+		$(use_with spell aspell)
+		$(use_with ssl gnutls)
+		$(use_with zlib)
+
+		# other magic
+		$(use_enable nls)
+		--with-perl-module-build-flags='INSTALLDIRS=vendor'
+		--enable-fast-configure
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
deleted file mode 100644
index daeedb74a570..000000000000
--- a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="f427d083ee899d42532c046100490a915b0e8a82"
-DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="https://github.com/ekg2/ekg2/"
-SRC_URI="https://github.com/ekg2/ekg2/archive/${EGIT_COMMIT}.tar.gz
-	-> ${PN}-${EGIT_COMMIT}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
-	perl readline rss spell sqlite ssl xmpp unicode zlib"
-
-RDEPEND="dev-libs/glib:2
-	gadu? ( <net-libs/libgadu-1.12:0= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl:0= )
-	openssl? ( dev-libs/openssl:0= )
-	perl? ( dev-lang/perl:0= )
-	readline? ( sys-libs/readline:0= )
-	rss? ( dev-libs/expat:0= )
-	ssl? ( net-libs/gnutls:0= )
-	xmpp? ( dev-libs/expat:0= )
-	zlib? ( sys-libs/zlib:0= )
-
-	ncurses? ( sys-libs/ncurses:0=[unicode=]
-		gpm? ( sys-libs/gpm:0= )
-		spell? ( app-text/aspell:0= ) )
-	sqlite? ( dev-db/sqlite:3= )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-DOCS=(
-	AUTHORS README.md docs/README docs/TODO
-	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
-	docs/themes.txt docs/themes-en.txt
-	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses && ! use readline; then
-		ewarn 'ekg2 is being compiled without any frontend. You should consider'
-		ewarn 'enabling at least one of following USEflags:'
-		ewarn '  gtk, ncurses, readline.'
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# direct plugin references
-		$(use_enable gadu gg)
-		$(use_enable gpg)
-		$(use_enable gtk)
-		$(use_enable ncurses)
-		$(use_enable nntp)
-		$(use_enable openssl sim)
-		$(use_enable perl)
-		--disable-python
-		$(use_enable readline)
-		$(use_enable rss)
-		$(use_enable sqlite logsqlite)
-		$(use_enable xmpp jabber)
-
-		$(use_enable !minimal autoresponder)
-		$(use_enable !minimal jogger)
-		$(use_enable !minimal mail)
-		$(use_enable !minimal polchat)
-		$(use_enable !minimal rivchat)
-		$(use_enable !minimal sms)
-
-		# sqlite switch
-		--with-sqlite3
-
-		# optional deps
-		$(use_with gpm)
-		# do not pass --with-inotify as it will fail if check fails
-		$(use_with spell aspell)
-		$(use_with ssl gnutls)
-		$(use_with zlib)
-
-		# other magic
-		$(use_enable nls)
-		--with-perl-module-build-flags='INSTALLDIRS=vendor'
-		--enable-fast-configure
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 3ab02569cca2..95e8a266ea8d 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-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
@@ -29,7 +29,7 @@ RDEPEND="dev-libs/glib:2
 	xmpp? ( dev-libs/expat:0= )
 	zlib? ( sys-libs/zlib:0= )
 
-	ncurses? ( sys-libs/ncurses:0=[unicode=]
+	ncurses? ( sys-libs/ncurses:=[unicode(+)=]
 		gpm? ( sys-libs/gpm:0= )
 		spell? ( app-text/aspell:0= ) )
 	sqlite? ( dev-db/sqlite:3= )"
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index c9bb021c714e..0cf623cfe185 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.31_amd64.deb 81607506 BLAKE2B 4a8ae5594982fe533380f5ad1e1965f54899214aaafe4501d22c7ed7d055d3f6a98217c60317fc9d603c726a6908294e23359545c34277a563dede5381815ad4 SHA512 e9ba9c1f8f9267b81bcf9f0f32651a3031b90e9ee1d5ccfaf92e1121802cc6e10488b2e973ede7b827c431715009e681a87aeb1f579d10cdae5a542ba3e1bf56
-EBUILD element-desktop-bin-1.7.31.ebuild 1785 BLAKE2B b0b4f43004c390dfcc933e6db8079b95b81ce689dc433f61e400aa1f8b2c40b6bbcf94ad2c5776c9cc413c33407fdc7e38534e3d836b9a1e3bcd5e31883ee029 SHA512 808e02467dab7f6fb2203ca29e8c0a03b03f44cd48974615964715e2253e0e6d8a65f8cf6af715080929605e8e6eed894d65f9fcf15cdf913285de7a51e4e9a0
+DIST element-desktop_1.7.32_amd64.deb 81626504 BLAKE2B af4cc2e7e853988fe4a89301943f3a72b45f21a3b3023ceb2ebc735ec89b6e011e40312057289d5856084f1a5415f040410b355c5da655465202a646202708d0 SHA512 69bba229161f303c6e69761db2356a561838e3047da7f7a766886fc55c627f78029958bf3ec93be7c7cd24eff1ac0396fc92eb443905024c35f2d12f642c6a08
+EBUILD element-desktop-bin-1.7.32.ebuild 1775 BLAKE2B fcad580d6600d42ce5ed10431ab199ee7c7d1557d2f3848235403874f0f5ea93d6a0dc6e781afab8472114b6e6b93993342353735bbdd627b47420a5a54b52d3 SHA512 c8f174c0c675bba2c115c100de73f297534285d3b602d7fd7d65db83753788973c4ed38ee2f1567da32b5362fed4b19bb4efbb8fc1721962b941f9cac4eaa7cf
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild
deleted file mode 100644
index af28b3f1fe7f..000000000000
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker xdg
-
-MY_PN="element-desktop"
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
-HOMEPAGE="https://element.io"
-SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+emoji"
-RESTRICT="splitdebug"
-
-RDEPEND="app-accessibility/at-spi2-atk:2
-	app-crypt/libsecret
-	dev-db/sqlcipher
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	emoji? ( media-fonts/noto-emoji )"
-DEPEND="${RDEPEND}"
-
-QA_PREBUILT="
-	/opt/Element/chrome-sandbox
-	/opt/Element/element-desktop
-	/opt/Element/libEGL.so
-	/opt/Element/libGLESv2.so
-	/opt/Element/libffmpeg.so
-	/opt/Element/libvk_swiftshader.so
-	/opt/Element/libvulkan.so.1
-	/opt/Element/swiftshader/libEGL.so
-	/opt/Element/swiftshader/libGLESv2.so"
-
-src_prepare() {
-	default
-	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
-}
-
-src_install() {
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	insinto /
-	doins -r usr
-	doins -r opt
-	local f
-	for f in ${QA_PREBUILT}; do
-		fperms +x "${f}"
-	done
-	fperms u+s /opt/Element/chrome-sandbox
-
-	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
-	dosym ${MY_PN} /usr/bin/riot-desktop
-}
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild
new file mode 100644
index 000000000000..acb8fc1ce31c
--- /dev/null
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg
+
+MY_PN="element-desktop"
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
+HOMEPAGE="https://element.io"
+SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+emoji"
+RESTRICT="splitdebug"
+
+RDEPEND="app-accessibility/at-spi2-atk:2
+	app-crypt/libsecret
+	dev-db/sqlcipher
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	emoji? ( media-fonts/noto-emoji )"
+DEPEND="${RDEPEND}"
+
+QA_PREBUILT="opt/Element/chrome-sandbox
+	opt/Element/element-desktop
+	opt/Element/libEGL.so
+	opt/Element/libGLESv2.so
+	opt/Element/libffmpeg.so
+	opt/Element/libvk_swiftshader.so
+	opt/Element/libvulkan.so.1
+	opt/Element/swiftshader/libEGL.so
+	opt/Element/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
+}
+
+src_install() {
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "/${f}"
+	done
+	fperms u+s /opt/Element/chrome-sandbox
+
+	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
+	dosym ${MY_PN} /usr/bin/riot-desktop
+}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 67ed4e8f5197..028e804b811f 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,11 +1,6 @@
-DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
-DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
-DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
+AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6
 DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
-DIST gajim-1.3.1.tar.gz 9885129 BLAKE2B ee1fac7f1354576879c5ef14d167d4f7248e497f5b7c468d4bdeb9bf93b749482e221e4ad7a965c86799baa959020303b1b3e49ca99ce1607fc721d0722cbffd SHA512 840b9424c4f93281fe32569331917ba3bdd0afc51428d778ec357b1b0dfc9aecdf77a48c44fa4b66259d82633ca277ccab6b4d6ead47e7eb66d22f078e8ebb84
-EBUILD gajim-1.2.1.ebuild 2354 BLAKE2B 6f3ce6c6363e69d6be10a0fdbb20195b68a2ded9f037c9e40948e8897e4a0234f4c111fdb408684d50ea3f3bdbd886318263fe712a04e5317506436273c8b614 SHA512 da1f7e0e70fb08e81ac7ff9fed60f694af7002a77047c3c89f352aa30bf090929defc1a032fb3b410f4fa3c16c651060ccac1d2474525d4059d47e76c368405f
-EBUILD gajim-1.2.2.ebuild 2356 BLAKE2B 2b8063e45e51d32f0d2399f802c658f256a54be2f2e92d5127627ded7c367391a1899aeeb1b6fe456ea6a9acb722f2ac78c4aab4ffb335a69d1d9f8c53193721 SHA512 7902589bc9b94037bf8d4867b4ba9777900ba0b9ff8e75a5409efb63b7eb4953fd6cbfa228a77a01ef26f601203ef63ba61f565a4bf936b5acaadccaafb1587d
-EBUILD gajim-1.3.0.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
-EBUILD gajim-1.3.1.ebuild 2375 BLAKE2B 79eb66fd1c81029f25b9a65205ec6eb9d97933ca6df45879e8f4d01b80d08ad52bb304839502c2ceeb3accd18fe20e119b007edaff95330169dce44b4a7484cf SHA512 a772430a49f87279ebcb2b9dfaf1b4694ce9570b74bde0e1525ff5838e7340b16a448cc5c8cc0a9debf224fe94c8f457ff0418f59a3a3f19bf8b3286b504d3ee
+DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
 EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
-MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
+EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
+MISC metadata.xml 866 BLAKE2B 5199f029cac2e80f2e3acf9d0373d65f7a2c5e70c2c9a7e1a2af812ea8b9570778f9cd3bf9be0ca5480846648ed4ea4199e13195ab2bea84958b4762204fb832 SHA512 745b3c132ff83fa300e21c01ba9fac2958dcbbb0eabe38652a287836f144510a61891eecbaface58896f9f9b0620547dda57b9958e1fe88256beca549b99951c
diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
new file mode 100644
index 000000000000..04428d3acbe5
--- /dev/null
+++ b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
@@ -0,0 +1,44 @@
+diff --git a/gajim/history_manager.py b/gajim/history_manager.py
+index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
+--- a/gajim/history_manager.py
++++ b/gajim/history_manager.py
+@@ -55,7 +55,6 @@
+ from gajim.common.const import JIDConstant
+ from gajim.common.const import KindConstant
+ from gajim.common.const import ShowConstant
+-from gajim.common.settings import Settings
+ 
+ 
+ def is_standalone():
+@@ -76,6 +75,8 @@ def init_gtk():
+ if is_standalone():
+     init_gtk()
+ 
++    from gajim.common.settings import Settings
++
+     try:
+         shortargs = 'hvsc:l:p:'
+         longargs = 'help verbose separate config-path= loglevel= profile='
+@@ -100,6 +101,8 @@ def init_gtk():
+     app.settings = Settings()
+     app.settings.init()
+     app.load_css_config()
++else:
++    from gajim.common.settings import Settings
+ 
+ from gajim.common import helpers
+ from gajim.gui.dialogs import ErrorDialog
+diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
+index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
+--- a/test/unit/test_gui_interface.py
++++ b/test/unit/test_gui_interface.py
+@@ -3,6 +3,9 @@
+ '''
+ import unittest
+ 
++import gajim.gui
++gajim.gui.init('gtk')
++
+ from test import lib
+ lib.setup_env()
+ 
diff --git a/net-im/gajim/gajim-1.2.1.ebuild b/net-im/gajim/gajim-1.2.1.ebuild
deleted file mode 100644
index 94a9cb349704..000000000000
--- a/net-im/gajim/gajim-1.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.1[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.2.2.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
deleted file mode 100644
index 92a23399d45c..000000000000
--- a/net-im/gajim/gajim-1.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.0.ebuild b/net-im/gajim/gajim-1.3.0.ebuild
deleted file mode 100644
index 3e2cb3f1105e..000000000000
--- a/net-im/gajim/gajim-1.3.0.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${P}"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.1.ebuild b/net-im/gajim/gajim-1.3.1.ebuild
deleted file mode 100644
index 192769880a80..000000000000
--- a/net-im/gajim/gajim-1.3.1.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${P}"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.2.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
new file mode 100644
index 000000000000..3786de899854
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.2.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} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
+
+# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
+PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		omemo? (
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index d4e7cc8f23d5..c9ce2f629c37 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="spell">Spellchecking of composed messages</flag>
     <flag name="upnp">Ability to request your router to forward port for file transfer</flag>
     <flag name="webp">Support WebP avatars</flag>
+    <flag name="omemo">Install dependencies for OMEMO encryption plugin</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 24142f5142b6..f5bdd8c25137 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -10,7 +10,7 @@ DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b
 DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
 DIST pidgin-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 7562 BLAKE2B d8d867a76c4a95379cfc95638c8e15b2433792d49fbc7c98a26d4aee840842cbff97c748924cca9e2fefc5ce7e66be7c7effbf1f1cbe76ac5dc90217dc807d58 SHA512 fb64ce4d38c7327b2e4c0ef66b356f63077d955f2c3c468fb9fc300d866d03f185454a392e8080e785c4d73cf7343d4bb514dfc575d60071ae32fe5fade80b5d
-EBUILD pidgin-2.14.6.ebuild 7528 BLAKE2B e52ef0a392052d35a9d5baef958e8e090212d7fd51aabe20648dae787cddc0cc84c1ef46d99deff8cfd7e29f64c4677aa7a495d052198764c90d05d75fb70113 SHA512 e78ebfd31d3297d6c4932622c02762d73ab6c5ea195bd509ab8262d91eb77e3c1df649b251da3516139420809a8bd2f49f7f7c784a43d5f4cd642c4b8f66f6f2
+EBUILD pidgin-2.14.3-r2.ebuild 7892 BLAKE2B 2ca7042ea5e1c1c8b43d98921b164ac46024892e9d013a2cb2901f3fbe4d2062933f90d5a4b7842b20ef02325986df5f570a61eb04d7074b95dac29d46a21dd7 SHA512 0e54da4e56dbe215cd5d06e1daca6ec8ae9f5200a3c887a263da40f0a1ea66e28d4d68a7e31bad16f78b121d1d66396d1d5242d99e288c600b5928fa6ea84776
+EBUILD pidgin-2.14.5-r1.ebuild 7558 BLAKE2B 1cad17311a17cf600f9ca3473108d43b9d94f7375663ad6e3b483b46a8b94e8f811066c73b5b736591061e520ddcbc24d2d1200bb659b26e411ae1e731a4b60f SHA512 23b23f488475e17b351efec647d13d875f692b53eef32af1620d921b8441e90c6947c42ebc536fd2ad25e9a04ef4a6f541ff57cc6420fab6dbaa7262a7fda407
+EBUILD pidgin-2.14.6-r1.ebuild 7524 BLAKE2B 667cd32d96a26e121eab48311fcf81ccf2dc33a5f3f9407c269de3edaca89bc54e5d2f1ff08282651e8f4811cad6673fd432b2690550ce7bd87c4cd83e2a9754 SHA512 f76eff2b24246254f1e6039b881cbb778a611d0023efa75d21c3d14e763271144f6d9c459458185dfe2982a70f2f0a67b524bfbf4d79400cf3804d9f3c18abe1
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.3-r1.ebuild b/net-im/pidgin/pidgin-2.14.3-r1.ebuild
deleted file mode 100644
index 195abc7995c5..000000000000
--- a/net-im/pidgin/pidgin-2.14.3-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
-	"${FILESDIR}/${PN}-2.14.3-remove_oscar_tests.patch"
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.3-r2.ebuild b/net-im/pidgin/pidgin-2.14.3-r2.ebuild
new file mode 100644
index 000000000000..fca4c0679d35
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.3-r2.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.14.0-gold.patch"
+	"${WORKDIR}/${PN}-eds-3.6.patch"
+	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
+	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
+	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
+	"${FILESDIR}/${PN}-2.14.3-remove_oscar_tests.patch"
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python || use dbus ; then
+		python_fix_shebang "${ED}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/pidgin/pidgin-2.14.5-r1.ebuild b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
new file mode 100644
index 000000000000..21139390fc9e
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python || use dbus ; then
+		python_fix_shebang "${ED}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/pidgin/pidgin-2.14.5.ebuild b/net-im/pidgin/pidgin-2.14.5.ebuild
deleted file mode 100644
index 602e11022512..000000000000
--- a/net-im/pidgin/pidgin-2.14.5.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
new file mode 100644
index 000000000000..a9ab6bb11e2b
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python || use dbus ; then
+		python_fix_shebang "${ED}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/pidgin/pidgin-2.14.6.ebuild b/net-im/pidgin/pidgin-2.14.6.ebuild
deleted file mode 100644
index 1d200e58f3cc..000000000000
--- a/net-im/pidgin/pidgin-2.14.6.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python || use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 9a52e6545836..4e170dc96234 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,3 +1,3 @@
 DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
-EBUILD profanity-0.9.5.ebuild 1032 BLAKE2B b33c741b25c04ed7e9b70f24612aff0ce7cda6e62b5a9c2b54b0b966bd0c6cedf3f41338dde60a9750b42901339b4eb655abb7c5394f75551172f3bf49ffdc17 SHA512 04cec15cf7803d180e21d412b19fca734a01f8fb16e3c3b8552f1aa77d9b695fc445f66ed7e81b7ca0f611ea77d81a5c35cc3f8be76c054c89beb87413355417
+EBUILD profanity-0.9.5-r1.ebuild 1035 BLAKE2B 94078ea301009255f2b9b57b0835558ebc797ad3c0c75393be2c95c4b368832dabc0be1d596e45c2b421e3c2e58ea099d0238c55dc9a9ceaf0ccc3519b4c96ce SHA512 c21319345910123603041d916f0712c4eac3851bb71efee3906d8e2423e2aef3032139bb663ce3a4d2bcf13254456c03948a10511ef8dc2d72f214f023db19ed
 MISC metadata.xml 605 BLAKE2B d26bea42cbf668507f197cc43a131cebc4a2569806e2789f608c68d41ff3b8b679ed1ad9cdd9df706e539cea71150f8b13157c1750aa313e1b1067f968b8eb3f SHA512 bf7004fa94e5515e3e54da31797e52d13096483a1d7f356fcccb0ceff1d3ae4c157929aadd4ccf24d54078070ba8ba94e3d6e641f85fa5c30cbd113cd487eae8
diff --git a/net-im/profanity/profanity-0.9.5-r1.ebuild b/net-im/profanity/profanity-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..24acf02ba694
--- /dev/null
+++ b/net-im/profanity/profanity-0.9.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="https://profanity-im.github.io/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="libnotify omemo otr gpg test xscreensaver"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libstrophe:=
+	dev-libs/openssl:0=
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/ncurses:=[unicode(+)]
+	gpg? ( app-crypt/gpgme:= )
+	libnotify? ( x11-libs/libnotify )
+	omemo? (
+		net-libs/libsignal-protocol-c
+		dev-libs/libgcrypt
+	)
+	otr? ( net-libs/libotr )
+	xscreensaver? (
+		x11-libs/libXScrnSaver
+		x11-libs/libX11 )
+	"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notifications) \
+		$(use_enable omemo) \
+		$(use_enable otr) \
+		$(use_enable gpg pgp) \
+		$(use_with xscreensaver)
+}
diff --git a/net-im/profanity/profanity-0.9.5.ebuild b/net-im/profanity/profanity-0.9.5.ebuild
deleted file mode 100644
index 9b0fc0ae5fdd..000000000000
--- a/net-im/profanity/profanity-0.9.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A console based XMPP client inspired by Irssi"
-HOMEPAGE="https://profanity-im.github.io"
-SRC_URI="https://profanity-im.github.io/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="libnotify omemo otr gpg test xscreensaver"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/libstrophe:=
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-apps/util-linux
-	sys-libs/ncurses:=[unicode]
-	gpg? ( app-crypt/gpgme:= )
-	libnotify? ( x11-libs/libnotify )
-	omemo? (
-		net-libs/libsignal-protocol-c
-		dev-libs/libgcrypt
-	)
-	otr? ( net-libs/libotr )
-	xscreensaver? (
-		x11-libs/libXScrnSaver
-		x11-libs/libX11 )
-	"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notifications) \
-		$(use_enable omemo) \
-		$(use_enable otr) \
-		$(use_enable gpg pgp) \
-		$(use_with xscreensaver)
-}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 7d8f00ba9b18..0843fc92976e 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,9 @@
 DIST skypeforlinux_8.72.0.94-1.x86_64.rpm 118230043 BLAKE2B 9d7d8609c117947fbab4e2ac68a9bbe909f94f2ae82bc910cad66412aaced2ba13f35ce785a4f0d95690125c42789cbc4bbec6831bc0038add7fe7a98469f20b SHA512 349550d69efce07e3c9fa92ea659fc0d4b87e4e110c0bdfac9ecd365685b4d5623362b315cb3eaab7eb91078dde7e1c286165ce487e8b93585e59272e8cca3e3
 DIST skypeforlinux_8.73.0.129-1.x86_64.rpm 123370656 BLAKE2B 831188ea01a8ae27b6c5b557f7e752740a3f32928bd113bd6d8fffd31badfbff4a8f088e8e0b8fdc1b1b133ff5e6b692db3b83df4669da5d92725847a3555280 SHA512 153afbf9e7b3ad8d3ca9002835d54038e8450868df2506a61cd278ddfe3329241a913d0caef9ad0179c3f8a6a2d8f7138e4fff74c7ef7b12ddbdbe60f78e58a2
 DIST skypeforlinux_8.73.0.92-1.x86_64.rpm 119323419 BLAKE2B e201be43c6f331555d3759e9484d13c1d0613dd9e60ce67c3dafec27fa9d183ddc89e1c23feb1722ace2fd492185f8402be6abec80c748e6ad1f666878a72025 SHA512 dc6b72dc43443ad7747a30adef7b08afb50b4cc40a61cff2eb8989c9f68ae817c221d4ce2812d5d54cb9a4ac5f2accfe350efdfab622096d2d0805953fbddd13
+DIST skypeforlinux_8.74.0.152-1.x86_64.rpm 123390893 BLAKE2B 746f1ac2f777ff79a47444052fdad86d2a67f7278eb809d57fedc681ca5648320d16b32e100b50b36bcaea853dff266eb0b47bdb9c8ba48582c63a09b3eeabda SHA512 f1c40c58305cecec899f9be1a477103ff9dc7e0d02ea68a9ebc15b4e80292d5a3925fbcf6451cae0c2b854b3b3f74abe101715a7f3afdc2ea954e18759cab37d
 EBUILD skypeforlinux-8.72.0.94.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.73.0.129.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.73.0.92.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+EBUILD skypeforlinux-8.74.0.152.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild b/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild
new file mode 100644
index 000000000000..a44feb7c8927
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils rpm multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${PF} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 151f64c601fd..6520c15e49a3 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,14 +1,8 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.6.1.tar.gz 15071996 BLAKE2B 927c571e8a35c30cdf0c974895e3a7d2a3257077959e9a6a0b7b5c819833a83cf6d5e7136f0e8909490310cac01863de88bf3ebd2c82fe60c8ed85f988ed3887 SHA512 abd0630c4bd979cdc36b61c7c9b3223f7cdc090805d88f6a3173466b092934a3400313c7af3a170c5b116ec2aefa7577d008cd41085a94aca5e20759a3957995
-DIST tdesktop-2.7.1.tar.gz 15117072 BLAKE2B caf01d2d4c6b5ec8d9621e1cf2b4d5a906230caeb29fc484b64d69de3bce070f42f9efa43b31149cffbbab4adbbea17fdda65b24dad702db8df01f232b4ad5e6 SHA512 148299b00348129950e92be4f7ea6dc38d0ec6dd4cd673c05126ba724caa9bde3f9b10ba42b55803116f5f145097c83f93fdcdd541a6f9894406ca19a395b583
-DIST tdesktop-2.7.4.tar.gz 15226377 BLAKE2B eeb889c6027e889d08b8df2f74a8a7df964475d62bea500122ad455202c6e590f1908877f38c0d0249c9ab6bfe8f99c610804919e36ab0cb2a39c50331e5b7f1 SHA512 f4f896d725bc96c221e70cff19105834dcb0223ad9b4da6bcb00485204fa77447f7cb82e8fd5fd43c841e44376ee763f9707bd3eb18ff4ee53c16bc523002802
 DIST tdesktop-2.8.1.tar.gz 15334528 BLAKE2B 915823eef057634404dd2bf1e75afdeb5c8768d7c7c7435216f31eec058b1cb8e5f96a47b1faeeecdfa46b4d0acb9dd1839978c3120ef8d41144608d89e45710 SHA512 2da82e6f6c33b5f404d20687e849aff17ce5de24c741adf2276e252643273f558a822c449d1acfd7deeb64644da94d472ddb55eb1881464390efa5d95219e489
-DIST tsetup.2.6.1.tar.xz 35300412 BLAKE2B cf4e616c4957b8a6ee91b621a79556a588c5d736583457d4fa35c3f0b4266b929f41b488764330c5f5d06314ac57a853613f9fcf70e5d129dceb9ac9e8059c8d SHA512 f8b9f78b4d7f6cf886a9368731733f598749babf6ed50541b5332dfef20ccc24616f399448d17cc523409b6e1dcdd2c137bbe0e5eb13e4e9ade902a6e26cf1ea
-DIST tsetup.2.7.1.tar.xz 35867608 BLAKE2B 13ae89d4c7e98dbb0ec536c22554cd5d2ef6905a07e9eb1684fa536ccd0b6469791955a581bc2d0e71e8727ca5b3c4735a5658d6ec2aa7aecfd2b68c4906c110 SHA512 732d0be95e63e5948258e64fd33ab171adf610706714115fcd4715034d95f3edf030dbc1a7000f1fd01ce140234056b0f1db1d94cb512286789681ade1b0d739
-DIST tsetup.2.7.4.tar.xz 36173288 BLAKE2B 7b25475c2e64a23a658e96bf2bee1495946cdf4c17eb412e3cb385fd3d003cfe99ff67ec66e68590e22d5c818a9c6f4f9060a589edeb17c1b7c69aa222e66d00 SHA512 bd070c1efc9d5db60ebb82e4f0d0145ddadf04760314fa0b37e5a8920f9955dbb475b062911c3857fd6176a4bd8469e1e5764b1c855baf35b2289bb6d12cdcee
+DIST tdesktop-2.8.9.tar.gz 15383963 BLAKE2B 2b156a5b4557c4aa5f358dbc6105cca2ff9d838160e71d6476332c2d4d9b78ea13b659cd95e7620e854d3116e44c537d2080dee424f6a942a0d9c0aa97c73e0d SHA512 537177e47d37772ae623ea4cca68df1e068362edd56a9af86fa02cabc44693403afe020460af709454148333711a34f34169dd239a9ef56e9996b5b0b44ef9c5
 DIST tsetup.2.8.1.tar.xz 37205872 BLAKE2B 915041cf403feca63b796747c3a072be555b729401a4290ad3773794a0d6df22eddbfea930fb2b17d8aa5aab337e6d8b45e28e710ffe34b80a7e033ae10e83be SHA512 e84cbec26420a633c93adcebe514b530bcb7fe425926795521d06f8f60377107f4174b57713fe248b9bfa7642ef1ff7709a825e96cf0b8d76e0e7e2ec7454aa2
-EBUILD telegram-desktop-bin-2.6.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-EBUILD telegram-desktop-bin-2.7.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-EBUILD telegram-desktop-bin-2.7.4.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+DIST tsetup.2.8.9.tar.xz 38714912 BLAKE2B fa1049d2c921dd8e7bfcf4777c5017ec1deb3508d24c79250dae774194c7e4e26bcc9313378e6c58255012baef7302545cd12a70ab64d908d68ef1475af1677a SHA512 b8c6ac6be16b4bc143c17c711ee46c73c986712f0fd89e3d4467f108c3b9e675f83a479569cf5cfc06c81c581080b75c2610fecf54644e600985d9b650d2f55a
 EBUILD telegram-desktop-bin-2.8.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.8.9.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.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 desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.1.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.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 desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.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 desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
new file mode 100644
index 000000000000..5d9bb593c191
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6a15a2f9a7ac..bc4090bc2325 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -4,13 +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.10-jemalloc-only-telegram.patch 973 BLAKE2B 6efc62db44ea8d26f469d937fc91135c77eea38e6e51b1c6cc772bc91afb7372292731b0369544ea52f67075ce9800fdcadc150ec72df571c29f2818b88cc56d SHA512 754e7286aebd183891b3808b66979df4b8e62355147a8f6bd860bf37360e089928247073b7adf9fc8d09ed4edc35746e50a4eff3d0bdc2d74888e8cb74042cf0
 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
+DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860
 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
+EBUILD telegram-desktop-2.8.11.ebuild 4340 BLAKE2B 276357e4e6783eee86a125490deb8ddd3e759df56162a65b5f4762ef69f92c92cb757230c997d7aa1a3d13640b1ed949c535450d2f3cbecd67c0d6e283cf5413 SHA512 492610a0170b36b29fe2a64ea4bb6780004499bd3ca87951e362471aada0967c6ce0cfc29e0f0561b5e9e2a1ffc75a56081acd7aba0a4710a939a62aa9e4ec76
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..8604acc6a74d
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
@@ -0,0 +1,31 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-2.8.10-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt
+@@ -87,6 +87,7 @@
+     PRIVATE
+         desktop-app::external_glibmm
+         desktop-app::external_glib
++        desktop-app::external_jemalloc
+     )
+ 
+     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+--- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake
++++ tdesktop-2.8.10-full/cmake/options_linux.cmake
+@@ -58,11 +58,6 @@
+     endif()
+ endif()
+ 
+-target_link_libraries(common_options
+-INTERFACE
+-    desktop-app::external_jemalloc
+-)
+-
+ if (DESKTOP_APP_USE_PACKAGED)
+     find_library(ATOMIC_LIBRARY atomic)
+ else()
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
deleted file mode 100644
index dff2455d4e3d..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-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/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild
deleted file mode 100644
index 69bfb7c3a172..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +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-im/telegram-desktop/telegram-desktop-2.8.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
new file mode 100644
index 000000000000..aaa30fc0f334
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
@@ -0,0 +1,145 @@
+# 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 +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/jemalloc:=
+	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:= )
+	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 a proper fix, not upstreamed
+	"${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
+	# Not upstreamed (yet)
+	"${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.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_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 the 'gtk' useflag if you have image copy-paste problems"
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 8cff239745d1..92402a95c5f7 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
-AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
+AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.6.22045.0607_x86_64.tar.xz 51749804 BLAKE2B 73d37f9118bc8b3dd424ec903e72cb6f1da9c7a8b87319845befe0b4f10f9793ef603481d8e3e6c6af51dd7b342eb5bb157fbb8eb495b48641a70b62ae96534f SHA512 04e7c1b483c769b4d809f31fa615a2fedd3229edba13da7f51231c38a810d6cef7458c6b9aa504097c2bf1b4fbf81df1a6d9e0921dc6df1b9a8cb02038fcdd7a
 DIST zoom-5.7.26030.0627_x86_64.tar.xz 52351944 BLAKE2B d34e11aa148945e9b1093c5f78b5930a58a7e4011b07e1ae3b6873ba0d1b1774ca6ef28fba6678b962e70b7340079dc4795d54e1bf4ce4702fc653a5dd06a21d SHA512 aa0af2d95c8c65a4f1af7a3de6cb9626b8c88f662922ccc7f59fbcc9cc5ba3c3398c50687b381126a3fbd84c9662e926727635fcc50025c834bedb08bcaf9961
+DIST zoom-5.7.28852.0718_x86_64.tar.xz 52589228 BLAKE2B 61337f7722a48b258c13cd389f7bae9d3cbc4c2c3468c7b413bde4a87b24e5f64989a516f3073882cbf70f898b6ad188c9a5876ab3d75e2dd5f688ff94f706a4 SHA512 8a00fb01f5af0dfcc1a9e13058f7d3e492545d827d157effe3d19a0846a53ce2427172ce4b33a95f0420259876b5e16c44122f5753632278e5967ec222657f2b
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.6.22045.0607.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
 EBUILD zoom-5.7.26030.0627.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
+EBUILD zoom-5.7.28852.0718.ebuild 4189 BLAKE2B a024abc94ef953f75d770b041adf50f8b2e9f3edcc9dc77f0c9295bcda21a32b503c10aff773cc8866e6d83f27ff8dc5517e2a208f7752de37490dbb9676e723 SHA512 81db6cc78abc3e8939fb030cfe5ddffdd66b98a235de8708716fa92f87f94dea3debd512df9ab1a6f77d1c7502785e87f37b2f7476679f10691b99c97fb9cd03
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
index 06f1f9b3dce0..12e5058b397a 100644
--- a/net-im/zoom/files/README.gentoo
+++ b/net-im/zoom/files/README.gentoo
@@ -3,3 +3,6 @@ display compositing. If you encounter a black window when sharing
 the screen, then one of the following actions should help:
 - Enable compositing in your window manager if it is supported
 - Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
+
+To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf
+and change the value of enableWaylandShare to true.
diff --git a/net-im/zoom/zoom-5.6.22045.0607.ebuild b/net-im/zoom/zoom-5.6.22045.0607.ebuild
deleted file mode 100644
index 514387cfdd02..000000000000
--- a/net-im/zoom/zoom-5.6.22045.0607.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/quazip:0=
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )
-	wayland? ( dev-libs/wayland )
-	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtscript:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe
-	bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		# Remove insecure RPATH from bundled lib
-		patchelf --remove-rpath libturbojpeg.so || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r json ringtone sip timezones translations
-	doins *.pcm *.sh Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-
-	local quazip_so="libquazip1-qt5.so"
-	if has_version "<dev-libs/quazip-1.0"; then
-		quazip_so="libquazip5.so"
-	fi
-	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
-	fi
-
-	if use bundled-qt; then
-		doexe libicu*.so.56 libQt5*.so.5
-		doins qt.conf
-
-		local dirs="Qt* bearer generic iconengines imageformats \
-			platforminputcontexts platforms wayland* xcbglintegrations"
-		doins -r ${dirs}
-		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-
-		(	# Remove libs and plugins with unresolved soname dependencies
-			cd "${ED}"/opt/zoom || die
-			rm -r Qt/labs/location QtQml/RemoteObjects \
-				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
-				QtQuick/Scene3D QtQuick/XmlListModel \
-				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
-			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
-				platforms/libqwayland*.so || die
-		)
-	fi
-
-	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
-	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom-icon.svg
-	doicon -s scalable zoom-icon.svg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.7.28852.0718.ebuild b/net-im/zoom/zoom-5.7.28852.0718.ebuild
new file mode 100644
index 000000000000..2d1b6688d0d6
--- /dev/null
+++ b/net-im/zoom/zoom-5.7.28852.0718.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	dev-libs/quazip:0=
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
+		|| die "Extraction of icon failed"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json ringtone sip timezones translations
+	doins *.pcm *.sh Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if use bundled-qt; then
+		doexe libicu*.so.56 libQt5*.so.5
+		doins qt.conf
+
+		local dirs="Qt* bearer generic iconengines imageformats \
+			platforminputcontexts platforms wayland* xcbglintegrations"
+		doins -r ${dirs}
+		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+
+		(	# Remove libs and plugins with unresolved soname dependencies
+			cd "${ED}"/opt/zoom || die
+			rm -r Qt/labs/location QtQml/RemoteObjects \
+				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
+				QtQuick/Scene3D QtQuick/XmlListModel \
+				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
+			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
+				platforms/libqwayland*.so || die
+		)
+	fi
+
+	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
+	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	doicon zoom-icon.svg
+	doicon -s scalable zoom-icon.svg
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5e413036f4df..12684b15e8bc 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 19fe7a20c5d6..11b685b6c809 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -1,13 +1,8 @@
-AUX iroffer-dinoex-3.29-config.patch 7014 BLAKE2B 69a79b55922735e51622f8df9cd2a9c3601362ba0f54d9ba4e6b28c134a9d23e0186c3dca99aa2be055ad958be56681f370b92d43763e3a2aba10629be8d3f35 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8
 AUX iroffer-dinoex-3.31-config.patch 8156 BLAKE2B cf247efbcc6f5d8742af3b236615c9ffe33c6f5d51e8fd42c7809c917af7fe4bdd13ae45a4bf46e43db1e304d952e24267640194375679df192392c350902b2c SHA512 26df67f9c64e15cc2762f214a20a05e1458c6b7d1ebb5fc92e17eb77f2bf005fdbadb4412d634f6f89fd1994020f3a7d0877745995900c59e8aed18d525b2a82
 AUX iroffer-dinoex-Werror.patch 502 BLAKE2B d93cb7c5643357f2ffc208f2a169aa0cbf652f9295664e5bae780dba3cd3b3f30780dc53568ec13aea0d733a5a58b4deaee08ef5d91ce1362caa18e33c063c11 SHA512 dc0c88d85943421f5c8998b0080b41585f4ca2513bd554709110d2bef31d7b6f59fc558124974b1255ca97c1edd86bb656c495cabac0fb5c9115cb52033aa7eb
 AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634
 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a
 AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015
-DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
-DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80
 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 2632 BLAKE2B b0e9e83a5f0c9dbdd10830ada51c0e9109529c57b24f60717ffe870b7367ee5742109d53e417703e8a94a03f8b516bc2e5ac2b587d5c332bf0653540739e5b78 SHA512 a07f3c06f516f3809c9273bc14f811ad715a817c9721a7e60c847a8d6bd20193ba864bae72a7862ac5022724fd076b5daf9d3849440bfddde46d38f146093eff
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
deleted file mode 100644
index 5dc9d6183ef6..000000000000
--- a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -ru iroffer-dinoex-3.29/beispiel.config iroffer-dinoex-3.29.NEW/beispiel.config
---- iroffer-dinoex-3.29/beispiel.config	2013-02-01 08:28:18.000000000 +0100
-+++ iroffer-dinoex-3.29.NEW/beispiel.config	2013-03-09 18:43:33.084000000 +0100
-@@ -15,19 +15,19 @@
- ##############################################################################
- ###                             - pid file -                               ###
- ### Schreibt die Prozess-ID beim Start in diese Datei                      ###
--pidfile mybot.pid
-+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
- 
- ##############################################################################
- ###                             - log file -                               ###
- ### logfile gibt die Logdatei für den Bot an.                              ###
--logfile mybot.log
-+logfile /var/log/iroffer-dinoex/mybot.log
- 
- ##############################################################################
- ###                            - log rotate -                              ###
- ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt      ###
- ### wird, mögliche Werte "none" (nie), "monthly" (monatlich),              ###
- ### "weekly" (wöchentlich), "daily" (täglich) und 1-24 (stündlich).        ###
--logrotate weekly
-+logrotate none
- 
- ##############################################################################
- ###                         - expire logfiles -                            ###
-@@ -48,7 +48,7 @@
- ### Diese Datei dient als allgemeines Datenlager für die bereitgestellten  ###
- ### Dateien und die dazugehörigen statistische Daten. Hier werden auch die ###
- ### Beschreibungen der Pakete gespeichert.                                 ###
--statefile mybot.state
-+statefile /var/lib/iroffer-dinoex/mybot.state
- 
- ##############################################################################
- ###                          - old state file -                            ###
-@@ -74,7 +74,7 @@
- ### als Packliste auf einer Webseite zu dienen, oder für andere Zwecke.    ###
- ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit     ###
- ### ausgegeben.                                                            ###
--xdcclistfile mybot.txt
-+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
- #xdcclistfileraw
- 
- ##############################################################################
-diff -ru iroffer-dinoex-3.29/exemple.config iroffer-dinoex-3.29.NEW/exemple.config
---- iroffer-dinoex-3.29/exemple.config	2013-02-01 08:26:21.000000000 +0100
-+++ iroffer-dinoex-3.29.NEW/exemple.config	2013-03-09 18:45:35.340000000 +0100
-@@ -15,18 +15,18 @@
- ##############################################################################
- ###                             - pid file -                               ###
- ### Écrit l'identifiant du processus dans ce fichier au lancement.         ###
--pidfile monbot.pid
-+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
- 
- ##############################################################################
- ###                             - log file -                               ###
- ### Écrit le journal du robot dans ce fichier.                             ###
--logfile monbot.log
-+logfile /var/log/iroffer-dinoex/mybot.log
- 
- ##############################################################################
- ###                            - log rotate -                              ###
- ### Archivage du journal jamais (« none »), quotidien (« daily »),         ###
- ### hebdomadaire (« weekly ») ou mensuelle (« monthly »).                  ###
--logrotate weekly
-+logrotate none
- 
- ##############################################################################
- ###                         - expire logfiles -                            ###
-@@ -44,7 +44,7 @@
- ##############################################################################
- ###                             - state file -                             ###
- ### Fichier temporaire de stockage des informations d'état d'Iroffer.      ###
--statefile monbot.state
-+statefile /var/lib/iroffer-dinoex/mybot.state
- 
- ##############################################################################
- ###                          - old state file -                            ###
-@@ -71,7 +71,7 @@
- ### « xdcclistfile » et Iroffer écrira la liste XDCC dès que nécessaire.   ###
- ### Si « xdcclistfileraw » est défini, le fichier sera écrit avec les      ###
- ### caractères spéciaux IRC (couleur, format, etc.)                        ###
--xdcclistfile monbot.txt
-+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
- #xdcclistfileraw
- 
- ##############################################################################
-diff -ru iroffer-dinoex-3.29/sample.config iroffer-dinoex-3.29.NEW/sample.config
---- iroffer-dinoex-3.29/sample.config	2013-02-01 08:26:58.000000000 +0100
-+++ iroffer-dinoex-3.29.NEW/sample.config	2013-03-09 18:46:30.612000000 +0100
-@@ -15,18 +15,18 @@
- ##############################################################################
- ###                             - pid file -                               ###
- ### Writes the process id to this file on startup                          ###
--pidfile mybot.pid
-+pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
- 
- ##############################################################################
- ###                             - log file -                               ###
- ### Writes logging information to this file.                               ###
--logfile mybot.log
-+logfile /var/log/iroffer-dinoex/mybot.log
- 
- ##############################################################################
- ###                            - log rotate -                              ###
- ### After the time given here a logfile will be rotated.                   ###
- ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly   ###
--logrotate weekly
-+logrotate none
- 
- ##############################################################################
- ###                         - expire logfiles -                            ###
-@@ -44,7 +44,7 @@
- ##############################################################################
- ###                             - state file -                             ###
- ### temporary storage for iroffer state information across restarts        ###
--statefile mybot.state
-+statefile /var/lib/iroffer-dinoex/mybot.state
- 
- ##############################################################################
- ###                          - old state file -                            ###
-@@ -71,7 +71,7 @@
- ### needed.                                                                ###
- ### If xdcclistfileraw is set the file will be written with the IRC        ###
- ### control characters included (color, formatting, etc..).                ###
--xdcclistfile mybot.txt
-+xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
- #xdcclistfileraw
- 
- ##############################################################################
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
deleted file mode 100644
index e384c6cea296..000000000000
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="de en fr it"
-PLOCALE_BACKUP="en"
-
-inherit plocale toolchain-funcs user
-
-DESCRIPTION="IRC fileserver using DCC"
-HOMEPAGE="http://iroffer.dinoex.net/"
-SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
-	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
-
-REQUIRED_USE="
-	admin? ( http )
-	gnutls? ( ssl )
-"
-
-RDEPEND="virtual/libcrypt:=
-	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= ) )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup iroffer
-	enewuser iroffer -1 -1 -1 iroffer
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.29-config.patch"
-	eapply "${FILESDIR}/${PN}-Werror.patch"
-
-	eapply_user
-
-	plocale_find_changes "" 'help-admin-' '.txt'
-}
-
-do_configure() {
-	echo ./Configure $*
-	./Configure $* || die "configure phase failed"
-}
-
-src_configure() {
-	do_configure \
-		PREFIX="${EPREFIX}/usr"\
-		CC="$(tc-getCC)"\
-		$(usex debug '-profiling' '' '' '')\
-		$(usex debug '-debug' '' '' '')\
-		$(usex geoip '-geoip' '' '' '')\
-		$(usex chroot '' '-no-chroot' '' '')\
-		$(usex curl '-curl' '' '' '' )\
-		$(usex gnutls  '-tls' '' '' '' '')\
-		$(usex upnp '-upnp' '' '' '')\
-		$(usex ruby '-ruby' '' '' '')\
-		$(usex kqueue '-kqueue' '' '' '')\
-		$(usex blowfish '' '-no-blowfish' '' '')\
-		$(usex ssl '' '-no-openssl' '' '')\
-		$(usex http '' '-no-http' '' '')\
-		$(usex admin '' '-no-admin' '' '')\
-		$(usex telnet '' '-no-telnet' '' '')\
-		$(usex memsave '' '-no-memsave' '' '')
-}
-
-src_compile() {
-	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(plocale_get_locales)
-}
-
-myloc() {
-	emake DESTDIR="${D}" install-${1}
-
-	dodoc help-admin-${1}.txt
-	use http && dodoc doc/INSTALL-linux-${1}.html
-
-	insinto /etc/${PN}
-	case ${1} in
-	"de")
-		doins beispiel.config;;
-	"fr")
-		doins exemple.config;;
-	*)
-		doins sample.config;;
-	esac
-}
-
-src_install() {
-	plocale_for_each_locale myloc
-
-	dodoc README* THANKS TODO
-	doman iroffer.1 xdcc.7
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins ruby-sample.rb
-	fi
-
-	if use http; then
-		insinto /usr/share/${PN}/htdocs
-		doins htdocs/*
-	fi
-}
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
deleted file mode 100644
index 8d04b7572213..000000000000
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="de en fr it"
-PLOCALE_BACKUP="en"
-
-inherit plocale toolchain-funcs user
-
-DESCRIPTION="IRC fileserver using DCC"
-HOMEPAGE="http://iroffer.dinoex.net/"
-SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
-	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
-
-REQUIRED_USE="
-	admin? ( http )
-	gnutls? ( ssl )
-"
-
-RDEPEND="virtual/libcrypt:=
-	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= ) )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup iroffer
-	enewuser iroffer -1 -1 -1 iroffer
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-config.patch"
-	eapply "${FILESDIR}/${PN}-Werror.patch"
-
-	eapply_user
-
-	plocale_find_changes "" 'help-admin-' '.txt'
-}
-
-do_configure() {
-	echo ./Configure $*
-	./Configure $* || die "configure phase failed"
-}
-
-src_configure() {
-	do_configure \
-		CC="$(tc-getCC)"
-		PREFIX="${EPREFIX}/usr"\
-		$(usex debug '-profiling' '' '' '')\
-		$(usex debug '-debug' '' '' '')\
-		$(usex geoip '-geoip' '' '' '')\
-		$(usex chroot '' '-no-chroot' '' '')\
-		$(usex curl '-curl' '' '' '' )\
-		$(usex gnutls  '-tls' '' '' '' '')\
-		$(usex upnp '-upnp' '' '' '')\
-		$(usex ruby '-ruby' '' '' '')\
-		$(usex kqueue '-kqueue' '' '' '')\
-		$(usex blowfish '' '-no-blowfish' '' '')\
-		$(usex ssl '' '-no-openssl' '' '')\
-		$(usex http '' '-no-http' '' '')\
-		$(usex admin '' '-no-admin' '' '')\
-		$(usex telnet '' '-no-telnet' '' '')\
-		$(usex memsave '' '-no-memsave' '' '')
-}
-
-src_compile() {
-	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(plocale_get_locales)
-}
-
-myloc() {
-	emake DESTDIR="${D}" install-${1}
-
-	dodoc help-admin-${1}.txt
-	use http && dodoc doc/INSTALL-linux-${1}.html
-
-	insinto /etc/${PN}
-	case ${1} in
-	"de")
-		doins beispiel.config;;
-	"fr")
-		doins exemple.config;;
-	*)
-		doins sample.config;;
-	esac
-}
-
-src_install() {
-	plocale_for_each_locale myloc
-
-	dodoc README* THANKS TODO
-	doman iroffer.1 xdcc.7
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins ruby-sample.rb
-	fi
-
-	if use http; then
-		insinto /usr/share/${PN}/htdocs
-		doins htdocs/*
-	fi
-}
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 72ea42fb2693..451d5d41eb51 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -4,5 +4,5 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d
 AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
-EBUILD rbot-0.9.15_p20160325-r2.ebuild 5227 BLAKE2B 4d59e06fa44c51c75e3652dbb56c500e85a5514d4d57ff2ee7e69bcbcdec17a0485d1320125d227f2b2fb59ce40809e49ffdf697e0da57c51d9fd21ce0cc35a6 SHA512 76f57cf985223d6842b7b307f75382e5d63c27c76dbb2585a1b70bb45be6dd00c8a75107b086acd3ba89ee9ec74082e7bf3a456a350557f1862381a9f4f3eda2
+EBUILD rbot-0.9.15_p20160325-r3.ebuild 5243 BLAKE2B e265a1889ebd602e4eefb3d20388d07933904c1837c7b7d5e1cca48877de1c197ee11b84973f8fb15a54889c884f374053b88ddc7fee9a2f6f6ed2296ea27652 SHA512 fd1562e5b85681838b569921c5b312761e4e5806b7b3166ae6283bdb9f0fce2a66bea8267700a8f002a88a4a6ec5b58ec9c6f14e6a08753105b9dc168bd0a00f
 MISC metadata.xml 2429 BLAKE2B 74471471dec1be09b55dfa02344e81acddef59e9ec6e8aef5b777297ccef5a858dff6e6f955a1c22e970e93d2cd8864ef35002bfa5e0bbe8aeac799bc3d3dfa2 SHA512 3e91bac4f83db11e76233e1d60dbabe171a6235a57a95a130234cdc07de688ace7869ebe4358600d2b0e2f1c0beb450ab429279ca871bf8b6a2bbf3e437f343b
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
deleted file mode 100644
index a49349572b5f..000000000000
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
+++ /dev/null
@@ -1,193 +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"
-
-GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
-inherit ruby-ng strip-linguas user
-
-DESCRIPTION="A ruby IRC bot"
-HOMEPAGE="https://ruby-rbot.org/"
-SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( feh GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="spell aspell timezone translator nls figlet
-	fortune cal host sqlite toilet"
-ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
-RUBY_S="${PN}-${GITHUB_COMMIT}"
-
-RDEPEND+="
-	spell? (
-		aspell? ( app-text/aspell )
-		!aspell? ( app-text/hunspell )
-	)
-	figlet? ( app-misc/figlet )
-	sqlite? ( dev-ruby/sqlite3 )
-	toilet? ( app-misc/toilet )
-	fortune? ( games-misc/fortune-mod )
-	cal? ( sys-apps/util-linux )
-	host? ( net-dns/bind-tools )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/sqlite3
-	)
-	nls? (
-		>=dev-ruby/ruby-gettext-2
-		dev-ruby/rake
-	)"
-
-ruby_add_rdepend "
-	dev-ruby/tokyocabinet
-	timezone? ( dev-ruby/tzinfo:* )
-	translator? ( dev-ruby/mechanize )
-	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
-"
-
-pkg_setup() {
-	enewuser rbot -1 -1 /var/lib/rbot nobody
-}
-
-all_ruby_prepare() {
-	eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch
-
-	# Avoid tests that are only compatible with ruby22
-	rm -f test/test_journal.rb || die
-
-	# Fix deprecated code that was removed with ruby22
-	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
-
-	# Avoid tests for optional dependencies that are not packaged.
-	sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die
-
-	# Avoid broken tests that call code that doesn't exist
-	rm -f test/test_plugins_threshold.rb || die
-}
-
-all_ruby_compile() {
-	disable_rbot_plugin() {
-		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
-	}
-	use_rbot_plugin() {
-		use $1 && return
-		disable_rbot_plugin "$2"
-	}
-	rbot_conf() {
-		echo "$1: $2" >> "${T}"/rbot.conf
-	}
-	use_rbot_conf_path() {
-		use "$1" \
-			&& rbot_conf "$2" "$3" \
-			|| rbot_conf "$2" /bin/false
-	}
-
-	local spell_program="/usr/bin/hunspell -i"
-	if use !spell; then
-		disable_rbot_plugin spell
-		spell_program="/bin/false"
-	elif use aspell; then
-		spell_program="/usr/bin/ispell-aspell"
-	fi
-
-	rbot_conf spell.program "${spell_program}"
-
-	if use !figlet && use !toilet; then
-		disable_rbot_plugin figlet
-	fi
-
-	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
-	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
-
-	use_rbot_plugin timezone time
-	use_rbot_plugin translator translator
-
-	use_rbot_plugin fortune fortune
-	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
-
-	use_rbot_plugin cal cal
-	use_rbot_conf_path cal cal.path /usr/bin/cal
-
-	use_rbot_plugin host host
-	use_rbot_conf_path host host.path /usr/bin/host
-
-	local rbot_datadir="${D}"/usr/share/rbot
-
-	# This is unfortunately pretty manual at the moment, but it's just
-	# to avoid having to run special scripts to package new versions
-	# of rbot. The default if new languages are added that are not
-	# considered for an opt-out here is to install them, so you just
-	# need to add them later.
-	if use nls; then
-		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS+set} ]]; then
-			# As the the language name used by the rbot data files does
-			# not correspond to the ISO codes we usually use for LINGUAS,
-			# the following list of local varables will work as a
-			# dictionary to get the name used by rbot from the ISO code.
-			local lang_rbot_zh_CN="traditional_chinese"
-			local lang_rbot_ru="russian"
-			local lang_rbot_nl="dutch"
-			local lang_rbot_de="german"
-			local lang_rbot_fi="finnish"
-			local lang_rbot_fr="french"
-			local lang_rbot_it="italian"
-			local lang_rbot_ja="japanese"
-
-			for lang in ${ILINGUAS}; do
-				has ${lang} ${LINGUAS} && continue
-
-				lang_varname="lang_rbot_${lang}"
-				lang_rbot=${!lang_varname}
-
-				rm -r \
-					"${S}"/data/rbot/languages/${lang_rbot}.lang \
-					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
-					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
-					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
-					"${S}"/po/${lang} &>/dev/null
-			done
-		fi
-
-		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb config --prefix="/usr" \
-		|| die "setup.rb install failed"
-}
-
-each_ruby_test() {
-	pushd test || die
-	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
-	popd || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb install --prefix="${D}" \
-		|| die "setup.rb install failed"
-}
-
-all_ruby_install() {
-	diropts -o rbot -g nobody -m 0700
-	keepdir /var/lib/rbot
-
-	insinto /etc
-	doins "${T}"/rbot.conf
-
-	newinitd "${FILESDIR}/rbot.init2" rbot
-	newconfd "${FILESDIR}/rbot.conf2" rbot
-}
-
-pkg_postinst() {
-	elog "rbot can be started as a normal service."
-	elog "Check /etc/conf.d/rbot file for more information about this feature."
-	ewarn "DEPRECATION NOTICE:"
-	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
-	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
-	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
-	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
-}
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r3.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r3.ebuild
new file mode 100644
index 000000000000..a738ba756199
--- /dev/null
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
+inherit ruby-ng strip-linguas
+
+DESCRIPTION="A ruby IRC bot"
+HOMEPAGE="https://ruby-rbot.org/"
+SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( feh GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="spell aspell timezone translator nls figlet
+	fortune cal host sqlite toilet"
+ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
+RUBY_S="${PN}-${GITHUB_COMMIT}"
+
+CDEPEND="
+	acct-group/rbot
+	acct-user/rbot
+"
+
+RDEPEND+="
+	${CDEPEND}
+	spell? (
+		aspell? ( app-text/aspell )
+		!aspell? ( app-text/hunspell )
+	)
+	figlet? ( app-misc/figlet )
+	sqlite? ( dev-ruby/sqlite3 )
+	toilet? ( app-misc/toilet )
+	fortune? ( games-misc/fortune-mod )
+	cal? ( sys-apps/util-linux )
+	host? ( net-dns/bind-tools )"
+
+DEPEND+="${CDEPEND}"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/sqlite3
+	)
+	nls? (
+		>=dev-ruby/ruby-gettext-2
+		dev-ruby/rake
+	)"
+
+ruby_add_rdepend "
+	dev-ruby/tokyocabinet
+	timezone? ( dev-ruby/tzinfo:* )
+	translator? ( dev-ruby/mechanize )
+	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
+"
+
+all_ruby_prepare() {
+	eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch
+
+	# Avoid tests that are only compatible with ruby22
+	rm -f test/test_journal.rb || die
+
+	# Fix deprecated code that was removed with ruby22
+	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
+
+	# Avoid tests for optional dependencies that are not packaged.
+	sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die
+
+	# Avoid broken tests that call code that doesn't exist
+	rm -f test/test_plugins_threshold.rb || die
+}
+
+all_ruby_compile() {
+	disable_rbot_plugin() {
+		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
+	}
+	use_rbot_plugin() {
+		use $1 && return
+		disable_rbot_plugin "$2"
+	}
+	rbot_conf() {
+		echo "$1: $2" >> "${T}"/rbot.conf
+	}
+	use_rbot_conf_path() {
+		use "$1" \
+			&& rbot_conf "$2" "$3" \
+			|| rbot_conf "$2" /bin/false
+	}
+
+	local spell_program="/usr/bin/hunspell -i"
+	if use !spell; then
+		disable_rbot_plugin spell
+		spell_program="/bin/false"
+	elif use aspell; then
+		spell_program="/usr/bin/ispell-aspell"
+	fi
+
+	rbot_conf spell.program "${spell_program}"
+
+	if use !figlet && use !toilet; then
+		disable_rbot_plugin figlet
+	fi
+
+	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
+	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
+
+	use_rbot_plugin timezone time
+	use_rbot_plugin translator translator
+
+	use_rbot_plugin fortune fortune
+	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
+
+	use_rbot_plugin cal cal
+	use_rbot_conf_path cal cal.path /usr/bin/cal
+
+	use_rbot_plugin host host
+	use_rbot_conf_path host host.path /usr/bin/host
+
+	local rbot_datadir="${D}"/usr/share/rbot
+
+	# This is unfortunately pretty manual at the moment, but it's just
+	# to avoid having to run special scripts to package new versions
+	# of rbot. The default if new languages are added that are not
+	# considered for an opt-out here is to install them, so you just
+	# need to add them later.
+	if use nls; then
+		strip-linguas ${ILINGUAS}
+		if [[ -n ${LINGUAS+set} ]]; then
+			# As the the language name used by the rbot data files does
+			# not correspond to the ISO codes we usually use for LINGUAS,
+			# the following list of local varables will work as a
+			# dictionary to get the name used by rbot from the ISO code.
+			local lang_rbot_zh_CN="traditional_chinese"
+			local lang_rbot_ru="russian"
+			local lang_rbot_nl="dutch"
+			local lang_rbot_de="german"
+			local lang_rbot_fi="finnish"
+			local lang_rbot_fr="french"
+			local lang_rbot_it="italian"
+			local lang_rbot_ja="japanese"
+
+			for lang in ${ILINGUAS}; do
+				has ${lang} ${LINGUAS} && continue
+
+				lang_varname="lang_rbot_${lang}"
+				lang_rbot=${!lang_varname}
+
+				rm -r \
+					"${S}"/data/rbot/languages/${lang_rbot}.lang \
+					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
+					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
+					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
+					"${S}"/po/${lang} &>/dev/null
+			done
+		fi
+
+		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} setup.rb config --prefix="/usr" \
+		|| die "setup.rb install failed"
+}
+
+each_ruby_test() {
+	pushd test || die
+	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
+	popd || die
+}
+
+each_ruby_install() {
+	${RUBY} setup.rb install --prefix="${D}" \
+		|| die "setup.rb install failed"
+}
+
+all_ruby_install() {
+	diropts -o rbot -g nobody -m 0700
+	keepdir /var/lib/rbot
+
+	insinto /etc
+	doins "${T}"/rbot.conf
+
+	newinitd "${FILESDIR}/rbot.init2" rbot
+	newconfd "${FILESDIR}/rbot.conf2" rbot
+}
+
+pkg_postinst() {
+	elog "rbot can be started as a normal service."
+	elog "Check /etc/conf.d/rbot file for more information about this feature."
+	ewarn "DEPRECATION NOTICE:"
+	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
+	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
+	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
+	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index df66ff1eaa6f..57c3e91934ec 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 311871f03bb3..317d7d74e150 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-2.1.5-r100.ebuild 4851 BLAKE2B 654527168c497fcfa02adf84c9445dd3d6ba4916fac602bad198f4a5043824e72d32eca8c8ec54ed28139a0fffe894d75ae7d00abe5e590b377976ffb95c0f95 SHA512 54828ed8e13f1f17a51b40369a19488d48e72de03b08fe1623ffdd3b578d6327e7f943d6e42d561c9209971311e1c2f901551e7ed14d711cbb47dc868390e8a3
+EBUILD axtls-2.1.5-r101.ebuild 4706 BLAKE2B a159b0b0e2714cfcd544973708a2cc55027bfdde1d13f3c485beebe253713e20e3cd4c3385fe1e92d146f82fbef21047de59e34de8c60fdcbe68ebaf8f0c65bd SHA512 c11a0b60ac84687d84da047a3ec422a78713b98322cada28a67d0241853a2ef6534da68fef35338a9a27fa2490aac8e340cd1386f18b17c6af18262a13b8e52e
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild
deleted file mode 100644
index d9a47694270d..000000000000
--- a/net-libs/axtls/axtls-2.1.5-r100.ebuild
+++ /dev/null
@@ -1,185 +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 multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-BDEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( ${LUA_DEPS} )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd ${LUA_REQUIRED_USE} )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use cgi-lua && lua-single_pkg_setup
-
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-		if use cgi-lua; then
-			sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r101.ebuild
new file mode 100644
index 000000000000..5f09e2c9f169
--- /dev/null
+++ b/net-libs/axtls/axtls-2.1.5-r101.ebuild
@@ -0,0 +1,178 @@
+# 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 multilib-minimal savedconfig toolchain-funcs
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+#	make menuconfig
+#
+# Now configure axtls as you want.  Finally save your config file:
+#
+#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version.  You can then run emerge again with
+# your configuration by doing
+#
+#	USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0/1"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+BDEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+	httpd? (
+		acct-group/axtls
+		acct-user/axtls
+		cgi-lua? ( ${LUA_DEPS} )
+		cgi-php? ( dev-lang/php[cgi] )
+	)"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+	static? ( httpd )
+	cgi-lua? ( httpd ${LUA_REQUIRED_USE} )
+	cgi-php? ( httpd )"
+
+pkg_setup() {
+	use cgi-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC
+
+	eapply "${FILESDIR}/explicit-libdir-r1.patch"
+
+	#We want CONFIG_DEBUG to avoid stripping
+	#but not for debugging info
+	sed -i -e 's: -g::' config/Rules.mak || die
+	sed -i -e 's: -g::' config/makefile.conf || die
+
+	eapply_user
+
+	multilib_copy_sources
+}
+
+use_flag_config() {
+	cp "${FILESDIR}"/config config/.config || die
+
+	#Respect CFLAGS/LDFLAGS
+	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+		config/.config || die
+	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \
+		config/.config || die
+
+	#The logic is that the default config file enables everything and we disable
+	#here with sed unless a USE flags says to keep it
+	if use httpd; then
+		if ! use static; then
+			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+				config/.config || die
+		fi
+		if ! use cgi-php && ! use cgi-lua; then
+			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+				config/.config || die
+		fi
+		if ! use cgi-php; then
+			sed -i -e 's:,.php::' config/.config || die
+		fi
+		if ! use cgi-lua; then
+			sed -i -e 's:\.lua,::' \
+				-e 's:lua:php:' \
+				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+				config/.config || die
+		fi
+		if use cgi-lua; then
+			sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die
+		fi
+	else
+		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+			config/.config || die
+	fi
+
+	emake -j1 oldconfig < <(yes n) > /dev/null
+}
+
+multilib_src_configure() {
+	#Per-ABI substitutions.
+	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+		Makefile || die
+
+	#Use CC as the host compiler for mconf
+	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+		config/Rules.mak || die
+
+	if use savedconfig; then
+		restore_config config/.config
+		if [[ -f config/.config ]]; then
+			ewarn "Using saved config, all other USE flags ignored"
+		else
+			ewarn "No saved config, seeding with the default"
+			cp "${FILESDIR}"/config config/.config || die
+		fi
+		emake -j1 oldconfig < <(yes '') > /dev/null
+	else
+		use_flag_config
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use savedconfig; then
+		save_config config/.config
+	fi
+
+	emake PREFIX="${ED}/usr" install
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+	fi
+
+	# The build system needs to install before it builds docs
+	if multilib_is_native_abi && use doc; then
+		emake docs
+		dodoc -r docsrc/html
+	fi
+}
+
+multilib_src_install_all() {
+	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd || die
+	fi
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc README
+}
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 482820b42033..4ddf740ffa5f 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,7 +1,5 @@
-DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
-DIST gssdp-1.2.2.tar.xz 61444 BLAKE2B 917936ba61ef6074939a11792ddb4f3baf0bd88475df7e49fd6e598dc2530610f04661a4b5efcb2a024e0d37011bfab32bcffd644d2a3be2eb1325c9020b73bf SHA512 3d962ac5a633492979d49c722bbbbeec88385fdbd063d3b68f6b82edbc62c9e78c556d48a904460dd04328bf7a79668dcf3ee33bf61a271ac926e01e2e645f68
 DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82
-EBUILD gssdp-1.0.3.ebuild 1390 BLAKE2B e976444c3ac2fa6dcc4f680abb1715ed4c4c8198f1ff5dd77914380d5cf7fe8a5f592c6cb3eb6d98a6a59d16148dc722dc72905d486aa344bc15d72d1525fd5d SHA512 26a7e121088e3b4293c798b07a83010095eb7b9a7e7e3ccbec774139d3cfa0b93a51dfaf1d5012b79cfd1c254d9659965fa27e3a9893f802bb75019072120311
-EBUILD gssdp-1.2.2.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230
+DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85
 EBUILD gssdp-1.2.3.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230
+EBUILD gssdp-1.3.0.ebuild 1512 BLAKE2B a2e895b117d895f3dd497ecf95a53a57939f4cfb6076d8e346346105fa12e16622c611a0fa3079a5f70b9802f4c965af683e742cfb2235049db9ff18131e0360 SHA512 cff03653eed4c1b2dde7d5244af720b716b2541a94572710dec7bce1934aa787c20a08efb4b383395a6058c20a243d24adc7cf1408a3d9a92365e213bd8423df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
deleted file mode 100644
index a5f6b160c168..000000000000
--- a/net-libs/gssdp/gssdp-1.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal vala
-
-DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="+introspection gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	introspection? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.36:= )
-	!<net-libs/gupnp-vala-0.10.3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Disable functional test as it requires port that might be used by rygel to
-	# be free of use
-	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
-		-i "${S}"/tests/Makefile.in || die
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with gtk) \
-		--disable-static
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/gssdp/gssdp-1.2.2.ebuild b/net-libs/gssdp/gssdp-1.2.2.ebuild
deleted file mode 100644
index 689c160c9ce0..000000000000
--- a/net-libs/gssdp/gssdp-1.2.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"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( >=x11-libs/gtk+-3.12:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gssdp/gssdp-1.3.0.ebuild b/net-libs/gssdp/gssdp-1.3.0.ebuild
new file mode 100644
index 000000000000..a71c9b505b29
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
+
+LICENSE="LGPL-2+"
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection gtk vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( gui-libs/gtk:4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	virtual/pkgconfig
+	vala? (
+		$(vala_depend)
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool gtk sniffer)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use gtk-doc ; then
+		mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
+		rmdir "${ED}"/usr/share/doc/gssdp-1.2
+	fi
+}
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 1081991d69c5..6f499669587f 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
+DIST gupnp-av-0.13.0.tar.xz 91584 BLAKE2B 96f4a452f199d48c72cf65a7fa0ef6eb59488862f87a7bf7d1eaaa79289e89bab43718c4a4e94f1d6a71ddf65071c1c1b3aa49c180ba068928b1740bb7a3c8d1 SHA512 8ff5dcacaa5893290c263ba8be2613da6853e074e2afcbc3e111dbff8c9b9d7edbd3772341bc370a1db06b4ba815fd6071158f61a832e2e8f2a51d66d5d8f230
 EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654
+EBUILD gupnp-av-0.13.0.ebuild 984 BLAKE2B 971c2197e5eea9e4d0bf0cd307f1926f18fee4f071274f88f99fe166347b02d5c132e7a6aa98936e7b6e8bfff51571223860982a2746e584df75e21389051577 SHA512 ac0935987ec127610ded324bfb14bde63ea2933fa21e65dd378e7837887c225fb355c8105aed673154f62ecc0ac147a66846c5a7beb8d2390e5da613b830d890
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild
new file mode 100644
index 000000000000..d8baf6de158b
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av"
+
+LICENSE="LGPL-2"
+SLOT="0/3" # subslot: soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use introspection vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 0ac49e9e61a4..26e4360db0f3 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,6 @@
 AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
+DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
 EBUILD gupnp-igd-0.2.5-r10.ebuild 1430 BLAKE2B e8ae3e32363644ce7c8f4988ec44b2b9d1aee5df419c344cc00b4c8e6a9611d4db105d59a8cd1598d87451bbf5271e4d419da9d82dfdf76dee0785d0d91acab1 SHA512 f74bda750feb5939a6175c96f689a6baea353ca1c2c16d719835569c2314e0a05c9390ba19cffad973cad1dac2ea9e5fd1ccec6b03bf41965f09dbcf9e58cf6e
+EBUILD gupnp-igd-1.2.0.ebuild 1102 BLAKE2B e1d611a561b72a9ac6389b6b5ccc6571e49000b132bb87712ba1338b1ba6eeb6d1e0b784b8229111c0c3e87223dc719e84eaa1c47d552d555ffb4bdba0f34d67 SHA512 297b47cac96cd8b039bf9859ddc90ceacc7b463c622464785e3a1510f79479f9d6e5668f87885cfda5b473f5d9c43422ad640ba1905267f21bd557cac8113193
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
new file mode 100644
index 000000000000..4afadf5e7934
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson-multilib xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+# The only existing test is broken
+#RESTRICT="test"
+
+src_prepare() {
+	xdg_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index ecfe7622ae35..919b40f5e942 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,5 +1,7 @@
 DIST gupnp-1.2.6.tar.xz 142652 BLAKE2B 12f3fd59b6c8616dcbc32ab4feeeccde864af6da0593d0d51b8a9bab045c39b8e4540bc1470a0758f1a0979e647f9dae67bae544d1457e567264d7408d58e06f SHA512 317ff1f0ea1f03476596db6ce2f6c7c86b7c9962a7ddb00da9f487fe7f7bb70ccf8fe64e485583e4a988d90afdb41128730fef459f4ecb757ff2aef44dc4de9c
 DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
+DIST gupnp-1.3.0.tar.xz 150160 BLAKE2B 300147881e30300cd2bbff7ffc2666d6281dc165cbfcca46617a59c244bb699d49f26074e07909782038f5a87939ac342fe5ae5468a9c38d8065ceea70293c6b SHA512 6367f3d616acef433a26d2475b4ec3067ced9d09e9e9ccf6400f30abc4202e0dd524aa33beb7bb5f88c9a62ff69fafc0d283dc0cb80220f53bfd027205069763
 EBUILD gupnp-1.2.6.ebuild 2065 BLAKE2B 2f76e6584658f65b4bef9beb15c6f39f63204af7aa468955002d6698aba3c00cea9b7d7b468ef4b4fcd7c6688d8693ca1ca4b13178f0cadb3d0f3a97c1364ab2 SHA512 e3add284a70c4d19b9e3978ea5eadfc668f69eddc3128d7f905e85d0609cc444c9a5d5fc46fc16969e0a879004c603f0eba538ddc6a6f59dc3c2f67644e83388
 EBUILD gupnp-1.2.7.ebuild 2066 BLAKE2B 0c36906a29505e42bae46c506628da361272981f3ec9f3b4cd1f4eb94a170b374aee3cb8054549e4c53cf693eb19a6e3d89aaf1f76ec20e67982dce5ca28de53 SHA512 623a495d00c395ce02c746b0fbde69f0620c7f257cba3e5b4881b785690210259be874f3aefa38ff159a464a559276b3109e91fd03ac27b1e7b46f454ae5ca0e
+EBUILD gupnp-1.3.0.ebuild 2106 BLAKE2B 18dc5285702f075e17d40a683eb764e5d3ea94af0e9f631ea420f494d7c6e0c9bb81729b6d4a50b90c02552de79d07589f13ce651e82761fd21fc31e7f355854 SHA512 588d198c7df6ec981286a6a8cf50370a68a50f767c957606095c7094c9b3f78ba035034c7161eff681a6a539555eaa7bc52f8cd43f4aa9a3e63294ca753bfb88
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.3.0.ebuild b/net-libs/gupnp/gupnp-1.3.0.ebuild
new file mode 100644
index 000000000000..e981b8b42e46
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson-multilib python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.3.0:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.3.0:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index 764beff7698d..f82192a32d75 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
 DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
-EBUILD libasr-1.0.4.ebuild 477 BLAKE2B f8aa5f1c201b57d5cb0b78e176eeb5f27da427d3f9142a487a18196e738b9d3b85bd1b900133609aeaeed65d234b7d1a8f29ccac53461248d1848bbf4cfa1c17 SHA512 5b12fa1857b91e6e85a35241648f306c33d7f4ba7382ba597ce6019f838cf531e8efe6827e9894552768d53004b316db50628ab6ab8071d1691247de85c19904
+EBUILD libasr-1.0.4.ebuild 484 BLAKE2B a10c571b9702de489e93e4e5e5081950c2eb5fc59519729b0013c88ef05efaddf23f2ff8e1e84cd1029288a55b205cf5345a9acb828f6db99a99a327dc078b7d SHA512 f1d075dd624b4ceeefd23a72718ae880e87a7c71fdd8a972a9e373a27784854b936971a1c4a8b16acecce7e7114810329f1af1106ccab18474c374f29512b528
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index 0e9a9e249408..f85a8c9d0ad5 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 11f3de110a9d..9c21372b61bf 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -3,5 +3,5 @@ DIST libnetconf2-1.1.46.tar.gz 295868 BLAKE2B ac20dd66c779b9b509f09c1a45224679e2
 DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8
 EBUILD libnetconf2-1.1.43-r2.ebuild 898 BLAKE2B 2a64da7fce34e499bc0790687d89fec7d11c5f9b6c0b76a0079f918b619076feb84ca695062abaaf89d46e7adec50fd65de0682bf4810ae9beb0b2119c4679ee SHA512 d8cb9719c0f5051efa69060e01e0397c563a4bd3b03ac364259798039710d2f6191c170c2d3718cc34aa0dee4852b7e8e56f029ff7f43d230eceadd80fe390a8
 EBUILD libnetconf2-1.1.46-r1.ebuild 905 BLAKE2B c105df3d6811cce4b1571cecb84dc4561b6fd8a6ac622e67bb22f1f76c2d149798f082962dd18fb3781edc81ceaca454ab2c9a881bdaa0ebd1ae407897985afe SHA512 6c151fc3bd6211c3c6f94d752666d7665f2034e1cc7f97f356b1eea8f299aa2ba99f4e4ca6993cb47fbe0862acf68787e6f78ec077ed3e002a5ae2b933c17e1b
-EBUILD libnetconf2-2.0.1-r1.ebuild 871 BLAKE2B b307c6f10b17a0c5d3c64e0d709896346fce387c9c21a5b0f4e826d64e46e34aaa0608a0e23078226a2de8b18b8a368e323cc38a7b079638f48ca18fb1a26e63 SHA512 5901a352c3e85fc2a637e4263ea7fec8b7b1fd27a0a0836dc3b70f96fb9e233f55e6f45afe7b309d9cdfc7a579287d9a082833e9c2ccbfb2065208a680705d36
+EBUILD libnetconf2-2.0.1-r1.ebuild 870 BLAKE2B 8dfb3bace07254a607dd8758840f13031e1181355321c15d9f239f51f3d36b4da68395d1dedfdc0a36dc50a6ebd16ff17c6af895dc038640be6f639f52aaeabb SHA512 bf92dfe163a2cc227ebcaa16e1c0ef6a5ba9bce3c016328bd735aff7b25b75c11df7f7e3efb01f19d22e18849f33c97dd7825034c48ab6d4c67f4d26a7acc230
 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
index 6f7150129f7c..af28d77b0ef9 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 153802f76cec..5d298aef60ac 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,3 +1,3 @@
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.2.0-r1.ebuild 914 BLAKE2B 31a23c85cda7d129d3039808bccc99c94304276288870a7e56fe5f9f375d59b23fa85141322835d82454de3c22f2888908ac0ef2f84de1c8aedb7348f4ec2304 SHA512 f75455f6aa5cde44fd11b4e31f36f76cfab9aa2a0cae4d873443509fd4abe07395905466eda0c264b081f24a48a4b3bf52ca26f2250f7cfb24066c80b50c9b20
+EBUILD libsearpc-3.2.0-r1.ebuild 906 BLAKE2B 1c91aa79d7d792d31a31c4aac9cc220924e04696c4bd345ad5fc388c121be1c3385a7bdfb60c09d0abe843e2f048d3fb0e195fcdf2572d1b270c67906ca139af SHA512 7e51fd5640be2a37bb06bc823cbcbf01cb060bebeb7b19e65679979845aff82d62173adbe135c6286db3acd907baac73305b9128b0f2bf5c34c580efd84dcd21
 MISC metadata.xml 479 BLAKE2B 52ef362ca8291b0f9cb820c002588448a8db2b68b41a495e9ef4ad6303fb523bc599a94fa8e786d9270cb6920b64011c2a965208d2eaf8e18ca56c5912d2409c SHA512 eeff06104b2ed7fd648c0943149296448ac37123be3bdbfb93f6f63703b18637680220b5d284b7d9679e46e3fd742bbeed93ad55f60ce28f03ae6cb25ffd4aa8
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index 5c78c100213c..c3cd310e52b5 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=(python3_{8,9})
 
 WANT_AUTOMAKE=1.16
 
@@ -24,7 +24,7 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/jansson-2.2.1"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	')"
 
 src_prepare() {
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index a61a5aceabd4..c3eb7d07307d 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,5 +1,5 @@
 AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d
 AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d
 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
-EBUILD libvncserver-0.9.13.ebuild 2073 BLAKE2B 1583f9e65352b0ac074e5337de2fb23c3b3359e060cabc2943476967300d0a361c50caa6e97a1373df869176ffe32b705ba8143aa559595ccc72798f96738384 SHA512 fc72611b36cc97bca832cc13a532be0a630bb5f2613c0d1dd1b51ae9db8565691713496a1019e7c6fa4b89bdcd56e6f460e9c1868f76deae4e5159d13fee1094
+EBUILD libvncserver-0.9.13.ebuild 2080 BLAKE2B ece08bc97161240f55bfc76bb3709c5bcf4f9e0be117c3565f5ca4e33a9699b7067ff6d13ec66c06fad3ce2f7df847bfd29c1f7be216b6ddde684d6034c6687c SHA512 1734f760558d2e438dd37d821b50b255a8fe6d9ea8e345e41a665868ec7c08a5e3feb9d1025aad5abacb4642ffbb64466949427bef409f9bdf3fe80b3fc54b59
 MISC metadata.xml 1077 BLAKE2B 8870ce3ed354e5afd05b3133c4ac69b797a93a773724252a57d7f1fbcce62e66d2f98878a9ec80a629246f9d890151b601a4064ed7473af266b1b2df4a466ea4 SHA512 3aef9425b2bd79ce7c5c8e3708c2f3d670c8bd5a3965c0e2385b1f86468f9f77ca80e213ccb7ed610556866aef87cbc47d933bf07eb4fa87762d6aa66af36b00
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
index b0e0993064f3..c046ad17bcf2 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 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"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index aeaeb38814f5..584534021f69 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -3,5 +3,5 @@ DIST libyang-1.0.240.tar.gz 1667619 BLAKE2B ec988301ee422cf90fd6d50b31f42f28f5f0
 DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
 EBUILD libyang-1.0.236.ebuild 988 BLAKE2B 5c426507aa166549c283169f65ac56136fa62857db55dad0d145d5a67c6ad99b9b6a34cf280063b0923c97441bf23625ab35449c14fb7375e27f32dad71c0d5f SHA512 cc300ada4d32f432a88da55eea518748774b7f7642738ac5e9c7b206c46ac0bcad2ae36a2c5af22655796a3ea3183360ca2e410655aa23d86a6849c06ca5125d
 EBUILD libyang-1.0.240.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308
-EBUILD libyang-2.0.7.ebuild 861 BLAKE2B d0fd56392c038e0ea9a338fc5b6013c4871d0f463f60acdc6c09c86b3a41a01d6a750c57b8adad1ab305aa39aec4915472e2ea8873347f53230767a72bad8a9e SHA512 114e1c5c874d8c7fe74de3b0808f83c0e625a19e0b82059eda67a2d213208ec988d1f8c5d1e0cfb6bb5a58c90f21e7de0090803090bd8b47ff65bd3496d61340
+EBUILD libyang-2.0.7.ebuild 860 BLAKE2B 045f198f2660e0774d0f6edb071f93f6e5eb5bd3fdc4c6ff38786a3e037af715db23c548c67e9f4f77634f3657ef323869a28bbad951a5d6946fdc7517d23c9e SHA512 d25d0df1a6d1a4313cafe52c9379cf3e9eba375685e1dfb3ef7c483f972cebecce9e13c07be08b2bee8f57b7f8d1e9b321074c9876906500f64a3c04548da568
 MISC metadata.xml 585 BLAKE2B b4ee06f08fd3f10d45796cb0b3bde13c0790c4883b3408f3c89f7b0812b49206b741556ad2b28772ff1b18a40ad517f988ff4301c1a4270d127ab6ba0632c752 SHA512 54ccc9ecd6b9981ce5544174a74c8d9d5517e8c56b7a28402cac8af3d854c7e41ab8e2a0ad5a0fbd4d6460f848ee9a31f64b6b74cc1b7a1333e2899ceae9ba6f
diff --git a/net-libs/libyang/libyang-2.0.7.ebuild b/net-libs/libyang/libyang-2.0.7.ebuild
index 6254659806fa..57f270bd1c08 100644
--- a/net-libs/libyang/libyang-2.0.7.ebuild
+++ b/net-libs/libyang/libyang-2.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 0bc1c28f2a39..c1560f4e84c7 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -3,5 +3,5 @@ DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3
 DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
 DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
 EBUILD miniupnpc-2.2.1.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
-EBUILD miniupnpc-2.2.2.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
+EBUILD miniupnpc-2.2.2.ebuild 1531 BLAKE2B d96235e0df9e81ce6bd27acb4a5d392de6f24e4fad6ac294aff7f010210cb195bb45d250d1745500193fd6bf9e9a2eb017347f125e1af746379011e558e77f33 SHA512 75ee602e5778d5fb05d54bb5dc8c449b7c59bc55056ba2ba11474b40e4f3b8317de809a8e25280368314a24ea81d558762d25e3954cdb1fd30711b2a6193feee
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
index 7ac6dc55a8fa..de6ed42db309 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index fc9f60bff2f3..8ab16f9a8460 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
-DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
+DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
 EBUILD nghttp2-1.41.0-r2.ebuild 1939 BLAKE2B 2f985404d208614eacd79a7688e58b041b2f3f145b68af46c3047b69589c78da368af2a0f3c36c4905475a5f6bdd3ef7004e537a211b0df9cee7884f68ff58a9 SHA512 79afbb367fd0dd6c13216f8c49cbf756e517892dc5e83b1f55a3989f6248324d0987de2e1025b0e85d9ab9b7b9d39e3982c0084b35eb2d8db6f78feddc7e541f
-EBUILD nghttp2-1.42.0-r2.ebuild 1999 BLAKE2B 256137c46baa1fb83fb7a77535e9523a3f54f0a86c7e300b4a165462f29819457ba53e668a4ba94cc76b4c64a63350b289c12e3c8c325e61b4a77ca363583e54 SHA512 e980e8ff8c71f664abdb59d5e35ed6245de8c13bf8406e8873fc8f1ae3fb822a8b1bebc84cff29efdd550842a0094d222406f9b24f57810d949f335b3cbbe648
-EBUILD nghttp2-1.43.0-r2.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
+EBUILD nghttp2-1.43.0-r2.ebuild 2012 BLAKE2B 6ffcd5b832940b1c42023b834d0ccc7c534f3e59cc7c2df9e4d58f720f75e870b635162c1b1fd1058665735b5daedc10a42d48356afdd9a6433edfacd13f6385 SHA512 0aa726de4eef9bf97a393ce6566562e689b2447feb202f8c9ee12dcaacf0f550b96c05db818aaff2dd271b8af82d051ec67a954a3db61ed85d33d51ea1a2d5c9
+EBUILD nghttp2-1.44.0.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
 EBUILD nghttp2-9999.ebuild 1979 BLAKE2B accfeb064d7750bb523939d9e9f50dc194455d771e0e22b1a5c7138d826f521faa3b0f830cf320d470803636faaaf38f83a6f84a272d875f04bc6d115780cc64 SHA512 f6ea435254aa3f2d2622eee95739a80d9f9e3d9321413a74ed875d71cba1901d87f225b7ed1086db2dd81295bda21bb72152b7502296ff87296cb37485a8a77b
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild
deleted file mode 100644
index 0b93e6d962c2..000000000000
--- a/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
index cc514dc2d659..e8c5aa7cef5e 100644
--- a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.44.0.ebuild b/net-libs/nghttp2/nghttp2-1.44.0.ebuild
new file mode 100644
index 000000000000..cc514dc2d659
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.44.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index dbfb7c5c2bae..2c98bbfc6a75 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,8 +1,10 @@
 AUX pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch 4724 BLAKE2B a098969ca78f538848a6616d6168dc74dc4d6c09f348e0e6436089341827346f52c3feb43a4de13453df940cad65b02f650c9e3cdfae4b449da0a5140e0fda54 SHA512 49846fd649f664ce29098800d4f9acee95ac4c06ff5499495b5bcc78269a33e9e66e9df126755aba9c48481c3a87040ff0a6bf1e4fc64bdf0492c55d428978f0
 AUX pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch 1564 BLAKE2B 30f7af19ae18c071b62e31a6a049e4e67f7b391a65ab52ef8d5270ef504a4057b35679c580ba056c9b1b3e5813fde5ccc8ca863bead4f62156e39f8c2947e4d2 SHA512 9fb5b8961e7c69cf8a902eaa28cb2147faf8f0809467911454758b793832831240992a3c27ecb722a4ea066df909c0cf12b4b1bf139037f647828eb4cc16fee0
+AUX pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch 10321 BLAKE2B 6e69e2476439d2f6ca97cd94376d3ffe924840289abe49bf33ecc10c1b67d33457e4231a47851b1e749600f3d7b4a4980b1e5bada06bfc1df5334f6a51b0e8f1 SHA512 58faf870bae4ec94cfc78ca9397e476b7db26c69bb4de5dd6bdaa63f6a8cca95438a182661b485afb04872899c41a8f8ff72c5cfbad35c41cbdc5e9831813c4a
 AUX pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch 3929 BLAKE2B fc7e12b7e8e9ff35556aa153496c2f7decd13bc78493d8c6f24449f063fe9c76b1772f6dc2b6cfc279c9731cc08735b27cd990ac6c4648c18e7f08c2c9fc3810 SHA512 e230041cff87d97947ad8caeb80c4858b8a1d435251d79b281fc0035da04aab549d1d5dc085681d98410da7e37359bb2ed721d132b321cce9a7326e4ff52c40f
 AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
 EBUILD pjproject-2.10-r1.ebuild 3339 BLAKE2B 7bdb4fd1731d2a32750b73970f06c70188309227b727f50f13819e435adcb897f42bb9408c0ef5c151a12dd6954a01205740b11aea657cb53ead6112a9c9036a SHA512 6b7f60dd30b96d600197d4ed5d1d3002df152c0101c359c644a45787ed7112dc1667065d96ab8001ffa1f8c9de0e8d505be9040aca3cd188b7cb155fa0caeb54
+EBUILD pjproject-2.10-r2.ebuild 3425 BLAKE2B 5e75ed21cdf7da4b13eee7e6db0e9c3aa8af96c8488eb361f90cbe855e08f3d2de815a4bec2d4d26ce51b0a97331de54143f84a372f20c8933f22ebbb74bca9b SHA512 3c3d63692852d7f34dee7345447267da1f72fe42d7e61d3fbc03a2e5b3dbca1b23d4bce5cacd1129231474e1a3177b178da645f0279f6e36a5a610267989c8c8
 MISC metadata.xml 1378 BLAKE2B f5445d873e1167362e054d6010d68e515a237481f64ef50bbc18d7bdaf338fea6f5620297ce165c6ad79022ae0a60665d120dad5fffce44f71f7861acf2af878 SHA512 c76ce7cc7885daa1462cb707cc15d8f6ce385db25bd0358ec4ffc7c02134ebebe27c69d20eaa2923cf834863359453593bf52b89315ae5a8386c9fcdafcbb7d6
diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch
new file mode 100644
index 000000000000..ba31cf19eda7
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch
@@ -0,0 +1,289 @@
+From d5f95aa066f878b0aef6a64e60b61e8626e664cd Mon Sep 17 00:00:00 2001
+From: Nanang Izzuddin <nanang@teluu.com>
+Date: Fri, 23 Jul 2021 10:49:21 +0700
+Subject: [PATCH] Merge pull request from GHSA-cv8x-p47p-99wr
+
+* - Avoid SSL socket parent/listener getting destroyed during handshake by increasing parent's reference count.
+- Add missing SSL socket close when the newly accepted SSL socket is discarded in SIP TLS transport.
+
+* - Fix silly mistake: accepted active socket created without group lock in SSL socket.
+- Replace assertion with normal validation check of SSL socket instance in OpenSSL verification callback (verify_cb()) to avoid crash, e.g: if somehow race condition with SSL socket destroy happens or OpenSSL application data index somehow gets corrupted.
+---
+ pjlib/src/pj/ssl_sock_imp_common.c  | 47 +++++++++++++++++++++--------
+ pjlib/src/pj/ssl_sock_ossl.c        | 45 ++++++++++++++++++++++-----
+ pjsip/src/pjsip/sip_transport_tls.c | 23 +++++++++++++-
+ 3 files changed, 95 insertions(+), 20 deletions(-)
+
+diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c
+index 025832da4..24533b397 100644
+--- a/pjlib/src/pj/ssl_sock_imp_common.c
++++ b/pjlib/src/pj/ssl_sock_imp_common.c
+@@ -255,6 +255,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
+ 
+     /* Accepting */
+     if (ssock->is_server) {
++	pj_bool_t ret = PJ_TRUE;
++
+ 	if (status != PJ_SUCCESS) {
+ 	    /* Handshake failed in accepting, destroy our self silently. */
+ 
+@@ -272,6 +274,12 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
+ 		      status);
+ 	    }
+ 
++	    /* Decrement ref count of parent */
++	    if (ssock->parent->param.grp_lock) {
++		pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
++		ssock->parent = NULL;
++	    }
++
+ 	    /* Originally, this is a workaround for ticket #985. However,
+ 	     * a race condition may occur in multiple worker threads
+ 	     * environment when we are destroying SSL objects while other
+@@ -315,23 +323,29 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
+ 
+ 	    return PJ_FALSE;
+ 	}
++
+ 	/* Notify application the newly accepted SSL socket */
+ 	if (ssock->param.cb.on_accept_complete2) {
+-	    pj_bool_t ret;
+ 	    ret = (*ssock->param.cb.on_accept_complete2) 
+ 		    (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
+ 		    pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), 
+ 		    status);
+-	    if (ret == PJ_FALSE)
+-		return PJ_FALSE;	
+ 	} else if (ssock->param.cb.on_accept_complete) {
+-	    pj_bool_t ret;
+ 	    ret = (*ssock->param.cb.on_accept_complete)
+ 		      (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr,
+ 		       pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr));
+-	    if (ret == PJ_FALSE)
+-		return PJ_FALSE;
+ 	}
++
++	/* Decrement ref count of parent and reset parent (we don't need it
++	 * anymore, right?).
++	 */
++	if (ssock->parent->param.grp_lock) {
++	    pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
++	    ssock->parent = NULL;
++	}
++
++	if (ret == PJ_FALSE)
++	    return PJ_FALSE;
+     }
+ 
+     /* Connecting */
+@@ -930,9 +944,13 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent,
+     if (status != PJ_SUCCESS)
+ 	goto on_return;
+ 
++    /* Set parent and add ref count (avoid parent destroy during handshake) */
++    ssock->parent = ssock_parent;
++    if (ssock->parent->param.grp_lock)
++	pj_grp_lock_add_ref(ssock->parent->param.grp_lock);
++
+     /* Update new SSL socket attributes */
+     ssock->sock = newsock;
+-    ssock->parent = ssock_parent;
+     ssock->is_server = PJ_TRUE;
+     if (ssock_parent->cert) {
+ 	status = pj_ssl_sock_set_certificate(ssock, ssock->pool, 
+@@ -957,16 +975,20 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent,
+     ssock->asock_rbuf = (void**)pj_pool_calloc(ssock->pool, 
+ 					       ssock->param.async_cnt,
+ 					       sizeof(void*));
+-    if (!ssock->asock_rbuf)
+-        return PJ_ENOMEM;
++    if (!ssock->asock_rbuf) {
++	status = PJ_ENOMEM;
++	goto on_return;
++    }
+ 
+     for (i = 0; i<ssock->param.async_cnt; ++i) {
+ 	ssock->asock_rbuf[i] = (void*) pj_pool_alloc(
+ 					    ssock->pool, 
+ 					    ssock->param.read_buffer_size + 
+ 					    sizeof(read_data_t*));
+-        if (!ssock->asock_rbuf[i])
+-            return PJ_ENOMEM;
++	if (!ssock->asock_rbuf[i]) {
++	    status = PJ_ENOMEM;
++	    goto on_return;
++	}
+     }
+ 
+     /* If listener socket has group lock, automatically create group lock
+@@ -980,7 +1002,7 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent,
+ 	    goto on_return;
+ 
+ 	pj_grp_lock_add_ref(glock);
+-	asock_cfg.grp_lock = ssock->param.grp_lock = glock;
++	ssock->param.grp_lock = glock;
+ 	pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock,
+ 				ssl_on_destroy);
+     }
+@@ -1008,6 +1030,7 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent,
+ 
+     /* Create active socket */
+     pj_activesock_cfg_default(&asock_cfg);
++    asock_cfg.grp_lock = ssock->param.grp_lock;
+     asock_cfg.async_cnt = ssock->param.async_cnt;
+     asock_cfg.concurrency = ssock->param.concurrency;
+     asock_cfg.whole_data = PJ_TRUE;
+diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
+index 88a2a6b94..df4f4f96a 100644
+--- a/pjlib/src/pj/ssl_sock_ossl.c
++++ b/pjlib/src/pj/ssl_sock_ossl.c
+@@ -327,7 +327,8 @@ static pj_status_t STATUS_FROM_SSL_ERR(char *action, pj_ssl_sock_t *ssock,
+ 	ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock);
+     }
+ 
+-    ssock->last_err = err;
++    if (ssock)
++	ssock->last_err = err;
+     return GET_STATUS_FROM_SSL_ERR(err);
+ }
+ 
+@@ -344,7 +345,8 @@ static pj_status_t STATUS_FROM_SSL_ERR2(char *action, pj_ssl_sock_t *ssock,
+     /* Dig for more from OpenSSL error queue */
+     SSLLogErrors(action, ret, err, len, ssock);
+ 
+-    ssock->last_err = ssl_err;
++    if (ssock)
++	ssock->last_err = ssl_err;
+     return GET_STATUS_FROM_SSL_ERR(ssl_err);
+ }
+ 
+@@ -786,6 +788,13 @@ static pj_status_t init_openssl(void)
+ 
+     /* Create OpenSSL application data index for SSL socket */
+     sslsock_idx = SSL_get_ex_new_index(0, "SSL socket", NULL, NULL, NULL);
++    if (sslsock_idx == -1) {
++	status = STATUS_FROM_SSL_ERR2("Init", NULL, -1, ERR_get_error(), 0);
++	PJ_LOG(1,(THIS_FILE,
++	       "Fatal error: failed to get application data index for "
++	       "SSL socket"));
++	return status;
++    }
+ 
+ #if defined(PJ_SSL_SOCK_OSSL_USE_THREAD_CB) && \
+     PJ_SSL_SOCK_OSSL_USE_THREAD_CB != 0 && OPENSSL_VERSION_NUMBER < 0x10100000L
+@@ -819,21 +828,36 @@ static int password_cb(char *buf, int num, int rwflag, void *user_data)
+ }
+ 
+ 
+-/* SSL password callback. */
++/* SSL certificate verification result callback.
++ * Note that this callback seems to be always called from library worker
++ * thread, e.g: active socket on_read_complete callback, which should have
++ * already been equipped with race condition avoidance mechanism (should not
++ * be destroyed while callback is being invoked).
++ */
+ static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
+ {
+-    pj_ssl_sock_t *ssock;
+-    SSL *ossl_ssl;
++    pj_ssl_sock_t *ssock = NULL;
++    SSL *ossl_ssl = NULL;
+     int err;
+ 
+     /* Get SSL instance */
+     ossl_ssl = X509_STORE_CTX_get_ex_data(x509_ctx, 
+ 				    SSL_get_ex_data_X509_STORE_CTX_idx());
+-    pj_assert(ossl_ssl);
++    if (!ossl_ssl) {
++	PJ_LOG(1,(THIS_FILE,
++		  "SSL verification callback failed to get SSL instance"));
++	goto on_return;
++    }
+ 
+     /* Get SSL socket instance */
+     ssock = SSL_get_ex_data(ossl_ssl, sslsock_idx);
+-    pj_assert(ssock);
++    if (!ssock) {
++	/* SSL socket may have been destroyed */
++	PJ_LOG(1,(THIS_FILE,
++		  "SSL verification callback failed to get SSL socket "
++		  "instance (sslsock_idx=%d).", sslsock_idx));
++	goto on_return;
++    }
+ 
+     /* Store verification status */
+     err = X509_STORE_CTX_get_error(x509_ctx);
+@@ -911,6 +935,7 @@ static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
+     if (PJ_FALSE == ssock->param.verify_peer)
+ 	preverify_ok = 1;
+ 
++on_return:
+     return preverify_ok;
+ }
+ 
+@@ -1474,6 +1499,12 @@ static void ssl_destroy(pj_ssl_sock_t *ssock)
+ static void ssl_reset_sock_state(pj_ssl_sock_t *ssock)
+ {
+     ossl_sock_t *ossock = (ossl_sock_t *)ssock;
++
++    /* Detach from SSL instance */
++    if (ossock->ossl_ssl) {
++	SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL);
++    }
++
+     /**
+      * Avoid calling SSL_shutdown() if handshake wasn't completed.
+      * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an
+diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c
+index 56a06cf99..24e43ef60 100644
+--- a/pjsip/src/pjsip/sip_transport_tls.c
++++ b/pjsip/src/pjsip/sip_transport_tls.c
+@@ -1333,9 +1333,26 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
+     PJ_UNUSED_ARG(src_addr_len);
+ 
+     listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock);
++    if (!listener) {
++	/* Listener already destroyed, e.g: after TCP accept but before SSL
++	 * handshake is completed.
++	 */
++	if (new_ssock && accept_status == PJ_SUCCESS) {
++	    /* Close the SSL socket if the accept op is successful */
++	    PJ_LOG(4,(THIS_FILE,
++		      "Incoming TLS connection from %s (sock=%d) is discarded "
++		      "because listener is already destroyed",
++		      pj_sockaddr_print(src_addr, addr, sizeof(addr), 3),
++		      new_ssock));
++
++	    pj_ssl_sock_close(new_ssock);
++	}
++
++	return PJ_FALSE;
++    }
+ 
+     if (accept_status != PJ_SUCCESS) {
+-	if (listener && listener->tls_setting.on_accept_fail_cb) {
++	if (listener->tls_setting.on_accept_fail_cb) {
+ 	    pjsip_tls_on_accept_fail_param param;
+ 	    pj_ssl_sock_info ssi;
+ 
+@@ -1358,6 +1375,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
+     PJ_ASSERT_RETURN(new_ssock, PJ_TRUE);
+ 
+     if (!listener->is_registered) {
++	pj_ssl_sock_close(new_ssock);
++
+ 	if (listener->tls_setting.on_accept_fail_cb) {
+ 	    pjsip_tls_on_accept_fail_param param;
+ 	    pj_bzero(&param, sizeof(param));
+@@ -1409,6 +1428,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
+ 			 ssl_info.grp_lock, &tls);
+     
+     if (status != PJ_SUCCESS) {
++	pj_ssl_sock_close(new_ssock);
++
+ 	if (listener->tls_setting.on_accept_fail_cb) {
+ 	    pjsip_tls_on_accept_fail_param param;
+ 	    pj_bzero(&param, sizeof(param));
+-- 
+2.31.1
+
diff --git a/net-libs/pjproject/pjproject-2.10-r2.ebuild b/net-libs/pjproject/pjproject-2.10-r2.ebuild
new file mode 100644
index 000000000000..ee620bea10a9
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.10-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.9-ssl-enable.patch"
+	"${FILESDIR}/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch"
+	"${FILESDIR}/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch"
+	"${FILESDIR}/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch"
+	"${FILESDIR}/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch"
+)
+
+RDEPEND="net-libs/libsrtp:=
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( media-video/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( media-libs/libilbc )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(use_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(use_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(use_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	LD="$(tc-getCC)" econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(use_enable alsa sound) \
+		$(use_enable amr opencore-amr) \
+		$(use_enable epoll) \
+		$(use_enable opus) \
+		$(use_enable portaudio ext-sound) \
+		$(use_enable resample libsamplerate) \
+		$(use_enable resample resample-dll) \
+		$(use_enable resample) \
+		$(use_enable silk) \
+		$(use_enable speex speex-aec) \
+		$(use_enable ssl) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		$(usex webrtc '' --disable-libwebrtc) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index dde09b448e98..a470993fca06 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,9 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
 AUX 2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch 1893 BLAKE2B be04d827fee9d17d64230c485add8dd21be6f8c9787c0407973774fd2ced724c00c688476c47bddaccaed3b59dab53dfc4de11f2b96139fe2a74b68cf57eae50 SHA512 3eaff22c9002fde1567331ede3196c733c34986932212954270bb59a5c776d6e4709ee8e366cdcdaeb67e36cd7757d01f4cce84ce4e2d6a1eca3c6ab3fa98f66
 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
+DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8
+DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
 EBUILD webkit-gtk-2.32.1.ebuild 9219 BLAKE2B f1a1b08374d123ba0d97361dd81fa6fa7d6dd22e8ad02d5cc37b315dadd505d013541c803b30fc3c93d6126934fa9199761305c8ba12eb955947f99ce187b1e4 SHA512 b51d1de9a62f612080bfc7bc470715e3faa4725d5774527c775be399b9811103e0d263b43016b150f19f5d76b6e20db465c8d42abd7466eaab1af67c48b2f911
+EBUILD webkit-gtk-2.32.2.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703
+EBUILD webkit-gtk-2.32.3.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
new file mode 100644
index 000000000000..b9fb5aa5f700
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
new file mode 100644
index 000000000000..b9fb5aa5f700
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f3d3e617d988..aaaa4089121b 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 63883cbd36aa..a0d952d637b8 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -7,5 +7,5 @@ DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
 DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
 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
+EBUILD dovecot-2.3.15-r1.ebuild 8858 BLAKE2B 15b3b8ea8586f1bf5cee1e6ad7b262f7816ef0b251464aeba84b30653f4b8cea91ff121ba620cc93026d9a7b056e6a4519f5b76f4482443d008d88e1c4033b78 SHA512 cb4dce94e90ae5845981a625767a2f5625d85cf57c47ee19c07b46297a8cf1b6d37b3182ee0a804eea25c4520c6902311f322d4ff81f9858ff3bcca080e5cff7
 MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
diff --git a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
index b8d050347b01..1668061de0a9 100644
--- a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 lua5-3 )
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
 
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
@@ -29,7 +29,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 ~riscv ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
@@ -99,6 +99,9 @@ src_prepare() {
 	# bug 657108
 	#elibtoolize
 	eautoreconf
+
+	# Bug #727244
+	append-cflags -fasynchronous-unwind-tables
 }
 
 src_configure() {
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index a5c28d645317..da875fc2fdb2 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,8 +8,8 @@ DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cb
 DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
 DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
-EBUILD fetchmail-6.4.16.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
-EBUILD fetchmail-6.4.19.ebuild 2389 BLAKE2B fd515cc8505dc7b96ea5b27766b689de3abce6751ba5a985d264bfcf3f77c018ee5818d38e50c9024b66471bad0c5f2ba99d86c4e4be6c344c9dba15bdf80fc1 SHA512 70f3a116f552cf47d7f9277588fcdc18b8ee4acbee8388b2d5cdd9c9033420769862ad644fa0e9f800e2108ecfd40ec0ede8b17e24f23f3f8965d6dce4b8736f
-EBUILD fetchmail-6.4.8.ebuild 2387 BLAKE2B 898edfe5dd3c8e3bb68103130af2e4fdd0e9c99a0c9fe31d1b5da9c2eb709400eb2aea7a9aacbe4c869e8175b23cd2c1f1635fbb87ee720d48e4fa932f9a25da SHA512 24279e83b1dc8427d9206fdca009f2852410ae00d06f4e8347a6ae530bc1dd58a65b66edb9ca115020322d4a10d69958839012fb6dbefb75334671d9227f7bcb
-EBUILD fetchmail-7.0.0_alpha8.ebuild 2509 BLAKE2B 0f652d7a1f9f41f8d512a1535f25f3faa5ec49d61394334979be0324b7e9b614f4dc19cd1a59c4ca219af82593e1402a1ddcc039cf87a00c37d8cfbcb2aa9833 SHA512 fb9f10979419fd96cc2c22d438c2806741107fd83e1b920690a95d53253a11f512fdf71a750af5680f181fd7d98f7c5a2eaaefd630c9333dcce043b1ef8a977a
+EBUILD fetchmail-6.4.16.ebuild 2387 BLAKE2B a3f0807de07c27a5e7ff01fa52107d667c36a9a4f105959aeda1ed959fc5cd0c493ce9ec9621e4341eff6777192051e5e0debd41d8b7815855f28fa5e7095abb SHA512 178254b1eb407c4bb6916774f7b468b07c960541b79f9ff0fb90f31d27c7d2d2dfd4237f96967664606792bdc037001fe796dc5c566f2bfed28acda35cf1785f
+EBUILD fetchmail-6.4.19.ebuild 2381 BLAKE2B fb808119e5d5286f0091ee0ddc8a9623bc6d1687805e7bca6bdb2aca1ecfea77b66dff6bf62804c01f142b6297bd9c269290d1ceba6da1fa51615a50cfa60fa9 SHA512 cb077671e4e4d08ad054a7763ae15666807915edce7f74ac282d393a8db075864160c3fb9a3317a0f2f34f4bab268fcb3b26a267c2ce12ed414d421684762598
+EBUILD fetchmail-6.4.8.ebuild 2377 BLAKE2B a7ffd34ba34e384618153aed0557a8dd47e018013e08d12720809bbe3bfb278253f5fe3032c185844a5b4d42a5a719fec38fca9a8ab86ec052a584068aa9882e SHA512 71ecb949c8dc620e9ca9fabce558eecbd00fe8cc9915bf9e7a3b73e27181662ef198cce6b1428f3e39873f2e41bd24e1c56e0e2d39462e83344b5cf395c1e4dd
+EBUILD fetchmail-7.0.0_alpha8.ebuild 2501 BLAKE2B ab0d5779dc6e78fac7f79b411d0118deaf2789ec94021045dd7e0e54816d5bc1760731a2cc06fd0b5c07275a91645034957e01cb7c96cf94b9e536b95c2d7782 SHA512 4309f7ad15ac6bdf8f63540585995c0482a7f1bd4c2b3d44e257702a8d01d914ba8b9ebf2fd70e8d9a6010c06a7d1085306a39a74d577a3216518a5e26221f81
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.16.ebuild b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
index f39826489a82..9a15f59666e2 100644
--- a/net-mail/fetchmail/fetchmail-6.4.16.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk"
 
 inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -32,7 +32,7 @@ RDEPEND="acct-user/fetchmail
 	tk? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
 		')
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index 96584027a596..dfd0275cfb0e 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk"
 
 inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -32,7 +32,7 @@ RDEPEND="acct-user/fetchmail
 	tk? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
 		')
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 8f61c9ee07ed..5e9c5c2ab3eb 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="tk"
 
 inherit python-single-r1 systemd toolchain-funcs autotools tmpfiles
@@ -32,7 +32,7 @@ RDEPEND="acct-user/fetchmail
 	tk? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
 		')
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
index 73e3f2376e41..2a9b14181a09 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk?"
 
 inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -33,7 +33,7 @@ RDEPEND="acct-user/fetchmail
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
 		')
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e0ba38eeeb38..61cc685bf3a0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,7 +5,7 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-EBUILD notmuch-0.31.3.ebuild 6678 BLAKE2B 967b4938b066a4f4350c92358aa19f9522104c904a83d100bceeefa273b2946d22d310a1146f6556ee8ae854a3bd0b71ae09811c7badd41827322011628f728b SHA512 9577a0958a649037ff9efc3ec12516ccaf24d9ad12c4047e765057b0530229a2515da459a1ccbb32a0a7f3c14dc43a42a9ed0213799641dcef29c9cb8b259ddf
-EBUILD notmuch-0.32.1.ebuild 6725 BLAKE2B 496d1ce926cbbf39171bfa4ff9dd53899a9ca26e6a4a3bd49dd0166485a35094ac9f1b53650c287ba1a9c3458b3f9651f118c0c884d1569622afe6e39a84397c SHA512 06e0bac43fda25a96aa1c57052be35095ca54076997ab950b0c5e384522ebb718650d0dfbd662899c0c2e091b4dacc0cef7c26b4f252b95263bc2fbca2d0b256
-EBUILD notmuch-0.32.2.ebuild 6733 BLAKE2B 616c269a845b76af0ba953f943bb68551d7cc9e07d618d64a382bfb3ee4f80daae2e3ef8e8c4b6a0326dad980789a16a411dafaa42e707e4f726070419bf2fac SHA512 e8b87188e5c26499af210dfc857d321f49926af8886d518e846b28caa0e74746f60ddbd57b418f388be11f0839580b9170a25475c9bf010b61639d193201e16f
+EBUILD notmuch-0.31.3-r1.ebuild 6674 BLAKE2B b61220991036bded267852e04044eb26d08f558b5b60b4f4a511e7e61b23a911b48576b5d2dd9a0628647f5d9baa230a4392a6e20b0e3c4ef854ca18171beb89 SHA512 edf47ff836d921f1be92e888b29446fbb354da8d3294bbc9bf26db4e74a8ac108b0393dfba51008d4da824e03c853f65a3272f6564fbaafbd12c51b252e815a4
+EBUILD notmuch-0.32.1-r1.ebuild 6721 BLAKE2B 469644b9f9305a64e63d52c5a0bff1700d1bd61b52a3aafd3d67459d974b4a72138a0a2d280154b81005ad45229e48fdfe5705251ff8d318db339d9a2632d4b2 SHA512 2b85da32d4ee30c130840a2ff805fe9795504e1a5beb868e6c37181bcb5d60d27565b67a6ebe648b4a4cbfe95a326655c4eabf5dd92d556eda6b036801ac1c96
+EBUILD notmuch-0.32.2-r1.ebuild 6729 BLAKE2B 10d49edb3ffa78f766757175d055e80ae09df621df7eaf5a6c681ac62058594cc48ff0312222d633d8660c7b7c5a272c6f5d523d50eca63c67230aa00d9df08b SHA512 2dfce89cd99c9b0ae48e84f608bc058960f5dceac12b5ad51d2d199f346af62de059403a9882053a2cac7faf4621eec39bbeeafa7676415270c42fce16d28cd6
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/notmuch-0.31.3-r1.ebuild b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
new file mode 100644
index 000000000000..ae71b74055bb
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.68.patch
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
+	pax-mark -m notmuch
+	NOTMUCH_TEST_SERIALIZE=1 \
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
deleted file mode 100644
index 70e772471e19..000000000000
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glib-2.68.patch
-)
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	# NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed)
-	pax-mark -m notmuch
-	NOTMUCH_TEST_SERIALIZE=1 \
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
diff --git a/net-mail/notmuch/notmuch-0.32.1-r1.ebuild b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
new file mode 100644
index 000000000000..78bf6a0ccc8b
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1.ebuild
deleted file mode 100644
index 2382baa059e5..000000000000
--- a/net-mail/notmuch/notmuch-0.32.1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? ( sys-process/parallel )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
new file mode 100644
index 000000000000..5a0146cb8cfe
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils[extra-filters(-)]
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		dev-perl/Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.32.1-tests.patch"
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
diff --git a/net-mail/notmuch/notmuch-0.32.2.ebuild b/net-mail/notmuch/notmuch-0.32.2.ebuild
deleted file mode 100644
index 2c5173f19dba..000000000000
--- a/net-mail/notmuch/notmuch-0.32.2.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-REQUIRED_USE="
-	apidoc? ( doc )
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	virtual/pkgconfig
-	apidoc? (
-		app-doc/doxygen
-		dev-lang/perl
-	)
-	doc? (
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)
-	test? ( sys-process/parallel )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib
-	dev-libs/gmime:3.0[crypt]
-	>=dev-libs/xapian-1.4.0:=
-	sys-libs/talloc
-	sys-libs/zlib:=
-	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
-		app-misc/dtach
-		sys-devel/gdb
-		crypt? (
-			app-crypt/gnupg
-			dev-libs/openssl
-		)
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	nmbug? ( dev-vcs/git )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.32.1-tests.patch"
-)
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	use python && distutils-r1_src_prepare
-
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
-	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
-
-	use test && append-flags '-g'
-
-	# Non-autoconf configure
-	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
-
-	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
-	echo 'man_make_section_directory = False' >> doc/conf.py || die
-}
-
-src_configure() {
-	python_setup # For sphinx
-
-	tc-export CC CXX
-
-	local myconf=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with apidoc api-docs)
-		$(use_with doc docs)
-		$(use_with emacs)
-	)
-
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_compile
-	# copy stuff just in case
-	if use test; then
-		mkdir -p build/stage/tests || die
-		 cp -v tests/*.py build/stage/tests || die
-	fi
-	popd > /dev/null || die
-
-	# TODO: we want to drop those, research revdeps
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_compile
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc	&& emake -C bindings/python/docs html
-}
-
-src_compile() {
-	python_setup # For sphinx
-
-	# prevent race in emacs doc generation
-	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
-	if use emacs; then
-		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
-	fi
-
-	emake V=1
-
-	use python && distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		emake notmuch-mutt.1
-		popd > /dev/null || die
-	fi
-}
-
-python_test() {
-	# we only have tests for cffi bindings
-	pushd bindings/python-cffi > /dev/null || die
-	rm -f tox.ini || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-src_test() {
-	local test_failures=()
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${S}/lib" \
-		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
-	pax-mark -ze notmuch
-
-	# both lib and bin needed for testsuite.
-	if use python; then
-		LD_LIBRARY_PATH="${S}/lib" \
-			PATH="${S}:${PATH}" \
-			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
-	fi
-
-	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
-}
-
-python_install() {
-	pushd bindings/python-cffi > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-
-	pushd bindings/python > /dev/null || die
-	distutils-r1_python_install
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		pushd doc/_build/man/man1 > /dev/null || die
-		ln notmuch.1 notmuch-setup.1 || die
-		popd > /dev/null || die
-		if use apidoc; then
-			# rename overly generic manpage to avoid clashes
-			mv doc/_build/man/man3/deprecated.3 \
-				doc/_build/man/man3/notmuch-deprecated.3 || die
-		fi
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		domenu emacs/notmuch-emacs-mua.desktop
-	fi
-
-	if use nmbug; then
-		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt > /dev/null || die
-		dobin notmuch-mutt
-		# this manpage is built by pod2man
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd > /dev/null || die
-	fi
-
-	local DOCS=( README{,.rst} INSTALL NEWS )
-	einstalldocs
-
-	if use python; then
-		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
-		distutils-r1_src_install
-	fi
-}
-
-pkg_preinst() {
-	local _rcfile="/etc/mutt/notmuch-mutt.rc"
-	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
-		elog "To enable notmuch support in mutt, add the following line"
-		elog "to your mutt config file:"
-		elog ""
-		elog "  source ${_rcfile}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		xdg_desktop_database_update
-	fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a938578b99dc..9bd0f6a9a179 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 15309054f5df..7f4bc7ab28c9 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,15 +17,21 @@ AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa35
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
 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-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
 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-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
 DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
 DIST asterisk-18.5.0.tar.gz 27956264 BLAKE2B 1b2cc477dd37be81b7c1611f1334db8e5095a2d76b1cfa0148072f7c3e9247e3d43da8b0bf502e18c2f553a893b1cc0a1aa9f2ca0942b012d0261c6171536370 SHA512 f31ac2ccd4b9af3ee4ad1c1368519e889d2e3e5b6b22e6f1b6dc020ffbdc8caccf0c03ba620f4a8b6346403abffde23d93fa8c06a6d7d993074edfaa0cf256df
+DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
 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-13.38.3.ebuild 10811 BLAKE2B db87d4b4a0103d66951ab699ddabed115b16143c5f841f6b6e1e42bccaafc4ccae72c17ba2b90fef21940f7ee2ae9d1b7090a26be88f851183fdfb4b925ff817 SHA512 0a2efd82cf5dd7d03fee02c0d2813981a366eaca95a8d7de654608809af62bd1700875eab247642ffe68d1d07ce40d82268ce02769610c640b0d6854b89da1f6
 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-16.19.1.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
+EBUILD asterisk-18.5.1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.3.ebuild b/net-misc/asterisk/asterisk-13.38.3.ebuild
new file mode 100644
index 000000000000..c350ab4c288c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.3.ebuild
@@ -0,0 +1,349 @@
+# 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 curl dahdi debug 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 vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch"
+	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/libcrypt:=
+	sys-libs/zlib
+	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 )
+	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:= )
+	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/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	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"
+	"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 \
+		$(use_with caps cap) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable 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 curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_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 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}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.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 < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+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 [[ -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-16.19.1.ebuild b/net-misc/asterisk/asterisk-16.19.1.ebuild
new file mode 100644
index 000000000000..9548b400631a
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.19.1.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.1.ebuild b/net-misc/asterisk/asterisk-18.5.1.ebuild
new file mode 100644
index 000000000000..1334c613ae61
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.5.1.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/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index e94b92cef625..6d50eb487351 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,4 +1,4 @@
 AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.5.0.ebuild 5159 BLAKE2B 4b4fd431fcb2eb561702b1489a5057b8c3d31c34d50defe990c6fd7fd33059ba1949398e09b918a21ee91ade3820d6aa2e5755df7f2fc2c7fad861a85bcb2c29 SHA512 3b05464321158422f46e84b0332e23b460dab13a856cbd2b71b5752de291144ebc8b5a37890928c8855bda3de88f624bb0cf11f67fac1224e562b1e9bb866fe1
+EBUILD bfgminer-5.5.0-r1.ebuild 5162 BLAKE2B 4144271fe24ae5b82a29f083ad3ffc9abfa346f20bcfd876a5dd6cd7b12ba65ea7a187c618086a6c6126fab3371601709e1419cc10a8dc88574d6087f9b835bc SHA512 d312445b6fb789fa0c78b20c42fde0ac110f0cc1d9e0c6ba6208640be5f342005d476177e6814ed3e54e3f409332471e484ce8e6f8415cf712bfa8970c04583e
 MISC metadata.xml 3962 BLAKE2B 70c28b8c2c68996fb2d3bd7f134feb618776adf3a3e8b2e080dc00c813f072c80519909149bcd5bba17904d044fd49773dffca06880f07446d39240c87bf2574 SHA512 e4fa5e82269099a6d1681c22d3b9d31e8e73bef8b0555dee227c69008b40efc191819e61f4e61a3c7d516563627c910d5c473dd7413e94451d61c21aa64eba20
diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild
new file mode 100644
index 000000000000..65c008cf49d2
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE="
+	|| ( keccak scrypt sha256d )
+	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	alchemist? ( scrypt )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bitmain? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm-sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( bitfury sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm-sensors? (
+		sys-apps/lm-sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			app-misc/realpath
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
+)
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -no-pie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses="--with-curses=ncursesw"
+		else
+			with_curses="--with-curses=ncurses"
+		fi
+	else
+		with_curses="--without-curses"
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable alchemist)\
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bitmain) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		${with_curses} \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm-sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${ED}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
deleted file mode 100644
index b107ddd50512..000000000000
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE="
-	|| ( keccak scrypt sha256d )
-	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
-	adl? ( opencl )
-	alchemist? ( scrypt )
-	avalon? ( sha256d )
-	avalonmm? ( sha256d )
-	bitmain? ( sha256d )
-	bfsb? ( sha256d bitfury )
-	bfx? ( sha256d bitfury libusb )
-	bifury? ( sha256d )
-	bigpic? ( sha256d bitfury )
-	bitforce? ( sha256d )
-	bitfury? ( sha256d )
-	cointerra? ( sha256d )
-	drillbit? ( sha256d bitfury )
-	dualminer? ( || ( sha256d scrypt ) icarus )
-	gridseed? ( scrypt )
-	hashbuster? ( sha256d bitfury )
-	hashbuster2? ( sha256d bitfury libusb )
-	hashfast? ( sha256d )
-	icarus? ( || ( scrypt sha256d ) )
-	jingtian? ( sha256d )
-	keccak? ( || ( cpumining opencl proxy ) )
-	klondike? ( sha256d libusb )
-	littlefury? ( sha256d bitfury )
-	lm-sensors? ( opencl )
-	metabank? ( sha256d bitfury )
-	minion? ( sha256d )
-	modminer? ( sha256d )
-	nanofury? ( sha256d bitfury )
-	scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) )
-	sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	rockminer? ( sha256d )
-	twinfury? ( bitfury sha256d )
-	x6500? ( sha256d libusb )
-	zeusminer? ( scrypt icarus )
-	ztex? ( sha256d libusb )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses:=[unicode?]
-	)
-	>=dev-libs/jansson-2
-	dev-libs/libbase58
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lm-sensors? (
-		sys-apps/lm-sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	screen? (
-		app-misc/screen
-		|| (
-			>=sys-apps/coreutils-8.15
-			app-misc/realpath
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		|| (
-			virtual/opencl
-			dev-util/nvidia-cuda-sdk[opencl]
-		)
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.7
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
-)
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -no-pie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses="--with-curses=ncursesw"
-		else
-			with_curses="--with-curses=ncurses"
-		fi
-	else
-		with_curses="--without-curses"
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable alchemist)\
-		$(use_enable avalon) \
-		$(use_enable avalonmm) \
-		$(use_enable bifury) \
-		$(use_enable bitforce) \
-		$(use_enable bitmain) \
-		$(use_enable bfsb) \
-		$(use_enable bfx) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cointerra) \
-		$(use_enable cpumining) \
-		$(use_enable drillbit) \
-		$(use_enable dualminer) \
-		$(use_enable gridseed) \
-		$(use_enable hashbuster) \
-		$(use_enable hashbuster2 hashbusterusb) \
-		$(use_enable hashfast) \
-		$(use_enable icarus) \
-		$(use_enable jingtian) \
-		$(use_enable keccak) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable rockminer) \
-		$(use_enable scrypt) \
-		$(use_enable sha256d) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		${with_curses} \
-		$(use_with udev libudev) \
-		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm-sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable zeusminer) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}/rpc-examples"
-	fi
-	if ! use screen; then
-		rm "${ED}/usr/bin/start-bfgminer.sh"
-	fi
-}
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index 68124fbd6a90..f617d36041f9 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,4 +1,4 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003-r2.ebuild 948 BLAKE2B 0f5626e262c13a4a09e42aaf0b23b9034f5589ea41c6b34881f21a637ee5237ba68b43397649eae60fbe3a2e969ff2e81f176f855bb5f84128f89e8ecb0ce674 SHA512 27463c9750c2c1d39b0580bdc299c4a38d34766411c7f8fe399ac84d4a8e23eb5f2fffea827b07346cae117510fc6bf10d9ca7d2444856684ff11a52f40c074c
-EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B 8c500f60718391885b7d805304390ac4814a06e02b1d720ab41af955fd47f9aeeb4b4d01f04a7d901bce897d844c2423120d875685863a5ff7fed2c44ecb1585 SHA512 c1db99b1759a772a9fec828878c79f6db72cb8eb2d58487e0e5b5d9cf03d46ae352218fc8bb987b2352601ebc71f1dc6c08f189b67747690632765c54dd38897
+EBUILD connman-notify-0_pre20191003-r2.ebuild 936 BLAKE2B af298f040eb91cb211c01fec54027bcd6675c81cd3697db5ebcde297c7afce9e3ffa802fa3d2cddc81f88bbee3644d94f8db5c02be3eda74804c9d89f2f46087 SHA512 06eb93318636644c45b1105b81678f627849e05d8f35539f432c12363a966ad14ba0e8aeb3b296dff9873c6d77c1d87fe0e25847501f8413b3046d6d772fffb5
+EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B 8881fb5d7c81599db764e1a07fb771d32475b1a48b2163b76630581f289941db9f4b2af991276d55f64170fef0ba1dcbca327394105dab02aad2061fa54ad7b9 SHA512 1287250d93fc96b91aa647e0d7ac4db274ed48e1f75f03377f897b53ce17be8dfb900173cfeb4bbd5ec8096495470b9381026564a5e79184e50ab8b652007eda
 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 69220f55962a..7358a56ef944 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit desktop python-single-r1 vcs-snapshot
 
@@ -23,8 +23,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	net-misc/connman
 	virtual/notification-daemon"
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
index e9555e6bfa2b..217e156b72ed 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit desktop python-single-r1
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 9881a99a2e57..78bb5224124e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,7 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
+DIST curl-7.78.0.tar.xz 2440640 BLAKE2B 0422071ce22d38b89652c702989674a2257dd18b05004245c4f2d7494ccdd24b5b52f330629ce6a411a059d5990e8c879cbbdf23d873b881141f9d2b9ad07f7f SHA512 f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a
 EBUILD curl-7.77.0-r1.ebuild 8190 BLAKE2B 74e01af974be6af7c87a6d81c1c05c95d91c120aa209a6ca4bac9de0642db21c3fae733fa098a675c8e009109b07873ccc57b6d03354d44a74de5e97c61757f1 SHA512 2975d07fa1bf102af238cb953fa4adabc0d5708564923bef96956b2de893421ed5aa2bac3ab2754df618eba0a0bf6142f5b6a87b1bf1cde054ff98456e923ce9
+EBUILD curl-7.78.0.ebuild 7967 BLAKE2B 553696eb2caf096ac91f89c114e8115e25b3c40056ed15bedefb2508a61270ff74fd832303eac6b9b17987ba16f46c2466e4ade1977aa72fa0ac50ba65f09ab3 SHA512 70ed0a168a819df463c251d7ae2823505d9dd7048b5e2f478c91e6a494e82e773f9cef7eb7c36cb5e1a7409ba42107b84fb0737a02768a775e763291e54dd779
 MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
diff --git a/net-misc/curl/curl-7.78.0.ebuild b/net-misc/curl/curl-7.78.0.ebuild
new file mode 100644
index 000000000000..389a3af42159
--- /dev/null
+++ b/net-misc/curl/curl-7.78.0.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+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="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--disable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-hidden-symbols
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		$(use_enable threads threaded-resolver)
+		$(use_enable threads pthreads)
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-cyassl
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-spnego
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c682ff1a052f..7fdcc6ff9cf1 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,5 +24,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
-EBUILD dhcp-4.4.2_p1.ebuild 8229 BLAKE2B b2fa827693f56af3f8667b6faaa3ca40afc9959e30e3540e887cd5ae36332e2fb571a52e22f421db49b981beaeabed81f752998869a3303aeaf331e1727e10cc SHA512 b2acace9bc295fa546db48370e4420346c84e015fc9862a7707d86a6f914f757aabb38883c144e99a361e7f9be0e3b0f657b293cbf84ba3fbdab99c4ae6af1cd
+EBUILD dhcp-4.4.2_p1.ebuild 8230 BLAKE2B 97b9f6360bcb5ca161241542f285c116bec231d677937de7b40599a3c09cead4ef70c1bb17ca0c81be9d92f25b5b4b2b23c36b125698d2c1d39aa92b796d7df4 SHA512 d7d6a964db96ec1a3ae7f00dd6aa850f3ed7a32898e6779a134b2440e2fba519d11652e821bced65eb424e1dc0b2558f7300abbd74ce0ae8b2686e34048dd3ad
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 3f8699608d38..4b86781a388a 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
@@ -67,7 +67,7 @@ PATCHES=(
 
 	# Possible upstream candidates
 	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
-	"${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
+	"${FILESDIR}/${PN}-4.4.2-variable-name.patch" #752402
 )
 
 src_prepare() {
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 1d0caa73f1d6..382890c70025 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,11 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-125.4.3474.tar.gz 98803434 BLAKE2B 9416f95e297ba5f278dde845c5f4b0b6e2d5c53dd8336017b27bfad8546d685a5f7ab4a953a0db471e87cab6a544178fd92dfd737aeb9f9b052364da41f18305 SHA512 2e3a8843d083a754513cf2d8c897910ccad9591d939bce84026e39a5cf4a9fc3489dc05ed7981fedd194c078a45bac412217cc5f629cdf1d77e70cbcdf7f9c5a
 DIST dropbox-lnx.x86-126.4.4618.tar.gz 99181455 BLAKE2B 3f7326d719c2a71d76a584173356d249164750fdb6c97e12d47de0d99cb43559a0b51d07f90ba7918c9e50d95cef77aec4eac854eaebdc56f0fa366d5ad44cc8 SHA512 4ca715e5309dd2dcec53721c8be93a3ad3898550edc42f6da90e99818593f812eb59040a9df5fe88517970893d6769cd2e39961ebc5c1c73de5df22e128bd02c
+DIST dropbox-lnx.x86-127.4.4265.tar.gz 99182625 BLAKE2B e16df0643ee583cd1e080a748fb96ad426d84c722994fd21bc2cb01027eaf4db0fa2a0402ebf35c2254c4cf0b4cadda4a78e47731de0656009cbafa99518762f SHA512 7be5d9f3f98e45672ea6972e8beea99356bddbc870ccf86f5a9644ac56897be3027f4321860dda0ad5d9293b3db9e9a012fb65fd8e9062ae80d620f59e0cd45d
 DIST dropbox-lnx.x86_64-125.4.3474.tar.gz 101953751 BLAKE2B 5ef621e2dba90ac08e52678eb8a63eaf3c97d3e294bd237499ef988a17a16d6b9425e5b0c17caa1dccc3d81ea7b558b0103f9120eb31ca1ff28baa487e43cd20 SHA512 dca1088d3e2467b54eb7494276cc3b97eb83ef8089bba513f7abb6e0007807f549615d41d3574ac9b53f74c84203d5863018dc374f883a485d60450e9a6c0a07
 DIST dropbox-lnx.x86_64-126.4.4618.tar.gz 101031058 BLAKE2B ff05f235d574824d45857d737db146b548813f4c8a3097a5103af273326ad3bb07d6b11e08c322afb9591479a325f25598a9196cfcc6ec0743452b1c51778bb9 SHA512 6c2d52bfbb53512ab4a35851dba2116f66387760e71b0744f863024599a68fa5fa948b5a5747cd45628da53cadae29a5239bb6d2412ec2f11a8b73e2e6975f15
+DIST dropbox-lnx.x86_64-127.4.4265.tar.gz 101007286 BLAKE2B 7ec73bc48e29409392a0daa104412dd2765efe35b5a8564371255a49985c851442ebc3d7d27a1178084c55de12633ccee62c2a36ff52b372719563e8f8ffe3f6 SHA512 f03d4918ebeac218bb1291b925a3ffbbd8805f5f632c35a92cd3f7ad2a11ca3472990246edd63365973d6f2d4c059a2da0705ccee5e35269fdf859c026916ea4
 EBUILD dropbox-125.4.3474.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
 EBUILD dropbox-126.4.4618.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-127.4.4265.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-127.4.4265.ebuild b/net-misc/dropbox/dropbox-127.4.4265.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-127.4.4265.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index e28dd84aa838..cedcd8cf2824 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -3,7 +3,9 @@ AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa15
 DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
 DIST electrum-4.1.3.gh.tar.gz 4958955 BLAKE2B 0d338261ada16d5f1a9b01532fd976094ed7105204f45997c789c01c757d85e7d8a47d20935f848a7e52db1755f953d999e974500cb016f34088642f046c6637 SHA512 af74cfd5ef3f5bc8a788a55b3459029fec7a08b693a3e58133b74a5ad782d4a716061e8619bef633fcfee8a9d1989980c1e8e8e314cea2431e473745660e773e
 DIST electrum-4.1.4.gh.tar.gz 4959040 BLAKE2B ac17588f542bde4d368065815688c36afac2c5d0ace849a7dfe997113d2c0d6c23512c8091d039a73436709f7104fb0c86aabe1a81448ae0d26644343c4cc588 SHA512 e6e0d01f1f32389da95c3fa131c8aaaeeaf38af1203cddbd06cbfb1b09070cc89fcd30a9c9979f5b06d4ba40001d046690aea6501342ce1669271c6646717be9
+DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92
 EBUILD electrum-4.1.2-r1.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
 EBUILD electrum-4.1.3.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
 EBUILD electrum-4.1.4.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
+EBUILD electrum-4.1.5.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum/electrum-4.1.5.ebuild
new file mode 100644
index 000000000000..a8c551d5f9bb
--- /dev/null
+++ b/net-misc/electrum/electrum-4.1.5.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} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# unbind aiorpcX dep
+	sed -e '/aiorpcx/s:,<0.19::' \
+		-i contrib/requirements/requirements.txt || die
+	sed -e '/aiorpcx/s:raise.*:pass:' \
+		-i run_electrum || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 2009e66e3a6f..d4c296c15cef 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,3 +1,3 @@
 DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
-EBUILD geomyidae-0.34.ebuild 1106 BLAKE2B 9274bb87b8c0d99d33052b26acd4f0b21a5118105bd4ae0db0a825cf2c5bfb536413cdc8a75d563f2cd98e5086121f80d1743baeba9e4c377818ce9f6c2add5b SHA512 f2ba1cf38519d8850ae2b8b494afa204d1300c89eecde9c11252de844f8faf42f2d1f02b6629726e989a718fdb116323af7296e53a345ed417e5fb1c39dd3497
+EBUILD geomyidae-0.34-r1.ebuild 1092 BLAKE2B ac44156e892812b7c00ec072999f3c86a0d68f02c2b7dae9826778586d6486b9d0520627f2ccc89babaf2f310e8ced288e9893740c2be6a65861a89b2648cc70 SHA512 49a96889f0c256ad49eb7e7e6e424769ec40932551416ae89ebc23a19dbfa9b3e63257d354d1b4d5c056087a06d862feeec168750a57483500b8870ecf16ffcf
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild b/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
new file mode 100644
index 000000000000..36930da5891e
--- /dev/null
+++ b/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon to serve the gopher protocol"
+HOMEPAGE="http://r-36.net/scm/geomyidae/"
+SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	acct-group/gopherd
+	acct-user/gopherd
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# enable verbose build
+	# respect CFLAGS
+	# remove /usr/lib from LDFLAGS, bug #731672
+	sed -i \
+		-e 's/@${CC}/${CC}/g' \
+		-e '/CFLAGS/s/=/?=/' \
+		-e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \
+		Makefile || die 'sed on Makefile failed'
+	# fix path for pid file
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		rc.d/Gentoo.init.d || die
+
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd rc.d/Gentoo.init.d ${PN}
+	newconfd rc.d/Gentoo.conf.d ${PN}
+
+	insinto /var/gopher
+	doins index.gph
+	fowners -R root.gopherd /var/gopher
+	fperms -R g=rX,o=rX /var/gopher
+
+	doman ${PN}.8
+	dodoc CGI README
+}
diff --git a/net-misc/geomyidae/geomyidae-0.34.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild
deleted file mode 100644
index 1125cd687e28..000000000000
--- a/net-misc/geomyidae/geomyidae-0.34.ebuild
+++ /dev/null
@@ -1,57 +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="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/scm/geomyidae/"
-SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-pkg_setup() {
-	enewgroup gopherd
-	enewuser gopherd -1 -1 /var/gopher gopherd
-}
-
-src_prepare() {
-	# enable verbose build
-	# respect CFLAGS
-	# remove /usr/lib from LDFLAGS, bug #731672
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/=/?=/' \
-		-e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \
-		Makefile || die 'sed on Makefile failed'
-	# fix path for pid file
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		rc.d/Gentoo.init.d || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rc.d/Gentoo.init.d ${PN}
-	newconfd rc.d/Gentoo.conf.d ${PN}
-
-	insinto /var/gopher
-	doins index.gph
-	fowners -R root.gopherd /var/gopher
-	fperms -R g=rX,o=rX /var/gopher
-
-	doman ${PN}.8
-	dodoc CGI README
-}
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 4d17bc721427..5ee1e03eb0ad 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -5,5 +5,5 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
-EBUILD icecast-2.4.4.ebuild 2089 BLAKE2B 047a5f137621a8f1dd121419952aa53e0ddcc7cbc2c31a8e29456ee2e4c00c6e3d36b6cbdb0167c3b47ecd325ee45e3e1737e8bb367c00af1216c1013f694715 SHA512 d7d6e4cfce9d196d182bff7459a575afad9c621ecd2c08198f06fa32f1cda8816c655a69c74c39a7b33b79801246b8a51ea292cdc15882db888c03d6a98e2219
+EBUILD icecast-2.4.4-r1.ebuild 2072 BLAKE2B 720c084b7a6799cdc3abf6a45fd925ae39d3a2a493d4108ffce028e1df0ac21586ebdb28c0e2de961849c718a68ec9122b52d16981b7866a0fcaf775f97f7a59 SHA512 93e9fcbcda55ac720367023954c82996d0581f5b54c4e80809a493b3c6391bca864abd0f515994e3a49c58fc2e6beedcbd54dac60dd9972523c8adc0de755298
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.4-r1.ebuild b/net-misc/icecast/icecast-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..08a3afff7a22
--- /dev/null
+++ b/net-misc/icecast/icecast-2.4.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
+HOMEPAGE="https://www.icecast.org/"
+SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="kate logrotate +speex +ssl +theora +yp"
+
+#Although there is a --with-ogg and --with-orbis configure option, they're
+#only useful for specifying paths, not for disabling.
+DEPEND="
+	acct-group/icecast
+	acct-user/icecast
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/libogg
+	media-libs/libvorbis
+	kate? ( media-libs/libkate )
+	logrotate? ( app-admin/logrotate )
+	speex? ( media-libs/speex )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	theora? ( media-libs/libtheora )
+	yp? ( net-misc/curl )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# bug #368539
+	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
+	# bug #430434
+	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir=/etc/icecast2
+		$(use_enable kate)
+		$(use_enable yp)
+		$(use_with speex)
+		$(use_with ssl openssl)
+		$(use_with theora)
+		$(use_with yp curl)
+	)
+	econf "${myeconfsrgs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	docinto html
+	dodoc doc/*.html
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/icecast2
+	doins "${FILESDIR}"/icecast.xml
+	fperms 600 /etc/icecast2/icecast.xml
+
+	if use logrotate; then
+		dodir /etc/logrotate.d
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}.logrotate ${PN}
+	fi
+	diropts -m0764 -o icecast -g icecast
+	dodir /var/log/icecast
+	keepdir /var/log/icecast
+	rm -r "${ED}"/usr/share/doc/icecast || die
+}
+
+pkg_postinst() {
+	touch "${ROOT}"/var/log/icecast/{access,error}.log
+	chown icecast:icecast "${ROOT}"/var/log/icecast/{access,error}.log
+}
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
deleted file mode 100644
index 7c424982d14f..000000000000
--- a/net-misc/icecast/icecast-2.4.4.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 systemd user
-
-DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
-HOMEPAGE="https://www.icecast.org/"
-SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="kate logrotate +speex +ssl +theora +yp"
-
-#Although there is a --with-ogg and --with-orbis configure option, they're
-#only useful for specifying paths, not for disabling.
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/libogg
-	media-libs/libvorbis
-	kate? ( media-libs/libkate )
-	logrotate? ( app-admin/logrotate )
-	speex? ( media-libs/speex )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# bug #368539
-	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
-	# bug #430434
-	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
-)
-
-pkg_setup() {
-	enewuser icecast -1 -1 -1 nogroup
-}
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/icecast2
-		$(use_enable kate)
-		$(use_enable yp)
-		$(use_with speex)
-		$(use_with ssl openssl)
-		$(use_with theora)
-		$(use_with yp curl)
-	)
-	econf "${myeconfsrgs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	docinto html
-	dodoc doc/*.html
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/icecast2
-	doins "${FILESDIR}"/icecast.xml
-	fperms 600 /etc/icecast2/icecast.xml
-
-	if use logrotate; then
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}.logrotate ${PN}
-	fi
-	diropts -m0764 -o icecast -g nogroup
-	dodir /var/log/icecast
-	keepdir /var/log/icecast
-	rm -r "${ED}"/usr/share/doc/icecast || die
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/icecast/{access,error}.log
-	chown icecast:nogroup "${ROOT}"/var/log/icecast/{access,error}.log
-}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 797e5c2fa47d..d0a423a785d1 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,5 +1,8 @@
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
+DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
+DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
+EBUILD iputils-20210722.ebuild 4218 BLAKE2B 155c1e2581e7a2c49b5685fc100cd58f9486bb2b45d892b91aec2134ab3273aefe0cb9803fadb8ca8843eb360ebeb7a8b72b3f74d995ff3e6eb9e2c63102afd4 SHA512 f6105cce94fa3ed8af8b4cda65e709499defdad5f5d635b8175691ce6f0217420a52600698beeac4662ec8804efed5a8b178381fab9a0d8e92ac9329a6af974a
 EBUILD iputils-99999999.ebuild 4218 BLAKE2B 155c1e2581e7a2c49b5685fc100cd58f9486bb2b45d892b91aec2134ab3273aefe0cb9803fadb8ca8843eb360ebeb7a8b72b3f74d995ff3e6eb9e2c63102afd4 SHA512 f6105cce94fa3ed8af8b4cda65e709499defdad5f5d635b8175691ce6f0217420a52600698beeac4662ec8804efed5a8b178381fab9a0d8e92ac9329a6af974a
 MISC metadata.xml 1509 BLAKE2B 800c6f657d331ad2f73fbd3e6a199732549f89ba31188e8caf5612008b89f60c6a7fb925f2740fcca07d3772f12ea9c5590de834e77201730b848a877061a97a SHA512 5b358f53068f6a49f00141c47f75fde84fe609fd6652e3e717b97b9d36abbfb80ea52c1ef8c2e3a850ab3724f1d4a87093b2bfc1ee5497d082ce1937dc3aa83d
diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20210722.ebuild
new file mode 100644
index 000000000000..731796a22c5e
--- /dev/null
+++ b/net-misc/iputils/iputils-20210722.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces dependencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag, all USE flags enabled and
+# tar ${S}/doc folder.
+
+EAPI="7"
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+LIB_DEPEND="
+	caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn2:=[static-libs(+)] )
+	nls? ( virtual/libintl[static-libs(+)] )
+"
+
+RDEPEND="
+	traceroute6? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	static? ( ${LIB_DEPEND} )
+"
+
+if [[ ${PV} == "99999999" ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+src_prepare() {
+	default
+
+	plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local emesonargs=(
+		-DUSE_CAP="$(usex caps true false)"
+		-DUSE_IDN="$(usex idn true false)"
+		-DBUILD_ARPING="$(usex arping true false)"
+		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
+		-DBUILD_PING="true"
+		-DBUILD_RARPD="$(usex rarpd true false)"
+		-DBUILD_RDISC="$(usex rdisc true false)"
+		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
+		-DBUILD_TFTPD="$(usex tftpd true false)"
+		-DBUILD_TRACEPATH="$(usex tracepath true false)"
+		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
+		-DBUILD_NINFOD="false"
+		-DNINFOD_MESSAGES="false"
+		-DNO_SETCAP_OR_SUID="true"
+		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
+		-DUSE_GETTEXT="$(usex nls true false)"
+	)
+
+	if [[ "${PV}" == 99999999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS="$(usex doc true false)"
+			-DBUILD_MANS="true"
+		)
+	else
+		emesonargs+=(
+			-DBUILD_HTML_MANS="false"
+			-DBUILD_MANS="false"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	dodir /bin
+	local my_bin
+	for my_bin in $(usex arping arping '') ping ; do
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
+	done
+	dosym ping /bin/ping4
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+	fi
+
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+
+		if use tracepath ; then
+			dosym tracepath /usr/bin/tracepath6
+			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+		fi
+	fi
+
+	if [[ "${PV}" != 99999999 ]] ; then
+		local -a man_pages
+		local -a html_man_pages
+
+		while IFS= read -r -u 3 -d $'\0' my_bin
+		do
+			my_bin=$(basename "${my_bin}")
+			[[ -z "${my_bin}" ]] && continue
+
+			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
+				man_pages+=( ${my_bin}.8 )
+			fi
+
+			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
+				html_man_pages+=( ${my_bin}.html )
+			fi
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+
+		pushd doc &>/dev/null || die
+		doman "${man_pages[@]}"
+		if use doc ; then
+			docinto html
+			dodoc "${html_man_pages[@]}"
+		fi
+		popd &>/dev/null || die
+	else
+		if use doc ; then
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index bbb6b6a53429..2abca7532eba 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,5 +1,5 @@
 AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-2.0-r1.ebuild 1003 BLAKE2B 434b6f80bb5a3bcb3f187c50e5e388f8552f14a8f23b277d96d8d85d5d0608302948bcad7b25c89e1d911be22392f6ef67f88a21257295025780cca1512bca65 SHA512 73755062bd6e4d0618fcbfc3747e5f2bd708b1c5f3b7b3170dd36834ecc3103ff8e06c800bd86d113269c4ba722d637b47fd887db28bdfad5ecae1cb438c4733
+EBUILD linuxptp-2.0-r1.ebuild 1010 BLAKE2B 5ad2322fe0db2c71fa4c77280629cd79f5068eb2de94a372045f4985320988f6340f803fcc02a17fcceb9ab49e45900ee5185aec17a35c0f7590b8eaf369397c SHA512 1451b2f25078e1353070991863acf67d2afeb5de016c8076601d622ff367af42c8d5db2a6d25c11ddd023c1dc11d6071597125c14d8384717409351920284a0f
 MISC metadata.xml 327 BLAKE2B 2f8f68a89168272c97f38af2ee447d621164d5f2c31bbaf75818d1386b4082ce59cfe724d54b9b118bc835c1832c4e7fe5b7c6c4b83fd36f48dc7f24701fa2eb SHA512 a98a1fe6de19dad7ab76f21672de567f3f8ac16c857194f4435d260741a9c2bc4f04d268fbc539aa6f1f1d2203bf509416e7e2970f9c24c4d31651a11eac6cd4
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 6594c946478c..0739195533e5 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index 8bb5d0505e24..48929ee8ecb1 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -3,5 +3,5 @@ DIST netopeer2-1.1.76.tar.gz 171127 BLAKE2B 77b97cc60185b8843c216f69d6e7c6366b66
 DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
 EBUILD netopeer2-1.1.70-r1.ebuild 1014 BLAKE2B ed146b0a8bc26b6da5200e2766987cbee3672a4fa07fc7a210a071ac82230a17d57c331bb224929c4107aea2209704fe230573c9e53c1347e104528d59c3798f SHA512 49c34f131200aa54aa72f429f04021433ddda84ddf4448eabe58d1aa8055876b11dea74bc5a1ead59d1eb44bf95393a3b2e0d0671e9c3d51df1dc5ffed5e0626
 EBUILD netopeer2-1.1.76.ebuild 1016 BLAKE2B 29a306b4114bb72c5ad83dff2148269618751f7ad4bc4c3664329443c2102a85e43b4ff79aff8a2ff804a4070bd4cf9f62fe88fd81e607b22b8e77078b134eb0 SHA512 292f43496f1e61b1b70588a6bf684f7cfb580d630adcbafffdc94ed11de9e64a09c9bc2e896d7939eed475d8ca9ac330f48e65149dfc653996c73cde75326751
-EBUILD netopeer2-2.0.0.ebuild 925 BLAKE2B 1b527e1f11dd8c24f3e594d030877293c5ca6eee48515afeaea03efdc3891f05d5d810c52ac811393f65524192f7e30d04179e9a4635f3e9bb4e460b16b99d20 SHA512 5de23f009617944ba31c3472731cb79dfb3fb811ea65cc303c185ef1d3b0ce55a2728d4124b79d2523a377c17a19b80617858ce3aa662a6101799aca9c5fba24
+EBUILD netopeer2-2.0.0.ebuild 924 BLAKE2B b6c84adfc6808eaca8614a4710d33851dd6522787f8ff9a16cd43262ded4cb6d7f1582521ecb82a1158d8b89c24a28fec111787ba3f80a54bd1cf42ecf6b47d1 SHA512 039c37773d3c58869ee29cb57d059a00dc90fd7123afed364d4ca83a8e06a7553c92a1f89e1250bd9d5bb0f24188d1c186c7cdb64fd593616ccb06fbf1b672f8
 MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff
diff --git a/net-misc/netopeer2/netopeer2-2.0.0.ebuild b/net-misc/netopeer2/netopeer2-2.0.0.ebuild
index fa8bef0b722d..de0c88e56a92 100644
--- a/net-misc/netopeer2/netopeer2-2.0.0.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index bb6e2fda8dd0..f1c3863d5d31 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.75.tar.gz 2731167 BLAKE2B 529b2c65853b8f915afd0563c1a055244d919794a71cff43573910fa2d4a81efca060c12320a0d07ddf3b03064b7e27d00ae396d6a2c1e46dc1a06403cae5c17 SHA512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028
+DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.75.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
+EBUILD putty-0.76.ebuild 1702 BLAKE2B 7bf2b36d317be0075c8ccf668d063d1337e61c1f649b537281d0f74c7ae5f2997a1f5eff452a999f925ac77618703d06e14082d2becc6211efdda46893d8d0c8 SHA512 f6d56ae2990384113f2d4b55c547feb6ce51a56fa836c99e2503a3b8e8489767833c5d756d9bbf7109ce058458f45dcb4a50b6c72d782e9b4aaf82f9ca85ba75
 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.76.ebuild b/net-misc/putty/putty-0.76.ebuild
new file mode 100644
index 000000000000..26f9ce9c31a3
--- /dev/null
+++ b/net-misc/putty/putty-0.76.ebuild
@@ -0,0 +1,95 @@
+# 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/r8168/Manifest b/net-misc/r8168/Manifest
index df09745b2d4b..7cf8fda3021c 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,5 +1,6 @@
 DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750
+EBUILD r8168-8.049.02-r1.ebuild 1061 BLAKE2B 6b0904a0908a4e557354426b44908ad4901dc5f600ca1217883bafafdd849563432c7d172e3156199972da300b4fd3bdf07fc61e144ac9a343d223be1952a98e SHA512 0e739eb173a87807f1c3e6620c72c14dab52f8427fd4a1eb29ac840b2e5744e9b7300c4933679aba6b52cae3502bddaf107620e86571eba8322561ae0b42aff6
 EBUILD r8168-8.049.02.ebuild 924 BLAKE2B f4ff3e0f5177124d6628f6c3205f62512e6c3343e0a8de91d87073c7af0f57fcab421e2834434da7a9d309e02a604e6a006294016c78621e7864f276cb8e9a88 SHA512 b82a87e40ed975c981eacc6e03410dca1b824319cf0ae7aa75bad04d30c986af62fb14f164e587a7d585b50eba216225bb8f316c089b18ba6d46b8702b27a053
-MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
+MISC metadata.xml 576 BLAKE2B cebd5a259c0effc02ce184d6f34bcf685b2a38bf176c84e014d346ef1339db5cfe6a61301c27ef4f4401fab3c043c349b0c79ca440ae64ea4b1fdfb408c94cb9 SHA512 86f7dcaa57d2c5ad8d3bccef1be31d357723a700da502151bcab453455c0daafe56b7b87a34126ee6dc69ad8db3acc5d87987e007487db3c90814eb97aa779b4
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
index 1b220df09674..b8dfb31fc702 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription>Official Realtek r8168 linux driver. The following cards are currently supported:
 RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
 RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
+	<use>
+		<flag name="use-firmware">Enable support for automatic firmware loading</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.049.02-r1.ebuild
new file mode 100644
index 000000000000..47810f27e05d
--- /dev/null
+++ b/net-misc/r8168/r8168-8.049.02-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 479d604817e9..39f1d5e95c37 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -2,5 +2,7 @@ AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e5856
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91
+DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea
 EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 517cf859914216b94b892632ffa73671323044a4b8a726faa8916f156f024295075503356cdad523c5f353efb4838bec810fb7a989c65cd690ed5b58bff6e956 SHA512 7865ffd3400a7c7302536323ac9b70a71fd181c0af91321c42b2aaead3080cf9d6c6aaa90d80802c1f95a9cbb3cad9655e1f829aef1305878c9f057d693d2213
+EBUILD rabbitmq-server-3.8.19.ebuild 2079 BLAKE2B c27d84c750b5bbc7a421162a9d9fc198957ccfc936bed6dea10292581edc159e92ca9103e4807fc90796e0af6600c4f0ae2474cabd7064be4b2dd65652ba90bc SHA512 5fd5a4f3ebd056564fa60f8ece07f022b5450b13f3208e7e5ff584d07510f41cedd96cc702ed7b7c66f31cbdac03082382e0761decdd3bfa6a6f5d8eb485301c
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19.ebuild
new file mode 100644
index 000000000000..3331d90285eb
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-any-r1 systemd
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	acct-group/rabbitmq
+	acct-user/rabbitmq
+	>=dev-lang/erlang-22[ssl]
+"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq/mnesia
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 7fe0d34eb776..c39fb1f776f5 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,5 @@
 AUX s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch 1927 BLAKE2B 76d18015437f5b9b2ec0ed2a573189a711ec055366dfe44d8a6557d0b240b9aad4f1f9a145b845a692acb93f3ab0c27b5cf70fa3626b90c6822ff026144e8801 SHA512 57302dc8238980ef28a273c2d91f5a099aad25855c246bf0dff2e64fede9efb8a6ad9ccd1a23df5e753e620080ac7ee4c02ce0f0c3c867210e5b49d53697e796
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
-EBUILD s3cmd-2.1.0-r1.ebuild 622 BLAKE2B 56f38ff9027933c54bdc421977e9c7b719d5583613da66250658e490ab1d18bda9f9c32f99a4764e221ba2ddd07c6bd7f35bafe059362963d50aeb4105fcdc3f SHA512 8901d811fb89a3ed9e7b7ba08e5c746d1b0fd7095eadfe65393acccfcaa9924da4d042033956b406b475f80b66be5f2437211faf43e76b03ae8836e320c9e29d
+EBUILD s3cmd-2.1.0-r1.ebuild 620 BLAKE2B 9efd86f09d044b2a1f5d272da0a0b2f64084ac9085307f75696d10fee99a09385bdbf02597188fc66f4c75328bff67ee67832cee33d0d1037198cff612d009ae SHA512 15bd3d78cc1b72079c149c09f3f2df30a773e0a6f00c100fadf3f1381217ba08f602d9423bf31da0f70baf861f13762df947da3af511a66ebef89504ee9de419
 EBUILD s3cmd-2.1.0.ebuild 548 BLAKE2B e3ed8df8e2c54fa963b625bd9394a89dc326403470eaac824e64d6bd2b912dee1a7bc3bdc46a0a488304a86e2f472abe0ac8e6a1163df128cffc80b16e4d37e5 SHA512 da0b560f6ed2acf6d7cd00c6f8c8bbb825f32e49f25e6f05503928e0bbbec7c6803b39cae35ff17e5a75bc9a6896015a0e5d713eb1ee6c3ebb08ef730d57580b
-MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5
+MISC metadata.xml 739 BLAKE2B cafb24d9e55e795d3d18c6b24e990bc74ae3b9a4dca43ce1bef649ef903494cfbfef2fd527421f3ac3dab992d7a8f7c71587d4fbe7374d667ae86ef477096757 SHA512 5e348bcd83451c891ecd101df6f0a62d5859d9097f0bdc2ac9531b880384bbaf3884d2c6847a566de1acb6cd00ba7c96ef8cbf4acacd5e1de4ddbfc05a2fc4e7
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 6115812190c8..53cb59747793 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -20,4 +20,5 @@
   <upstream>
     <remote-id type="sourceforge">s3tools</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
index 8fd4a4deed4d..0206e5fe4679 100644
--- a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index fde7505aa7d4..99b0bf2daf5f 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,7 @@
 DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
 DIST seafile-8.0.2.tar.gz 732341 BLAKE2B 29bf3187a37c0f01261d3afba996e1165ddebe05a36f734fd3d7ee5d0368ae2f94b70cd9251799ddeeea2318c510094b7b2fe917ce06a6328aca00f378dcb9ae SHA512 772dfb060e381eb2395b7ab094e11865f13e71f8c767d31e4ca8b48eaadf74d5d447298ea261f9cd48ff126828829c8d258ca943b01890f72072a36753d8333b
 DIST seafile-8.0.3.tar.gz 738066 BLAKE2B 302de3b5a4f465429955d2819c7b43ddb305cccc76cc7cf67885a75747ec5dcad85d17f94975abdd3b3d54d49a5d9ea05ab7947c3a2b84764b50fe5fb10e7636 SHA512 c51edfc094aa509c730b1b3f4ceb911461081689c8cc2564fb866cddaa54c445d9ad12ca9e4e90e98b771eafc6b6e1496e052538a2475a03642cdceb9212115a
-EBUILD seafile-8.0.1.ebuild 1158 BLAKE2B dfb7d32c17b77300ce3a9544aedc3c64268d80abec68654f2ba4d8b33b74572c7a03a76de475370ddcda68058ea1865f19e1aebf8e02da426b97b9824325fdd9 SHA512 1611948ad7be350b03c9d64042fb894d39e84454b281272eb2c0140318582cc38332a1b35523bcf6ae004657309f0263365394961fd5c92c33b47396c70916d7
-EBUILD seafile-8.0.2.ebuild 1268 BLAKE2B 76a5762935fda973abc27134677dee2444d9b640e5dcf5e79d531a32ba7fd06604e09a086ea106464a08dd58b71aa9f2276eff645766bd35abbfd112d737ce97 SHA512 13b21aab181100561c3de95f49007ded681ea2cae1069b12a271a2673859f2d2e830c527008b6bd6fc68391b030ebbaed139115fd9e61d4a8c9ad6b8cf7a20e7
+EBUILD seafile-8.0.1.ebuild 1150 BLAKE2B 3b4cbc06d5f5481167cfd6c4c4272a6226b8e2524b836435a70fea9754355de145b20c77357dbd84212464e81b57820d9ed0a7af0abe9b932223c18d2691ba6a SHA512 5bd7e4cbb0cb1848fe3142b283e694a191853c0dc6bdf4eab04063fe0288f3d43230398dd1a95122506cb05fa965d2d0fc6c02e4b1038e31d339faee0ceb3a06
+EBUILD seafile-8.0.2.ebuild 1260 BLAKE2B 0bf296dcbac58e0d905049a4cfabaaa004b4e54883511f18b18a42e5f94a19b6b9e02f240f2e0477da10e48dc05925168bb37e885c1f2ec31a16f017e6377027 SHA512 7f2a4a431bae4864b58fdb73f8038b4e589f6ace8a9d4e36fca59aa455c8cef118888b9d6be5a0f4627144cb714ef7d24a4eab2791760c8d40688ceeb213a173
 EBUILD seafile-8.0.3.ebuild 1296 BLAKE2B c919005ef8a2830f391bf7671934d0ad19095cc43c39dda5e817fa44dd6ef3b1420864cd2ae37c31cb369f4e8317d48e209574027b598dce225b282de4a8c29f SHA512 426e817269b2966bf1e226dcb69eae06f2910702311ca82ba275c6087be11c440a2bf02c9842d1bc0678b0ffa3b3330a3380986ee6b11f6ebde468ffacf9a8c7
 MISC metadata.xml 477 BLAKE2B 6491e1ec0cb07251b6bbbeeff7e9b04ece552e19d922f7db44866e323f17b14839a165e5c6ac77ab0327daef328aa701e338f2c9620188bfab8833b9497bd187 SHA512 012355a4c6b2c9fff5f4d1d2202dfc377c718f6b8d96e5474b5650894ef6e5dd0a97a927174b0bd492bfb72af0323a4a8bdca3b9c928f01d664c1f196fb861df
diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild
index e38abffbafcf..891aaaa47dd8 100644
--- a/net-misc/seafile/seafile-8.0.1.ebuild
+++ b/net-misc/seafile/seafile-8.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=(python3_{8,9})
 
 WANT_AUTOMAKE=1.16
 
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_MULTI_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
 	')
 	dev-libs/openssl:=
 	dev-db/sqlite:3
diff --git a/net-misc/seafile/seafile-8.0.2.ebuild b/net-misc/seafile/seafile-8.0.2.ebuild
index 24c749f0b911..04c6660122f2 100644
--- a/net-misc/seafile/seafile-8.0.2.ebuild
+++ b/net-misc/seafile/seafile-8.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=(python3_{8,9})
 
 WANT_AUTOMAKE=1.16
 
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_MULTI_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
 	')
 	dev-libs/openssl:=
 	dev-db/sqlite:3
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 1c24c0f19b27..c8d552225b34 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,7 +1,7 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
-EBUILD streamlink-1.3.1-r1.ebuild 2060 BLAKE2B d3e2cb738d52fb3cb03e0adb0a15f2422335200fd1d83788a9113a2ad4ec761d3022d0884d67486d515ad237230d7fff2ac80f6fbbac501e8c0f072177fe18a3 SHA512 1d2f6d2adc441298e75402170b40a6d1baacf9097b566cb030f919b8362b9beb82dcd8f9b1bb3decc9e3da595309fb3ef786d4c26ab2ef3ebece333372a37ab3
-EBUILD streamlink-2.0.0.ebuild 1831 BLAKE2B 2c65f0230f4f5a6170ee647acdfa0c3c0bbcf1b6b11e77ac23cc05c6ec6acf503c42c2db55a675477a572c748c17859bddccacebbe291445e6de0a20ffeb6b39 SHA512 5355ba71c7c018c26c43e3a6686bea68d90b91eb307c4a823df052abc3d38ecdfe1ee90d491f1a0a12c2b87e240fe5c6572bf9755ea8327ecefd7b061957a25b
-EBUILD streamlink-9999.ebuild 1831 BLAKE2B 2c65f0230f4f5a6170ee647acdfa0c3c0bbcf1b6b11e77ac23cc05c6ec6acf503c42c2db55a675477a572c748c17859bddccacebbe291445e6de0a20ffeb6b39 SHA512 5355ba71c7c018c26c43e3a6686bea68d90b91eb307c4a823df052abc3d38ecdfe1ee90d491f1a0a12c2b87e240fe5c6572bf9755ea8327ecefd7b061957a25b
+EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
+EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
+EBUILD streamlink-9999.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
index bc7367b7878f..339f8b00c2ff 100644
--- a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -31,12 +31,12 @@ RESTRICT="!test? ( test )"
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
 	$(python_gen_cond_dep '
-		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
-		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
-		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -46,15 +46,15 @@ RDEPEND="${DEPEND}
 BDEPEND="
 	$(python_gen_cond_dep '
 		doc? (
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
-			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
 		)
 		test? (
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/freezegun[${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/net-misc/streamlink/streamlink-2.0.0.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild
index 4c7dab37c195..92c0803d4cf5 100644
--- a/net-misc/streamlink/streamlink-2.0.0.ebuild
+++ b/net-misc/streamlink/streamlink-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 ${GIT_ECLASS}
@@ -29,11 +29,11 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
-		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -43,10 +43,10 @@ RDEPEND="${DEPEND}
 BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 4c7dab37c195..92c0803d4cf5 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 ${GIT_ECLASS}
@@ -29,11 +29,11 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
-		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -43,10 +43,10 @@ RDEPEND="${DEPEND}
 BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
 		)
 	')"
 
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index c355dc79ba02..b1b612bfd7c9 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -4,5 +4,5 @@ DIST sysrepo-1.4.140.tar.gz 683340 BLAKE2B bc9d51fc18450809e0428b32901a20516a82b
 DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
 EBUILD sysrepo-1.4.122-r1.ebuild 772 BLAKE2B 7425a6e27b426b7b6b62f47ced029fec376dac49a7bd1ca4192c0af7281b540d89695db22eff2d4c8648bb2a7d71be34c127592dfcbec4c443096c5e10ba7087 SHA512 e481e28e1532e179ee42fce9095bfc4d975642c66c4cd33af9b5508db69470689999aa859577c2eb9a7eb2667d2e091d1f457ef65a560273a0c23d3abc881060
 EBUILD sysrepo-1.4.140.ebuild 774 BLAKE2B 6f7998ed5a0bbc506477c05feced5915dcbdd45e06bc13c334188df54fc9a67cfafff230ae7e34123b45a4e5a005e2774ea04a8f2c4971793031e965467a8c06 SHA512 0a5ade7ed2d9751659a9324d2528a023319490ab8fef9059e055a2eaffeb6f953c20f062cb22a2a9d2a36c3149b11806c68f4b0a06f55442622c63d962fa393f
-EBUILD sysrepo-2.0.1.ebuild 786 BLAKE2B 676f6c564fb8fadd063a9bf4b0e380bf6441bcc6e959c802c48a3a8add0472838adb6fb074092333bf919171fca4406850fab59933ca88357003644f5f6e65ff SHA512 750d39de3bb4fdce534491a8d95eaaf528b4cdb4084125e7fcbaa0d4f457c6918956b820227ebe8842a8864fcc73be29e302f53c2146e5404e826143511d9f21
+EBUILD sysrepo-2.0.1.ebuild 785 BLAKE2B 2cd86b4571470cfceb7b5da605d253cc3bf05166188703d33778499d8ec3891cb93cb8efc35a34691eeeab453a54d9a170aaba3b6042ce4da24f73ca2045b92f SHA512 812019d67306ed48b5a72ce2281e4fe0a5a28e8a06f5aaae46a9ece281c38b8805f6946298dd0b0f13c87fbe096e7f0862f9aa7f1e6307d1ebe5cc99e9e0abdc
 MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba
diff --git a/net-misc/sysrepo/sysrepo-2.0.1.ebuild b/net-misc/sysrepo/sysrepo-2.0.1.ebuild
index b35cdd15a375..c7ce50e0227e 100644
--- a/net-misc/sysrepo/sysrepo-2.0.1.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 9a0546ad1337..4a60a20412ae 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdc
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.11.0-r2.ebuild 4119 BLAKE2B 4391703cb314cf923b455ba36270f7a12f5f8d89f441d9cacc57d8b2a9e5b73c6b087941ec4238f61d937b8fd193a9324d3820942bc7b57140d826fe2427cbab SHA512 6c7d465314a4b12699cbfd68e9ec07a84d719f25c57b5f97cceb8f15ab44c2b1dda1bce4243520422ffcf177c1773bd0c8310acdf214042dea51e15df4bdc70a
 EBUILD tigervnc-1.11.0-r3.ebuild 4113 BLAKE2B 09995fb98a43899b50d2f6ca7051d713fb0c76593c405d1b36c5f5b37b23513493bd9ee67eda9704a2ac44ec394dfab9ae1d6889778c254f14ca8759ec9f04f7 SHA512 7ec990a1747655c78051c782034bde44bb2cf89b3c7a4e521b38cb085a8f4ba480415f6f32590f2b6cbaaa083c9c728243e7f3191e30a2eb804880dd06735283
-EBUILD tigervnc-1.9.0-r1.ebuild 4481 BLAKE2B d6e4025f83ae516bacd9f11b141f523405e0e5d3b9a5421b6c6cbe2a89c51a6cf6346583220391a0743bf6e8e34a4f7e92bf09f8275917a925419af4e76855cd SHA512 dab32c975d04ec1e0a534c53c03766901645bc2336776cc4dc0f3a0e13d970a57a1434bb0502514af1a5378104c0db1ea0b267cc89a6b2445a0f6f45d90d57e4
-EBUILD tigervnc-1.9.0-r2.ebuild 4439 BLAKE2B ed49b0953b26816c7019e358daf5a366ae4317fb554e345f932f8be64d1fa8d2205b0916fc21fab3e5ca9be08b44e358e61fe235ac4f70cb0c0d418f0633ad1e SHA512 e131576ac239a6a8dee16a8dc11979d5504512b8db91ad6e9d0ef8afbd88af434ee54c87d6e9178980a709dee83e0b49613aaff8a837409f01dc201f4b166108
+EBUILD tigervnc-1.9.0-r1.ebuild 4488 BLAKE2B 43b4cfaee8dd183e5b5591c2b20248f79503770c5ba2ef69e64f7defad9a3534265dffb12b17700f52dbee1bcad144be1d9df82115a728fd931c979ee64385e8 SHA512 5428d3bc4828e04fb6919b5818b72d73f7f6e2d66179e6b1ca94c742d7826d20545d40f0cf88af5d81543d06af75fc1198b66ada3fd2322db9225774efc57b6c
+EBUILD tigervnc-1.9.0-r2.ebuild 4446 BLAKE2B 5804fffa0eecc1cb0327d715a4cd86293c879a5e2098aeb50df71a5a2f7e0e31ec8ccf01ef9657c53862688db2bde59a4f12a9b0d7d43c1bfebcb86970f61bd9 SHA512 5930af12c2fee57a14706cc28afeea3837229676a0912423297113100a40af258c7ad56f48788784581e4ba79e67e42bf03f7becc4f54f5ab5b4bc45d1135a68
 MISC metadata.xml 470 BLAKE2B de3d7d8fab83908aa664760afe1d401f016be431c67eee547127f3ee94f290d0127cc972e2d27f31b9adc0d48786f755a94ac8d1e605ce3e8e02fcf7144b7af3 SHA512 b31d1126757d68a177817cfa7069e07277742222c02dbb0e0a26ed5a144f68eeda94db5cdaec760a2b8abb491fe420867dbf06d89b6a4c1a3edfdbb1461999c3
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 2fa2e3e93ea5..f455a2bea0dd 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-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="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index 35e3507950d2..d437a75767e6 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-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="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index c91fcf74422e..4b2a7586cfde 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -2,5 +2,5 @@ AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9
 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
 AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d
 DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
-EBUILD vinagre-3.22.0-r3.ebuild 1806 BLAKE2B 4131e2a661c7ca2816096c70cc7672e5a054595fbec50ce5660378b84ed147943e6d4d5267869c58adbc7443fda9ec592c28dc89ac2df0318f8fd5fbed6c1df8 SHA512 f49739a732a1012c484eb2f4bd6bbdffdbced649f9f6539809d8a3544470438b05025aee92a5bcc04ddd7a777ef9ca947d2d655010ae7607f78c62c8ef57184d
+EBUILD vinagre-3.22.0-r3.ebuild 1766 BLAKE2B 71f0e5b65f265f158a1f7f7bb8e062d1d263b496a0712b1047966da09bd32d270cc4f49e97def5cd92c41122134bed620918a57def779e8fca9ea64d0431ded3 SHA512 d39485fd0c35bff1555d440ffe88454f8ddb2ce50435c3d33aa62f61b344dfcb83cf9273a87ae7fb2f55046baafc1e24ab977088b564aa69db2f6673ac2a3240
 MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
index 77ecdf41e187..97706955cfeb 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-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=6
@@ -32,7 +32,7 @@ RDEPEND="
 	telepathy? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)
diff --git a/net-misc/websocketd/Manifest b/net-misc/websocketd/Manifest
new file mode 100644
index 000000000000..aad48e194840
--- /dev/null
+++ b/net-misc/websocketd/Manifest
@@ -0,0 +1,5 @@
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
+DIST websocketd-0.4.1.tar.gz 46366 BLAKE2B 8b2fd1b63736cb47363e512044cb22a6eaa726c471289dbd1a6b77733d64b3023eddadd47a82357aec4bcbe097ce2b90806284f4483a36d2cf446d4eef66c224 SHA512 8535637bdf8fecbc4340606b6096672420126c32ed9e68944593f577e6307c810caf654e76f7077bf119d6273c6eec4c4c21eb21bfd805d0b8f5549c626460e4
+EBUILD websocketd-0.4.1.ebuild 737 BLAKE2B 28d5c70abd78e4a81747dd2436324cefc8db766b2e0d311e43618024a36f0ebe3df7a039a6aea30615f086743fd6e9f4daa280fca9096d9ba6de858d8dc0da21 SHA512 095d9712dee37c00bf16dda7885a9304d0ce02bfc83849df3775db65d1b6d5b16029198b88eddd079e61bcfbcb8027e1c7b4d3337e7297fb0261ef199998200a
+MISC metadata.xml 303 BLAKE2B 17c1847d16be705e0992719a1d8a425234bee05b26c73cf860689b2771ae8e2606bb96ea9e32dc72e3470b11c4490869e79d9202c3f81ff578ffb8e2a9f1c6b1 SHA512 631c3a3ac28da7ed40c715ad39baae39ca0cc74f0cc30d47cb0a1219ab361f5c463c187a5952aa30aac1123ed5862a0b902ad27655c9ba0f53cf52a77ed0746c
diff --git a/net-misc/websocketd/metadata.xml b/net-misc/websocketd/metadata.xml
new file mode 100644
index 000000000000..d7ed249b765a
--- /dev/null
+++ b/net-misc/websocketd/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>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">joewalnes/websocketd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/websocketd/websocketd-0.4.1.ebuild b/net-misc/websocketd/websocketd-0.4.1.ebuild
new file mode 100644
index 000000000000..a611fd44e054
--- /dev/null
+++ b/net-misc/websocketd/websocketd-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+EGIT_COMMIT="v${PV}"
+ARCHIVE_URI="https://github.com/joewalnes/websocketd/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="Like inetd, but for WebSockets."
+HOMEPAGE="https://github.com/joewalnes/websocketd"
+SLOT="0"
+LICENSE="BSD-2"
+
+EGO_SUM=(
+"github.com/gorilla/websocket v1.4.0"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+)
+
+go-module_set_globals
+SRC_URI="
+	${ARCHIVE_URI}
+	${EGO_SUM_SRC_URI}
+"
+
+src_compile() {
+	GOBIN="${S}/bin" CGO_ENABLED=0 go install ./... || die
+}
+
+src_test() {
+	go test -work "./..." || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGES README.md
+}
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 8040f9739f6d..e13dfb118c5c 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -3,7 +3,7 @@ AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab3535
 DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
 DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
 DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
-EBUILD xmrig-6.12.2.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
+EBUILD xmrig-6.12.2.ebuild 1285 BLAKE2B f15b873ba2ccd6b9d3ec6e62caaa5bc42a1f8aec5fcd34125a7fa342a581189665e61dbe76f58942e6c016f17f27cdef772abbe874a72ce15a103075a1472437 SHA512 4de94d4676131fad47a5f5cfd43822f210895cb55b724d7ead73c075af5dcc892e1abd896e230be5b063965df207e6617e34cc7cfe695723820ea2a78763fd52
 EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
index 97dc2905531c..81cbcc47b6f9 100644
--- a/net-misc/xmrig/xmrig-6.12.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-nds/389-ds-base/389-ds-base-1.4.4.13.ebuild b/net-nds/389-ds-base/389-ds-base-1.4.4.13.ebuild
index 87a454b5a620..f6feea8c46f3 100644
--- a/net-nds/389-ds-base/389-ds-base-1.4.4.13.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.4.4.13.ebuild
@@ -133,7 +133,7 @@ DEPEND="
 	pam-passthru? ( sys-libs/pam )
 	selinux? (
 		$(python_gen_cond_dep '
-			sys-libs/libselinux[python,${PYTHON_MULTI_USEDEP}]
+			sys-libs/libselinux[python,${PYTHON_USEDEP}]
 		')
 	)
 	systemd? ( >=sys-apps/systemd-244 )
@@ -143,7 +143,7 @@ BDEPEND=">=sys-devel/autoconf-2.69-r5
 	virtual/pkgconfig
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/argparse-manpage[${PYTHON_MULTI_USEDEP}]
+		dev-python/argparse-manpage[${PYTHON_USEDEP}]
 	')
 	doc? ( app-doc/doxygen )
 	test? ( dev-util/cmocka )
@@ -157,12 +157,12 @@ RDEPEND="${DEPEND}
 	acct-group/dirsrv
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_MULTI_USEDEP}]
-		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-ldap[sasl,${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-ldap[sasl,${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
 	')
 	virtual/perl-Archive-Tar
 	virtual/perl-DB_File
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 53865949590c..8285989a33d2 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -85,5 +85,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD 389-ds-base-1.4.4.13.ebuild 6699 BLAKE2B 07a1095db2b78dd22147adae56b3e8f2299a285f49185c2145d52ddde3f4bf447e05774d1be59bc1c752eede7e6d18a19ecc49292323036a6118e8c966de3861 SHA512 1c8dce486c1da723f92c291f6ca17b658ad3a1d697abc8e9991632acb34c7d41a9811b6154bbd8e8bb8dca1682233cfff288bc91f3f0fd5c21d3ccd1f7a53dd9
+EBUILD 389-ds-base-1.4.4.13.ebuild 6651 BLAKE2B 3afe8d9e9c043c4d774250a78ff12fc6c883985691d5ede0db5a956f197bf9bf9946780579c5accb136de78c4bc4dc6c4b3cbac6d0e6221a14f0da72dd66da81 SHA512 822ddb45926f7250cf3a5323cab11cf49cbad829a9ad1c2624a436d90b2b6983b9a02081db23cf19664f42d0283f60ba791640a6ee3c01357f284310a9497add
 MISC metadata.xml 1459 BLAKE2B 6da8c449be55f7c70e560a5d5ec6fb1fbcf3823586ef3beaa4bd5c5b4d3cdd71f2383ffd08744b051419bbc8492faac5ef1b94e5a88d546bd36b3cc7e94d9292 SHA512 b9c6773813d4c4b221622457bc9cfc284232c7d572445c2cd9531476528863e354f3c4483f61d2d81564aabea60d1594f5b5cae6c279f0c51af1370f5c623b2d
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 8368d8da56b6..29157d8afd41 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 0e5e4d7809b9..7ffc5e4fbf72 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index b75ed1204ff8..978f1bf042b3 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -143,6 +143,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-EBUILD newsboat-2.21.ebuild 2707 BLAKE2B 8d5d542f62527de3ccc1b11c92ccbd201f259d2868e82b35535174df035f6f0e617a5cb4b9dda02f6d2dc0da27095c5112a2e7bc23976faf2bed024b486fe6ec SHA512 77faf83c1295d2c5db20577e78b1e13baac89bb4ad42d42de12b84f23eeed7edbf36983db9a33c7433fe06cddb6e6aacad042a2d216f99e4d3dbe04fb9e5492a
-EBUILD newsboat-2.23.ebuild 3149 BLAKE2B 12ec2a0452a3deb74e48343c346f7f5b9719355f94360412b5eb51769a6b102291f910cb1f44d14cce56ccee3607d20015b3f9ccdafa6b487e27797d4ca5ef46 SHA512 5e1d217b629247d10cfd88dc246cff8c159be3fc00a2916b735b85598df50eed42144788364c4e391fb54241c5fb1b506fe5f10649fde0f0cd431af05a9232b9
+EBUILD newsboat-2.21-r1.ebuild 2709 BLAKE2B ad38277177f9361b3acb8ba6e345d7609062086c2219e714aa1e2d165fdb43c97324f035db80540d52d46df7380de2d5f029034ab618e69d8442a5b6b959b62d SHA512 eed7e51415d32a9cff1275751fc74f9f0a9dbc4506824b8d6bb0128c98d25568e2cca02436782c8c40f7bd24d65460367efa730ab1dcf0e04e064838160f0ae5
+EBUILD newsboat-2.23-r1.ebuild 3151 BLAKE2B 72fdd754e3a98633c6f90454dd375d112d65dfd097994a146c0d656fd19782691c136fd7e980077d7a47c54b3aa4f2250d7d75fdd3596bf9770d28e4cee86e20 SHA512 0fe5ef3858d909ee17a6ac5334f8b4cc3ba8012f8bbbecfcbe7df9d56223458a76e88c36364c23ad0cae95bd0fd5704f90f515d5214a6cb557059de024435253
 MISC metadata.xml 215 BLAKE2B 936d37ef66986b32cf36792a6e24253e879e02aacddfc3c3fbba0ff7951e761a2db63a0c344c512315b3845f6e9a9116effa985de44cfcaf22f7bf432533a5fb SHA512 13b907fe919da35e8fe030dcfcfcb4feb35b802e9c4a8721aa36454648f8f8c15e80ffaecd795c9ca8b4a6bd4a0650b6c548fed935b601569c1ac243eb0724f1
diff --git a/net-news/newsboat/newsboat-2.21-r1.ebuild b/net-news/newsboat/newsboat-2.21-r1.ebuild
new file mode 100644
index 000000000000..8dfbd5280859
--- /dev/null
+++ b/net-news/newsboat/newsboat-2.21-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+addr2line-0.12.2
+adler32-1.1.0
+aho-corasick-0.7.13
+arrayvec-0.5.1
+autocfg-1.0.0
+backtrace-0.3.49
+bit-set-0.5.2
+bit-vec-0.6.2
+bitflags-1.2.1
+block-0.1.6
+byteorder-1.3.4
+cc-1.0.57
+cfg-if-0.1.10
+chrono-0.4.15
+clap-2.33.3
+curl-sys-0.4.36+curl-7.71.1
+fnv-1.0.7
+getrandom-0.1.14
+gettext-rs-0.5.0
+gettext-sys-0.19.9
+gimli-0.21.0
+idna-0.2.0
+lazy_static-1.4.0
+lexical-core-0.7.4
+libc-0.2.77
+libz-sys-1.1.0
+locale_config-0.3.0
+malloc_buf-0.0.6
+matches-0.1.8
+memchr-2.3.3
+miniz_oxide-0.3.7
+natord-1.0.9
+nom-5.1.2
+num-integer-0.1.43
+num-traits-0.2.12
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+object-0.20.0
+once_cell-1.4.1
+openssl-sys-0.9.58
+percent-encoding-2.1.0
+pkg-config-0.3.17
+ppv-lite86-0.2.8
+proptest-0.10.1
+quick-error-1.2.3
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_xorshift-0.2.0
+redox_syscall-0.1.56
+regex-1.3.9
+regex-syntax-0.6.18
+remove_dir_all-0.5.3
+rustc-demangle-0.1.16
+rusty-fork-0.3.0
+ryu-1.0.5
+section_testing-0.0.4
+static_assertions-1.1.0
+tempfile-3.1.0
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.43
+tinyvec-0.3.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-width-0.1.8
+url-2.1.1
+vcpkg-0.2.10
+version_check-0.9.2
+wait-timeout-0.2.0
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+xdg-2.2.0
+"
+
+inherit toolchain-funcs cargo
+
+DESCRIPTION="An RSS/Atom feed reader for text terminals"
+HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
+SRC_URI="
+	https://newsboat.org/releases/${PV}/${P}.tar.xz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
+
+RDEPEND="
+	>=dev-db/sqlite-3.5:3
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.21.6
+	>=dev-libs/json-c-0.11:=
+	dev-libs/libxml2
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib
+	dev-libs/openssl
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	dev-ruby/asciidoctor
+	virtual/awk
+	virtual/pkgconfig
+	>=virtual/rust-1.42.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.11-flags.patch"
+)
+
+src_configure() {
+	./config.sh || die
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	# tests require UTF-8 locale
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
+	# Tests fail if in ${S} rather than in ${S}/test
+	cd "${S}"/test || die
+	./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+	einstalldocs
+}
diff --git a/net-news/newsboat/newsboat-2.21.ebuild b/net-news/newsboat/newsboat-2.21.ebuild
deleted file mode 100644
index 2688836e1167..000000000000
--- a/net-news/newsboat/newsboat-2.21.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.1
-
-EAPI=7
-
-CRATES="
-addr2line-0.12.2
-adler32-1.1.0
-aho-corasick-0.7.13
-arrayvec-0.5.1
-autocfg-1.0.0
-backtrace-0.3.49
-bit-set-0.5.2
-bit-vec-0.6.2
-bitflags-1.2.1
-block-0.1.6
-byteorder-1.3.4
-cc-1.0.57
-cfg-if-0.1.10
-chrono-0.4.15
-clap-2.33.3
-curl-sys-0.4.36+curl-7.71.1
-fnv-1.0.7
-getrandom-0.1.14
-gettext-rs-0.5.0
-gettext-sys-0.19.9
-gimli-0.21.0
-idna-0.2.0
-lazy_static-1.4.0
-lexical-core-0.7.4
-libc-0.2.77
-libz-sys-1.1.0
-locale_config-0.3.0
-malloc_buf-0.0.6
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.3.7
-natord-1.0.9
-nom-5.1.2
-num-integer-0.1.43
-num-traits-0.2.12
-objc-0.2.7
-objc-foundation-0.1.1
-objc_id-0.1.1
-object-0.20.0
-once_cell-1.4.1
-openssl-sys-0.9.58
-percent-encoding-2.1.0
-pkg-config-0.3.17
-ppv-lite86-0.2.8
-proptest-0.10.1
-quick-error-1.2.3
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-rand_xorshift-0.2.0
-redox_syscall-0.1.56
-regex-1.3.9
-regex-syntax-0.6.18
-remove_dir_all-0.5.3
-rustc-demangle-0.1.16
-rusty-fork-0.3.0
-ryu-1.0.5
-section_testing-0.0.4
-static_assertions-1.1.0
-tempfile-3.1.0
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.43
-tinyvec-0.3.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.13
-unicode-width-0.1.8
-url-2.1.1
-vcpkg-0.2.10
-version_check-0.9.2
-wait-timeout-0.2.0
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-xdg-2.2.0
-"
-
-inherit toolchain-funcs cargo
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-SRC_URI="
-	https://newsboat.org/releases/${PV}/${P}.tar.xz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.21.6
-	>=dev-libs/json-c-0.11:=
-	dev-libs/libxml2
-	sys-libs/ncurses:0=[unicode]
-	sys-libs/zlib
-	dev-libs/openssl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	dev-ruby/asciidoctor
-	virtual/awk
-	virtual/pkgconfig
-	>=virtual/rust-1.42.0
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.11-flags.patch"
-)
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	# tests require UTF-8 locale
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
-	# Tests fail if in ${S} rather than in ${S}/test
-	cd "${S}"/test || die
-	./test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	einstalldocs
-}
diff --git a/net-news/newsboat/newsboat-2.23-r1.ebuild b/net-news/newsboat/newsboat-2.23-r1.ebuild
new file mode 100644
index 000000000000..3fb11d1cb45f
--- /dev/null
+++ b/net-news/newsboat/newsboat-2.23-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+addr2line-0.14.0
+adler-0.2.3
+aho-corasick-0.7.15
+arrayvec-0.5.2
+autocfg-1.0.1
+backtrace-0.3.55
+bit-set-0.5.2
+bit-vec-0.6.3
+bitflags-1.2.1
+bitvec-0.19.4
+block-0.1.6
+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
+codespan-reporting-0.9.5
+curl-sys-0.4.41+curl-7.75.0
+cxx-0.5.10
+cxx-build-0.5.10
+cxxbridge-flags-0.5.10
+cxxbridge-macro-0.5.10
+fnv-1.0.7
+form_urlencoded-1.0.0
+funty-1.1.0
+getrandom-0.1.15
+getrandom-0.2.0
+gettext-rs-0.6.0
+gettext-sys-0.21.0
+gimli-0.23.0
+idna-0.2.0
+lazy_static-1.4.0
+lexical-core-0.7.5
+libc-0.2.90
+libz-sys-1.1.2
+link-cplusplus-1.0.4
+locale_config-0.3.0
+malloc_buf-0.0.6
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+natord-1.0.9
+nom-6.1.2
+num-integer-0.1.44
+num-traits-0.2.14
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+object-0.22.0
+once_cell-1.7.2
+percent-encoding-2.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro2-1.0.24
+proptest-0.10.1
+quick-error-1.2.3
+quote-1.0.8
+radium-0.5.3
+rand-0.7.3
+rand-0.8.3
+rand_chacha-0.2.2
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.2.0
+rand_hc-0.3.0
+rand_xorshift-0.2.0
+redox_syscall-0.2.4
+regex-1.4.2
+regex-syntax-0.6.21
+remove_dir_all-0.5.3
+rustc-demangle-0.1.18
+rusty-fork-0.3.0
+ryu-1.0.5
+scratch-1.0.0
+section_testing-0.0.5
+static_assertions-1.1.0
+syn-1.0.55
+tap-1.0.0
+tempfile-3.2.0
+termcolor-1.1.2
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.44
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.1
+vcpkg-0.2.11
+version_check-0.9.2
+wait-timeout-0.2.0
+wasi-0.10.0+wasi-snapshot-preview1
+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
+wyz-0.2.0
+xdg-2.2.0
+"
+
+inherit toolchain-funcs cargo
+
+DESCRIPTION="An RSS/Atom feed reader for text terminals"
+HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
+SRC_URI="
+	https://newsboat.org/releases/${PV}/${P}.tar.xz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-db/sqlite-3.5:3
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.21.6
+	>=dev-libs/json-c-0.11:=
+	dev-libs/libxml2
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib
+	dev-libs/openssl
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	>=dev-ruby/asciidoctor-1.5.3
+	virtual/awk
+	virtual/pkgconfig
+	>=virtual/rust-1.46.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.23-flags.patch"
+)
+
+src_configure() {
+	./config.sh || die
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	# tests require UTF-8 locale
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
+	# Tests fail if in ${S} rather than in ${S}/test
+	cd "${S}"/test || die
+	./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+	einstalldocs
+}
diff --git a/net-news/newsboat/newsboat-2.23.ebuild b/net-news/newsboat/newsboat-2.23.ebuild
deleted file mode 100644
index 5a58d4c3d3e2..000000000000
--- a/net-news/newsboat/newsboat-2.23.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.1
-
-EAPI=7
-
-CRATES="
-addr2line-0.14.0
-adler-0.2.3
-aho-corasick-0.7.15
-arrayvec-0.5.2
-autocfg-1.0.1
-backtrace-0.3.55
-bit-set-0.5.2
-bit-vec-0.6.3
-bitflags-1.2.1
-bitvec-0.19.4
-block-0.1.6
-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
-codespan-reporting-0.9.5
-curl-sys-0.4.41+curl-7.75.0
-cxx-0.5.10
-cxx-build-0.5.10
-cxxbridge-flags-0.5.10
-cxxbridge-macro-0.5.10
-fnv-1.0.7
-form_urlencoded-1.0.0
-funty-1.1.0
-getrandom-0.1.15
-getrandom-0.2.0
-gettext-rs-0.6.0
-gettext-sys-0.21.0
-gimli-0.23.0
-idna-0.2.0
-lazy_static-1.4.0
-lexical-core-0.7.5
-libc-0.2.90
-libz-sys-1.1.2
-link-cplusplus-1.0.4
-locale_config-0.3.0
-malloc_buf-0.0.6
-matches-0.1.8
-memchr-2.3.4
-miniz_oxide-0.4.3
-natord-1.0.9
-nom-6.1.2
-num-integer-0.1.44
-num-traits-0.2.14
-objc-0.2.7
-objc-foundation-0.1.1
-objc_id-0.1.1
-object-0.22.0
-once_cell-1.7.2
-percent-encoding-2.1.0
-pkg-config-0.3.19
-ppv-lite86-0.2.10
-proc-macro2-1.0.24
-proptest-0.10.1
-quick-error-1.2.3
-quote-1.0.8
-radium-0.5.3
-rand-0.7.3
-rand-0.8.3
-rand_chacha-0.2.2
-rand_chacha-0.3.0
-rand_core-0.5.1
-rand_core-0.6.2
-rand_hc-0.2.0
-rand_hc-0.3.0
-rand_xorshift-0.2.0
-redox_syscall-0.2.4
-regex-1.4.2
-regex-syntax-0.6.21
-remove_dir_all-0.5.3
-rustc-demangle-0.1.18
-rusty-fork-0.3.0
-ryu-1.0.5
-scratch-1.0.0
-section_testing-0.0.5
-static_assertions-1.1.0
-syn-1.0.55
-tap-1.0.0
-tempfile-3.2.0
-termcolor-1.1.2
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.44
-tinyvec-1.1.0
-tinyvec_macros-0.1.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.16
-unicode-width-0.1.8
-unicode-xid-0.2.1
-url-2.2.1
-vcpkg-0.2.11
-version_check-0.9.2
-wait-timeout-0.2.0
-wasi-0.10.0+wasi-snapshot-preview1
-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
-wyz-0.2.0
-xdg-2.2.0
-"
-
-inherit toolchain-funcs cargo
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-SRC_URI="
-	https://newsboat.org/releases/${PV}/${P}.tar.xz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.21.6
-	>=dev-libs/json-c-0.11:=
-	dev-libs/libxml2
-	sys-libs/ncurses:0=[unicode]
-	sys-libs/zlib
-	dev-libs/openssl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	>=dev-ruby/asciidoctor-1.5.3
-	virtual/awk
-	virtual/pkgconfig
-	>=virtual/rust-1.46.0
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.23-flags.patch"
-)
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	# tests require UTF-8 locale
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
-	# Tests fail if in ${S} rather than in ${S}/test
-	cd "${S}"/test || die
-	./test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	einstalldocs
-}
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index 89f2eca4f702..ee13da98848f 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,3 +1,3 @@
 DIST snownews-1.6.10.tar.gz 189715 BLAKE2B 0456faa526b21d06c5a7fe70f52cffbb3c7d977afcc4a5bc80179fd928b9c00d0674d44a64342a469a1cbccd3a1e0264ecadc1065f5a85965d9ef76fc3d3d896 SHA512 df90c3c55da8d11b2936075aab86f66f54f9a6ace0cbe0db54d0e6177ae71e28ab3c700d79b521d55859bb94ef7ecc89e3eb69f215eb9f7286d30cc4e2bec078
-EBUILD snownews-1.6.10.ebuild 1074 BLAKE2B 7ba7934244a920f4d70e7666ed3f06e65eaaa415f30ad5c79b886411bd8a2f5bd36bec6b4b4c45e77d2895d0c71ace61cc5f9dc623efe6b274f6229fda6f6982 SHA512 82401ad4d57de07a3a10529652dacc6593bba4e1827c7e753cbbd40afaf2f794b17257d028bad868761ee8bacfe8b34c8ecbcaac5f13ad97ade726f0a40e3c56
+EBUILD snownews-1.6.10-r1.ebuild 1070 BLAKE2B b22e64f260067a2c2225d228b944eaea6e3f569ed10f3b2bb4feab15d915332d95df289848cdcfcecedd5d360036408a76fa02015587f517383689f8745b152b SHA512 84aaa8f531157b8b06691157abd13192c2e16cc29ac807364a7329218c5bb51b28bc9fc0d53b696144d79a41e52c5b6c80534f4660a7def0c2a054659aeb52e6
 MISC metadata.xml 393 BLAKE2B 4e6384d199282453f5abaeb4b3fc89a44a3eae88d7084e6619c2ca3abb7162b476adfb9dfa938c20a24c84f879962455922082a9ee4765791531afd4b8366781 SHA512 610ff6d76acaee2a052ebe59b637f1baa26293b675683f4322d5364b0bb0a41294e654fa848eac866cf0e25788c72cb5d32fc1aba3bcfc5eb2275b4892a504fa
diff --git a/net-news/snownews/snownews-1.6.10-r1.ebuild b/net-news/snownews/snownews-1.6.10-r1.ebuild
new file mode 100644
index 000000000000..78957b1ac1c2
--- /dev/null
+++ b/net-news/snownews/snownews-1.6.10-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 autotools toolchain-funcs
+
+DESCRIPTION="Command-line RSS feed reader"
+HOMEPAGE="https://github.com/kouya/snownews"
+SRC_URI="https://github.com/kouya/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.6
+	sys-libs/ncurses:=[unicode(+)]
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-perl/XML-LibXML
+	dev-perl/libwww-perl
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	tc-export PKG_CONFIG
+	local libs=$(${PKG_CONFIG} --libs ncursesw)
+	sed -i "s|-lncursesw\?|${libs}|" configure Config.mk.in || die
+	sed -i 's|$(INSTALL) -s snownews|$(INSTALL) snownews|' Makefile || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	# perl script, not autotools based
+	./configure --prefix="${D}${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}"
+}
diff --git a/net-news/snownews/snownews-1.6.10.ebuild b/net-news/snownews/snownews-1.6.10.ebuild
deleted file mode 100644
index c531137245bb..000000000000
--- a/net-news/snownews/snownews-1.6.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Command-line RSS feed reader"
-HOMEPAGE="https://github.com/kouya/snownews"
-SRC_URI="https://github.com/kouya/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3:0=[unicode]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-perl/XML-LibXML
-	dev-perl/libwww-perl
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export PKG_CONFIG
-	local libs=$(${PKG_CONFIG} --libs ncursesw)
-	sed -i "s|-lncursesw\?|${libs}|" configure Config.mk.in || die
-	sed -i 's|$(INSTALL) -s snownews|$(INSTALL) snownews|' Makefile || die
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	# perl script, not autotools based
-	./configure --prefix="${D}${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}"
-}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 08903514e926..8784856daf2e 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 550fa4ca4fb2..13728534d3d9 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,7 +5,7 @@ AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e
 DIST SABnzbd-3.2.1-src.tar.gz 2777984 BLAKE2B 6e0ebe122a01f8cbd5b26eefe3728478dd348b3d11fb274c2a146b7567f306074ddd93b438463471e22fc77c6c2223e864c6019ba0d7ab464162451e9f9c8cb9 SHA512 ace29199eb6f03450d25fc3b79960d1afc336f0013771bcf698e7df5c5e5ed920ad783f542ba8f3dbcd451d279993a6d4299d78075184e43ad74411ac19c3f59
 DIST SABnzbd-3.3.0-src.tar.gz 2786354 BLAKE2B aa5034d99b570c6ae643209663b2b292d0dcc06dabcb09bb9b28e7b38248b88c98736ae35cff7c6e4c93d2d6a44b716dbf2fd8c7cf71f0b5a65ef0c625d9d00e SHA512 eefc20c9f6921a1efc8f7cafc6f544949dccacacfa01aff29a32355431f8d62d9f4f36312271987b10ff96e9b5f8c6bef390f594282ce42b743faa556489e7fa
 DIST SABnzbd-3.3.1-src.tar.gz 2786705 BLAKE2B 1ce58c2fd51304395402e2ad4379556e9f1a1471d524d1b3b969b9b201edf15dece1f12d9891695e9dbb02664014c2540ed9fce02b4418fc3100cd3bb2717983 SHA512 0ab7001935f19c8e1829051949965977b895456b83ee26b6379fd9c7024d114d5bdd0701d747c8935bb46a829d46379e4406012007a9039c43fb99e4db3ee920
-EBUILD sabnzbd-3.2.1.ebuild 3127 BLAKE2B 9e9c5aadb0d24d229278816683373c3b62599332d49eb4c626ae2ca501b3b9f33b943b4e31bca24631a1e2bc7a284679dee398d30d8789c6094b51d83443e763 SHA512 582cddf425da427b41a3e4b1c0a9563395325892bacaa11153db4390e07fe50508a3f4a1fec89f2253098bf3a6cfb29dac1733dcf966ebc3ed28b5a2a2dbfe6b
-EBUILD sabnzbd-3.3.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
-EBUILD sabnzbd-3.3.1.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
+EBUILD sabnzbd-3.2.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
+EBUILD sabnzbd-3.3.0.ebuild 3074 BLAKE2B 872c7c7a66131b4152554786a27891e722df4536ba6c6089304883918fd07bfefef78b0825f4c02048bfa707f6dede18ecbb6cd6ee1c0dbfe534d1a98675c4cb SHA512 9a8bf26731bbfad94d5763009272fd0b7e31275c6c23961c102a40b76441a083ee3c589f3c8ca0859b3f8d6813d4872b21805cb7c5642aa6c2c0404eac07af37
+EBUILD sabnzbd-3.3.1.ebuild 3074 BLAKE2B 872c7c7a66131b4152554786a27891e722df4536ba6c6089304883918fd07bfefef78b0825f4c02048bfa707f6dede18ecbb6cd6ee1c0dbfe534d1a98675c4cb SHA512 9a8bf26731bbfad94d5763009272fd0b7e31275c6c23961c102a40b76441a083ee3c589f3c8ca0859b3f8d6813d4872b21805cb7c5642aa6c2c0404eac07af37
 MISC metadata.xml 537 BLAKE2B 7e120368e0f02298c0b0760d0574156d970807b43e78b7faa85d84a69fa5c9d97f12929865c9446f8de5a2f50b3a034e57925f9420b48ee85cf48a949ec78328 SHA512 9006b64233c7bc73f34f3aaa70d9de7c7eda5375017ac892169d100d2b0f931695f723644235203b04fe4cd6da5dc74ca247c62f217307a4224b81bc005cb753
diff --git a/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
index 63fb8e85240d..62d937efe4f5 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 # Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 systemd
@@ -32,15 +32,15 @@ COMMON_DEPS="
 	acct-group/sabnzbd
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-4[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild
index e842f9ed1be0..b09442235e47 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 # Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 systemd
@@ -32,15 +32,15 @@ COMMON_DEPS="
 	acct-group/sabnzbd
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-4[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
index e842f9ed1be0..b09442235e47 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 # Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 systemd
@@ -32,15 +32,15 @@ COMMON_DEPS="
 	acct-group/sabnzbd
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-4[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index faffc250b657..81f2227cb870 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,3 +1,3 @@
 DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
-EBUILD tin-2.4.5.ebuild 1775 BLAKE2B 7aeea4f668ee3728f5f1be7f962d550c89a7d546011d53cc275521b196e1b01144af79f27035c49ca4447f04d803f005ccc86b548ea43f745800758405bd03fc SHA512 f0c31aa2b02f4f0b273c83daaaa79cc75628049cffa1e42ed6114723ee06b15f407d04f2aee062ebb7bbd921813d4d34a7006f9c7ab2f8c3a4904e96be8e8049
+EBUILD tin-2.4.5-r1.ebuild 1780 BLAKE2B 040add152e5d93840962ecc1217fc0fa2bbc721ebe8a09fe61d5f4c801a42272ab8f8c33ae40ed3a1ec8a726a7e24707829aea2bc92dba6a509c37ea2d7fb5b7 SHA512 db7b439ca03746cbaf67f6803fec71a705df5f699c4b569321386e5fcad004b9c8fb9aa53b93505a37983be2cac0d062f30f68a08b41f086f4f91c2e6e83520c
 MISC metadata.xml 456 BLAKE2B e606f48de760db9a54bc0d98453c04b71070d0eede202c65ab8ab64ad13557d794c24709c141837cb79468eb063ff6ecf17361385145c2294d90c43f585fe81a SHA512 c73827179e20f2487344e28828b999de4ccf1925a09dac5ae2fbdffbf398c3b147db96f6c69c14e8156bdc84c070dda5b7a24109efb57853ec7a8064a16c8bae
diff --git a/net-nntp/tin/tin-2.4.5-r1.ebuild b/net-nntp/tin/tin-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..d9022f05e519
--- /dev/null
+++ b/net-nntp/tin/tin-2.4.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
+HOMEPAGE="http://www.tin.org/"
+SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/uulib
+	sys-libs/ncurses:=[unicode(+)?]
+	gpg? ( app-crypt/gnupg )
+	idn? ( net-dns/libidn )
+	mime? ( net-mail/metamail )
+	nls? ( sys-devel/gettext )
+	sasl? ( virtual/gsasl )
+	socks5? ( net-proxy/dante )
+	unicode? ( dev-libs/icu:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local screen="ncurses"
+	use unicode && screen="ncursesw"
+
+	tc-export AR CC RANLIB
+
+	econf \
+		$(use_enable cancel-locks) \
+		$(use_enable debug) \
+		$(use_enable etiquette) \
+		$(use_enable gpg pgp-gpg) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with mime metamail /usr) \
+		$(use_with socks5 socks) $(use_with socks5) \
+		$(use_with spell ispell /usr) \
+		--disable-mime-strict-charset \
+		--enable-echo \
+		--enable-nntp-only \
+		--enable-prototypes \
+		--with-coffee  \
+		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
+		--with-pcre=/usr \
+		--with-screen=${screen}
+}
+
+src_compile() {
+	# To build from the root dir you have to call `make build`, not just
+	# `make`.
+	emake build
+}
+
+src_install() {
+	default
+
+	# File collision?
+	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
+
+	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
+	use doc && dodoc doc/{*.sample,*.txt}
+
+	insinto /etc/tin
+	doins doc/tin.defaults
+}
diff --git a/net-nntp/tin/tin-2.4.5.ebuild b/net-nntp/tin/tin-2.4.5.ebuild
deleted file mode 100644
index 3d038bb3b7f0..000000000000
--- a/net-nntp/tin/tin-2.4.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
-HOMEPAGE="http://www.tin.org/"
-SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="dev-libs/libpcre
-	dev-libs/uulib
-	gpg? ( app-crypt/gnupg )
-	idn? ( net-dns/libidn )
-	mime? ( net-mail/metamail )
-	nls? ( sys-devel/gettext )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses:0[unicode?]
-	unicode? ( dev-libs/icu:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local screen="ncurses"
-	use unicode && screen="ncursesw"
-
-	tc-export AR CC RANLIB
-
-	econf \
-		$(use_enable cancel-locks) \
-		$(use_enable debug) \
-		$(use_enable etiquette) \
-		$(use_enable gpg pgp-gpg) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with mime metamail /usr) \
-		$(use_with socks5 socks) $(use_with socks5) \
-		$(use_with spell ispell /usr) \
-		--disable-mime-strict-charset \
-		--enable-echo \
-		--enable-nntp-only \
-		--enable-prototypes \
-		--with-coffee  \
-		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
-		--with-pcre=/usr \
-		--with-screen=${screen}
-}
-
-src_compile() {
-	# To build from the root dir you have to call `make build`, not just
-	# `make`.
-	emake build
-}
-
-src_install() {
-	default
-
-	# File collision?
-	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
-
-	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
-	use doc && dodoc doc/{*.sample,*.txt}
-
-	insinto /etc/tin
-	doins doc/tin.defaults
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index f8d5ea0471ef..8e097387d476 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitflu/Manifest b/net-p2p/bitflu/Manifest
index 20489056cb7f..4cfc7f71a45d 100644
--- a/net-p2p/bitflu/Manifest
+++ b/net-p2p/bitflu/Manifest
@@ -1,5 +1,5 @@
 AUX bitflu.config 1685 BLAKE2B 0f8e815101b473d877dcf427088672989fe1a069949b3e3600efa95a02643c6729190ac361d51c84d8678a4c1ea007a57ecd44dba0cd592e18efe94e8cfeea5c SHA512 c0ed5b1f27f871b80cbfc9148bdc1d9d73a03361587bb2e69df77062335110d841f3e4debdaf16cf8e2d3e2fdd91581f89d09ae58b11608541d57528aec2fa69
 AUX bitflu.initd 887 BLAKE2B b2ca0e185376cd29c2eb8653441cc4b17c0b6ef47a0cda406fafb12fd5099e1e2429eb71c299498f6fcc6ce1bcc2e3858c49bf5615aabe3bf67954dc3548b0e0 SHA512 46a11d59198eb428418fe018cd5e95149e385b3c4b642106cb294ecf6ff8576ba3a5de038ec6a71bb7de894680f55b5a38931d101e5d5ee589c0764c9de609ba
 DIST bitflu-1.52.tgz 162308 BLAKE2B 0f9e0c7121b9d36d8a071b6e6a88f1649202bddcd50935433f75bc077cd43df780d250405495b6da107575b56db81cb2f2a8acc13b674021e59e01596523d93f SHA512 fff6d253b57e43a2e5a917e508a864304c19d5c12e965abb74905bee1ecea10f79a3f3b7d7d0c8112bedabe2d42288171397bd03136a1f37c439039971659ebe
-EBUILD bitflu-1.52.ebuild 1802 BLAKE2B a922eb97505c6c13d7cdd3b9977364bd329944976ce9d971a202e89ef16d22ee4211ad0ee0dbdee148e9976e8922e3b279e94621ceeef2aacd8d9c1a82befa5e SHA512 d9eea0047caef028816a5b6cd1785f56981d5957efd5c1ef0d0ef8c6e4ef79c7c5edc26974273f716791105d446a55f88f8a430768af09c37cc1e9768154e71b
+EBUILD bitflu-1.52-r1.ebuild 1637 BLAKE2B 0c9fc3d62041f9b9173b3be2f07b3c993a8532add83d9b39881ed4cd0b96a5bd29926f6e9f1a2c192c7cc5bfd07aee62efb5499ffdc419fb07a6c4c11ac526af SHA512 8d23e3da221de1fa1e8a97bf2c400ee3a5ff13fd7f2414e56c46af2ba16e96018c294b5011fc6e0ad7736b824c244a15e616706c6b353b5e96c6cee8f08710e2
 MISC metadata.xml 466 BLAKE2B ecc2313218094e45e9027403e1ad7c1b8dd4c2a4a6ff9f5c2b836c1456a23d8e1fe957f2d0edaa00d0cae6cacabce9315ee3eda7fc899b9f069495113ee1733f SHA512 09b471a3ce2088c69698afaedb48b37cdd305f94eea72e402965b090b29d691bde743da8c6891ba6fa880a2b4e37f3c9ea7e3012cf7c68493dac34726417335b
diff --git a/net-p2p/bitflu/bitflu-1.52-r1.ebuild b/net-p2p/bitflu/bitflu-1.52-r1.ebuild
new file mode 100644
index 000000000000..f6d0d7367da5
--- /dev/null
+++ b/net-p2p/bitflu/bitflu-1.52-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="BitTorrent client, written in Perl and is designed to run as a daemon"
+HOMEPAGE="http://bitflu.workaround.ch"
+SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
+
+LICENSE="Artistic-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	acct-group/bitflu
+	acct-user/bitflu
+	dev-perl/Danga-Socket
+	dev-perl/Sys-Syscall
+"
+RDEPEND="${DEPEND}"
+
+src_compile() { :; }
+
+src_install() {
+	local PLUGINS="/usr/lib/bitflu"
+	local CONFDIR="/etc/bitflu"
+	local LOGDIR="/var/log/bitflu"
+
+	# executable daemon
+	dosbin bitflu.pl
+
+	# plugins
+	insinto "${PLUGINS}"
+	doins -r plugins
+
+	# config file
+	insinto "${CONFDIR}"
+	fowners bitflu:bitflu "${CONFDIR}"
+	fperms 775 "${CONFDIR}"
+	doins "${FILESDIR}"/bitflu.config
+	fowners bitflu:bitflu "${CONFDIR}"/bitflu.config
+	fperms 664 "${CONFDIR}"/bitflu.config
+
+	# log file
+	keepdir "${LOGDIR}"
+	fowners bitflu:bitflu "${LOGDIR}"
+	fperms 775 "${LOGDIR}"
+
+	# docs
+	dodoc bitflu.config.example ChangeLog.txt CONTRIBUTING README_IPv6.txt \
+		README.txt Documentation/bitflu-internals.txt
+
+	newinitd "${FILESDIR}"/bitflu.initd bitflu
+}
+
+pkg_postinst() {
+	ewarn "Note: At startup, or at the user's request, ${PN} (re)reads its"
+	ewarn "configuration file and overwrites it with its own sanitized"
+	ewarn "version.  A backup is created in the configuration directory,"
+	ewarn "/etc/${PN}, but that file will subseqently be overwritten if"
+	ewarn "a further backup is made.  You may want to keep your own backup."
+	ewarn "A prestine example with comments may be found in /usr/share/doc/${P}."
+}
diff --git a/net-p2p/bitflu/bitflu-1.52.ebuild b/net-p2p/bitflu/bitflu-1.52.ebuild
deleted file mode 100644
index 93668715d823..000000000000
--- a/net-p2p/bitflu/bitflu-1.52.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="BitTorrent client, written in Perl and is designed to run as a daemon"
-HOMEPAGE="http://bitflu.workaround.ch"
-SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
-
-LICENSE="Artistic-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-perl/Danga-Socket
-	dev-perl/Sys-Syscall"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup bitflu
-	enewuser bitflu -1 -1 /var/lib/bitflu bitflu
-}
-
-src_compile() { :; }
-
-PLUGINS="/usr/lib/bitflu"
-HOMEDIR="/var/lib/bitflu"
-CONFDIR="/etc/bitflu"
-LOGDIR="/var/log/bitflu"
-
-src_install() {
-	# executable daemon
-	dosbin bitflu.pl
-
-	# plugins
-	insinto "${PLUGINS}"
-	doins -r plugins
-
-	# working dir
-	dodir "${HOMEDIR}"
-	fowners bitflu:bitflu "${HOMEDIR}"
-	fperms 775 "${HOMEDIR}"
-
-	# config file
-	insinto "${CONFDIR}"
-	fowners bitflu:bitflu "${CONFDIR}"
-	fperms 775 "${CONFDIR}"
-	doins "${FILESDIR}"/bitflu.config
-	fowners bitflu:bitflu "${CONFDIR}"/bitflu.config
-	fperms 664 "${CONFDIR}"/bitflu.config
-
-	# log file
-	dodir "${LOGDIR}"
-	fowners bitflu:bitflu "${LOGDIR}"
-	fperms 775 "${LOGDIR}"
-
-	# docs
-	dodoc bitflu.config.example ChangeLog.txt CONTRIBUTING README_IPv6.txt \
-		README.txt Documentation/bitflu-internals.txt
-
-	newinitd "${FILESDIR}"/bitflu.initd bitflu
-}
-
-pkg_postinst() {
-	ewarn "Note: At startup, or at the user's request, ${PN} (re)reads its"
-	ewarn "configuration file and overwrites it with its own sanitized"
-	ewarn "version.  A backup is created in the configuration directory,"
-	ewarn "/etc/${PN}, but that file will subseqently be overwritten if"
-	ewarn "a further backup is made.  You may want to keep your own backup."
-	ewarn "A prestine example with comments may be found in /usr/share/doc/${P}."
-}
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 2eea7aeb3226..8117900949d1 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -12,6 +12,6 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
-EBUILD deluge-2.0.3-r8.ebuild 4584 BLAKE2B d25173f39f289cd061a69c88837e321121ce5698ae9bfebd6444475eab9b0a0c8c7a2bd997cb861a80a5d235d165808222f056f16948328b9fbf6d0aca575d1a SHA512 6e0e3dfc6dcb465ad3ab8dfb0b86c87e13092a22cf6604ad56420c8e3ad05d403e3e08dbb2a28a32df4702f5277866955b5bf20493caddc821730e5645e6517d
-EBUILD deluge-9999.ebuild 4544 BLAKE2B c2cd3f116435dcec7ed002b9d8a4892c6c83f414bb74bc618df1a338247185b052536e29b7e8959171b85018015d3fa05980e1ebb44d42d9fde2b2476018355b SHA512 632a5c2e7a9a3a04ec8536552575938140d0b33aa4e95f112c9357ef2e48d28e6f3e42ca6a3af655973df597d50b0c85091cba92ddbea28509ee53a231e72016
+EBUILD deluge-2.0.3-r8.ebuild 4480 BLAKE2B 8aed7e23112c258e9ecf7c378dffb016ff392873068817d12c64ad7957ca6bf18823e4459d0f97ec11eb18023a153ce4866feacb3d619395b2b81637250ce46d SHA512 58c0244a396a22ea473792b1df328a5d86a343f6acd1ba04232a3f9f9619ef975e8642e5e64543d385f1512020c8ef7f707c51f0e4cb30557cdb585f57a2113d
+EBUILD deluge-9999.ebuild 4440 BLAKE2B f6ab56b0b6b5c19729cec6c39dbf6863aebae433e540ab66301345a3a876122f0ec41361430fde9dfb1bc661c2966c503335864bd6b48d33f4a02fb6245801a3 SHA512 39dcb2a3706929fa51111abe1572c02110748d267d1db56834972351de3518d7d954d98d4c87f86e1deeaf510e74b9b9d315bdf28dfb4345b3baf222ab89fe45
 MISC metadata.xml 674 BLAKE2B 95f9759f521dd343d3b89dc944b39ed0b9bb34aabe1f046e27609a9a458ae0b6215dc032dc791ca47a84e0d1d8a6850fa0a97cdb2e567a91b0d467843e2425a5 SHA512 2035e01ea705109af45be1c62e8afeb374b4c2ca91f7a6050b0ed3b08d048a8f38f8ead075fb4a46790710b025b721efa4c41ea11522456dd9fa7bfe4354ca02
diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index d83b42bf73d4..99e877d5e202 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
@@ -29,33 +29,33 @@ REQUIRED_USE="
 
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 
 PATCHES=(
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index c6b27e123d32..bdb0681318ce 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
@@ -29,33 +29,33 @@ REQUIRED_USE="
 
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 
 PATCHES=(
diff --git a/net-p2p/litecoind/Manifest b/net-p2p/litecoind/Manifest
index 16170ed9317f..74c520fd346d 100644
--- a/net-p2p/litecoind/Manifest
+++ b/net-p2p/litecoind/Manifest
@@ -8,8 +8,6 @@ AUX litecoind-0.10.2.2-memenv_h.patch 506 BLAKE2B 70f9911bd90fcba5c4f41aaabfd8a2
 AUX litecoind-0.10.4.0-gcc6.patch 2789 BLAKE2B 3c943438cad1b029a4764b76b901e1959edb14599b09aced7897d632defc5005d70d7de3f49e9ea56fe87243b071e2257f6b6984bd748be7697b607044ee47ae SHA512 7c5a14c50076438d04fd7ce3b24d0c17ae23d67c043ffb381e893f2ec6c4903842638347be12ca090bef2e3fb07721bccae77c61c34018ba406e9ceba4cd0cc0
 AUX litecoind-0.18.1-system-leveldb.patch 1009 BLAKE2B 6d6b3ef44d1e0af47b1b171d7d0b600c6f24ffd213265583bcec8f99b87c6effdabb1a8de31170a9ffe85e12c3f79d67373ddcde10fb9e71593840c18f96475a SHA512 c51a22af818b4ba1c9eb657161c2edfc94b3ec1c5cb346d208d6adb28bc4dff5d689533d9db2915c744c10ee595be8e846caf4b919a1b9886810ca9258c3fc99
 AUX litecoind.logrotate 113 BLAKE2B 01ca87d1a52061ff95baba8f5c570747b962c7836e5fbe3bed62292afc8b1ddcd7eb550441a3966e84290e2ee2c37acd73ed58b753434723292a28ec17883f22 SHA512 eaa9f462be8dc755b675e4d5cb3ad271e3b1053edfa06df7862fa887160c849c768d2a268a7c8b52d1cfc834c186780b71435ee65475ea6c6692c18bded48dec
-DIST litecoin-0.10.4.0.tar.gz 4730189 BLAKE2B 3b3e4db10ca7ebb048853a424438d888a239cc736b1b2aa29dd0b6571daec5a64f95aee98a82991cd3e69b26965151f298655ca09745f103ebde1d15216ae2f8 SHA512 ae17e754d188efb1b51a376a52fe03e43b58c5059673b7dd4ecbf4f48574290b84011525fef2e10893f53e4da3d6ad9b5577001bb40aef7080d4c2479f4714a9
 DIST litecoin-0.18.1.tar.gz 5122629 BLAKE2B c6cb220bb893518eaf04e1b4b825dc0318103c955da6f262ef13fc9d925b7bae1bb0407a701a04a17bb3040c613b666e6de3331d443046e9d83aec4ed559e02e SHA512 59605cc0c4fd67c128bad0e2cabcc7b6bda1ebf5b23b7fcaee9fa69e86a4349598feba413f0ad42aef9338a42b0d6f8c04306634bd543856a2e7a203aa717f40
-EBUILD litecoind-0.10.4.0-r2.ebuild 2491 BLAKE2B bdbdfe1f2795a814ea785c2d491ec3b006dd1ed2f8005d5a5bfff7026a508569bd0426e9b39fce3c92f540dcba07af6359b2f14f8d80240e5da5a7cf19ecb2ae SHA512 3402d7cbea5df07f246db1ec798760435c75c576110cb3f5e60815b10a08edcae66c7681135d0ee252ccf3f54d3a3f44ed39bef970736f0524fe0b31cd198288
 EBUILD litecoind-0.18.1-r1.ebuild 2096 BLAKE2B c448a4efd917701350d9e5d9d31b7c876a7e212db4a3e86b7c4be2dbe7d836e701831ccbc688518654bb137ad06f9bc68b7eaf617951c97c39e79f6106db6279 SHA512 dde983593fe4014b97fded82c14dc8654af86d5194ae313ac56ef3cb1c93dfc0cbb3cf77b652937e72bae95060e57cc1eafe164d19c1135afbfcd5a28b03e450
-MISC metadata.xml 396 BLAKE2B d75a242beda5f641ab3e995c20517fc18334d39df0fdb44107e1c54adcd87911d8baf360ae05bdf66ba9d5e690d296760ba3d1599e8bd8cf5fbb1ed653601c29 SHA512 b7bed8abba67ee6344e39e4a41991a0b1c036a51cf1ca338a8851507e8e7bcb9e3081445eaa7fb09b2b1ef352d02dbff5339faebc0becce9273bd743344d47a6
+MISC metadata.xml 323 BLAKE2B 73fc1c6d1a46b6520918bb7235e13ab98a8a7c70572aa89c754ebe762a49afb919a2e9c734d55e887869d9fc5ca7f1383f906c1f016f506faed9d49413437f7b SHA512 b8c111acfb5072f140f88b3ead14b1c99b39c4ef3f59c4b18e711dd7fcc52ba9bd7efae1cf54e2c14ec5d5bfe2310695f92330770b55e4d388958205b87fa84f
diff --git a/net-p2p/litecoind/litecoind-0.10.4.0-r2.ebuild b/net-p2p/litecoind/litecoind-0.10.4.0-r2.ebuild
deleted file mode 100644
index 4baece7f884c..000000000000
--- a/net-p2p/litecoind/litecoind-0.10.4.0-r2.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
-
-DB_VER="4.8"
-
-inherit autotools db-use flag-o-matic systemd
-
-MY_PV="${PV/_/-}"
-MY_PN="litecoin"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="The offical daemon to run your own (full) Litecoin node"
-HOMEPAGE="https://litecoin.org/"
-SRC_URI="https://github.com/${MY_PN}-project/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT ISC GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="logrotate upnp +wallet"
-
-RDEPEND="
-	acct-group/litecoin
-	acct-user/litecoin
-	dev-libs/boost:=[threads(+)]
-	dev-libs/leveldb:=
-	dev-libs/openssl:0[-bindist(-)]
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	logrotate? ( app-admin/logrotate )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="
-	${RDEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.0-sys_leveldb.patch
-	"${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch
-	"${FILESDIR}"/litecoind-0.10.2.2-fix-gnustack.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	rm -r src/leveldb
-}
-
-src_configure() {
-	# To avoid executable GNU stack.
-	append-ldflags -Wl,-z,noexecstack
-
-	local my_econf=
-	if use upnp; then
-		my_econf="${my_econf} --with-miniupnpc --enable-upnp-default"
-	else
-		my_econf="${my_econf} --without-miniupnpc --disable-upnp-default"
-	fi
-
-	local myeconfargs=(
-		$(use_enable wallet)
-		--disable-ccache
-		--disable-static
-		--disable-tests
-		--with-system-leveldb
-		--with-system-libsecp256k1
-		--without-libs
-		--with-daemon
-		--without-gui
-		--without-qrencode
-		${my_econf}
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/litecoin
-	doins "${FILESDIR}/litecoin.conf"
-	fowners litecoin:litecoin /etc/litecoin/litecoin.conf
-	fperms 600 /etc/litecoin/litecoin.conf
-
-	newconfd "${FILESDIR}/litecoin.confd" ${PN}
-	newinitd "${FILESDIR}/litecoin.initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/litecoin.service"
-
-	keepdir /var/lib/litecoin/.litecoin
-	fperms 700 /var/lib/litecoin
-	fowners litecoin:litecoin /var/lib/litecoin/
-	fowners litecoin:litecoin /var/lib/litecoin/.litecoin
-	dosym ../../../../etc/litecoin/litecoin.conf /var/lib/litecoin/.litecoin/litecoin.conf
-
-	dodoc doc/README.md doc/release-notes.md
-	newman contrib/debian/manpages/bitcoind.1 litecoind.1
-	newman contrib/debian/manpages/bitcoin.conf.5 litecoin.conf.5
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/litecoind.logrotate" litecoind
-	fi
-}
diff --git a/net-p2p/litecoind/metadata.xml b/net-p2p/litecoind/metadata.xml
index e5fa4a887501..32c821f67571 100644
--- a/net-p2p/litecoind/metadata.xml
+++ b/net-p2p/litecoind/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<use>
-		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
 		<flag name="wallet">Enable wallet support</flag>
 	</use>
 	<upstream>
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index bf0e4b8099df..bf6f23eab1ef 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,4 @@
 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
-EBUILD ncdc-1.22.1.ebuild 991 BLAKE2B baf7f6ba1c99d50bf3c06c2bb6ae6cbf538869406ee191390494e5eaa1b657abb03eef505a940c79eb57d550f4fd93ea645f756f8ce73b89cc20150299de47ea SHA512 b245637d25cb644e7ddc5bb9613f59cdb24227c5fd87104a49a9355b4311e883465e87e24dcf4d65cb42bc0b940d19a8d903979234e94443c1b819f040f37311
-EBUILD ncdc-9999.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
+EBUILD ncdc-1.22.1-r1.ebuild 993 BLAKE2B 7d6a6c92d00a611710a578ac512ab835fa73f7b23a43748e2ac9de2ddf161c4c275d6a61c01b642df68f09aef482964bc365328b389410616b7beda67f8b9e9a SHA512 f2915f78eb33cd82edb0af152119ba9fb48b48a447b66edbaccd431daf0757dfb9bf1d9864f1ccc0572405f3bd37687d3a325c8f5fc7aab2b45a927e6a5f8b88
+EBUILD ncdc-9999.ebuild 995 BLAKE2B 3622d210b4c48feac9582f18b178a6d6e84dab2da2fd9dd08db461ea2c8e1e85c99f56dce6bb049c0d2e10dbd10d7861b2f3d1c715e0cbf61859fddf8594dbf3 SHA512 eab10df54ff414ba10bded7a946861c27467cdb9fa1cc931ae0ef0b179cdfd6272ade5de5bba13352e515b8273c8130b480fd4eb5269d70827eb4303d6d98814
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
diff --git a/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild b/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..d7201b1fe491
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="ncurses directconnect client"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+else
+	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+	KEYWORDS="amd64 ~ppc ~sparc x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="geoip"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	net-libs/gnutls:=
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib:=
+	geoip? (
+		dev-libs/geoip
+		dev-libs/libmaxminddb
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/makeheaders
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with geoip)
+	)
+	if [[ "${PV}" == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/net-p2p/ncdc/ncdc-1.22.1.ebuild b/net-p2p/ncdc/ncdc-1.22.1.ebuild
deleted file mode 100644
index 24e91e7af127..000000000000
--- a/net-p2p/ncdc/ncdc-1.22.1.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 toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
-else
-	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="geoip"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=[unicode]
-	sys-libs/zlib:=
-	geoip? (
-		dev-libs/geoip
-		dev-libs/libmaxminddb
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/makeheaders
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with geoip)
-	)
-	if [[ "${PV}" == *9999 ]] ; then
-		myeconfargs+=( --enable-git-version )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index 8377b413dc10..f6cebc9b3c0a 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-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 @@ RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	net-libs/gnutls:=
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib:=
 	geoip? (
 		dev-libs/geoip
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 4837630a14ab..5c5ef1315bd2 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 029ebdd08e08..826d91ebe796 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -7,5 +7,5 @@ DIST cups-filters-1.28.9.tar.xz 1502888 BLAKE2B ddfed7c0815673d8a372af96cd879fb1
 EBUILD cups-filters-1.28.3.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
 EBUILD cups-filters-1.28.7.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
 EBUILD cups-filters-1.28.8.ebuild 3597 BLAKE2B eab701365704a1ec5028b0a1104f3f42aa6bbae974ce8b16af901a41ee2d62ec1924f0ff730e2b72433671b4a1f79a1cc8f1828ccbae0137d81f74bfa679e0ad SHA512 2f6853a56107e804938af1df25312dcbf322c63c358ce9deff6d2d53f93da30f75ee6212042ccafbdd00d965a20a20a880fd96472fed0049ef1085f23eb88a4a
-EBUILD cups-filters-1.28.9.ebuild 3599 BLAKE2B e7d181a5657cc5d2eb7272160038613410ae6a1f7d1101634aa9dd4488cb4b4db1b13621d534fc79e0418666725de2f38d856df5509cb9e53fdf84c70bb55b69 SHA512 2ca6938c356826c5a262f6964e582b16a34d13acb6df6dc12e648a7b9cc55cd8e4dbd6eb1201ea4ecd8b27167326528ea9f812875ddae8705fcd9c6be73d1d2f
+EBUILD cups-filters-1.28.9.ebuild 3606 BLAKE2B 6078cdea39bbe969f74dbcc7df085d1253008f0a11643d984653a2a0a43de048f3096560313f3240c3f01c02fb457177ff2ffe927eeccf45335cc713e429928b SHA512 18fd7f914a278379a393cc209da189e535e4d625e00d6047a2a7bac30dded7a14a5bedf17021dbb47d0110944823a2ca890f4c6f004c46d2cb75296e79f5d159
 MISC metadata.xml 512 BLAKE2B 2dd3dbff375248f63add04f7cd136e0de7fbee885f359ee546de2060b4e0d965655e9c93b4f31c4cece89e1f750037766752f4b74d4f6216213e2dcd374e163f SHA512 9678f63f3ef2164ef837220914ce57111c118df556755e2c802d1476726312dc6d47baacc4d977e35e6a44ca1d5af8f0841a41323fdbd9a6471dea2c87103d32
diff --git a/net-print/cups-filters/cups-filters-1.28.9.ebuild b/net-print/cups-filters/cups-filters-1.28.9.ebuild
index f56e4ac2b4fc..8ad08aa25bbc 100644
--- a/net-print/cups-filters/cups-filters-1.28.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	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"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 88302e77e651..c0fb5cff9423 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,6 +8,6 @@ AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078d
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
 EBUILD cups-2.3.3-r4.ebuild 9701 BLAKE2B 4203eb7e427486594802694bc83124de8cdc2d1f116638b22669d4b38aa6132234b15d7551ba50eb0952933887128ce070b2ceb4c2ffd8dde5a7e1e7951079e5 SHA512 09c6f214213c13ceb7d2edaf979a378d2c2ac54040db3a1bcd44580b6dca3480ab75a575bc8338d9c0f167fcc8274cb16208c23419cffab5d5019cf0c9888b12
-EBUILD cups-2.3.3_p2-r2.ebuild 9064 BLAKE2B 369a48caeb3ea87c0b34455176f77534ee45e15aaa66c92e02740443d547d91be567acbe5d75dada8da53cb2666d4976a5e532e2710bd76fb41a74456e200f91 SHA512 5022c7e44c4bbbeefff27c77dfaf8fe00648133f1c7ec142b65ef4cbb803040222968c486b190ae27ba9cb6186c188f29d67ba1456ba0347fe72b8e5de0fca8c
+EBUILD cups-2.3.3_p2-r2.ebuild 9071 BLAKE2B 3942fb09f2010856b51a83f344fedefa0a2fd8a63e1e7613ba36f24aaca362c96ec9454f9acbf14b7dfd440616dc33514ec7e063884b801c8e491bf2f06a2a81 SHA512 8c08852a1729176b2ad826be11fde8f7e5b3bf2d1f887300d8881d4ee73e08f4baa05c891e42726e9c35cbbb920ce2c17495c7af26877c4c46b7c98da38de330
 EBUILD cups-9999.ebuild 9005 BLAKE2B 2321c7ddf922a49e643962932888d7b99f1565328487a1f1cd3b631ee392d056aa7a509962c34d2373687edcd703bfbaadf8836efca698329b9ac526c4846f39 SHA512 2bf49d626434b7c1562386c71ac0d96f2f2f34eb57fa3f02d8dcfc3abfdfcf4f483850fd7e9342542c56a45a542c0ddd91a733648c6dc74db4e0dfd65ae861c8
 MISC metadata.xml 527 BLAKE2B ec1e13892e9264410a238328b21d77c2aa686674e3427d4bf04afedcf3e9d14927060eca98e8cfa1e1557c707a50efec3c3d5532e83470cba59acd912116717d SHA512 8db4eeb1ce4597679bf88c5657b7bfde4f8f8a40814c81624103172c22b65e1fb3354c183e7de1b37ba72621e29397d3510458048f78f4a4c99e7ddb669e7adb
diff --git a/net-print/cups/cups-2.3.3_p2-r2.ebuild b/net-print/cups/cups-2.3.3_p2-r2.ebuild
index a5616f1a2095..1fb277c69548 100644
--- a/net-print/cups/cups-2.3.3_p2-r2.ebuild
+++ b/net-print/cups/cups-2.3.3_p2-r2.ebuild
@@ -19,7 +19,7 @@ else
 #	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		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"
 	fi
 fi
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 89fa89c646ea..39eab9224e43 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,7 +4,7 @@ DIST hplip-3.21.2-patches-1.tar.xz 19212 BLAKE2B c733651a7831b54bec13b5f037b0f00
 DIST hplip-3.21.2.tar.gz 27014784 BLAKE2B b6a13f0d48f3052ad09b419dbe9b68605c85ed8f1bfb6f1ec9720b9aace4a1c6d17a933b0d55ba20dbbc3d389ba1d2751dbd9a71d364ad2e2e1617cd7613dc2d SHA512 73ba37275cfe34a58b81c9656514e15da67c1a69af5471ad132a1538d324efe640879cb7e60c359915607e41b63e653e7ae757661e553235f6e83e378ab46474
 DIST hplip-3.21.4-patches-1.tar.xz 17812 BLAKE2B d38584eb04e5e8d886cd4c8ecd05c31f3a32db185c87eed8a6593f3f2d1368a284bbef36f9d78b2689862165cd132597a3d616aaf5411e875f97de45c57e197e SHA512 fd7438353af8b05e100b5ef16fedcc6bf9257d49fe7d5a12a1a2b3b26965c2ebcd613788e7f585f7c0bd3a97e83381e36f3915eabd16a1e8c4ac50c1129804e8
 DIST hplip-3.21.4.tar.gz 27019741 BLAKE2B 8e978488e09d99d136351b84fddd9ac7921b9ad1ca2355bfde4eca89646953c3caada5d45aeeb6e7882c448349e5ccd4b473df6f0f42e9b50d4b057157397d5f SHA512 3f22433b3d35013025b63163ccd879da203adcec821f9f90748ee8399b370a129ecdffb5889efa57da1dc5c3f45c42f7593d2198d9166240156baf839b55fce6
-EBUILD hplip-3.20.11-r2.ebuild 8281 BLAKE2B 73698ce5464b60119afa57056b3d8e596ec2e87f68909a8a73d81ca997a8733721f47113afda7676d097f8d04ad79b645ca159a23956c9b1ddcb953a4d211dfe SHA512 a6fc57891971aa4f9ce2ac15fa82abf38d07a1f15041a45870c2039a98d7796d2d51bb3566d514b0509d25f9a16ec28ae1894c39b784f102ed5c41288b64f9cd
-EBUILD hplip-3.21.2-r1.ebuild 8286 BLAKE2B 8c33bb775ed150bde68f2f70b7bc9b720798462a387a4758be62544bcf5ab20cdf2786882767f11e158fc5a8a1ee5977b08093ba2ef0902a74c8996ab0bccabe SHA512 6e75dcb2676acc755ac796f1c32ac939c54c4b42a4d342c20c65d62a1bb83c608a97ba5925335f1167365839abf5de8820e3ec9bd8d660800ee28964bbae819e
-EBUILD hplip-3.21.4.ebuild 8321 BLAKE2B 4be52bfe7b02e7a8fa48621975dd112dcae5472344801df4b9233adf90f5af248d8177f7834cf6b35e5fb2d715bb6227480923d6b57084c8bb304d91119fa08e SHA512 fc87f3cf750139dea5af933e4621f4c351fffde09d8ac63a13deb4db29a876a1b3ca56e91f0d010197a9c5e2fabdc1a8ec4f08d4bb3da0dcc45897f5489be92b
+EBUILD hplip-3.20.11-r2.ebuild 8231 BLAKE2B 3e060f6b134cfb101500db89a889c092f3eecd8803d8d475212d0c91fb7be52759dac472cfe82dd59eff85f4d579b48d7c03d68fb5ded3f90495334294578dde SHA512 a0fe5d63efd08036fcb45b23dc943b529b07d214f3b8bde4b4c91e34d28ae33f8032cb314108922f74955d6e0a4ed88a29c7d6672e18cd90aef6bce03750d13d
+EBUILD hplip-3.21.2-r1.ebuild 8236 BLAKE2B fc353a8f6eafc24043df16dc8c419807167ed983bf9ce68a8e7b214f5bba33d88997d25ddaac41151e6fc9563b3e543991213043b181790696446f964b81633e SHA512 608deb8451b8d088d2e94879e025028f381a0672cf49e58bfdaea95b8d6ef08612b8d1eba9704eaba0054b4b0cd9e341a91eabbb72dbeca13ed400314a93bb98
+EBUILD hplip-3.21.4.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.11-r2.ebuild b/net-print/hplip/hplip-3.20.11-r2.ebuild
index 7d1d95bcb4ea..b005d106d680 100644
--- a/net-print/hplip/hplip-3.20.11-r2.ebuild
+++ b/net-print/hplip/hplip-3.20.11-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
@@ -51,19 +51,19 @@ RDEPEND="
 	${COMMON_DEPEND}
 	app-text/ghostscript-gpl
 	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
 		kernel_linux? ( virtual/udev )
 		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
-			dev-python/distro[${PYTHON_MULTI_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
 			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
 			)
 			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
 				X? (
 					|| (
 						kde? ( kde-misc/skanlite )
diff --git a/net-print/hplip/hplip-3.21.2-r1.ebuild b/net-print/hplip/hplip-3.21.2-r1.ebuild
index e2d9b4b7d501..5edaeac52bed 100644
--- a/net-print/hplip/hplip-3.21.2-r1.ebuild
+++ b/net-print/hplip/hplip-3.21.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
@@ -51,19 +51,19 @@ RDEPEND="
 	${COMMON_DEPEND}
 	app-text/ghostscript-gpl
 	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
 		kernel_linux? ( virtual/udev )
 		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
-			dev-python/distro[${PYTHON_MULTI_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
 			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
 			)
 			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
 				X? (
 					|| (
 						kde? ( kde-misc/skanlite )
diff --git a/net-print/hplip/hplip-3.21.4.ebuild b/net-print/hplip/hplip-3.21.4.ebuild
index 84ae3994756d..e3f7c820026e 100644
--- a/net-print/hplip/hplip-3.21.4.ebuild
+++ b/net-print/hplip/hplip-3.21.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
@@ -51,19 +51,19 @@ RDEPEND="
 	${COMMON_DEPEND}
 	app-text/ghostscript-gpl
 	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
 		kernel_linux? ( virtual/udev )
 		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
-			dev-python/distro[${PYTHON_MULTI_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
 			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
 			)
 			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
 				X? (
 					|| (
 						kde? ( kde-misc/skanlite )
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index caa7eaf5cd82..d08a4847d33d 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index cdbb029b5898..db4f3bfa7da7 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-r6.ebuild 2694 BLAKE2B edf168174ddfdf936f54c70f92740e7cf67a134eeff76dcb36f8942c08fca5dedc492eb5e0a62f750a826e984ef978d06932aac5b37d7e62244ca8991cb7c410 SHA512 06b0c07dd52ed64cc7cb4efc490745c062206eaf431ee2e70ef981695de5ea38b0774c82cecc7dd9a7844b2b4b38aba9a2600be10f1f552a7fd71de13cc75d09
+EBUILD dante-1.4.1-r6.ebuild 2701 BLAKE2B 07aba4920687aee82bfde6d868d9da98dc31de2bdb3add0fb6406ea44d2659ebd091c51a6320fb159106d33c4058890182fc00032c9280b9e08a51966573b4b3 SHA512 ee042c1073326a25715da3dd72ca5ced83b88e3861dde05d88472b9ad2f5ff063ee54200dfa72c5b1af3001cd43cfd1210838e94a7f975b19dcb50ce94407fcb
 MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/dante-1.4.1-r6.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild
index 6b433c56f7a1..a08c030e38dc 100644
--- a/net-proxy/dante/dante-1.4.1-r6.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 CDEPEND="
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 2d89e64586c6..ba5694ac9428 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,26 +1,28 @@
 AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3cdb433db703ac9f6035d86de50a31d7f45f5d02c5704a30a4888b3b02e78d953acb31f29fedacc4c07b9521217dbfaeb2fd61d SHA512 a6ea15ac6b07c46695b9dc1aafadd7e3a74d413fbb31cf827fda202669a48c0108a20d303cd5a3e9c25bf7d75d588d011ba874eee3f90b5ba65498c861eca1b1
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
-DIST haproxy-1.8.30.tar.gz 2214184 BLAKE2B 07378b61c0b103fe3ff4c4ab936960d2f709cd20833ce2c343dece5496997f6819c68d0a58c6e11e4020b9a551328f9522b0ab739e7a0acd549eaa883bff7401 SHA512 13b0f80ad08c8d3ae41114b8112acd4f80f1f173f1a91a5f65439be86f341653be43ce9fe69168a934ccdb7a24abf476aef097b1f8fec5a0577f72ef19486d1f
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.22.tar.gz 2698262 BLAKE2B 417bc6bdfad276d210d597896f0685637034593a2418b0fcf984e62b767a491000a1f62f58b5ccc8f552890de14607737bc81bdf4736b6e4212ac15081ef5689 SHA512 29a1ee6d77892003ab4d813336d1ea165d91784bcf2124b98ca030e376e7ccc1c1b9f09e9a85ef0cd04f9808b589bfc7b7c19f831dcb55bb41d7777a172112ff
+DIST haproxy-2.0.23.tar.gz 2704381 BLAKE2B dbdad6bb11470088cae0092b4f0cef38840e2166f31e1fe2d571515ebd12c234a1470e7e59c07a68ab95f664deb15a1df537f405ffc800d89b0261fe5cb644f0 SHA512 0ede44b4d33630ac2d4419c93333aeb95c3cdc24f2aa0438a7e7fe57b4063fd91e308f974f29efdbfe62f24bc051c742645b48f3a810befc315ea54f1ada37dc
 DIST haproxy-2.2.14.tar.gz 2923727 BLAKE2B 6a234490247b5b0d8bf9131683deaa7b7fd4468aceaeec9c4ff401315a6be6237b5eae25a74330ffc2438de54f0e91938e8830fa8f17d6366286f6880be4af34 SHA512 ec5e2bf0c38a9af878f69f062e81e096b849c3ae93957bbcddc32f7c0e972d678136c8f06a16e594b60b7e2f41228e8179e93b4b0a3478ab775bece6745db877
+DIST haproxy-2.2.15.tar.gz 2930086 BLAKE2B 2198b7a6bc90f94fe511f3307df3323cc5ded3b722721992d54df5f41fc0d9f007494251f56d6365d781bcc97af81b98d2dd553ab2f11029b57a5a57d395cb5a SHA512 ef77cb2201ea61e7ac085acca8db6e9ee43ce1db2e8c5366d49cad9ace654eb81809a70f96b20a6f6f549061f8a73012ad1805a009c3e1c6fa5cd195af795012
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
 DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8b5b534665619703d42c9163afcd2b19768d408b27484ad73061e10b54b4bb512f09444944c403a30431814e8f8a SHA512 595a62d677240cb8a463245e5d5d497bb584a379852e533d82e45a77e1b91b469f84e386adcd42b6ec24e5806e256fc2708f672a0da5c1c4f784e3b76a9e7318
 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 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
+EBUILD haproxy-2.0.14-r4.ebuild 5487 BLAKE2B 5b4622a59d896e74f01849dc5ed28b468b8e38174b5e8c41aa9a3ea38a4b77143b8aa36902781829159981455a37e3c4dd7a399934969b65c1cdd8d1ddf6a5d6 SHA512 b11b191ccbcd769b67c1343b643e244dafa529cd8e9c25474430dd559654782ade68262b6734796f02d7a89af864d0aca9501a5d219c448e30ae92371759c4d5
+EBUILD haproxy-2.0.22-r2.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.0.23-r1.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.0.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.14-r2.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.15-r1.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.5-r3.ebuild 5546 BLAKE2B 34496ae5002d1d7659cb18e1d6c1b52ca6adbf0d8206989cdfe714b7ee5e077661caf7ba09b9a1f40085d6078b764d19eb9d16acece37c9c3aa590f557ccbdc9 SHA512 db03dc179a11c24cb541ebd1c7b1b51f9687c5738805ffe585817bd032003153b4df71f860219ddf9902fd8e91d819406ab0b0a0f271a67c8fb9c4e45e1cef3e
+EBUILD haproxy-2.2.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.3.10-r2.ebuild 5399 BLAKE2B 2218acf89a281aa07ce2d3f04c7503ef51a2555497a5c07fe711a475eb38b9a270f32079dffdc90ca845f1a500a5627e343d83587cded0a5bbfe49bf8fad9a6c SHA512 9444abf8051470c06d24647b39254b32c90753419277b7448a2bd972b497b64827cb116ec802dd45f53ec37aec5509cea76065302b5e458e12f92fa727268bef
+EBUILD haproxy-2.3.12-r1.ebuild 5399 BLAKE2B 2218acf89a281aa07ce2d3f04c7503ef51a2555497a5c07fe711a475eb38b9a270f32079dffdc90ca845f1a500a5627e343d83587cded0a5bbfe49bf8fad9a6c SHA512 9444abf8051470c06d24647b39254b32c90753419277b7448a2bd972b497b64827cb116ec802dd45f53ec37aec5509cea76065302b5e458e12f92fa727268bef
+EBUILD haproxy-2.3.9999.ebuild 5399 BLAKE2B 2218acf89a281aa07ce2d3f04c7503ef51a2555497a5c07fe711a475eb38b9a270f32079dffdc90ca845f1a500a5627e343d83587cded0a5bbfe49bf8fad9a6c SHA512 9444abf8051470c06d24647b39254b32c90753419277b7448a2bd972b497b64827cb116ec802dd45f53ec37aec5509cea76065302b5e458e12f92fa727268bef
+EBUILD haproxy-2.4.1-r2.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
+EBUILD haproxy-2.4.2-r1.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
+EBUILD haproxy-2.4.9999.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 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
deleted file mode 100644
index e6b1932baf9b..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.30-r1.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"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
deleted file mode 100644
index 68db0dd89896..000000000000
--- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r4.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r4.ebuild
new file mode 100644
index 000000000000..462ffc137f9c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.14-r4.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="amd64 arm ~ppc x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
deleted file mode 100644
index 6335de9e4750..000000000000
--- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.0.22-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r2.ebuild
new file mode 100644
index 000000000000..894bf001b81c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.22-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.0.23-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.23-r1.ebuild
new file mode 100644
index 000000000000..894bf001b81c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.23-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 41c1558bb74b..894bf001b81c 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -43,10 +43,10 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
-		dev-libs/openssl:0=[zlib?]
+		dev-libs/openssl:0=
 	)
-	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
@@ -103,12 +103,17 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 	append-cflags -fno-strict-aliasing
 
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
 	if use prometheus-exporter; then
 		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]}
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
 	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
deleted file mode 100644
index 6335de9e4750..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r2.ebuild
new file mode 100644
index 000000000000..894bf001b81c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.14-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.15-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.15-r1.ebuild
new file mode 100644
index 000000000000..894bf001b81c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.15-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
deleted file mode 100644
index 5ef90b045a36..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.5-r2.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"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ppc x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" )
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r3.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r3.ebuild
new file mode 100644
index 000000000000..e74a1dba415c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.5-r3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="amd64 arm ppc x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" )
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 6335de9e4750..894bf001b81c 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
-		dev-libs/openssl:0=[zlib?]
+		dev-libs/openssl:0=
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
deleted file mode 100644
index 56c62e7ad7df..000000000000
--- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.3.10-r2.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r2.ebuild
new file mode 100644
index 000000000000..d2978148fb5c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.3.10-r2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.3.12-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.12-r1.ebuild
new file mode 100644
index 000000000000..d2978148fb5c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.3.12-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12.ebuild
deleted file mode 100644
index 56c62e7ad7df..000000000000
--- a/net-proxy/haproxy/haproxy-2.3.12.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	if use prometheus-exporter; then
-		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins contrib/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 56c62e7ad7df..d2978148fb5c 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
-		dev-libs/openssl:0=[zlib?]
+		dev-libs/openssl:0=
 	)
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
deleted file mode 100644
index 9183ede9a103..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.4.1-r2.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..5c4cee22742d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.1-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins admin/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.4.2-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..5c4cee22742d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.2-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+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"
+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? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins admin/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.2.ebuild
deleted file mode 100644
index 9183ede9a103..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-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"
-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? (
-		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_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 9183ede9a103..5c4cee22742d 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
 	)
 	ssl? (
-		dev-libs/openssl:0=[zlib?]
+		dev-libs/openssl:0=
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index cc3fbf1a32ad..852eb86de994 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,5 @@
 DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
+DIST mitmproxy-7.0.0.tar.gz 27308204 BLAKE2B bea89db0dd39a8b3bd516d2e7c2868d4c226afdc78974ce0f88c055fcb4f907e398922c725cd93d344450e3e7e107c23c63ef6a60d19bff48400f6eeb4d0af0a SHA512 3836a33e5d2be09fb89987d2b0b898183dab9f17b990b98ab754d07cc5d7275786cfac0ab946e65a099ece054c7bbd65d62d01e4e4281e5f9b5f3dcdd0ac80b4
 EBUILD mitmproxy-6.0.2.ebuild 3046 BLAKE2B e943a273e580e36956e75e794b9848f6206d6a4b111f3e8c398e1ae2e8af23a6e358519ff18219f649f2834ec6dbd843f85a4031253fdf8348063d099a038102 SHA512 a2770f8d6222a509c2d3e0e6b30fe49db2105ef9b35beba460fa9ce309a7f657b8606f7c23a4dcbae08e3d0bc20da15802077a25959bc0c76d5fc54b4a087d66
+EBUILD mitmproxy-7.0.0.ebuild 2207 BLAKE2B d5a5c2ffc3bb7bfd699f2a9ca8daefa24a72f3edba0da8de41473e474fdd443d2738cb102c57658ab3c47809ef8706905e54bcabc2d1946d5af6ff63a0074c89 SHA512 23cd1a66a9f46437b00c8e1c0bca40f27cfe16bc3c0bf28d4cea2fc78fad7a9f700d0186404b54c01336b11d0569c9758f04ffc9d2624b124f2083373330485d
 MISC metadata.xml 1065 BLAKE2B 55b5f921dc3e44fe0b1b1a0957fe579d2c358996e4a0f6fcd352303e93749859474e56d639a4cd9f6ef152588c445a7bc88b58841209f6c64761a77f61865e31 SHA512 f5042a78818a1e00fb2157919aa9c6918a953fa55d775b8fd52f6549cbeefc138fd525c9c885186b4b047efb2c5b4d46e74cbc93edd3280a4220fc49b3a7f4e5
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild
new file mode 100644
index 000000000000..1476b80c35f6
--- /dev/null
+++ b/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild
@@ -0,0 +1,70 @@
+# 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,9} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
+HOMEPAGE="https://mitmproxy.org/"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
+	dev-libs/openssl:0
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
+		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# loosen dependencies
+	sed -i \
+		-e '/>/s/>.*/",/g' \
+		-e '/python_requires/d' \
+		setup.py || die
+
+	# remove failing test
+	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d9eaeabdb4ee..b467f86a7a6a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index b248668a048d..89f00dfabbe4 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.6.tar.xz 713464 BLAKE2B 7837d2e825b8e962a960bfd00d3e9a9ed247d20d3628d8242c86cb145f8aa3fa8e748126785f067f348a661867436fa5f6e529e4dfefdcb07eec273a807206b0 SHA512 8e6f0af6bcc275d5afff6388b75700c35a5b65773118876203a30ad42a5758cef5d27af8954e8c47bdc46c2b5dfd70262d894aca3d3a62bcab6d240c03eb6fb2
-EBUILD networkmanager-openconnect-1.2.6.ebuild 959 BLAKE2B dc1e1a263744965691d184d22a2fc2f104e635e8d34a2c73321be26f631300ceceaf7f1ad82c61ba19c8adcf772aedb682d865c5919ac43a0a826d9a4d2d58be SHA512 2aec5ce09f3c93232e091b31e76f11128662c5ad0d9ddcd5c157eeadccef23dfa5c1904bd4d2c372cfd3a164bc4dec6e4431b0a9a2ad360047c6ca0223b073e7
+EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 948 BLAKE2B de63d4917e5c832cb4ceb67adc8e54c78a676de017c8c4e411a73eda2f25722fc79bc04a02b9b57bc12974ac3b81e34e73dc90e42398745ac913052a98e9b604 SHA512 d3e6092eaa041501d4848fdf1dd9e99eb4eabe766652c405ff578af17a22325c6be76378bb590c3f8ecd3a7ed2c4557c69e0a41719bb07c15ded8508e86c3aa8
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..b03a1ae535e8
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+IUSE="gtk"
+
+DEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	>=net-vpn/openconnect-3.02:=
+	gtk? (
+		>=app-crypt/gcr-3.4:=
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3 )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openconnect
+	acct-user/nm-openconnect
+"
+
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--without-libnm-glib \
+		$(use_with gtk gnome) \
+		$(use_with gtk authdlg)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild
deleted file mode 100644
index c738e1b28505..000000000000
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	>=net-vpn/openconnect-3.02:=
-	gtk? (
-		>=app-crypt/gcr-3.4:=
-		>=app-crypt/libsecret-0.18
-		>=x11-libs/gtk+-3.4:3 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--without-libnm-glib \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index b208d1831272..5b455b79a936 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
-EBUILD networkmanager-openvpn-1.8.12.ebuild 1309 BLAKE2B 4f43d1a63291d1ee63608ac24fcf196e008acbc42bac665be4cd8e33854ec806b5aa5e1b8cf9fc1ca405a30b6dc9135b14d2030756f1e821dde49f2acdf7823d SHA512 07a4fdca208573de39314aef0cd7e1b1afc8e69ffe522b630acfa036c38d8d52ef35caf95f21881f96037e44b760099ef5963d0bce87d0da3949b2324c43615c
+EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12-r1.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12-r1.ebuild
new file mode 100644
index 000000000000..0087339898bb
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="gtk test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libxml2:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=net-libs/libnma-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openvpn
+	acct-user/nm-openvpn
+"
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
deleted file mode 100644
index 61b13e607235..000000000000
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gtk test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=net-libs/libnma-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		--without-libnm-glib
-}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3669e652fae4..106339d582c1 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -20,5 +20,5 @@ EBUILD tor-0.4.4.9-r1.ebuild 2797 BLAKE2B 2b37de0b894e2b7088fad0463bb173a08139ca
 EBUILD tor-0.4.5.7-r1.ebuild 2788 BLAKE2B 7c390e7a4789c967ce7b63b6a9505d487fc5dc7eba3b3d11d929f37a4bb4768dbd00c9547263d051aee401f8016f1abb69189acec02fa22616bfe8b3fb1cbc48 SHA512 746c9462ee787c860d3cee7deb8435b310cd1488c11dd385895fa891a43043bcacc15ed2c3df6905242f132111dbb2ac64850f21397e392e80bd09f851322fca
 EBUILD tor-0.4.5.9-r1.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
 EBUILD tor-0.4.6.5-r1.ebuild 2742 BLAKE2B ded94096f45ce9dd6be3ed15c762f80086aff5f2590ae83b94850ef1a2827d0c436313ee27f661dc190c89ef36417c3b2e8deb89817351b8b82d6e28e3d51eb5 SHA512 489760dbb35167c927ba53f061a767d03f17d90168010907e4a89db62a394029f3ed88f86e127d13c9720f8b875832531545aee4f5fee24522554602a973c692
-EBUILD tor-0.4.6.6.ebuild 2742 BLAKE2B ded94096f45ce9dd6be3ed15c762f80086aff5f2590ae83b94850ef1a2827d0c436313ee27f661dc190c89ef36417c3b2e8deb89817351b8b82d6e28e3d51eb5 SHA512 489760dbb35167c927ba53f061a767d03f17d90168010907e4a89db62a394029f3ed88f86e127d13c9720f8b875832531545aee4f5fee24522554602a973c692
+EBUILD tor-0.4.6.6.ebuild 2748 BLAKE2B 58f5ada5baad900c2693a457cee8d02163ff7e67cdfcb75f23476d838ac3241995b260f0241787c65d095a8fb28e206c2056c6af6e4532d5f92cd3c2bbf226b5 SHA512 4337b7031c3e51a8842cf3e6586d6aa701fafda7d49e9c259b573f83647a08147af530745720a93b273c299a9dcf92d22c02ba325873b5d608d6fe7ca05361f1
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.6.6.ebuild b/net-vpn/tor/tor-0.4.6.6.ebuild
index 5b9be817185e..a02b230e9c79 100644
--- a/net-vpn/tor/tor-0.4.6.6.ebuild
+++ b/net-vpn/tor/tor-0.4.6.6.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
 DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
+HOMEPAGE="https://www.torproject.org/"
 SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
 	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
 	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
 fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f46b3eb3da4d..82e619e7dd75 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index bb61511a65f3..ae0b1cc51b74 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
 DIST blueberry-1.4.2.tar.gz 1414169 BLAKE2B cd55e2bb572efb2badeab1667324df67c35f5833c53755c76c0793c07e8427c7d4714135014dad90aeaddc806c798f2b89960a051a15f668d214bb95cc0943e3 SHA512 5c2fb94e842cd1229682305f0054061724b958406ea15a64495ca418aa7da73c38b45ddc43c27a193aef995ab860cad985e3369e3dac53d2098463e6e4250493
-EBUILD blueberry-1.4.2.ebuild 1296 BLAKE2B c29128d59d0dcf6995cc592da97c7479a50282fcfdccc024bf153a47bc6fa3caaf88c3562a98fac37ce6a04d6ee9f084db98b7eeeeccaf74295ced6906ae4b74 SHA512 5561f2471aa84bb5b1408018ee85e6a229e53e2b40362e84854e5e0ae4ff5394f11500705339df0dc395b99b51ae74cf2bc1e66e17965c0fc5f9ce93192fbdae
+EBUILD blueberry-1.4.2.ebuild 1270 BLAKE2B e41da4d8d46f46279d39d62731bb646f3fd09c62c806a8c7fbb1b38aaaf1d2d7233844f3e7b550b2b590fe202ad1090e544f5f73212e86215b25d2bab02b22ce SHA512 a6d9f7e4821fbef86be025a79b19c09d441c5ac0f343f121256f4e07b809c54ca78d0158af2688e2f4902150ce09acd18f425d2131bdb0822db61815d207772e
 MISC metadata.xml 493 BLAKE2B dc1b8b9993a0f35f5c76f345a5025545c68c561a906bc8cb6627e65ba94cde16960484c4477afb9769e2e26f35f25c6d49df3e678aef0578ffbd9f7b145b0ccc SHA512 49551111e454436f2bfd52b88befff6bcb06a9aff3130b1c4fcb1ff27974685ababf3e3100a7ffe087f7ed5c958081b9faeed56bbfa160b4d277a1061f4bcd16
diff --git a/net-wireless/blueberry/blueberry-1.4.2.ebuild b/net-wireless/blueberry/blueberry-1.4.2.ebuild
index b028a7305853..d4077a454e74 100644
--- a/net-wireless/blueberry/blueberry-1.4.2.ebuild
+++ b/net-wireless/blueberry/blueberry-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
@@ -19,10 +19,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
 	')
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
 	net-wireless/bluez[obex]
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 74a6b6f188b9..0bb0cb8d7540 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.2.1.tar.xz 1570992 BLAKE2B b6d2296b68990c25e6d8077b513ebd3915152522fdf66bb5d887a90cf98e8835d993caf89a93089947ff1f6470075b9b6643ee0169ba86e46d190c09fbc6942a SHA512 7668a68470e7b5ab8e5cd774c89a7ae347de4193e293b5f2a467407fcb625e07a482f986fd7b672b763c297a0c0692c1da53dcc4ae75ec7fa118b180be623104
-EBUILD blueman-2.2.1.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
-EBUILD blueman-9999.ebuild 2905 BLAKE2B 3d80557bbad6913616edbb090de49c365a99b139487acd324a07d1f781f0c0ddc776b2e6a11ebc1c118198f8e112b8b8545891bf3c2e97d2ea9c39ce9c40618e SHA512 8c344268760aacebcbe34df0e3423a11db515550f44bb54622f1c06f4249ea5a3492cb4cd83d31d47d6d9637a6c72a4f72c57d47154863d8b6fb67e9d05c1ec0
+EBUILD blueman-2.2.1.ebuild 2893 BLAKE2B 592923dee6370b03f0b3c39326b9bb3dbc3103e8e515df1685a70f1b301f90602095888a09c901160ad49ba1b6e92d2d3200656bc066d6e2ac48434160610ba1 SHA512 44b9679e840ad1416410032bc596a513cb77e66575a0c9c482f0ba32aee9dcf92e66d404caf2ec412afa4cc638ce8875cb69574ed43e8193b53c56d563cb0e39
+EBUILD blueman-9999.ebuild 2887 BLAKE2B 117452d13783d9690945882cc894d04a9a3f6fe14af1144363a6230d156fca997f48c1f17f8f3ed1ba120b09ec018f815724da24e46cee5a1cf5ad6769f90878 SHA512 92c1ba859f27b19f71ea02cd6deca4559e0114496131f685835c46ac45119069384a29f077f7f8f7a7fee129a24c900f9b17b4d491603f5c193daeef257af4d1
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.2.1.ebuild b/net-wireless/blueman/blueman-2.2.1.ebuild
index 34209ec79cbc..dccbae5e252b 100644
--- a/net-wireless/blueman/blueman-2.2.1.ebuild
+++ b/net-wireless/blueman/blueman-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -26,19 +26,19 @@ IUSE="appindicator network nls policykit pulseaudio"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=net-wireless/bluez-5:=
 	${PYTHON_DEPS}"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
 	nls? ( dev-util/intltool sys-devel/gettext )"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
 	')
 	sys-apps/dbus
 	x11-libs/gtk+:3[introspection]
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 0ab627a1c047..7b936b7e4547 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -26,19 +26,19 @@ IUSE="appindicator network nls policykit pulseaudio"
 
 DEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=net-wireless/bluez-5:=
 	${PYTHON_DEPS}"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
 	nls? ( dev-util/intltool sys-devel/gettext )"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
 	')
 	sys-apps/dbus
 	x11-libs/gtk+:3[introspection]
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 044e36198db9..d4023a6d1295 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -6,7 +6,7 @@ AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
 DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b
-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
+EBUILD bluez-5.58-r1.ebuild 9352 BLAKE2B 5a61262e6209c7b9422ccab76eb64a16a0671d3fd3d10f8eceeb5189e5a8296a7929b54fde2ccf94e113abe63271be420c612c66be0832b861d823628b15186a SHA512 d3af406292d2c2aa1e05e4060436ef80b3c72170f03a61fbec149ef1a2254a6ad1f9ea4d620e6fae5f3504769b75f913257ff714049872f9ede92f27ca1de5ca
+EBUILD bluez-5.58.ebuild 9409 BLAKE2B 338f1b2dac68cc078a2c9564b6695abce3ba601116d24564e05f3ed54d4db002d4d94264e55dfe6ab7cd401291f70239514170675de4b8acbd5c55824fb9e341 SHA512 0538b7d1076f743bfbf543efbfaab04906d368737f74b97a50339b86312581a03eee9985c978399c36b5d85dc4291a75c71fd8820cbe8316a0a394bff648bce7
+EBUILD bluez-5.60.ebuild 9278 BLAKE2B e554e09c492539f6cc103f6251cb755081664cf2befc957a96a6df66e24fce6191298bdd4a0dab4c569e183ceada5e3ee2119df6219e5b5bcf136dba0839dcb6 SHA512 e4f8b048c7f6d4d9f7523d75367017160b75b08802972903c74ad137d8371d34aa847a7243066f6e558224f34db31ef5225eaccfac86284fe5cd444912413ea7
 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 5020f2ad5398..18c11b1754e9 100644
--- a/net-wireless/bluez/bluez-5.58-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.58-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 
@@ -26,8 +26,8 @@ REQUIRED_USE="
 
 TEST_DEPS="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/net-wireless/bluez/bluez-5.58.ebuild b/net-wireless/bluez/bluez-5.58.ebuild
index 51471cbc5ae3..b15f600ce590 100644
--- a/net-wireless/bluez/bluez-5.58.ebuild
+++ b/net-wireless/bluez/bluez-5.58.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 
@@ -26,8 +26,8 @@ REQUIRED_USE="
 
 TEST_DEPS="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.60.ebuild
index 9f2c32a2449b..415cff1e5f22 100644
--- a/net-wireless/bluez/bluez-5.60.ebuild
+++ b/net-wireless/bluez/bluez-5.60.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 
@@ -26,8 +26,8 @@ REQUIRED_USE="
 
 TEST_DEPS="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 32ecc7005e41..1d72965a5666 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20200812.tar.gz 94491 BLAKE2B bfea628afb191fa88b2ffba7b99bccb05c5bc22e4799db85082ec5d0f1ccb98826a1aca728e8e5c096cd78d11ea7cf2b8ddf46b1783b33f2bd87da75d8f25c84 SHA512 5e012980436b7fff7226bbd9897b0eeceff60fa678fb41c4a83e59cd10b8d441eda2b378fa5d5767e0f24980863a6a756f5457e5cae346827481eb089fa719a9
-EBUILD gr-ieee802154-0.0_p20200812.ebuild 1412 BLAKE2B bf62989b39ae8f7d6daaa4e0bd7993d0106af77af1799f7b886196c3cf404264d6682362105285b7139967daa05afd35090a89cfc1babe68eec794350cc5182c SHA512 c58e44e2a7bb5163e7367ca8c4cb2368b3051e252ae780686a81fdbeaa6c7c6b4932cb42eb13c7be39271581e74b5b89a05e650aa775efc71a7ba0eb1820899c
-EBUILD gr-ieee802154-9999.ebuild 1412 BLAKE2B bf62989b39ae8f7d6daaa4e0bd7993d0106af77af1799f7b886196c3cf404264d6682362105285b7139967daa05afd35090a89cfc1babe68eec794350cc5182c SHA512 c58e44e2a7bb5163e7367ca8c4cb2368b3051e252ae780686a81fdbeaa6c7c6b4932cb42eb13c7be39271581e74b5b89a05e650aa775efc71a7ba0eb1820899c
+EBUILD gr-ieee802154-0.0_p20200812.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
+EBUILD gr-ieee802154-9999.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
index 79937546fc96..f58d5031539e 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ SLOT="0/${PV}"
 
 RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	dev-libs/gmp
 	sci-libs/volk:=
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index 79937546fc96..f58d5031539e 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ SLOT="0/${PV}"
 
 RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	dev-libs/gmp
 	sci-libs/volk:=
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index dccadba4b412..35145abaa47a 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,4 +1,4 @@
 DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
-EBUILD gr-paint-0.0_p20200517-r1.ebuild 1223 BLAKE2B c27b28a7bb2052839a4e7ebfe8e02b0aa75d53365d86a8b2422701c89a90ef9370230118d8d3e89580f28d2d7aec0921fdc321d1870539f43b787ffa756610dc SHA512 d23be5e62e24a7eb6da749570c6464360385f89533361065855303b36d457dfda143899372eeaff5aff155506ce114ad9c399ded2c66fc9afb43a45f9196f665
-EBUILD gr-paint-9999.ebuild 1223 BLAKE2B c27b28a7bb2052839a4e7ebfe8e02b0aa75d53365d86a8b2422701c89a90ef9370230118d8d3e89580f28d2d7aec0921fdc321d1870539f43b787ffa756610dc SHA512 d23be5e62e24a7eb6da749570c6464360385f89533361065855303b36d457dfda143899372eeaff5aff155506ce114ad9c399ded2c66fc9afb43a45f9196f665
+EBUILD gr-paint-0.0_p20200517-r1.ebuild 1215 BLAKE2B 2347a73a629950690c73f75d1109b57ce8cb6021f7a3f0a6fdfbbd2f818248eb9e4c9436a20c1912acf2d84ccb4b9988ae96fab50fde30c2059a9acdd831fc1e SHA512 19a03122b29777231f3654cd1c048b9c7a086d530e0ada160bc59b71fbd70e1fe24ebfa2acb3ffef12756bc2f555672e637d2109839c8d5d5d41aef70d5dbdc7
+EBUILD gr-paint-9999.ebuild 1215 BLAKE2B 2347a73a629950690c73f75d1109b57ce8cb6021f7a3f0a6fdfbbd2f818248eb9e4c9436a20c1912acf2d84ccb4b9988ae96fab50fde30c2059a9acdd831fc1e SHA512 19a03122b29777231f3654cd1c048b9c7a086d530e0ada160bc59b71fbd70e1fe24ebfa2acb3ffef12756bc2f555672e637d2109839c8d5d5d41aef70d5dbdc7
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
index d10f7768be46..aad1eb07b45d 100644
--- a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -29,7 +29,7 @@ RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	dev-libs/gmp
 	sci-libs/volk:=
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index d10f7768be46..aad1eb07b45d 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -29,7 +29,7 @@ RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	dev-libs/gmp
 	sci-libs/volk:=
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index d3cb9c32cf2e..8dcc41d4c80b 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,4 +1,4 @@
 DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03 SHA512 d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2
-EBUILD gr-rds-0.0_p20200807.ebuild 1408 BLAKE2B 01910300668b39dc507a3f45b5f88cb56433d307ffd88fa7d6a1d764efd850dc74c63eef836fc59011b13e6cb6a7c2fb4f68c0136fecd51f072fb4300573864f SHA512 4f5c4a73fb937344ba7846e4a6a6ce8a6de9f531164c6127be5b291a1986089c79d4ed6fd0d47354c87493dbd0d93e4b2e84ac809f269b1fc95cc22fb62d509c
-EBUILD gr-rds-9999.ebuild 1408 BLAKE2B 01910300668b39dc507a3f45b5f88cb56433d307ffd88fa7d6a1d764efd850dc74c63eef836fc59011b13e6cb6a7c2fb4f68c0136fecd51f072fb4300573864f SHA512 4f5c4a73fb937344ba7846e4a6a6ce8a6de9f531164c6127be5b291a1986089c79d4ed6fd0d47354c87493dbd0d93e4b2e84ac809f269b1fc95cc22fb62d509c
+EBUILD gr-rds-0.0_p20200807.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
+EBUILD gr-rds-9999.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
 MISC metadata.xml 317 BLAKE2B 38ab4417f4befdeb7d9912a3712a259653e223aac63528287493cde0094efbe7c985f1cd93e871a10fb1a99b8add72f20d6b31a93d06017171a85a276f4b9840 SHA512 a5cb2c2182d2c0a2afbb3ebc9ac175af13be57ea5ca28abd3cb59d25a562484f8dc01b08da9e0644929a6cbd63f2c850eb6169f574dbed838180e5a5e89ad510
diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
index 326e694c0081..2f2eb3797c78 100644
--- a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
+++ b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 326e694c0081..2f2eb3797c78 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		dev-libs/boost:=[${PYTHON_USEDEP}]
 	')
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index f41373c9f8b3..b8a4c5b53970 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 4932 BLAKE2B 25440fbe7f4207ab40a7a0f666ff8fd230bbfb3133ce1514230b792789ce4fecd9d27c754615089471b343eb424ffeb92a4feda4ab6bfb02e2379183c4031328 SHA512 494b2ae2283a86827a13ba8a0b0d00fd9e3b8b29fd70ac6a8b8106acbcbff75a1cf1a420489160a554e75486691e3cd81a2a24ae8289ba8a403b0377edbef168
+EBUILD iwd-1.15.ebuild 4931 BLAKE2B 9abce6319373c393d60773bdd5e033cb0cd4dd636ee5150a3d2e7b8332851f988b808244eb9f885c3c5ac3fa626f4035037ddde9731777ab4c26a3d737279128 SHA512 192360894da56b1eeb9580df5495e13a7c5ed0f1add65e21b0657d4c2ff9f916b69c6ded6bff84724b1303fb11e7c3387552ae47da1a9cfdbb38ed2cb4973b64
 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 109522fe0d6b..b39e6f81a9ee 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/kismet/Manifest b/net-wireless/kismet/Manifest
index e1f0feaed16d..7359de980a52 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,8 +5,8 @@ AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540
 DIST kismet-2020-12-R3.tar.xz 9887764 BLAKE2B 4d011a13888f6a60d34ddcbc47d83c01debf73307da7d26c28034b15ad6dde2d8ae7741b4104d250ff112be242af0cbbcff612fc172d67d404d14b3d0ef688f3 SHA512 6c4c95a9963977d5a383e34f662f814a803d0d36d7dbc35d3d0a42d3e67c20e8d46357df0ee544b8dd3c7f527bd43ef9c0d913577d4979f261764fc9761cd6d1
 DIST kismet-2021-05-R1.tar.xz 10611692 BLAKE2B fc0a145005440c8af5320488e1a4bfe808ad8aeba614c9294b511a8da70ec2d51dbfd2ecc840c9af84e0222967200bb82856b2e008e39f015b455be131f89484 SHA512 edca956c9c04f99e06a09dc23216a908fbac68637246d73430b2d9d3a3ba1c2e8099d263819073d24494dce17bd36c83a2f51c648430a6eea3db7332b07e2fba
 DIST kismet-2021-06-R1.tar.xz 10616368 BLAKE2B 22c216355b31224f41991f6caa6ad86cd2549982196cf0dd6f89ef88f92d85f57bd12100a74ebbe3e0cee0140da4bd545b548382d55a4c3ac1403504680c9ca3 SHA512 88d92e2ef3f0513a3a00b573012edbd115f92e5f28f884aead5ab049fad97b328222c2f3cbb49d80c5fcfdab2212934532cf41c100c4d0a5e94c932e1c5e8352
-EBUILD kismet-2020.12.3.ebuild 5090 BLAKE2B 19a1e715659b6a459d17842dd2e1aa9ba12d32ca387c8975203540cecddaef426b23c3eb1bd99eba27eb34408ca23ecbf4c58b619158cf6316a778b7ddc1178e SHA512 7da5c4482f2e8826ef7b6c499a3b74f89d2c77e42a3985ee4b365f3af876a881db2c21be40e2bfa0cbe7093e0bdbfbd6f8c3210c91cedc6cf38faee8dc3824f1
-EBUILD kismet-2021.05.1.ebuild 5929 BLAKE2B 0a51d634288261f70b2c4119539720692f1e230bcc382d50d11eb8661e9bd3785b77f7651072c4430151cc04a18c6429630982b410898a6d65106c26dd2b8633 SHA512 120d91f4f3075a93cc224c15d7ea54679a76f08d3b60bd712cef50526fbf1fd8f8e51ebd4d4cf2c89698e3de2e8b58b655ebf2239d887303db977df72b80ce7c
-EBUILD kismet-2021.06.1.ebuild 5932 BLAKE2B ed3c5e21bff6d354a0d30e6915f37d251bb38fedf217dadccabffaff2f7d9fb24849ec774a62c5f123d3fade02517153e8ee4c578ef94e09e0c1cd6814416598 SHA512 da81b3ae3cca95ebb544c439ac15e7ae18847be69ba33e38baa57667b90228696f1ed11f2e33b22c2af5026d061511e654c64f6bc8922b24d86c69946e5e7c1f
-EBUILD kismet-9999.ebuild 5932 BLAKE2B ed3c5e21bff6d354a0d30e6915f37d251bb38fedf217dadccabffaff2f7d9fb24849ec774a62c5f123d3fade02517153e8ee4c578ef94e09e0c1cd6814416598 SHA512 da81b3ae3cca95ebb544c439ac15e7ae18847be69ba33e38baa57667b90228696f1ed11f2e33b22c2af5026d061511e654c64f6bc8922b24d86c69946e5e7c1f
+EBUILD kismet-2020.12.3.ebuild 5064 BLAKE2B e292eae0d0c10dc978468dc9a7aec2ea4c01132213264ee08bcd3c02e5d715a3e1a257769e549a7e44f58df0196a88e78277143cab897b80d4f36806339bb091 SHA512 60b5cc9ac6000e7adc0594d1422415bfc4b42327abb90ce45e01fa31b357953d6566e03f3001b13fd53a1f55a4ef18b1a6e1edea3aa57e97a46dc729e7c306d9
+EBUILD kismet-2021.05.1.ebuild 5903 BLAKE2B f8fd598b17dc569b8393e0a57e300386a60fb5961b9c25fa39a99cf29949206ce9eccff314f9eaaa111158edc54b4664c622072e61a228b1ab5c2b0ae3645477 SHA512 8b56a312d228d82f1aaca7e55efc482276f1578e3cbdfd6511157a1854559b4a02d3029fc4535414647bf84a67d0a518a72a208a6f80678457ca3253fcdb973b
+EBUILD kismet-2021.06.1.ebuild 5906 BLAKE2B 05f821970f3543d285b8a73184c4d5949baec48fbadc7c05f4aa7a48965efc0b344db83210594fa27b198b73fa427c6e20abdb8ed6d26bfeac59a783cd93b615 SHA512 bd51d4b00765e6c767eea72010421401d06539ab5673e5c698c25cce3662c460d8a74681083d013854c1778ba1be2f4c6c891ea323843faa67f32aeeef38339c
+EBUILD kismet-9999.ebuild 5906 BLAKE2B 05f821970f3543d285b8a73184c4d5949baec48fbadc7c05f4aa7a48965efc0b344db83210594fa27b198b73fa427c6e20abdb8ed6d26bfeac59a783cd93b615 SHA512 bd51d4b00765e6c767eea72010421401d06539ab5673e5c698c25cce3662c460d8a74681083d013854c1778ba1be2f4c6c891ea323843faa67f32aeeef38339c
 MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-2020.12.3.ebuild b/net-wireless/kismet/kismet-2020.12.3.ebuild
index bba825c65d75..3984c8e938ea 100644
--- a/net-wireless/kismet/kismet-2020.12.3.ebuild
+++ b/net-wireless/kismet/kismet-2020.12.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools multilib python-single-r1 udev systemd
 
@@ -49,8 +49,8 @@ CDEPEND="
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
@@ -65,14 +65,14 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
 	')
 	selinux? ( sec-policy/selinux-kismet )
 "
 PDEPEND="
 	rtlsdr? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 		net-wireless/rtl-sdr
 	)"
diff --git a/net-wireless/kismet/kismet-2021.05.1.ebuild b/net-wireless/kismet/kismet-2021.05.1.ebuild
index a01ea62aafbb..4d086c30ee7b 100644
--- a/net-wireless/kismet/kismet-2021.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2021.05.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools multilib python-single-r1 udev systemd
 
@@ -55,8 +55,8 @@ CDEPEND="
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
@@ -73,14 +73,14 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
 	')
 	selinux? ( sec-policy/selinux-kismet )
 "
 PDEPEND="
 	rtlsdr? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 		net-wireless/rtl-sdr
 	)"
diff --git a/net-wireless/kismet/kismet-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.06.1.ebuild
index d75e2d985726..45462e528503 100644
--- a/net-wireless/kismet/kismet-2021.06.1.ebuild
+++ b/net-wireless/kismet/kismet-2021.06.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools multilib python-single-r1 udev systemd
 
@@ -55,8 +55,8 @@ CDEPEND="
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
@@ -73,14 +73,14 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
 	')
 	selinux? ( sec-policy/selinux-kismet )
 "
 PDEPEND="
 	rtlsdr? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 		net-wireless/rtl-sdr
 	)"
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index d75e2d985726..45462e528503 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools multilib python-single-r1 udev systemd
 
@@ -55,8 +55,8 @@ CDEPEND="
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
@@ -73,14 +73,14 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
 	')
 	selinux? ( sec-policy/selinux-kismet )
 "
 PDEPEND="
 	rtlsdr? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 		net-wireless/rtl-sdr
 	)"
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9bcd627a6b6e..67cadc9749b9 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -7,6 +7,6 @@ DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
 EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
 EBUILD rtl-sdr-0.6.0-r1.ebuild 1180 BLAKE2B 52cafed14f3ffadadfe80fc939bde5798eb93ceac4a7d050e1f03c5a1ece453f646619181476f0074752c24e6437ab218b92fe4c7531ef96cd38525e09ec9938 SHA512 d30cbb5fe9ab5c80a2eb44a53e875bb6042ad5352f5418cab1e2097197b94d15ffd1d8dd7e973891571258912562dab6c85b6a848e384c72c3fd7b0b6b4af395
-EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
+EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1590 BLAKE2B 0c610b7b6e154d6e8e6775cd651924a5183d9817f2f5e958b76360f85823637c140dd01aace5752de4e28588c1a512d06f1aa505ba088128a64628c6a881a427 SHA512 482a14e514d718eee5e016a36c5b6e0aa16a1d303db011eaf4227eb67bd6e846178dc927b38756a5a2c691c11bd5342092d9f457ddbc65cf2f540844f0b4871e
 EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
index f119f1ec187a..cedee6902d51 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.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
@@ -21,7 +21,7 @@ else
 	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
 	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 8d764950a360..5242d0360856 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -5,6 +5,6 @@ DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe12686846
 DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
 DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
-EBUILD uhd-3.15.0.0-r100.ebuild 3802 BLAKE2B 913430d31161f9aaaa280a4510790f0a7d7e63dd07d6debd36e1e5a1d22d28a65ce17b74480fccc3bc5b0d67984077ff4dcb77bb4a48850d4d3675c8950b680c SHA512 17106d5787eda6052445d0dd5646b6697c7a79443d6aad01cc12ba2789e9b04cb7340d0465c5ea3f40349dda965281077dec02eacef33015fbfe4ea091b18cf2
-EBUILD uhd-4.0.0.0.ebuild 3738 BLAKE2B 15d8634d0bfca5d15a8f89f7c5304a3b7d035fc4cef4e3c9feed8c1c10f54a96fbbdb7a0e69cf266db76906373a086d81c55121580d7336b93682c3e98a35d5b SHA512 dfb24cfafaa754c08f5a9aa0c6a8b839e1b0be6df70a7660990702b1105efc3952aef2979c6876c10dd61a8f12841a7d2d5f3d77900c17e4e5bb347a6972973e
+EBUILD uhd-3.15.0.0-r100.ebuild 3782 BLAKE2B 8d34e440265462624ab04b6106e7bcc44e855a8da6aa278b784fb873e852a1592c37035f6f2376aff16c2fc724658278fb28aec37d0ec60960c6ef40c141853b SHA512 9d01069eee1a35e81bef70e4261f56b011ff7b10904e598f8ae85f48418a9f97d4acb0c23c3b230880299c896abb93f94e9df461d0c2f63fe515fd1be64db1ba
+EBUILD uhd-4.0.0.0.ebuild 3718 BLAKE2B a4a2c28e9c9e49ce3e50da41ae0d6390daeba6b1894f0c110ffc85c66aa7f27015e96b5db5aa21a4c38cf023a503a68e3384a8d1c52c6c02dd081503ac93b762 SHA512 648ccbadcd35c4baa0d8c3f2663e306c9b8f9ebbf46ca96c1fe35ffef9ea829e6a7a9df7b5f91e090d94f9cc26a87d7b537213cc9c61a08fca535471c50d928c
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 044251f32ffd..3854e1ceee95 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -34,15 +34,15 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	sys-libs/ncurses:0[tinfo]
 	$(python_gen_cond_dep '
-	dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	')
 "
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	$(python_gen_cond_dep '
-	dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
 	')
 	app-arch/unzip
 	app-arch/gzip
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index 2515af186bab..c93dca6d407a 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -34,15 +34,15 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	sys-libs/ncurses:0[tinfo]
 	$(python_gen_cond_dep '
-	dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	')
 "
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	$(python_gen_cond_dep '
-	dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
 	')
 	app-arch/unzip
 	app-arch/gzip
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index b94b07a19336..1276403cd2e0 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1768 BLAKE2B 42d368e054f747e201d7284907877889dd4874813f3bfed4ef7fb118f3e55437b434b5f55a8765a7608defa6c3ad6fb4d690b536cc72a6bc738b5473d4791cbf SHA512 4aaf64d68578131c7ebeeaf5f867dc6561b3bc797caec3f979bc55a6277d4cb1434cc2abe0a9f21e590f3c9803689ea688cb6f8c030b9fa6e40b85523e54c91c
+EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 2372d7f8c6a983d0dc29ac75a60d49dd8b76f55328478be84aef7d47f5c21d6d7a413e553eabe5632c382ef95ac3340a72c74a714e924323f7122b7bd750abe3 SHA512 82cd644cca3481e2d2319602b200a1ea5156cb09a542d2588d501de2b85f8b9e0605598ed2ea540f0cccd1df1395642ddb465202b9bb7a8604a63505a5187d57
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index ec8dde43e805..375b8b9ac65a 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-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="multicall"
 
 DEPEND="sys-apps/sed"
diff --git a/perl-core/File-Temp/File-Temp-0.231.100.ebuild b/perl-core/File-Temp/File-Temp-0.231.100.ebuild
index 9f102e1375f4..7555c0f30cb5 100644
--- a/perl-core/File-Temp/File-Temp-0.231.100.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.231.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # bug 390719
diff --git a/perl-core/File-Temp/Manifest b/perl-core/File-Temp/Manifest
index 390f6da02e00..0d4398adfe19 100644
--- a/perl-core/File-Temp/Manifest
+++ b/perl-core/File-Temp/Manifest
@@ -2,5 +2,5 @@ AUX File-Temp-0.230.0-symlink-safety.patch 1120 BLAKE2B f12300564dc761ae438ebef6
 DIST File-Temp-0.2309.tar.gz 74840 BLAKE2B ae197c11648c20715880f23eb2e8af3ab43ae28e4cc8e3a6f8528c6be5793dc39cdc409740537c56e495e26de97d90fe17c35297e6725a56aeed2356fe108c54 SHA512 9812e35d561ccff310262dc5bc50a9612fb3bbf7765a715c8fcad7653de977d08382733e38978586d47f943152b4a9619b76357c2f823c13f78dbf9b4eb4cd65
 DIST File-Temp-0.2311.tar.gz 76988 BLAKE2B d867a5c391fb8bdf1534469ad67f3e122666fd857c3cabda67fcc216896159cb95b31a4885ee47c803e147fa246defc12608780e7814ede8e5662c8f8ffd3d0e SHA512 2db3f03f4d25013c60585cd3e6aa7e68fe9bb26f1957adf6674e9cae9e963a41c559d36862943703f567d116c82747b4fae0612253a784addeb53d7867a232d1
 EBUILD File-Temp-0.230.900.ebuild 557 BLAKE2B d7adf9e7111598442eba167920ec729bf86965266fa6938beafc5fcefcccc346ca5518611025834b4b2039073c36fc66860a109428c2a869f39a35563632c158 SHA512 8a78e943d188bb9d6e2b0c2016323b80a01c106f6a43c4ffd6d6ec55d128b9ac4c20f652c32e723a1e1dd985441688cdfc9c5a7cff386ce1cbeda020da47f9e4
-EBUILD File-Temp-0.231.100.ebuild 565 BLAKE2B 72300b5be69160c81090444e9d162ccef358569bc3b45fcca00fc8219e4e235226b6b12d0e8a1bc272c8dcf98f5f274f7521186fe3dc679294d94a82b3da3aa0 SHA512 8ac3558f3c941cc29c4b866f11b38ddc1905bc1e74d02599c73f7f4e565a350327d494d55b5c2008beedd6fffe20a239b7fb1c200dcd025b28224ab02a310953
+EBUILD File-Temp-0.231.100.ebuild 557 BLAKE2B bfc6205c00ba443f56df47cecb20abd9185176347d3175d2de9a8ee7357b475a6e160b8f223210bc47f93a568ca1dadc177d52dbe06610334c7874938e2296a5 SHA512 a06ddf08e1ae6f8eb2adfc2b4e46b8d770803096a9bd351e727329f365b906e8e41b47c5b5c94a18fb0cc39e03b5634f5213fc5c81eba5da917a99d43e2be835
 MISC metadata.xml 452 BLAKE2B c0f858232a6e98b6aa5153894d24a70c3f0c44d618ea57e9c0a01f797fa70075017f526ccaaa99abdb3d2efebb40a5f07d5344f3fac02fe710b69009b69a16ed SHA512 f32f3ab3cea90b5d55cf3823d93d82e4b7c92e0e37e084f8a43c31ba26efd72660d488772a1ceacde0e03fc2298722852501a6dce04ecefe01af8d408ee13984
diff --git a/perl-core/Getopt-Long/Getopt-Long-2.420.0.ebuild b/perl-core/Getopt-Long/Getopt-Long-2.420.0.ebuild
index 296d0cfd4c08..5f467eee9d81 100644
--- a/perl-core/Getopt-Long/Getopt-Long-2.420.0.ebuild
+++ b/perl-core/Getopt-Long/Getopt-Long-2.420.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="virtual/perl-Pod-Parser"
+RDEPEND="dev-perl/Pod-Parser"
 DEPEND="${RDEPEND}"
 
 SRC_TEST=do
diff --git a/perl-core/Getopt-Long/Manifest b/perl-core/Getopt-Long/Manifest
index 95b470e9dea3..0f3bb49aa004 100644
--- a/perl-core/Getopt-Long/Manifest
+++ b/perl-core/Getopt-Long/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-Long-2.42.tar.gz 42080 BLAKE2B 4cf92a18732ec46a344b828add503ee86cd989895e2eb190161831e6d37b338f40c822b6b1c2a2182ecd26c833ff77559bccde820ad6c0ba9626c4be741af2d6 SHA512 00944cb0b69c05fc273ed7c22287eff678f00d620c0e4c35b62da4ec184333a344161fde1538e7dad77e6536f28ef75a25a8afbf1cbc4d1ddf2a8818a23b021a
-EBUILD Getopt-Long-2.420.0.ebuild 328 BLAKE2B 39d7addd527db74c52d5fb19b9ec0e706d59703fda00796259354a43e344648e357f6b67ddead3b6b635f96cb7ec010fa93ee77704b24aec6a39c697fee6a76e SHA512 33d6d6935bea5aa4124f29465b5160305617d6a56086bd5c55f2c8ea3846a5818d672b7649ba0ef03e7f3fc0acc72dfbcab0b94443ca5d3a8c8ea71ea3d07aa3
+EBUILD Getopt-Long-2.420.0.ebuild 321 BLAKE2B efa87ca759d170d9c3153104b32dd69ac33ba0b046a8d9c1b8673f520363c62a2b1dda7806421ef5af776fac0bd087672bcee9e331f73bbcfdc1d525b30cf7ce SHA512 9eb88a20c2aa63b3f2e3e541f9d62ebc8f09034cd96b01015cf3faa780664fb08fffa2c8c30d4f7d8a5cf2ada8492954b465b5ddc7816c3718b8c045f79ae86c
 MISC metadata.xml 530 BLAKE2B 7141c63ac4ba9e675d3e0930620e59ab734fe548c453a91a58735a23a113684e51901e6d32a8fcc62fc73a7a24d6538b92fb451d2ad3092c1f0b5254291ee13d SHA512 d1572192f2bbb040ec542b36ee45d8a39f72c511ba464dcf5de4ae6ff5ad76919ebfdb33ebd14eceba39e079b5eb55a08300bdac9bb51665d071ed11394bf4e8
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index a302c4af9cbf..031e40cc2945 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e26c59109d36..3f7873dc3a1e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index f8713ce99e77..94fefc720be6 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-23)
+# gui-libs/gtk is not keyworded
+net-libs/gssdp gtk
+
 # Lars Wendler <polynomial-c@gentoo.org> (2021-07-09)
 # dev-libs/libbpf is not keyworded for alpha (yet?)
 sys-apps/iproute2 bpf
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 5646312f4808..ad772cf74ebe 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-18)
+# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
+# and media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects rnnoise webrtc zamaudio
+
 # Sam James <sam@gentoo.org> (2021-07-17)
 # Java isn't available here right now
 dev-util/diffoscope pdf
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index fe5f6d5127ad..1a9a8e09c6a3 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-18)
+# media-libs/rnnoise, media-libs/rubberband[ladspa], media-plugins/gst-plugins-webrtc
+# and media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects rnnoise rubberband webrtc zamaudio
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
 # Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
 games-fps/yamagi-quake2 vulkan
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index a71444b9958b..b70d106533c0 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-23)
+# gui-libs/gtk is not keyworded
+net-libs/gssdp gtk
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index b65584cb4309..b62e45f3bc97 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-23)
+# gui-libs/gtk is not keyworded
+net-libs/gssdp gtk
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 677b807221a0..ff5084873e30 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-23)
+# gui-libs/gtk is not keyworded
+net-libs/gssdp gtk
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-18)
+# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
+# and media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects rnnoise webrtc zamaudio
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
index aae03ed6a798..8c1c77451267 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 06e650635f22..f8e439c9bde3 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-18)
+# media-plugins/gst-plugins-webrtc and media-plugins/zam-plugins
+# not keyworded here
+media-sound/easyeffects webrtc zamaudio
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # Feature currently relies on amd64 prebuilt binaries.
 media-video/obs-studio browser
diff --git a/profiles/arch/riscv/package.use b/profiles/arch/riscv/package.use
new file mode 100644
index 000000000000..85361e21001c
--- /dev/null
+++ b/profiles/arch/riscv/package.use
@@ -0,0 +1,5 @@
+# Yixun Lan <dlan@gentoo.org> (2021-07-20)
+# Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU
+sys-devel/clang llvm_targets_AMDGPU
+sys-devel/llvm llvm_targets_AMDGPU
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 6ba073273821..9d8e925559f0 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,24 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-20)
+# sys-auth/sssd and it's deps not keyworded yet
+app-admin/sudo sssd
+
+# Alex Fan <alexfanqi@yahoo.com> (2021-07-20)
+# sci-libs/hdf5 fails tests with these 2 use flags enabled,
+# otherwise passes all tests
+sci-libs/hdf5 fortran debug
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-19)
+# sci-libs/hdf5 may or may not work properly on this arch (on some
+# systems fails tests even with the mask above in place), masked for
+# further testing.
+dev-libs/starpu hdf5
+sci-libs/gdal hdf5
+# (via dev-python/pytables)
+dev-python/pandas doc full-support test
+
 # Marek Szuba <marecki@gentoo.org> (2021-07-14)
 # LuaJIT does not support riscv
 app-text/texlive-core luajittex
@@ -23,30 +41,30 @@ mail-mta/courier fax
 dev-python/ipython nbconvert notebook
 dev-python/matplotlib wxwidgets
 
-# Marek Szuba <marecki@gentoo.org> (2021-07-02)
-# Yixun Lan <dlan@gentoo.org> (2021-05-24)
-#   net-fs/samba not keyworded here yet
-app-misc/mc samba
-gnome-base/gvfs samba
-net-libs/libsoup samba
-www-client/elinks samba
-
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
 #  - gnome-base/gconf, dev-libs/libotf & dev-libs/m17n-lib, net-libs/webkit-gtk
 app-editors/emacs gconf m17n-lib xwidgets
 #  - net-fs/openafs
 app-crypt/heimdal afs
-#  - sci-libs/hdf5
-dev-libs/starpu hdf5
-#  - dev-python/pygraphviz & sci-libs/gdal, dev-python/pandas
-dev-python/networkx extras pandas
-#  - sys-cluster/ceph
-net-analyzer/rrdtool rados
+#  - app-xemacs/ruby-modes (and by extension xemacs itself)
+dev-lang/ruby xemacs
+#  - sci-libs/gdal
+dev-python/networkx extras
+#  - app-text/dblatex & media-gfx/transfig
+dev-util/ragel doc
+#  - media-libs/dumb, media-libs/openal
+media-libs/allegro dumb openal
+#  - media-gfx/nvidia-texture-tools
+media-libs/devil nvtt
+#  - sys-cluster/ceph, dev-ruby/rrdtool-bindings
+net-analyzer/rrdtool rados ruby
+#  - dev-util/aruba & dev-util/cucumber
+sys-block/thin-provisioning-tools test
 #  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
 sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
-#  - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
-sys-cluster/slurm hdf5 ofed slurmdbd
+#  - sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
+sys-cluster/slurm ofed slurmdbd
 
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
@@ -57,7 +75,6 @@ media-libs/libcaca doc imlib
 x11-libs/tslib sdl
 dev-libs/libbytesize test
 sys-libs/libblockdev dmraid escrow
-app-text/docbook-xsl-ns-stylesheets ruby
 app-misc/geoclue modemmanager zeroconf
 gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios test zeroconf
 sys-power/upower ios
@@ -79,6 +96,7 @@ dev-util/strace unwind
 media-libs/gstreamer unwind
 media-libs/mesa unwind
 net-libs/zeromq unwind
+net-mail/dovecot unwind
 x11-base/xorg-server unwind
 x11-base/xwayland unwind
 
@@ -86,8 +104,8 @@ x11-base/xwayland unwind
 # Dependencies not keyworded, not tested
 dev-libs/gobject-introspection doctool test
 dev-python/markdown test
-x11-libs/gtk+ cups test colord
-net-libs/libsoup samba test
+x11-libs/gtk+ test colord
+net-libs/libsoup test
 net-libs/libproxy spidermonkey webkit kde networkmanager
 
 # Sam James <sam@gentoo.org> (2021-03-11)
@@ -125,11 +143,7 @@ dev-libs/libpcre jit
 
 app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp test
 app-arch/p7zip wxwidgets
-app-doc/doxygen doc
 app-text/asciidoc test
-app-text/ghostscript-gpl cups
-app-text/po4a test
-dev-libs/check subunit
 dev-libs/libgcrypt doc
 dev-python/argcomplete test
 dev-python/aiohttp doc test
@@ -143,26 +157,10 @@ dev-python/twisted test
 dev-python/urllib3 test
 dev-util/catalyst iso
 dev-util/pkgconf test
-dev-vcs/git cvs highlight subversion
-media-libs/harfbuzz doc
-sys-libs/libcxx libcxxabi libunwind static-libs
-sys-libs/libcxxabi libunwind
-media-gfx/graphviz devil svg pdf
-media-libs/tiff jbig webp
-net-fs/nfs-utils nfsv41
+dev-vcs/git highlight subversion
+sys-libs/libcxx static-libs
 media-libs/fontconfig doc
-net-irc/irssi socks5
-net-libs/gnutls doc test-full
-net-libs/ldns doc python
+net-libs/gnutls test-full
 net-libs/libpcap rdma
-net-misc/ntp openntpd vim-syntax zeroconf
-net-nds/openldap cxx kerberos sasl
-sys-apps/kmod doc
-sys-apps/portage apidoc
-sys-apps/rng-tools nistbeacon pkcs11
-sys-auth/pambase gnome-keyring pam_krb5 pam_ssh  mktemp
-sys-block/thin-provisioning-tools test
-sys-devel/automake test
-sys-devel/gdb source-highlight
+net-misc/ntp openntpd
 sys-devel/gettext cvs
-x11-libs/libvdpau doc
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index c18421fa6944..b66d3b1106da 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -30,6 +30,7 @@ valgrind
 bluetooth
 emacs
 fuse
+jack
 java
 latex
 libedit
@@ -37,11 +38,10 @@ mono
 motif
 opencl
 qt5
+pulseaudio
 rsh
-ruby
 slang
 sound
-systemtap
 webkit
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
@@ -53,7 +53,6 @@ ayatana
 
 video_cards_ast
 video_cards_dummy
-video_cards_fbdev
 video_cards_freedreno
 video_cards_geode
 video_cards_glint
@@ -61,7 +60,6 @@ video_cards_i915
 video_cards_i965
 video_cards_intel
 video_cards_mga
-video_cards_nouveau
 video_cards_nv
 video_cards_omap
 video_cards_qxl
@@ -79,7 +77,6 @@ video_cards_nvidia
 # input devices
 
 input_devices_elographics
-input_devices_evdev
 input_devices_joystick
 input_devices_vmmouse
 input_devices_void
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index e0e813eef861..638e27c1693a 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-23)
+# gui-libs/gtk is not keyworded
+net-libs/gssdp gtk
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 4f1ddc270e52..e8c84f7b7376 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-17)
+# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
+# and media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects rnnoise webrtc zamaudio
+media-sound/pulseeffects rnnoise webrtc zamaudio
+
 # Sam James <sam@gentoo.org> (2021-07-12)
 # Haskell is (only) available on amd64/x86 right now in Gentoo
 # bug #801649
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 7c7be35a0f19..88ae4e887a62 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Conrad Kostecki <conikost@gentoo.org> (2021-07-18)
+# For docs, app-text/pandoc is needed, which is currently
+# not stabilized and probably will not be in near future.
+# Bug #737612
+x11-wm/xpra doc
+
 # 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.
diff --git a/profiles/default/linux/ppc64/profile.bashrc b/profiles/default/linux/ppc64/profile.bashrc
new file mode 100644
index 000000000000..62968526d541
--- /dev/null
+++ b/profiles/default/linux/ppc64/profile.bashrc
@@ -0,0 +1,9 @@
+if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+	if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then
+		eerror "Please follow the instructions in the news item:"
+		eerror "2021-07-17-new-ppc64-profiles"
+		eerror "or choose the old profile in"
+		eerror "default/linux/powerpc/ppc64 structure"
+		die "ERROR: SYMLINK_LIB migration has not been performed!!"
+	fi
+fi
diff --git a/profiles/package.mask b/profiles/package.mask
index c8ae98b46fec..bc8f7432d677 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,61 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2021-07-23)
+# Abandoned.  All versions are vulnerable to CVE-2021-33909.
+# sys-kernel/gentoo-kernel{,-bin} are the suggested replacements.
+# Removal on 2021-08-06.  Bug #803212.
+sys-kernel/bliss-kernel-bin
+
+# Conrad Kostecki <conikost@gentoo.org> (2021-07-23)
+# Outdated and multiple bugs open.
+# Other alternatives in tree available.
+# Removal in 30 days (2021-08-22)
+www-servers/resin
+
+# Alfredo Tupone <tupone@gentoo.org> (2021-07-23)
+# Requirements conflicts so it is not buildable
+# No revdep. Retire in 30 days (2021-08-22)
+dev-ml/cstruct
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-18)
+# No gtk4 and friends in the tree yet
+>=media-sound/easyeffects-6.0.0
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-18)
+# Compatibility package for ruby 1.8. No longer maintained upstream.
+# Last release in 2016, but current release in gentoo is from 2012.
+# No reverse dependencies.
+# Masked for removal in 30 days.
+dev-ruby/sfl
+
+# William Hubbs <williamh@gentoo.org> (2021-07-17)
+# Does not build and has multiple open bugs including a security issue.
+# Dead upstream (last release in 2006).
+# Removal in 30 days (2021-08-16) (bug #602594).
+app-accessibility/eflite
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-17)
+# Obsolete; all versions in current Perl core distributions
+# are newer, and no virtuals currently pull these packages.
+# Removal in 30 days.
+perl-core/Archive-Tar
+perl-core/CPAN-Meta
+perl-core/CPAN-Meta-Requirements
+perl-core/Data-Dumper
+perl-core/Digest
+perl-core/Digest-MD5
+perl-core/Digest-SHA
+perl-core/Dumpvalue
+perl-core/Encode
+perl-core/ExtUtils-Constant
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-17)
+# Obsolete virtual; package was removed from the Perl
+# core distribution. Please depend on dev-perl/Pod-Parser
+# instead. Removal in 30 days.
+virtual/perl-Pod-Parser
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-17)
 # Deprecated upstream, replaced with factory_bot.
 # Last release in 2017, no dependencies.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ac95c81b37bc..be3739cfc416 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -179,20 +179,20 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		stable
 #ppc		 default/linux/ppc/17.0/musl/hardened			exp
 #ppc		 default/linux/ppc/17.0/uclibc				exp
 #ppc		 default/linux/ppc/17.0/uclibc/hardened			exp
-ppc64		default/linux/ppc64/17.0				exp
-#ppc64		 default/linux/ppc64/17.0/desktop			exp
-#ppc64		 default/linux/ppc64/17.0/desktop/gnome			exp
-ppc64		default/linux/ppc64/17.0/systemd			exp
-#ppc64		 default/linux/ppc64/17.0/desktop/gnome/systemd		exp
-#ppc64		 default/linux/ppc64/17.0/developer			exp
+ppc64		default/linux/ppc64/17.0				stable
+ppc64		default/linux/ppc64/17.0/desktop			stable
+ppc64		default/linux/ppc64/17.0/desktop/gnome			stable
+ppc64		default/linux/ppc64/17.0/desktop/gnome/systemd		stable
+ppc64		default/linux/ppc64/17.0/systemd			stable
+ppc64		default/linux/ppc64/17.0/developer			stable
 ppc64		default/linux/ppc64/17.0/musl				exp
 ppc64		default/linux/ppc64/17.0/musl/hardened			exp
 ppc64		default/linux/ppc64le/17.0				stable
 ppc64		default/linux/ppc64le/17.0/desktop			stable
-ppc64		default/linux/ppc64le/17.0/desktop/gnome		dev
-ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd	dev
-ppc64		default/linux/ppc64le/17.0/desktop/plasma		dev
-ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd	dev
+ppc64		default/linux/ppc64le/17.0/desktop/gnome		stable
+ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd	stable
+ppc64		default/linux/ppc64le/17.0/desktop/plasma		stable
+ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd	stable
 ppc64		default/linux/ppc64le/17.0/systemd			stable
 ppc64		default/linux/ppc64le/17.0/developer			stable
 ppc64		default/linux/ppc64le/17.0/musl				exp
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
new file mode 100644
index 000000000000..d256eeddfc0f
--- /dev/null
+++ b/profiles/updates/3Q-2021
@@ -0,0 +1,2 @@
+move media-sound/zam-plugins media-plugins/zam-plugins
+slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 74a2d5db2ee3..46183b1f0d4d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -134,12 +134,9 @@ app-admin/rsyslog:uuid - Include UUIDs in messages (requires sys-apps/util-linux
 app-admin/rsyslog:xxhash - Enable xxHash support in fmhash module (requires dev-libs/xxhash)
 app-admin/rsyslog:zeromq - Build the ZeroMQ input and output modules (requires net-libs/czmq)
 app-admin/sagan:libdnet - Add support for dev-libs/libdnet
-app-admin/sagan:lognorm - Add support for log/rules normalizations via dev-libs/liblognorm
 app-admin/sagan:pcap - Add support for network packet capture via net-libs/libpcap
 app-admin/sagan:redis - Add support for the Redis database via dev-libs/hiredis
 app-admin/sagan:smtp - Build witch SMTP (E-Mail) support
-app-admin/sagan:snort - Add support to interact with Snort IDE using net-analyzer/snortsam
-app-admin/sagan-rules:lognorm - Install normalize rules support with dev-libs/liblognorm
 app-admin/salt:cheetah - Enable support for dev-python/cheetah3
 app-admin/salt:cherrypy - Enable support for using cherrypy.
 app-admin/salt:genshi - Enable support for dev-python/genshi
@@ -2178,12 +2175,14 @@ dev-libs/openssl:ktls - Enable support for Kernel implementation of TLS (kTLS)
 dev-libs/openssl:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
 dev-libs/openssl:sslv2 - Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https
 dev-libs/openssl:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
+dev-libs/openssl:tls-compression - Enable support for discouraged TLS compression
 dev-libs/openssl:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 dev-libs/openssl-compat:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
 dev-libs/openssl-compat:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI
 dev-libs/openssl-compat:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
 dev-libs/openssl-compat:sslv2 - Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https
 dev-libs/openssl-compat:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
+dev-libs/openssl-compat:tls-compression - Enable support for discouraged TLS compression
 dev-libs/openssl-compat:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 dev-libs/pkcs11-helper:nss - Enable NSS crypto engine
 dev-libs/poco:7z - Add Support for the 7z archive format
@@ -2485,6 +2484,7 @@ dev-python/pyside2:widgets - Build QtWidgets module
 dev-python/pyside2:x11extras - Build QtX11Extras module
 dev-python/pyside2:xml - Build QtXml module
 dev-python/pyside2:xmlpatterns - Build QtXmlPatterns module
+dev-python/python-lsp-server:all-plugins - Pull in all optional plugins
 dev-python/python-mpd:twisted - Enable twisted support
 dev-python/python-stdnum:vies - Enable VIES
 dev-python/pyudev:qt5 - Install PyQt5 bindings
@@ -3123,6 +3123,7 @@ games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
 games-fps/quake2-icculus:rogue - Build support for the 'Ground Zero' Mission Pack (rogue)
 games-fps/quake2-icculus:xatrix - Build support for the 'The Reckoning' Mission Pack (xatrix)
 games-fps/quakeforge:client - Build Normal and QuakeWorld clients alongside the servers
+games-fps/quakeforge:vulkan - Enable vulkan renderer (experimental)
 games-fps/quakeforge:wildmidi - Use media-sound/wildmidi for midi support
 games-fps/qudos:demo - Install the demo files (quake2-demodata) and configure for use
 games-fps/qudos:mods - Build support for the quake2 mission packs
@@ -3863,8 +3864,8 @@ media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o
 media-fonts/terminus-font:center-tilde - Place the '~' character vertically centered on the line instead of to the top.
 media-fonts/terminus-font:distinct-l - ll2 variant with more distinctive l (lowercase L)
 media-fonts/terminus-font:otf - Install Open Type Font (OTF) (required for HarfBuzz backend)
-media-fonts/terminus-font:pcf - Install Portable Compiled Font (PCF) (X11 bitmap fonts)
-media-fonts/terminus-font:pcf-unicode-only - Remove non-unicode PCF fonts that could be problematic. See bug #520222.
+media-fonts/terminus-font:pcf-8bit - Install Portable Compiled Font (PCF) (X11 bitmap fonts), 8-bit encodings
+media-fonts/terminus-font:pcf-unicode - Install Portable Compiled Font (PCF) (X11 bitmap fonts), Unicode encodings
 media-fonts/terminus-font:psf - Install PC Screen Font (PSF) with unicode data (for linux console)
 media-fonts/terminus-font:quote - Changes view of quotes: symmetric ` and ' instead of asymmetric one (see homepage)
 media-fonts/terminus-font:ru-dv - Changes view of Russian letters 'de' and 've' (see homepage)
@@ -4415,7 +4416,6 @@ media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, req
 media-plugins/gst-plugins-vaapi:drm - Enable DRM renderer
 media-plugins/gst-plugins-vaapi:egl - Enable EGL support
 media-plugins/gst-plugins-vaapi:gles2 - Enable GLESv2 and GLESv3 support
-media-plugins/hexter:gtk2 - Enable x11-libs/gtk+:2 based GUI
 media-plugins/imlib2_loaders:eet - Enable Eet image loader
 media-plugins/imlib2_loaders:xcf - Enable XCF image loader
 media-plugins/ir_lv2:tools - Build convert4chan tool
@@ -4551,9 +4551,12 @@ 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:bs2b - Enable use of media-libs/libbs2b for the crossfeed FX
 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/easyeffects:rnnoise - Enable use of media-libs/rnnoise for the neural network-based noise-reduction FX
+media-sound/easyeffects:rubberband - Enable use of media-libs/rubberband for the pitch-shifting FX
+media-sound/easyeffects:webrtc - Enable use of media-plugins/gst-plugins-webrtc for various voice-enhancement FX
+media-sound/easyeffects:zamaudio - Enable use of media-plugins/zam-plugins for the maximizer 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
@@ -4703,9 +4706,12 @@ media-sound/pulseaudio-modules-bt:ffmpeg - APTX, APTX-HD encoding support
 media-sound/pulseaudio-modules-bt:ldac - LDAC encoding support, using media-libs/libldac
 media-sound/pulseaudio-modules-bt:native-headset - Build with native HSP (Headset Profile) headset for bluez 5
 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:bs2b - Enable use of media-libs/libbs2b for the crossfeed FX
 media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
-media-sound/pulseeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
+media-sound/pulseeffects:rnnoise - Enable use of media-libs/rnnoise for the neural network-based noise-reduction FX
+media-sound/pulseeffects:rubberband - Enable use of media-libs/rubberband for the pitch-shifting FX
+media-sound/pulseeffects:webrtc - Enable use of media-plugins/gst-plugins-webrtc for various voice-enhancement FX
+media-sound/pulseeffects:zamaudio - Enable use of media-plugins/zam-plugins for the maximizer FX
 media-sound/qmidiarp:lv2 - Enables Ladspa V2 plugins.
 media-sound/qmmp:analyzer - Enable visual analyzer
 media-sound/qmmp:archive - Enable archiving plugin via app-arch/libarchive.
@@ -4845,7 +4851,6 @@ media-tv/mythtv:vpx - Enable VP8/VP9 support for media-libs/libvpx
 media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper
 media-tv/mythtv:x265 - Enable h265 encoding using x265
 media-tv/mythtv:xmltv - Support media-tv/xmltv TV listing - not used by Schedules Direct]
-media-tv/plex-media-server:system-openssl - Use system copy of dev-libs/openssl instead of the bundled one. Unsupported upstream.
 media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
 media-tv/tvheadend:constcw - Enable support for the constcw protocol
 media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
@@ -5671,6 +5676,7 @@ net-fs/samba:system-heimdal - Use app-crypt/heimdal instead of bundled heimdal.
 net-fs/samba:system-mitkrb5 - Use app-crypt/mit-krb5 instead of app-crypt/heimdal.
 net-fs/samba:winbind - Enables support for the winbind auth daemon
 net-ftp/frox:transparent - Enable transparent proxying of data connections
+net-ftp/ftpbase:zeroconf - Enable support for zero-configuration networking via Avahi.
 net-ftp/lftp:convert-mozilla-cookies - Install the convert-mozilla-cookies script and its run-time dependencies
 net-ftp/lftp:verify-file - Install the verify-file script and its run-time dependencies
 net-ftp/proftpd:authfile - Enable support for the auth-file module
@@ -5756,6 +5762,7 @@ net-im/err:irc - Pull optional dependencies, needed for IRC backend
 net-im/gajim:crypt - End to end encryption and GPG encryption
 net-im/gajim:geolocation - Sharing your location
 net-im/gajim:jingle - Audio and video calls
+net-im/gajim:omemo - Install dependencies for OMEMO encryption plugin
 net-im/gajim:remote - Controling Gajim instance from command line with gajim-remote
 net-im/gajim:rst - Generating XHTML output from RST code
 net-im/gajim:spell - Spellchecking of composed messages
@@ -6565,6 +6572,7 @@ net-misc/quagga:pam - Add support for PAM (via sys-libs/pam) to the Quagga Virtu
 net-misc/quagga:protobuf - Enable support for dev-libs/protobuf
 net-misc/quagga:readline - Enable support for sys-libs/readline to provide the Quagga Virtual Terminal Interface Shell (vtysh)
 net-misc/quagga:tcp-zebra - Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain sockets are chosen otherwise
+net-misc/r8168:use-firmware - Enable support for automatic firmware loading
 net-misc/rdesktop:kerberos - Enable CredSPP support + Kerberos authentication
 net-misc/rdesktop:pcsc-lite - Enable smartcard support with sys-apps/pcsc-lite driver
 net-misc/rdesktop:xrandr - Enable XRandR window extension support
@@ -6738,7 +6746,6 @@ net-p2p/ktorrent:stats - Shows statistics about torrents in several graphs
 net-p2p/ktorrent:upnp - Forward ports using UPnP
 net-p2p/ktorrent:webengine - Embedded search for torrents using dev-qt/qtwebengine
 net-p2p/ktorrent:zeroconf - Discover peers on the local network using the Zeroconf protocol
-net-p2p/litecoind:logrotate - Use app-admin/logrotate for rotating logs
 net-p2p/litecoind:wallet - Enable wallet support
 net-p2p/mldonkey:bittorrent - enable bittorrent support
 net-p2p/mldonkey:fasttrack - enable fasttrack support
@@ -8250,7 +8257,6 @@ sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs.
 sys-fs/quota:netlink - Compile daemon receiving quota messages via netlink
 sys-fs/quota:rpc - Enable quota interaction via RPC
 sys-fs/squashfs-tools-ng:tools - Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools
-sys-fs/squashfs-tools-ng:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
 sys-fs/udisks:daemon - Build the system daemon, not just the client tool
 sys-fs/udisks:elogind - Use sys-auth/elogind for session tracking
@@ -8267,7 +8273,6 @@ sys-fs/zfs-auto-snapshot:cron - Install /etc/cron.* files
 sys-fs/zfs-auto-snapshot:default-exclude - Only take snapshots of datasets with com.sun:auto-snapshot=true property set
 sys-fs/zfs-kmod:rootfs - Install zfs-shutdown script to support exporting a pool containing rootfs
 sys-kernel/bliss-kernel-bin:initramfs - Build initramfs along with the kernel.
-sys-kernel/genkernel:cryptsetup - Enable support for Luks disk encryption using sys-fs/cryptsetup
 sys-kernel/genkernel:firmware - Prefer system firmware sys-kernel/linux-firmware over local copy.
 sys-kernel/gentoo-kernel:hardened - Use selection of hardening options recommended by Kernel Self Protection Project
 sys-kernel/gentoo-kernel:initramfs - Build initramfs along with the kernel.
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 69c341f3d55a..ee92f909ed10 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bcftools/Manifest b/sci-biology/bcftools/Manifest
index 71f2760dc9a6..cbaad97eda76 100644
--- a/sci-biology/bcftools/Manifest
+++ b/sci-biology/bcftools/Manifest
@@ -1,3 +1,3 @@
 DIST bcftools-1.10.2.tar.bz2 3702679 BLAKE2B 51acce94d463868562199206504dc8afb50c671c11139c5a96f52cedf135bb7a46115c69411b9943b970a2395e3c866275c85e345a4a40a90194d1094698314e SHA512 f07e405efa16b9b1b18521342df3eaf840ed1b3028b736a6b4d139012ea85769ddfb3cd3a2c94958415d984d07805dfcd3d4bbec0db401b3f071b861a56d1300
-EBUILD bcftools-1.10.2.ebuild 870 BLAKE2B 0f5069b904c7d4dd34f826902be66cf664592aabb1d97e05ee9c3d8b7ff5d1d6c1dae391082d7905140cc4a091edfaf0cf8e1296c77d19ba5d713b78749d73b4 SHA512 b737af1e2f6a37c534957a7687545647e13a16ec5c203a417a524b7f9f082b25247e1cd818f953b7c528580b6a3cc6ce072aada48af0a2050ab66d3c489284b7
+EBUILD bcftools-1.10.2.ebuild 864 BLAKE2B b98c493d6e50d982917ecbf32c424a45231c3f512a49a0c9cd675cbb3d5f21a57d62cc53a20556663b6fd1d58a68df01a9ed56185dd5f400b8ee5b5c7b5497fd SHA512 c8c3173376a35824ce10413e7cba172d6a90dae91352a292df5603f1a7e17cd5987fc91b463b030221b577bce5424ae7a219625cb684cb3fa2f6777581bb19bb
 MISC metadata.xml 343 BLAKE2B e1664c6d67ebde81b9f99b69d442e0b16891ecd392fddd55ed2aaa885dcb2f4ca39cd627cd3f6367f39b13e35eb1141119e53756d6efc4ac62c819ab1d611633 SHA512 cfa167a5733f40d7e36e9e229229acd883ba7bfd812afb9060c742c505354b1c754070e2e897a48d7611a123b9606b6f43a0816c089e71bf64f3d0dbd8b7184d
diff --git a/sci-biology/bcftools/bcftools-1.10.2.ebuild b/sci-biology/bcftools/bcftools-1.10.2.ebuild
index 46a30f0863a8..a484f69133e5 100644
--- a/sci-biology/bcftools/bcftools-1.10.2.ebuild
+++ b/sci-biology/bcftools/bcftools-1.10.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=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	dev-lang/perl
 	$(python_gen_cond_dep '
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
 	')
 	=sci-libs/htslib-${PV}*:=
 	sys-libs/zlib:=
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index 404ba0cdaf8c..e31d49a66e57 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,4 +1,4 @@
 AUX 7.3/folding-conf.d 339 BLAKE2B 93a0b3672777ad737ce27694aaca547634c375e180ad3c28c3adb9cae2cb1c054ff9458ee1fe04b70fe9841ae67d41198bcecfc4826d05d5de8df2759bd80910 SHA512 6fd10dc938262c05831e68176e93a24869bb6991508bcc48ece487b701788026561d073025bd347cd77ede13ca26f6b284861f30b07becf72ea77e4db22867b3
 DIST fahclient_7.6.13-64bit-release.tar.bz2 3951134 BLAKE2B 2748b7c1987d166bdda08caf5ff2f331523ff519e24768cd7e111c6d3a93f54c10c88d8adbf733230b6c51547360135dbcb272e5d43fd06d01918481601382a1 SHA512 f39f2990d78d075e1061ceaff9453b703a000770a3422965b7b8a91d1814f8804837628d8a34be5afd914228ef787f699f2488523baad295a8d9c1e3bb4f35cf
-EBUILD foldingathome-7.6.13.ebuild 4422 BLAKE2B 50f39d12b3c1bf23e94119a7d3a1434f7f44e1765ab77550e4561875be2e1b5b8ca1e00393ba1b218ebb12f54b4cc27721ee46586986b8771b8216ab6fe20e33 SHA512 1be3543d064a478e22abf386bdc634f5e63710aaada32fd035b4f5c1ef02bc01521a084430e9cc4fed17a677b51a62d811f5c74b1dca1b581b489f585d5d58ee
+EBUILD foldingathome-7.6.13-r1.ebuild 4368 BLAKE2B 987b6022e43c2a39338ec8269e3ac001f9c0667237384814183d100fa2191dd91aaf57cfa86407d3bac0e4cee7bd12e022a967d5045e6888ba57622873500d2d SHA512 5225fcec1fb2e5d29b6628a0b06ec1f9f588f74feee6282ff7ee910fb87fba29512880707219ef77e63d0c7584858f50d0a1262ee88eea624c8dedce7df5d873
 MISC metadata.xml 257 BLAKE2B c0d9bf845137c20d86333bbe5f6f7d27e5ae2edbdd6997f870a6678825b5494b8160a4dc5fba6221f252e1146c57d3237f3d7feb098a9beed9c272f57f30d708 SHA512 5be44a06c71b100dfe66effc1d12a9801f6daf2e252f74b6499528644db9b3dd00d51827a984817b78755e8d544f9c674c27c6a370c4c4414ce26a09b478b69b
diff --git a/sci-biology/foldingathome/foldingathome-7.6.13-r1.ebuild b/sci-biology/foldingathome/foldingathome-7.6.13-r1.ebuild
new file mode 100644
index 000000000000..c45300719bff
--- /dev/null
+++ b/sci-biology/foldingathome/foldingathome-7.6.13-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Folding@Home is a distributed computing project for protein folding"
+HOMEPAGE="https://foldingathome.org/"
+SRC_URI="https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v$(ver_cut 1-2)/fahclient_${PV}-64bit-release.tar.bz2"
+S="${WORKDIR}/fahclient_${PV}-64bit-release"
+
+LICENSE="FAH-EULA-2014 FAH-special-permission"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror bindist strip"
+
+# Expressly listing all deps, as this is a binpkg and it is doubtful whether
+# i.e. uclibc or clang can provide what is necessary at runtime
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	acct-group/foldingathome
+	acct-group/video
+	acct-user/foldingathome
+	app-arch/bzip2
+	|| (
+		dev-libs/openssl-compat:1.0.0
+		=dev-libs/openssl-1.0*:*
+	)
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/zlib
+"
+
+QA_PREBUILT="opt/foldingathome/*"
+
+pkg_setup() {
+	elog ""
+	elog "Special permission is hereby granted to the Gentoo project to provide an"
+	elog "automated installer package which downloads and installs the Folding@home client"
+	elog "software. Permission is also granted for future Gentoo installer packages on the"
+	elog "condition that they continue to adhere to all of the terms of the accompanying"
+	elog "Folding@home license agreements and display this notice."
+	elog "-- Vijay S. Pande, Stanford University, 07 May 2013"
+	elog ""
+	elog "(ref: http://foldingforum.org/viewtopic.php?f=16&t=22524&p=241992#p241992 )"
+	elog ""
+}
+
+src_install() {
+	patchelf --set-rpath "${EPREFIX}/opt/foldingathome" FAHClient || die
+	patchelf --set-rpath "${EPREFIX}/opt/foldingathome" FAHCoreWrapper || die
+
+	dosym "../../usr/$(get_libdir)/libssl.so.1.0.0" /opt/foldingathome/libssl.so.10
+	dosym "../../usr/$(get_libdir)/libcrypto.so.1.0.0" /opt/foldingathome/libcrypto.so.10
+
+	exeinto /opt/foldingathome
+	doexe {FAHClient,FAHCoreWrapper}
+
+	insinto /opt/foldingathome
+	doins sample-config.xml
+
+	newconfd "${FILESDIR}"/7.3/folding-conf.d foldingathome
+	cat <<EOF >"${T}"/fah-init
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+start_stop_daemon_args="--chdir \"${EPREFIX}/opt/foldingathome\""
+command="${EPREFIX}/opt/foldingathome/FAHClient"
+command_args="\${FOLD_OPTS}"
+command_user=foldingathome
+command_background=1
+pidfile="\${PIDFILE}"
+EOF
+	newinitd "${T}"/fah-init foldingathome
+
+	cat <<EOF >"${T}"/fah-init.service
+[Unit]
+Description=Folding@Home V7 Client
+Documentation=https://foldingathome.org
+
+[Service]
+Type=simple
+User=foldingathome
+Group=foldingathome
+Nice=19
+WorkingDirectory=${EPREFIX}/opt/foldingathome
+ExecStart=${EPREFIX}/opt/foldingathome/FAHClient --fork=false --pid=false --respawn=false --service=false
+NoNewPrivileges=yes
+PrivateTmp=yes
+ProtectControlGroups=yes
+ProtectSystem=full
+RestrictRealtime=true
+ProtectControlGroups=yes
+
+[Install]
+WantedBy=multi-user.target
+EOF
+	systemd_newunit "${T}"/fah-init.service foldingathome.service
+
+	fowners -R foldingathome:foldingathome /opt/foldingathome
+}
+
+pkg_postinst() {
+	elog "To run Folding@home in the background at boot:"
+	elog "(openrc)\trc-update add foldingathome default"
+	elog "(systemd)\tsystemctl enable foldingathome"
+	elog ""
+	if [ ! -e "${EPREFIX}"/opt/foldingathome/config.xml ]; then
+		elog "No config.xml file found -- please run"
+		elog "emerge --config ${P} to configure your client, or specify"
+		elog "all necessary runtime options in FOLD_OPTS within"
+		elog "${EPREFIX}/etc/conf.d/foldingathome"
+		elog ""
+	fi
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "NOTE, the 'initfolding' helper script has been dropped, please"
+		elog "use emerge --config ${P} or run FAHClient --configure directly"
+		elog "and adjust file permissions and ownership yourself"
+		elog ""
+	fi
+	elog "Please see ${EPREFIX}/opt/foldingathome/FAHClient --help for more details."
+	einfo ""
+	einfo "The original package maintainer encourages you to acquire a username and join team 36480."
+	einfo "http://folding.stanford.edu/English/Download#ntoc2"
+	einfo ""
+}
+
+pkg_postrm() {
+	elog "Folding@home data files were not removed."
+	elog "Remove them manually from ${EPREFIX}/opt/foldingathome"
+}
+
+pkg_config() {
+	cd "${EPREFIX}"/opt/foldingathome || die
+	su foldingathome -s /bin/sh -c "./FAHClient --configure"
+}
diff --git a/sci-biology/foldingathome/foldingathome-7.6.13.ebuild b/sci-biology/foldingathome/foldingathome-7.6.13.ebuild
deleted file mode 100644
index ca477a6d6b77..000000000000
--- a/sci-biology/foldingathome/foldingathome-7.6.13.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Folding@Home is a distributed computing project for protein folding"
-HOMEPAGE="https://foldingathome.org/"
-SRC_URI="https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v$(ver_cut 1-2)/fahclient_${PV}-64bit-release.tar.bz2"
-
-RESTRICT="mirror bindist strip"
-
-LICENSE="FAH-EULA-2014 FAH-special-permission"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-# Expressly listing all deps, as this is a binpkg and it is doubtful whether
-# i.e. uclibc or clang can provide what is necessary at runtime
-DEPEND="dev-util/patchelf"
-RDEPEND="app-arch/bzip2
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:*
-	)
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/zlib
-	acct-group/video
-"
-
-S="${WORKDIR}/fahclient_${PV}-64bit-release"
-
-QA_PREBUILT="opt/foldingathome/*"
-
-pkg_setup() {
-	elog ""
-	elog "Special permission is hereby granted to the Gentoo project to provide an"
-	elog "automated installer package which downloads and installs the Folding@home client"
-	elog "software. Permission is also granted for future Gentoo installer packages on the"
-	elog "condition that they continue to adhere to all of the terms of the accompanying"
-	elog "Folding@home license agreements and display this notice."
-	elog "-- Vijay S. Pande, Stanford University, 07 May 2013"
-	elog ""
-	elog "(ref: http://foldingforum.org/viewtopic.php?f=16&t=22524&p=241992#p241992 )"
-	elog ""
-
-	enewgroup foldingathome
-	enewuser foldingathome -1 -1 "${EPREFIX}"/opt/foldingathome video
-}
-
-src_install() {
-	patchelf --set-rpath "${EPREFIX}/opt/foldingathome" FAHClient || die
-	patchelf --set-rpath "${EPREFIX}/opt/foldingathome" FAHCoreWrapper || die
-
-	dosym "../../usr/$(get_libdir)/libssl.so.1.0.0" /opt/foldingathome/libssl.so.10
-	dosym "../../usr/$(get_libdir)/libcrypto.so.1.0.0" /opt/foldingathome/libcrypto.so.10
-
-	exeinto /opt/foldingathome
-	doexe {FAHClient,FAHCoreWrapper}
-
-	insinto /opt/foldingathome
-	doins sample-config.xml
-
-	newconfd "${FILESDIR}"/7.3/folding-conf.d foldingathome
-	cat <<EOF >"${T}"/fah-init
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-start_stop_daemon_args="--chdir \"${EPREFIX}/opt/foldingathome\""
-command="${EPREFIX}/opt/foldingathome/FAHClient"
-command_args="\${FOLD_OPTS}"
-command_user=foldingathome
-command_background=1
-pidfile="\${PIDFILE}"
-EOF
-	newinitd "${T}"/fah-init foldingathome
-
-	cat <<EOF >"${T}"/fah-init.service
-[Unit]
-Description=Folding@Home V7 Client
-Documentation=https://foldingathome.org
-
-[Service]
-Type=simple
-User=foldingathome
-Group=foldingathome
-Nice=19
-WorkingDirectory=${EPREFIX}/opt/foldingathome
-ExecStart=${EPREFIX}/opt/foldingathome/FAHClient --fork=false --pid=false --respawn=false --service=false
-NoNewPrivileges=yes
-PrivateTmp=yes
-ProtectControlGroups=yes
-ProtectSystem=full
-RestrictRealtime=true
-ProtectControlGroups=yes
-
-[Install]
-WantedBy=multi-user.target
-EOF
-	systemd_newunit "${T}"/fah-init.service foldingathome.service
-
-	fowners -R foldingathome:foldingathome /opt/foldingathome
-}
-
-pkg_postinst() {
-	elog "To run Folding@home in the background at boot:"
-	elog "(openrc)\trc-update add foldingathome default"
-	elog "(systemd)\tsystemctl enable foldingathome"
-	elog ""
-	if [ ! -e "${EPREFIX}"/opt/foldingathome/config.xml ]; then
-		elog "No config.xml file found -- please run"
-		elog "emerge --config ${P} to configure your client, or specify"
-		elog "all necessary runtime options in FOLD_OPTS within"
-		elog "${EPREFIX}/etc/conf.d/foldingathome"
-		elog ""
-	fi
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "NOTE, the 'initfolding' helper script has been dropped, please"
-		elog "use emerge --config ${P} or run FAHClient --configure directly"
-		elog "and adjust file permissions and ownership yourself"
-		elog ""
-	fi
-	elog "Please see ${EPREFIX}/opt/foldingathome/FAHClient --help for more details."
-	einfo ""
-	einfo "The original package maintainer encourages you to acquire a username and join team 36480."
-	einfo "http://folding.stanford.edu/English/Download#ntoc2"
-	einfo ""
-}
-
-pkg_postrm() {
-	elog "Folding@home data files were not removed."
-	elog "Remove them manually from ${EPREFIX}/opt/foldingathome"
-}
-
-pkg_config() {
-	cd "${EPREFIX}"/opt/foldingathome || die
-	su foldingathome -s /bin/sh -c "./FAHClient --configure"
-}
diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index 6154bc4f7273..66f09ef40483 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -2,5 +2,5 @@ AUX samtools-0.1.20-buildsystem.patch 6737 BLAKE2B 71445f57735903bccc2720a32f42b
 DIST samtools-0.1.20.tar.gz 566387 BLAKE2B a62d74c408877754af50f5e5fea0e2289ec1e0c9f25013ed0d039bfe8ef61108600d917f8c9d356e98aca632795b4eb0f01ea1b54526a652577fb74a38a433c2 SHA512 15bd8cf401d14c1ab4faa591b6054f5ea9731c4e966f37f71d33d9081a270cfeb91e8a3d80c631e0725b49da81387f824c206e8c21553ad554d0cfc5c238a6e5
 DIST samtools-1.10.tar.bz2 4721173 BLAKE2B 103c71ec5740eac151a4fc40d67286ee00123c7befd5f654cf5c89812bda44f82b38ab662a4a3216ac84434cabab49500b903612137f97f89a7ea38063e8fc08 SHA512 828ec2638592b440e06b81eafc57634416ab54dac6caaecb06f22a90e9bf99da1fd8bb54509cb98591899c4e097ac9038ee5d57ea7bfe1a18967cde4018d840a
 EBUILD samtools-0.1.20-r4.ebuild 2049 BLAKE2B d377712eaca931258b37645e6a6b3cc379fdb550ef83a0c272a3eb564d7753185fea53416973e4fdf2c25b79475a81ae72b646ce22c570c934e4eabce8a9ded6 SHA512 c0d387f715ebf1f746ea4e4a7eab85a86ef0bff646c9a69639b17ef02e93c39982941d7eb811a6d67b0e635c9c4e05924d2b89a6809c3bd0592db91894dab4aa
-EBUILD samtools-1.10.ebuild 991 BLAKE2B 206a77657bc9a82d6a7536d030b726a0450bbba406e4e7ec9cc670ee530b87d871111952c850d4008c436f81d3daeba802eb4a3442b59ff9ab0f5864bc4fcf21 SHA512 efb1f235e3e3996599df79317e9c7c2ca5434b666a93f91c495550ac4846905e99d96dd1a6876d22a489b684bf24a90c6f6afb4cec5677c5c45f28f0c4f35b35
+EBUILD samtools-1.10-r1.ebuild 993 BLAKE2B 69080337f15d653be56680f3183c2eab3c1813805e3ffc3be1d6dc0e04264a063ae758b694ccb1ff097e952cad736a387de02905ca4f7d4af779233d9e1fced2 SHA512 15dab01b933e56fc83b71f68b2c52c69b115df19f72599e4b4d9d959f9035a468e3ad825cb2e12a80ba558b953879d1b6f8e9dc50922d099c375312dd7580040
 MISC metadata.xml 408 BLAKE2B fcff66a327d0396cd0a1b0cb5c00aeb1bc728759d6d39933651f63e22d966af9c33d14f149d2ee008ca48266da1f24ff5919942d143d066898dc635673153df9 SHA512 71a9d6a299db7717ccd851a4519354c1fd7a373dd79af6fa216ebc9b6b0ccbbccc4394ca00c3f842afee492702f079268c5c83815eaaafa446bf0f37750c62ff
diff --git a/sci-biology/samtools/samtools-1.10-r1.ebuild b/sci-biology/samtools/samtools-1.10-r1.ebuild
new file mode 100644
index 000000000000..940895616906
--- /dev/null
+++ b/sci-biology/samtools/samtools-1.10-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
+HOMEPAGE="http://www.htslib.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-lang/perl
+	=sci-libs/htslib-${PV}*
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# remove bundled htslib
+	rm -r htslib-* || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-ncurses \
+		--with-htslib=system \
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_test() {
+	# the tview test diffs expect 80-columns output
+	unset COLUMNS
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-biology/samtools/samtools-1.10.ebuild b/sci-biology/samtools/samtools-1.10.ebuild
deleted file mode 100644
index 0ef5e6c19e8e..000000000000
--- a/sci-biology/samtools/samtools-1.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-lang/perl
-	=sci-libs/htslib-${PV}*
-	sys-libs/ncurses:0=[unicode]
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# remove bundled htslib
-	rm -r htslib-* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-htslib=system \
-		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_test() {
-	# the tview test diffs expect 80-columns output
-	unset COLUMNS
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index b1404e22286b..144048508493 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index a7fcd6625b18..13f44be756df 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,3 +1,3 @@
 DIST chemex-2018.10.3.tar.gz 546696 BLAKE2B d283cfb94118686f1974780249641e0ea6f86cdb854c4a256897e361a300a94506813a5035ee2f300fca13263e8452b77e7a0817436cbd620ba16d801a541af7 SHA512 784bd03b354724d6aa52d663c6f661f865d4ef7ca345573bc8aae9ef63e5dbb3e65abba364de3ff441b78adfa588344c718809c5880b3fc70d8ed24be06a0826
-EBUILD chemex-2018.10.3.ebuild 1043 BLAKE2B 2b1f45bf6d29b12cd12d14e67010eba1926f886e8bd7ea176d740c7b96eb5b6ff4181a3cab68121186eb4debf402e546727a4d28b0ba487abecac12cdc73643b SHA512 3acbe0588c4f357b22e466585f1841de0ae472652863bfafc0b62df3ee1a6adffedaaad688297ad9859e17f196a9759549d739336c1bfb4f92600ded2ae79579
+EBUILD chemex-2018.10.3.ebuild 1007 BLAKE2B 9b231e246e6401185db827f7cc808be6c1955a569f00b156b7b3ef43645cb51596865551df05c176bfa916128dd40953d933a54e7c10548c37fb08acbb8fb62c SHA512 82f4719818573b63cbdc8d7ffac0968204357f705655e327df0866ea6296c03fb38b8b05133b301fb88fdbaec693814c55c6fea935f7dc4a507eeee5fe0493f3
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sci-chemistry/chemex/chemex-2018.10.3.ebuild b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
index 0c983b2eb24f..19f50cce7be7 100644
--- a/sci-chemistry/chemex/chemex-2018.10.3.ebuild
+++ b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 DISTUTILS_SINGLE_IMPL="yes"
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -20,12 +20,12 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lmfit-0.9.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/setuptools_scm[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/scipy-0.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/asteval-0.9.11[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-0.9.11[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		>=dev-python/scipy-0.11[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 1a2e29194577..d49f82a99357 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -17,9 +17,9 @@ DIST regressiontests-2020.6.tar.gz 48541232 BLAKE2B dbb405bd9168775984de8c9fb9e3
 DIST regressiontests-2021.2.tar.gz 48514312 BLAKE2B 81b007d5e5e1d054349c73dc8bc3589db328752e48a66687c0ad36be87ebe580df9cbd93b193a724669bd5765af06ec306f2e12af00a228af616de03943d6f05 SHA512 b687ddfd3dc6ec1051af2a3253633703ef1c82335d1df23379819ea47e44dfcd417e81e29610cc584d4c5fb1ee1cbc76731a3fd31b529d8cdd0b9c22f432c7ec
 EBUILD gromacs-2018.8.ebuild 6943 BLAKE2B bd0a58000cf2c669bc4871f2f68d06b4ef7b4e40ef4a35ce306854fd1ebcdf99baed53199bc803b4fda40124226a1093168bf6fe262e27b9086bede6004db0ce SHA512 df2193024fec30dff1a9e87774267f93f46c1636893a4eb65d50ebe7314cf6cc39eee94c9b252247b40508cea2cbcbc6749681ce16c3ce461f0b2545e0418926
 EBUILD gromacs-2019.6.ebuild 7264 BLAKE2B 6196f750a81562c82f1004ba3e4be05193aa9100de0d5a917df242c1287989e83992a5574812f332639c95fc009b860fcfd4b563b5e5148dfa650ce82e861f5b SHA512 ac84483eeb66765b7ae0e5489d5c3b8d293dca6108b79dfcdc35674e033af1a487d0db0bcfc7ad1158fd3ae3aedef236a6549f8ade85483ef6dfb8309cccb05a
-EBUILD gromacs-2020.4.ebuild 10142 BLAKE2B 67561d5feb49c8133f2103c15759cb8824e98926fd83b64a7ae3ce4e15d9a35ff9a3b7f3e5fc38260006d42509235a65a39dee63f112b682e21336e561d0ea94 SHA512 4a2dd2fd2daec029e83b4ba9f7de4540a0b963842a0ccb3e4dbea66e4b6b30a28a7db1be4a17ffc0d0b5fdc241af32a80cfa7836b7d88f3d81c26ccb9ec04044
-EBUILD gromacs-2020.6.ebuild 10145 BLAKE2B 46db22597e4887bac67371d8ae340e5b707b0f6803ea9ad50148d254236266138f2ac53eef66301471933358e97bce72195dbe3772736d87676d90ff2d10e7be SHA512 fe0f1ebf7f5e96c3177858a36ac73e8e887536e570554885b47116be82703680940c5a4f0b3d571b665c776804a93351482c00bc6c13e6f691d5a9b5664db555
-EBUILD gromacs-2021.2.ebuild 10367 BLAKE2B 12d73f2b0e4412fba3bca6c55fef02f098d376094d045090b67201d776893d2709908113936bae8211f27c2d5231f86265c2e16018363b17e1d1aef5879e3253 SHA512 45255fe4eacec5caeb29696cb513b6c5c9a820e6d52bd543bdf89483e6a0d3710189403b7842e4af6ebaec14cb6a47b23130cc6dafa563740462382cff8d954e
-EBUILD gromacs-2021.9999.ebuild 10277 BLAKE2B cb9936b80f4c3beb1cb2572318a878a120d2038a31d258868aa0d1318c1acf6e8cd3a01fe9e00e6129f69d79773464755ca3301a0ae87bd3429c97c8f36e46b9 SHA512 7bbb314d7c4bb6469f1ea7245dc3a925adce3ebd582908f3f62a60b294558726374fa3bfd46620d4d5c6032d124b9af00d5faa84d546f77791db572cf599d634
-EBUILD gromacs-9999.ebuild 10277 BLAKE2B cb9936b80f4c3beb1cb2572318a878a120d2038a31d258868aa0d1318c1acf6e8cd3a01fe9e00e6129f69d79773464755ca3301a0ae87bd3429c97c8f36e46b9 SHA512 7bbb314d7c4bb6469f1ea7245dc3a925adce3ebd582908f3f62a60b294558726374fa3bfd46620d4d5c6032d124b9af00d5faa84d546f77791db572cf599d634
+EBUILD gromacs-2020.4.ebuild 10134 BLAKE2B efc77b2cb0981ebf3f90fbe531d54020be2e82b464dace3ab8d07d41cae060c5e073a8a3f641b4bb0431ec2717a5f990a2a6f08ceed6a805bde82742b9eba487 SHA512 f7af8d31c43abe23b9c92ce6afd0dbea4219fe48dad3d91bf19f50f80a520cb0ab98949d4f2653679de751853755e793fd0e84ad73ebf13bef17fc255d693001
+EBUILD gromacs-2020.6.ebuild 10137 BLAKE2B e5f058493f7757ffcff53c892445a3ea2dd15ebb83bbd7fd186a56d85e785be75277e8329487a182d27e23f7756b02618c227ef40c2aaf0243f2a1fbeda232c6 SHA512 37df9d310ab597ce4bb69bd3d77ec20d4b6e0b825b341e5fe78b139164fd02a43b5e3d012530fd9a62500d4a63d2efa05fcbc1219ef5edcb93bf232d563af821
+EBUILD gromacs-2021.2.ebuild 10359 BLAKE2B e14d69500a56fb7650a96b61bc7aeec186d61446eeea1d5d8ac4c983321997a31ddaf5f23644ff4bc44950e86387052a24c6261934ebb8a247ac139840e63e7d SHA512 099b68c19cd9e0c9d205471b38804cfe07cd71f232a24ffc40b02301150afd8674eb016a09987d0ffe4e2d0ebf36a2e5ecb6883c95731474327772755d97b621
+EBUILD gromacs-2021.9999.ebuild 10269 BLAKE2B 325e9c8bc349775cffa58a7767a9b5ca020bf6b9caf8b589d80379744327409ed45bd21fe138bd8e52b0a9eaf61b030e20b0b6b6be42bb15b3cd96cd59142f6c SHA512 52f6e758d518c8472c3c05c3b5d2c3a555e5aabd303ee94cc43675ff17b93b01c70b669b8a016b09b753085a7ac82df9e0002f2dc4bf9295107e7c92f4e1a45a
+EBUILD gromacs-9999.ebuild 10269 BLAKE2B 325e9c8bc349775cffa58a7767a9b5ca020bf6b9caf8b589d80379744327409ed45bd21fe138bd8e52b0a9eaf61b030e20b0b6b6be42bb15b3cd96cd59142f6c SHA512 52f6e758d518c8472c3c05c3b5d2c3a555e5aabd303ee94cc43675ff17b93b01c70b669b8a016b09b753085a7ac82df9e0002f2dc4bf9295107e7c92f4e1a45a
 MISC metadata.xml 1223 BLAKE2B 9e48794b267cdb031dcc680ecce38c0d9727c2706d95a0a52d3502d4aa73d245db419a77823d10c5022d65628390b2fd476e489ec764cdd1721c9dd8295a8232 SHA512 d9320e5896bd32e892a9be573da92943236d0cf912f3417b823a415c5470ad9e37a934eafcede6ab7487197854c515ef81270e44c8503540b14dc13356beb3de
diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
index 4a9027a2d180..4acfbb385118 100644
--- a/sci-chemistry/gromacs/gromacs-2020.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
@@ -62,7 +62,7 @@ BDEPEND="${CDEPEND}
 	build-manual? (
 		app-doc/doxygen
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 		media-gfx/mscgen
 		media-gfx/graphviz
diff --git a/sci-chemistry/gromacs/gromacs-2020.6.ebuild b/sci-chemistry/gromacs/gromacs-2020.6.ebuild
index 0e2baeb3b302..ffd92a1f1d73 100644
--- a/sci-chemistry/gromacs/gromacs-2020.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
@@ -62,7 +62,7 @@ BDEPEND="${CDEPEND}
 	build-manual? (
 		app-doc/doxygen
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 		media-gfx/mscgen
 		media-gfx/graphviz
diff --git a/sci-chemistry/gromacs/gromacs-2021.2.ebuild b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
index d3299c25bab8..4a9c41ff8ac9 100644
--- a/sci-chemistry/gromacs/gromacs-2021.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
@@ -62,7 +62,7 @@ BDEPEND="${CDEPEND}
 	build-manual? (
 		app-doc/doxygen
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 		media-gfx/mscgen
 		media-gfx/graphviz
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index 40f115d6a10e..cbac7d70f6b4 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
@@ -62,7 +62,7 @@ BDEPEND="${CDEPEND}
 	build-manual? (
 		app-doc/doxygen
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 		media-gfx/mscgen
 		media-gfx/graphviz
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 40f115d6a10e..cbac7d70f6b4 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_SINGLE_IMPL=1
@@ -62,7 +62,7 @@ BDEPEND="${CDEPEND}
 	build-manual? (
 		app-doc/doxygen
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
 		')
 		media-gfx/mscgen
 		media-gfx/graphviz
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index bac8374180d8..0b61e652da38 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,4 +1,4 @@
 DIST vmd-1.9.4_alpha51-gentoo-patches.tar.xz 14604 BLAKE2B f8621956785d365cc056ba53373120d8f99da1476ab9789af6bb8ef00b8dd8c2a4c3599d75e13eba2fc5630b291aed966ce64f7f408504b079e3e994e45da243 SHA512 c57fd81e667e405ab1208a4e4a1d63710e593c07f554420c32980becd3547c2df98fbf6e439a53a626121fc361559f1ba53ab7b7235c97422bba61ece59d23bc
 DIST vmd-1.9.4a51.src.tar.gz 42826371 BLAKE2B 239d87f975c41a71096083028c1db8bf40cc058fc687fd9fff3c14c97c9b12bd68818d4c2eaeefd8c95c661409f1f056bce42178d0ba9271aa344fdce6f81ea9 SHA512 b42af6a4a7b1d2f0d242f89bff3a1c25a608ff59b9902b90154ba82a40439afb802a2d319363fa388a5211420fdaf0ee9bfd1f0a0e6e85d89d1dd506b373ba40
-EBUILD vmd-1.9.4_alpha51.ebuild 7604 BLAKE2B 95a6087ebee108f1444fbef54e96478e32d0a2bd958c9a5679e9b087d9e43d8d46c0847e2babbef3906c7eaf20bfd2c4b9959476a61ea9cc0e0c4ca4504bbd17 SHA512 d52b6964ea258e30c7a8a337412a813a70ae10ad62b311ef27b87beb13c5afb844ff9380566a24e6e8191f2b13f15d0637d053d8ea3f54ba89be48eeb9707f85
+EBUILD vmd-1.9.4_alpha51.ebuild 7598 BLAKE2B fa0cdea71d0a85069b197d40e6d3cbc54a3136646bf18c6a9a702e591f2bbaed15606499923e8d75d1996f7e99fbd48604892add5fa16dd161cacda548df784d SHA512 8c9231669f17c59892114ee3aaf5f5d32b5c1b451795d8bcd1e7366bbf9d13723938140acf7e9e7504844e996986a96343df75ad9f4204ed5c14bec63ac0d7c4
 MISC metadata.xml 778 BLAKE2B 6c4202950f57a4d7a3004e966c761325a0a31ab19fe06a6bd69882bd685e41424953104ff653c03d6cbbcb60bb9aba45fbcec43cd228c4bb57fcb1c63a2bd881 SHA512 b967b71fb9f1b47a9d3b69e6958dfb0314a9f071dade7ed1876e91dfa73188748faf11ef832d240a71745b36a30422bde79de2e9ff8e5ec6b6da4b11b40d19c9
diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha51.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha51.ebuild
index 732d96f97bd7..f4678f8d788b 100644
--- a/sci-chemistry/vmd/vmd-1.9.4_alpha51.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.4_alpha51.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs xdg
 
@@ -27,7 +27,7 @@ RESTRICT="fetch"
 
 CDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	>=dev-lang/tk-8.6.1:0=
 	dev-lang/perl
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index ddc5a5ef1eaf..e9152c9239ef 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,13 +1,16 @@
 DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 2ea75cf08dc3005bd08ebe85113d95743fe85bae4b7ac3c2e2d9b64be64a7103ecf30b9edf45cffa86b7588d5c57a0256aef02f4590fa6031cb63881480bd0fd SHA512 3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
 DIST votca-csg-1.6.4.tar.gz 537966 BLAKE2B c9ccc3aa28bdc4a2a2c080104b70602d8cf4be19a71e7d0b4a1c03d11f54b645984103d1662823a9308a4e4c4baedef731de06ff314b168f89e7326c0d3c8ee9 SHA512 4cdbf6c0a593720675f48f574ff9a93d038a48037543c1e09a4559d3eb262a2d8bf83d5f5dab85b4820a541e0c57f7cca78315d5b3382763e8acd8cc0fcb65ac
+DIST votca-csg-2021.1.tar.gz 4300862 BLAKE2B 4ef287a8b0e14e97bcbc293bebdc3a0c45a08bd0033044ef8aa1ac18bac04928010ab3f5edfb656f1d062926f4572a1f3b0e55b3b3b635fdc388e5b850ec3bba SHA512 e1abdd34a3d88aea253cc10e7832a18d2cffc44286e4591c5a1239bf34e68d6c40054d3eb907a902e5ab6af5a9dea4ec266ff5ce59073b500413f4e122885e94
 DIST votca-csg-2021.tar.gz 4300573 BLAKE2B ba589c97f22888b8a1a12c71314133c08c89e44c201bafa6e5f1d74dfe90c87dd84a5d1c2883b26402858b6aa990d37add57bdfb9db6836a7c287f0685a40a59 SHA512 8eacf4045ddc13d33e853cd35a67d03dfb63da60c3e879ea4f16e63f27a92aa13cbf4e367d9258778c9c09462443e4bb2b937c247c6246377ceeecf56bc6fc12
 DIST votca-csg-manual-1.5.1.pdf 1263719 BLAKE2B 29e2ce27215787a1121e45ec1e88ce7c61ba81709a2519aa0959eede505498b9aaf4f38666bb1a4f97837c98b862e7ed02405da07294a7ec76cc80390fe72e0d SHA512 7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
 DIST votca-csg-manual-1.6.4.pdf 1242124 BLAKE2B 003a255d2869c8185f9e03038f646a80b682be3daceb18757c791f5d52101379402aee20c5dcb65ef8ce651bd6f6590ad5249e835e53ce92e04eb33214017a9e SHA512 36956acd24a21cb0a1dd26d6640b41b7473132948327c05856191b4f9531b4d1d5f98be68a9d1a847935d47633d483e87c2300634233a6e617a010c1fb563690
 DIST votca-csg-tutorials-1.5.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01a1153eabc63386063de800ff2dc6b483b0568191e7f06ddcb8be46123224ccfd3a97f5fb4e7cd603c0ee99a8636d7143f6c701 SHA512 f2e709ae31d914fe12a4ce37b5019deb878b15ade14972f2a8204bec8970ba2c8946b71b94a5bfd6f7569e41173bfbc75275ea09cbee4358ad1de0e84751049c
 DIST votca-csg-tutorials-1.6.4.tar.gz 5944389 BLAKE2B 66f1d4947bb28ec602250226ad2c08cc02278a90776acbcadca2df3078361435fb2353ee0fa299d0d19697d36682f20aab709d45539d5ac7e7070942601ebc3f SHA512 7e40037f2e70c861fd7f5c63806c17ad56672a340a8795fa745414940c55f593bef32b9f6b9050400131ed9e66aa927149e9d324a1c264364d8504baf1921e28
+DIST votca-csg-tutorials-2021.1.tar.gz 5941978 BLAKE2B 5e6c5cfc3860e287d93cf8d59862a75e3afe7ac1610e696427e99302a99c86d12ce12f7a23281f36c8859e48a25be138466b9316f4c0667d5bf784f33c27e6df SHA512 8370ac9e2e859153f9a54b2e02cd18692fd06810dafb50a6bf3d81eca5211847e1b75d9832df80b1436ae0f9dcab455aa0bfb4c8122165c584cabd14203408ba
 DIST votca-csg-tutorials-2021.tar.gz 5942031 BLAKE2B 60ef492c98bf07b5169c6f1be2298b6dac76003ef9981064463de9fdae649c215d469424e253d06b63637bb3eee9383c587a98322ab987995f8b4861bb0002e1 SHA512 844706407cb91d507c6b0433e23f4b27756dd4c882f6cef79d51f2b2acae6cd0114ccd91d626d090d0f61c58a57cc3c1eda0a0d10d6f4bfa522eda7ee8de21b3
 EBUILD votca-csg-1.5.1.ebuild 2522 BLAKE2B 0fe2b373307c76ebab320169b5ae837c463a734b029af1a328a87c2428b19484f138c75e7bb1e4ad91d0c099aa24c97c411c2f00308ebad051a81d0275e797be SHA512 2c6018212ae244e7387a2f63e186e970dd18825d77994f862c283131796ac93c6bb25a5233a41e306d8090ee75c82759025b74c3d1e0a0211adf67e0b3964449
 EBUILD votca-csg-1.6.4.ebuild 2290 BLAKE2B 1fa3398fce620103e69529a1b36f1b21fac4ff633ed602f218a61f8c41471376842c7e51e428bf6da165f225be8c54a6c76107fee7fd691c3cbf2a7fdcfcb6c8 SHA512 b794120a45fc6616873b31989e3d7df64c545673305ef714c189dce6f2725ab2f93e2e5625f38bf34fe6711583088e947ef3407e902ec0be5b5babac72316458
+EBUILD votca-csg-2021.1.ebuild 2097 BLAKE2B 3ff69560e5ed700f6c0cf3f15442d7ce277af2acab62e552fd921ca51f35348cd77ed25e89afa2208fdb6e0c8c4ac4771ada07fdb1fd85ba1bcb5d2d1dc647fd SHA512 5b52a2a2bb86cf0024fc64b60b3bd51fedb7f5d8dc4e2cfcb3e1e20dbd661469be79ec486c516c8c40b98d13e232ef5f3f7701e2c062ca3171beeebe047647ea
 EBUILD votca-csg-2021.ebuild 2033 BLAKE2B 77fc10474aff5882c3d99133175f67ee51704dd1a32e101a42afb5e4417f3c478b4311f9ed619d62c1eab13328b130cfb1e500ff1e890c518adc0b1fcf167c6c SHA512 de1e8c1d9cb22e75ebc8dc7c043aafb04dce6eaf3d7173f1e745a6578b7236e9f71ce3b75fa5698333eca7c5c74a41337eba3fb4cd5c037e8bf3172bf78296eb
 EBUILD votca-csg-9999.ebuild 2072 BLAKE2B 1b13ee8b2bd47a7bd17fbddf1cc46f3ac38a21ba4c2d6d5a453ef3c55e2894b31c20c0f32d2b335b76d76ca56df6838b2ed6a616ee96e9dcb6fb7981f2f10346 SHA512 561f20660a4db6bca57c3bcf10c69aab2834b0a054c2ce95245a52536a1064c1481840001594cf2bcc4c060e3c407078d9d0b67497bd861d3f0a1df6b0ba3678
 MISC metadata.xml 676 BLAKE2B b3f2e43f5cb505876216b0a329410c9cef1b44a9bbd7e1c61faa4acd00dbe87ea0cebb00ed78dc00b9e1d2b08b95e3c40d25fecc0738c992a3f933e430f94e2b SHA512 14ecd498eeeed1576923d8da9bc5dc98e47c1d162173b7f2419ad367fa84e227555bd0365709be8a456dc5388ea6fa6734fa7df3c82fd4efcd1cf3460c7e12a1
diff --git a/sci-chemistry/votca-csg/votca-csg-2021.1.ebuild b/sci-chemistry/votca-csg/votca-csg-2021.1.ebuild
new file mode 100644
index 000000000000..eb83c3f2c7a6
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-2021.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca coarse-graining engine"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="examples extras +gromacs hdf5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-shells/bash:*
+	>=dev-cpp/eigen-3.3
+	dev-lang/perl
+	~sci-libs/votca-tools-${PV}
+	gromacs? ( sci-chemistry/gromacs:= )
+	hdf5? ( sci-libs/hdf5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig
+"
+
+DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		if use examples; then
+			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
+				git-r3_src_unpack
+		fi
+	else
+		default
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GROMACS=$(usex !gromacs)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+		-DBUILD_CSGAPPS=$(usex extras)
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/tutorials"
+		docompress -x "/usr/share/doc/${PF}/tutorials"
+		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
+		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	einfo "https://dx.doi.org/10.1021/ct900369w"
+	einfo
+}
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index a720c673de91..8933d42bd96b 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -1,6 +1,8 @@
 DIST votca-xtp-1.6.4.tar.gz 1405299 BLAKE2B 9d4e9d3f87e0c6be886df77bf52f9d8c0b4010fb1d77621a51b739986f3f5d70c85637c0d7b4d6a8a06d7dfc7e70ff5491bdc833a1b9da6fe1e8a9742a82d220 SHA512 f35e9605f4ac92547c801b254de792b5c3bf40200e8636869467997412357251df08f88ad851bc76cb0ba15428f06f28dbd4f64043a7612273468c8d653e52af
+DIST votca-xtp-2021.1.tar.gz 2192322 BLAKE2B 8b15f17e1287249ff383fc2b66b5d37c7f78bac071ea6cc2f902811ab56cded26db764cd204371d5bebca55dfce73d840d680a4c62bc458a6cf55955d783a666 SHA512 ad0190f3e9235aec9c6db4ea16de7cd0daad96ff9836821672b46dcf098ed3bc1cdbb98ccf4b495dab172d1c1a971580eef8dbf341a2067964f684871ca6277f
 DIST votca-xtp-2021.tar.gz 2192166 BLAKE2B bcacdfe92b8c9fbbe2fe949d7096c09928ef7ece3cc4e40adbf58f2894036588762f9905bce1a1595bea99d1dfb8bcd99f395bed2ce7b94eeaf51b1c33719558 SHA512 1444fd0a64a684fd2b1327a9c3af067ea812190fa95cab5f3bfcc7aae932cc7469d07fc219871ca594496fbfe74e277d3b6ccfbd7d5c24c162623515ee2fef0b
 EBUILD votca-xtp-1.6.4.ebuild 916 BLAKE2B 3f322407b39ca300186e1e283a6a85749b79518cbd7355577992fc4eeb7931c419e018a384a29d1e84becc5a7c94f7905c96d26cf6a750a9b0124ea35a40bd7a SHA512 65a479d3292c7296cbfb6543fe47e54f2824705dcbc2b2e75f6f2f4fda9f827ce15904aacff59c927061547a45c940eebef4f4fa3e3bcb226f401a6817dd74fc
+EBUILD votca-xtp-2021.1.ebuild 1072 BLAKE2B fd96c0a844636d52b3d4f10fc3cd4ad04061f6e015d1e8b087bcd50157e4d8a2586d7a4948b39987628d6efd9fc0c373d8bb77344bc62c3651d7b08704bc59fc SHA512 a1e95165d8c55351762d5a1cf70316862de2e30b765df1aaf8d904aa0cc0bf8d9e1f75aba3c88a4c7b273fee29d6a1bc89d710bb3fe298da5ee92b4f427a4f4a
 EBUILD votca-xtp-2021.ebuild 943 BLAKE2B a0596dab1f69c3c8e9afb3699b44ab0e49cd4e8f5ef6a397eed39ed051e13f0b457ca0b0e225329dcf73bc58799d4e3fc217805784f936d9e1ee09c3586bd998 SHA512 9c4688a19b3a4ef75c79a0500f253aaa1a99d38ed4e56948e4743ea03e734e613be845b56d084c67d783a8e76cd4ebc2888b94bfe3c6e67a9799bc22af6ff19b
-EBUILD votca-xtp-9999.ebuild 1073 BLAKE2B a9c1b41b9c84fdc31a6203714b183bb5d119e14e4a7e7c439d854c8f484bfab1e7f7f547b47ca059a080d667db36acf1311f406c83bcae3cfadd99c2262b8c39 SHA512 158015f6f79d215ab8a443cec0b104992e3ccea07356ea7a1c24790d8f0ee67eacff1f238fac30a5f9f522b131a599d6ea9fc6ed943c9889203826c7a9ea8849
+EBUILD votca-xtp-9999.ebuild 1092 BLAKE2B 4cc16fc9d7abf33f18b3120f9b756b1ada45dddfcb0686a28f0d522feb989ad39f54fb00249e7b388bdc4a063da89486cfd2827cfb7d3eddb0303f232fc3af91 SHA512 967feec2008dc88c8a15d825876d3d83058792843d2a7b7a67f702f7ea097a32c99397909c65eea1b0e27d5eb76cf156749ae1f68630cca8af2270f47928485d
 MISC metadata.xml 453 BLAKE2B 51ee11d9c55f15fd0382a7c422d1c12364901a5ac257f57d04b91b8ca77acf9c1eb709879bfc6042b577961352cbc4e31b01ece3a8c650eaffa9b4ebc6d385fb SHA512 892c8f84df6bd19e969b372def9a485be9121d8f7ab410b532529980298e57d0705f73fac409d8f251449cf2119dd3f28133e08d21d0e73b27d5ec0e9a3f205e
diff --git a/sci-chemistry/votca-xtp/votca-xtp-2021.1.ebuild b/sci-chemistry/votca-xtp/votca-xtp-2021.1.ebuild
new file mode 100644
index 000000000000..4d4db8635e4d
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-2021.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca excitation and charge properties module"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	~sci-chemistry/votca-csg-${PV}
+	sci-libs/hdf5[cxx]
+	sci-libs/libxc
+	sci-libs/libint:2
+	~sci-libs/votca-tools-${PV}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
+	einfo
+}
diff --git a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
index e4c0b6c8a536..ff2782e4b99a 100644
--- a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
+++ b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	sci-libs/hdf5[cxx]
 	sci-libs/libecpint
 	sci-libs/libxc
+	sci-libs/libint:2
 	~sci-libs/votca-tools-${PV}
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 618e8b271a3b..4e903572b94f 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 1085666d6c5a..dfe079578448 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -3,5 +3,5 @@ AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
 DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
-EBUILD kicad-5.1.10-r1.ebuild 4998 BLAKE2B 6fe45d71bdef5e6b6823c8dea291919da42d40c37f61c24b5fa5498ecba14fdd309f0ac616c1589304e64f5f96b5375df65de8fadaf438853298d021cc5ced65 SHA512 2c5ad0ae10a00cc2c80ffb3fb483aed4cec110644612b649826db8c6f2267fb7f875a7d1dcd4c25656c812cc6a027fb325eede80eade02e2b4ba324c939f0623
+EBUILD kicad-5.1.10-r1.ebuild 4984 BLAKE2B be2dab0a34c18081380bff2dcd40d48b618dd01758d3b43eac2ae1e05aee47eba0493914e1786b3238eb826b643e6accedb0d153562c46d7c8bef8bdd12cddc5 SHA512 8569f09efa70a705dadc4d48b65db3a3790c48758195514deff8c038a574709eabcd70c41e7fb3b8f5d5bfcd1203d7047119827b00f440c84907e05bb0c0a608
 MISC metadata.xml 1043 BLAKE2B 01782b6dbb1f44de2c100eff987f9f3715afc7e860c782b333cbc8a87e8d117f0111c09c563e79859a7247d7931a5d46623461459118e0e3a55b7e5883f6aa02 SHA512 463508b78ca804425e53877e79e394b9d4977c5c65955c5f47ff1e1ab8eb1a45c576a50c22d49c5855bfcdb07d17ec41d39b90ff5e36ab00a8515a5bc805ce02
diff --git a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
index c0606f9c9cb0..ea33fd638444 100644
--- a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 WX_GTK_VER="3.0-gtk3"
 
@@ -40,8 +40,8 @@ COMMON_DEPEND="
 	oce? ( sci-libs/oce )
 	python? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
 	)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 47f633f162f5..f408d1427c66 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 5ffdd0de54bb..d37b193bd9a5 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-40.1.tar.xz 3543432 BLAKE2B adfffdcf6e3730414ebdf1da0727ee3c20d02b7e1c57f13070d5a08d9895d24f91ad452efac1465e881912f93fe4417cb255ff62324920ae73d482183d50cdbc SHA512 319d819737f6b370cd5344d4483e06781e362930610dbc4745641a208e71f753bf894693009690a6fe04bceac75ab5aa7788ae2511425cd0bd2b9229a5d0111c
 DIST gnome-maps-40.2.tar.xz 3542008 BLAKE2B 65f23bf61e2e3c24afa80b74400dd929510c91ec463aa7e36759b1ddc60814538e21d883df37b98b5d4da851705e5f8e78e9d54a8b50a9cfd490a3e965f34b87 SHA512 6214ebeb8f5dc5fb28e0aab659a2b9f56d6b0c7b9248cd3482a268a6694ca04c75d91686a7029ec96904efcfca91a028d66d17b6311efa7e95b76379c68f6a0e
+DIST gnome-maps-40.3.tar.xz 3542308 BLAKE2B cc1430a9b66ee638fb64d0bf907a8472833137cbedd19f264bf2933618af493fc4a1ece0fd9fa2edb70ab50e24a434b4775d8c81eb830958014559e2a454e0b6 SHA512 2372a3e12eb17ec9f33521fecf7f74d1edb217dd8ff6f7565485ccd8d55ff535f7eff475284a402acb9da6781b389186bcd5e4df919340374be3b244f4100077
 EBUILD gnome-maps-40.1.ebuild 1487 BLAKE2B 455f501a0654cdae1c74a92391c3cde774d7ea6f9ce8f208700b820d40911fe17a44e49f279a47a123f97fbc645f78cb6e28c47e691f4c0eb07fdabd39143443 SHA512 e3210f34b4ca43f83436b2ee7896be63f95e87d862d79dc7351f7003b8c3335c42f68e37848b529e57c6ed8d71db206fffa073923ce6fe66c8321ef1acb68579
 EBUILD gnome-maps-40.2.ebuild 1499 BLAKE2B 2330b20fe4a80551f13627e0b84fe5cccf444a961468fd0d75373952e89792ce33e2b72dadc6cfea060a29b1c7cc2903fa44e2fb6abde77fec3a65ebdd367e48 SHA512 fd4513e27ac54403d066d964bdcb1b2bc528706e860341292a07b71091cd70277fac4eab483f03473dd3453089b33ac10c2d1b3e410abed2d12749bfa3050d21
+EBUILD gnome-maps-40.3.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild
new file mode 100644
index 000000000000..5ec15782805f
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.66.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-0.84:1=
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10:=
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 1ad2fc052d74..f80ddb36e0af 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
 DIST gpxsee-9.1.tar.gz 4295570 BLAKE2B b2753bc53003279b84f2811cbbe7195d6941e821fe03dfe95206eaa8c86a6df255530fddd4b13f82036e6404fe547d3a3a33f0c5c65df38aa17eb32285dde14f SHA512 2be51e5df8155175c786cfb265bc02a2abbd848a26b5d38a4bdc82a9677ee32711d11c9623168b5706b299529576d2cecfbb37cae90ff24177ebb5a7b70e3439
+DIST gpxsee-9.2.tar.gz 4434460 BLAKE2B e12994afd9673d859d8846e56d17ae86368f312390d7bee835ff02b4e08ab7330c9138d1af451c0c6a44866e2b044c01111d9de77ce0a40b47c48377e6d9589c SHA512 6469f06a21814d25a56899e79d055f166d6c3ab6ecdcea851f87a4991d74ff4e99fec9924ecd4c3065dcf8cb8eed53bdff66c2e3f5642978e6333d80a75f8262
 EBUILD gpxsee-9.0.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
 EBUILD gpxsee-9.1.ebuild 1119 BLAKE2B aedcd32f3e09a31ce9726a613224665a95519150d793a2071c1d0daa787dc5ca85b3fd89a64edd9517685b87d9c47ba6d3345c845541b6f0d47531012e148719 SHA512 865c8dc1da8c5dacc9b46dcebd6678dd76b4fe8eefd93a24317e0e7bd9ac53f398778fb012d9abdb62811adb324cdfea944d63de09b0a46a907b0bb59570e035
+EBUILD gpxsee-9.2.ebuild 1119 BLAKE2B aedcd32f3e09a31ce9726a613224665a95519150d793a2071c1d0daa787dc5ca85b3fd89a64edd9517685b87d9c47ba6d3345c845541b6f0d47531012e148719 SHA512 865c8dc1da8c5dacc9b46dcebd6678dd76b4fe8eefd93a24317e0e7bd9ac53f398778fb012d9abdb62811adb324cdfea944d63de09b0a46a907b0bb59570e035
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-9.2.ebuild b/sci-geosciences/gpxsee/gpxsee-9.2.ebuild
new file mode 100644
index 000000000000..af40115090c9
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 3f05da9d7a2e..1c42f65680d5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,7 +4,7 @@ AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.18.3.ebuild 5425 BLAKE2B 37675d37a35b5f000c137d5461ceb0749608cec33210eda98838b76a202474230c982f6276bf1cac3c87fe53fa56b33232a04e7bcb9a17bfb54a87f18599a9d6 SHA512 4e9d8b1ef1453942995df58a8bc6ba00a02a3231bfc2e379124a71fdca3f1e7cd6db026f6a4e7454f3af6c9810caed065717082c06f8f8cb75b44a27afccf658
-EBUILD qgis-3.20.0-r1.ebuild 5464 BLAKE2B 1f3cda341ef61a0f6ab08335cbec01fb585982a777ceb7420c0b8e86255d7676718aebc6d6fb5ede2b742074bd0cb4c7d879f4fde24a380a36938f3f2595691c SHA512 01cd73d0c0bb8db1dafee8c9ea223a8efe40009eeada333d7c3245f97717492adfa7e56caaf5c440d55e94defd313e6cde795e84994390baa57c6f234af16189
-EBUILD qgis-9999.ebuild 5464 BLAKE2B 1f3cda341ef61a0f6ab08335cbec01fb585982a777ceb7420c0b8e86255d7676718aebc6d6fb5ede2b742074bd0cb4c7d879f4fde24a380a36938f3f2595691c SHA512 01cd73d0c0bb8db1dafee8c9ea223a8efe40009eeada333d7c3245f97717492adfa7e56caaf5c440d55e94defd313e6cde795e84994390baa57c6f234af16189
+EBUILD qgis-3.18.3.ebuild 5333 BLAKE2B bc87c4fed5e992e5ff9e87879a77e8b8dcff0808da1faa2ce8755a9e8305e7625ad6b66c5403a618ea8f3454b2349dc9cf5f01393acd6ad40628370841dca45a SHA512 39ba707d2e9daf9766b174b663496200981bf48d306517985be7d8d94175d02f3fe5d19525234cc94f2d36bad3b2d15a779de75046c1b1e611ef04b475cfe029
+EBUILD qgis-3.20.0-r1.ebuild 5360 BLAKE2B e994dabd1c8cd67cfb0626397c00f383ee5ddab639724a4d9998678e2c73cf07e5065578f8f7b75ceeea777ebf4177e7005a2f092ed9051192736496b55ec825 SHA512 21a5645d6bcf9466f37cf88681d6d75f35b375ae76ec246588a8b206f1fcc4060d43b8988b6eb5c69f92e2ed45a0b7db73ba4e0409b4473befe8a6fdf1c73db2
+EBUILD qgis-9999.ebuild 5360 BLAKE2B e994dabd1c8cd67cfb0626397c00f383ee5ddab639724a4d9998678e2c73cf07e5065578f8f7b75ceeea777ebf4177e7005a2f092ed9051192736496b55ec825 SHA512 21a5645d6bcf9466f37cf88681d6d75f35b375ae76ec246588a8b206f1fcc4060d43b8988b6eb5c69f92e2ed45a0b7db73ba4e0409b4473befe8a6fdf1c73db2
 MISC metadata.xml 1482 BLAKE2B 87925de85329041a784559b99dc67fd0c787afe25ec6238c19a4200dcabdc3edd45e327605e9178d9c3242ac41be92aa7c048a32c96d72e10af8a32e9461f549 SHA512 22ce6a29e4ddba67939f639e2b7dbf0a0632b3844a599bd4e6300b59f63bd11a447c19a530810fd172ca84a6009a65523445ff8000a2312ebe483c5591b3533f
diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 7e4e3237f9fb..d8e8430113f6 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999 ]]; then
@@ -73,21 +73,21 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index d7f5ec4633f4..5c5913d97ad0 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -72,23 +72,23 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index d7f5ec4633f4..5c5913d97ad0 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -72,23 +72,23 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f88ca29952ab..f5330d871942 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 49bf55216748..b744d2591e54 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,4 +1,4 @@
 AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67
 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
-EBUILD cantera-2.5.1-r1.ebuild 3468 BLAKE2B 111b26d493dc8627991be85031ee4a9d01b0c29a98fc6acade73777520b64e5ed06273f05a926bdb15ad6fcf2818b58af74b8f8e41dca5424c0487976891298f SHA512 442a7cd16d14ae967ca7b64bfdba8c1395dea07089d3c1dbc0b05c56cd0ce6bb2bb9b63671005ef7134ef6b4f60d1f7c014b65b7cead8039e8910182a43eba2a
+EBUILD cantera-2.5.1-r1.ebuild 3436 BLAKE2B d961413b7a6ccf67f13d8d91d067264af2ddab2b5c351abdb8d41c85a2d013f9ca44ec8a34ddabf71cd9fd06e7a97664f081f03264871a2be811e1b70758656a SHA512 692d7df06f6f659465672f379d10ccab4f9f4f8b574b69636e992d3a8664d6087a7bdd73222ed6f5cdcfe86b000a99f8b1b7c36a79f9078b3beb1f81389caab4
 MISC metadata.xml 841 BLAKE2B 6e302ea58d1e915a7b8f868c9e9e5f151434a3c1f8bd4583d0a2c3d28bd7cbd2d381b4c04dc9f2a3e63b3123ea566727ee275c9d4a13ada36f5fab34502fbac1 SHA512 59ffb087b063eeeb0446f66de657b745bea260ae96953673696d2780cb0d4ed86de718e0a3eaab6503e3395044c8c7291cc11e193d0bd72e720640f5df3d962a
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index db21ef944ead..659722a8c3cf 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
@@ -30,12 +30,12 @@ RDEPEND="
 	lapack? ( virtual/lapack )
 	cti? (
 		$(python_gen_cond_dep '
-			dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
+			dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 		')
 	)
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 	dev-cpp/yaml-cpp
@@ -49,15 +49,15 @@ DEPEND="
 	dev-libs/libfmt
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)
 	test? (
 		>=dev-cpp/gtest-1.8.0
 		python? (
 			$(python_gen_cond_dep '
-				dev-python/h5py[${PYTHON_MULTI_USEDEP}]
-				dev-python/pandas[${PYTHON_MULTI_USEDEP}]
+				dev-python/h5py[${PYTHON_USEDEP}]
+				dev-python/pandas[${PYTHON_USEDEP}]
 			')
 		)
 	)
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 454418468a50..af8a49c6b596 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2870 BLAKE2B 1a20bb0b9ec7690021f743ee25965ac87376213c4637dca27d9ec200b73727c5ef8c2c164aae05f17828df336e9d0fd9d2b8b81bf388e522ccad2b05e9e4633c SHA512 b6337cd9cca6ce5615a681cd2e452d7b58acf4c9c018c07ea8d754711aa83d47e5682121c895a4b9c2eb82b7e6fa888f6dd6762c33620ca369a047c774c20f2e
-EBUILD hdf5-1.10.5.ebuild 2705 BLAKE2B ea56ce9dc157e2b61fbb9f06ab23b0a249b2a7295d882a22c49c6d2da784dfaa55d7d4fbf64b150b2bf74a608b0adeecd35ba42c82fbf6655defa63d47254b51 SHA512 fb4ba35ce6f85630f5b92a499208590769a48782e8dae1be891ddeccf0cefca9209373e55c7d05e628d9157a5d142a7bdf5bb6e542686bf2c871d784c4bd93dd
+EBUILD hdf5-1.10.5-r1.ebuild 2877 BLAKE2B 44bfd73391f6c5719dadf410494cd1b03a12fd1ce2dd356f6d1e9c7858ff2fdd0a8d180e5cdb5e25b65564190eeb64a23aedfb6e4a632568848043e594f3cdd9 SHA512 c7cb3134244caf0f6f872d8bb93042aecbdccbf8a639801eac90d293e774a9fefdf7f72022d0e025994c83f79e61b4eb029218cdf69e00667526e3b802870f3e
+EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index 8836edf76cd1..97cebb298aa6 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index cfadb8e89e3c..f33f957fdad7 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index e889710d79db..f8cd16b213c2 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -6,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-r1.ebuild 1322 BLAKE2B 6c2d3c36a97a9fa8619660f052bf3921a4066264f026d3bd6b82e7a663d5195b107f1dd7a041a1686a3fd4f593efc9372f8581e8a37dc3dc2d21dc5e71acaa3a SHA512 be70f46eb97391ca80c45393eb5aa6aa713651a971d9a67a9927f0fca032b51a75ced63947bef557621995f4345513179e7e9b6c4c59da751537ad9ba9af5a2d
+EBUILD indilib-1.9.1-r1.ebuild 1329 BLAKE2B eb829f501e348ad182ef742a5c77b36699bf799c22589749aacc5ce8b3539cc60df04d156042c7a5268294a3e0cb13d4f6f903ce53203f7848ad544bf468855e SHA512 6b20d9c52b3ff77889187156ea2a185ac61b2a6b67780be80aa0bc36b23575b31647fb6272e1044a7276acdbd073fd70f954fe14657147c8b9ebe6b29c30596e
 MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
index eb8784d34540..9c843186a92e 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 055c66d77c4d..f5304d8e80a1 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,6 +1,5 @@
 AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
 AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
-EBUILD libspatialindex-1.9.3-r1.ebuild 795 BLAKE2B 9b2905bb029c7cc09f229a02a7fb6b947ecf1ac7745530eca2e9a5e6ed5774689d557c6027261f3cc9fc5569cef472e62fdbfbae79ee155e1bdbcf6bb51db476 SHA512 1fa70787f80d81b4d891a6a2713f784a1f5995e27e0662fe35d55fe8d8c82ead8817f1fa7fb895922f707e3209e93ca13104e8a334078c2487cb5e3d9ddaee44
-EBUILD libspatialindex-1.9.3.ebuild 703 BLAKE2B 15acede08c365069b469837f8f028e49227484c870e6ac356097493dc80bb2422a6d37777fbed4a391515b4adcc84f9bc3e15c7ad3b8350c35e8d4f2255ea917 SHA512 242dda9ea1180a15e468383ba6c49e4828b77c5e443337655e8927c6cb125fa9e4cb398098c04207db07771a8712b66a357c1c331386be44805c01a7ff080d23
+EBUILD libspatialindex-1.9.3-r1.ebuild 793 BLAKE2B 372706dc09eaeaf808626a085b80b3efabd2887fd0cb6d5087d4b20db1863688e5397513b90a6be7e4071204031d5464c361cfc007856ee7593e743b745ecf63 SHA512 5b3637159c5c1aade1d409afe82d55a41b0d2bf6a1ca4f6e0fb71dce5befcf706fa5d3aab6f0bf7f5a039c424578e82950cfad0b06fbb134108ce96193992a17
 MISC metadata.xml 508 BLAKE2B 4e8acedee7f5bb2118b52544713de9d97559fd6a622d4bdb95ac95fa4028fb0bb880c5a0ebf8c8969bf6b1cc68f4c6186b840017cad59c625eec9995145228c4 SHA512 5542e14bc46471e81273c7a79e074db945a488b65937ccad106980b0826d30d930b02046f1247cb8eeab542e42561738b5dc2f00225b611b4148df1acd747dc2
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
index bee01dbe1971..7e8ad2fbf9dd 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
deleted file mode 100644
index b38f1950daa6..000000000000
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3.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
-
-inherit cmake
-
-MY_P="spatialindex-src-${PV}"
-
-DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"
-HOMEPAGE="https://libspatialindex.org/
-	https://github.com/libspatialindex/libspatialindex"
-SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/6"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.3-respect-compiler-flags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIDX_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index c2ad881b4d53..ca547908b1e4 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 2681 BLAKE2B 9fe64026721f8a0c0d9968735ab39c985e918a92f108d28f2f29e35fcae894c0e9a640f486458a502ac585de7e2690e4b3b5b931366193c18afc2f04be729645 SHA512 5ad00b4477540542650d388b1cb58e7aa24c6015b00f52626b3e47ee4da1a0766cba9e4b1c973275688dc0d891be59a71388a17766d741b7e9e85cd515c6a994
+EBUILD libsvm-3.25.ebuild 2680 BLAKE2B 222e6fcc1cc6bd425ac0744cd17436cb3f1740c6f83aea2965f3b109264d86a270a5634907b5cbb26e5d2515576db34cdb4f317144c2719b45b5e63250a86bb9 SHA512 58a3f24a19d8517b55bb80d400fc2d95a4aa0f38230fc51c483194387e6d2ac04834099649b778b84ea32ea0dcc6da1362a85c10ff46ef5d99283ab6fb8105e9
 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 edd16c69d55d..10a3d9c63400 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 516dcbfc6050..bb9045c652c6 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -3,6 +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 1476 BLAKE2B 87c34e6e1637d9f26fdd5cd5ee91bd0251073f76ca6bf9f352a9015a6c3191c0e9c94bd7b48f288e35b8db739c8bbcd6aa0adbd1478ac7c07d5ae0d7d469db03 SHA512 fbe4473b0afef5bf9b2e2ce1c1f7a193d2398492dc4f836180b968aeff01aac21fea79424378e4bfdb47e6f586cf6091f45cb7799c872542aee47f8dbd998c5b
-EBUILD metis-5.1.0-r5.ebuild 1812 BLAKE2B 64973cd56608538c3dceb82f66aafb8f40d335acf7966d5b9854dcd373a7eb9ea1b6f3d66bc068d3efe41a5829eadcf094be9b22f768779de974862b17fe5412 SHA512 267d581d645f6041d88729eb79c5ad7c8c109a0b5ee3ace113de9bb05dbab4d813c59ef64d28b83be06f4ca457ed1152ebd73a4cc0f80cd677a771974838a4fa
+EBUILD metis-5.1.0-r4.ebuild 1479 BLAKE2B 1dad2bd86123cf3cc78880caef4aa08d2db055bfaabdaee900b5fe22910d2eb63cf6eda2301edcd3207336afd33d5c7311efd28a3660ab5661f2c868e983a9ff SHA512 ec614d74848fda9e75d3929a0e77e85b38b043ec379eb14a8d62c791252bde127e03ad49298b67b235424987657da0c0c39e90bd21e172223265bc976fdacb73
+EBUILD metis-5.1.0-r5.ebuild 1815 BLAKE2B ed7eb5121960cc9ed16f13478332d8b42346e16a23987bef51523cd33991bec86c0a938f6f2b436fb50e8917bd311d7be1488a1406dc9414da88d4237d389c73 SHA512 743e17926e170363cd82bb5a13770bc730a06d4602d112593eb4dbdd19c26ae75278498e026fd77e4398f2d746742bbbc553d6b1e9dcdada9a4af8fbc4638ce7
 MISC metadata.xml 861 BLAKE2B 6aef18847710e42d21884dbd4c8285ee0527efec9a7444b1a3d8613011408d2f54cd4bdfa761316b7c1a16a1acb1e02b820ea2e8fea9080d59a2eb98a0b07229 SHA512 5d13498d10d46c9b8561e9b222adfbd1ba5998059c72f84cc39206155d421ccb06dfeb24ac71cee2566244c6af0c03070820e130bdeb7f01b09928d72ad0985a
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index a2a82573dad6..692b7617144c 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/metis/"
+HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
index dec369ccd8f4..edba6584954c 100644
--- a/sci-libs/metis/metis-5.1.0-r5.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/metis/"
+HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index c6fd47d10f96..cd4b5cb0648c 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -6,10 +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
+DIST openblas-0.3.17.tar.gz 12513037 BLAKE2B bb3a89500f242613a6bed73519702995cf1e82dcfec49f9469ecfd6647121260a4364582dbc257a75212320b5690ba93e75a0f2762dce7f398ef6443b169b4e4 SHA512 a97745c1f050ea44fce5f1722810de469612d374a29796a874d12673d6ad189872160cc2b5d0885790e6562d9d7ade629144c86f2649e668b0d4def36aa74495
 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
+EBUILD openblas-0.3.17.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.17.ebuild
index 4566f928af81..4566f928af81 100644
--- a/sci-libs/openblas/openblas-0.3.16.ebuild
+++ b/sci-libs/openblas/openblas-0.3.17.ebuild
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index c46e5b19c64d..a7c80e07b2f1 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -2,6 +2,6 @@ AUX parmetis-4.0.3-01-cmake-paths.patch 1145 BLAKE2B 68b601d3421e88114a4cf3c6e58
 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
+EBUILD parmetis-4.0.3-r1.ebuild 4032 BLAKE2B 3901fd54c46582035071e7f588a9f3a7236932dfa21abbf33ce4bfa0ff6d161a18711dfc437ef2dd0c0ae27d5804c830a569e7eb246240fdbe1c4348e9891943 SHA512 50c5bb942c7862fef87ada2f5e056c090f25d73c9e77d378b6c50a063eeec2afdcaa604579ca74ac99d314db53fc6abcffc112081bb96957b65c99319904dfeb
+EBUILD parmetis-4.0.3-r2.ebuild 1615 BLAKE2B a964cc0c14643b2e0663c2309bf8e7a28cd9f35be63fa9ba79c0291d3d6b80d1a3d3b6674d63456de8625d6b4df8d22fa2115b5fbef094778396a3b1c92880b5 SHA512 14fc8f863b55404f5b63bf928842abfb80c8a95904433ac274475661a92084587e1816c95f28f9ad310073b91b41a9debf84b9cef9b138665e25546b485aabb2
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
index 017c930a97ff..185d5ebd41da 100644
--- a/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
@@ -10,7 +10,7 @@ METISP=metis-${METISPV}
 inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
+HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"
 SRC_URI="
 	http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz
 	doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
index 6d9599fec417..90bfeec2fc17 100644
--- a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake toolchain-funcs
 
 DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
-HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/parmetis/"
+HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 0a55cc03b138..32ea8d309354 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r102.ebuild 7504 BLAKE2B 8461982fe592d9168266f291e5b6ea36ebdcaedc0e88c202d81962db1fa11d51d554528fdf56a890587a1969ea524696ba3fdcd87c28a3d98d1abd428d150dec SHA512 06a5d6cf5908ea8270208fcd9c6fcd4820f0a95b772cae4ee5c2d7e220ccf80e492d73062e01e9ee5c7b34c21092d0a0bb04523d100db842d57dfd0abcbdfef7
+EBUILD plplot-5.15.0-r102.ebuild 7490 BLAKE2B b6eec0097527b227142d257e2e452c08d95a4b955cb42ba2433bf9671e55f7863f6d3d8c44072f183a656370b9294937faf73a8f1d370530a906a1d6ae4d0e13 SHA512 9dcb96928d40aba19f409d57343a426dc8bcfcb5504e2ab34730a5e1e1987821294a0ed8c24ab1a3a98cefa5433793fffe1c93289a9ef5e9d4c47cd508784fe1
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
index 25ff02cc744c..c4d312740e5a 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 # fails with ninja, due to USE=java missing swig output dependencies
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -53,8 +53,8 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			qt5? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+			dev-python/numpy[${PYTHON_USEDEP}]
+			qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 		')
 	)
 	qhull? ( media-libs/qhull:0= )
diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest
index 38ba7d5fb833..c334b1c92101 100644
--- a/sci-libs/shapely/Manifest
+++ b/sci-libs/shapely/Manifest
@@ -1,5 +1,4 @@
 AUX shapely-1.7.1-tests-support-geos-3.9.patch 2130 BLAKE2B 2785926f41a8d9486b9591616acf1f9b2dd76c2b009a7a51fefcb664733b304e7fc59b247a87fa36f4b4301132f157a16153f78dc68c2102901c4eea46c020ba SHA512 64c5ecd44ee7b6020e9605825b8af78ba0dfcaa5b0358c8f76af4104869ce027eb059331fa8c488add3ac1e360e41f46346d24e702c54858fe2f9bbef0b929a6
 DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
-EBUILD shapely-1.7.1-r1.ebuild 902 BLAKE2B 7ca1c17771c26ca7ba773eb6a781e8df5bde1b5b9becc1a5dabb31a15ce919ef0b0bafa1c07c23d3dd04e9c86a3f834977a7f0d525373b0c588a78d27495c0ee SHA512 6c03a2986f6ff854810e51dc26fc240d2e2ebc4cbe89eddec0492a21409a367d3d9cdae9b9c28edc7053a8eea6e26581d0e21190f942d33a58d54a02acba13df
-EBUILD shapely-1.7.1.ebuild 839 BLAKE2B cdff940dce5acbd360bb81467475bdf7bd95d512f23c45c9bc7604c6769d56f5e111e0c6a830ab3c79ef84b17fe9878eb424ddd56b62588a80cb18115b68af2e SHA512 407d39827d32b759fc7944195bed880243424374555471a283700c47426e39ab3ec57ec6808e41b9670f1783f580f19737c0aeb12ca2f39da1ef32bf6e17e0e5
+EBUILD shapely-1.7.1-r1.ebuild 900 BLAKE2B a67d83f78652ccddb4606ed59f1a59757bda9bd86cf6da58e21fdcbd0fd2dea3a4d818f8793db5a2fa6e3a9a47f19a095de803a8ac62fe5cf3c768ec42a230ae SHA512 f41a644b2ed955c072cad70e787a83717ce1e3fca28287467f592db83406e7da967fbd274666286c4d14ee15c961650ed867ace44bd6b668a757d25848c078c7
 MISC metadata.xml 896 BLAKE2B 44a39e16f3f580535a2f9adc3c08411dce5f10432aa05687f231d1614d9b18d442783a0f2344eac9300f52a17e32552dbae75be3efcc8e3b3cc4ec539eff39b4 SHA512 84a5c6215b64b2f5c27bf9360f19772945b5a919b1407b18ae812a057aba183a593652ad80729de7472fb412e0172a2cb693482b58eccab056c66303d632d856
diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
index 6bb1493675cf..7c75f9f5be29 100644
--- a/sci-libs/shapely/shapely-1.7.1-r1.ebuild
+++ b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sci-libs/shapely/shapely-1.7.1.ebuild b/sci-libs/shapely/shapely-1.7.1.ebuild
deleted file mode 100644
index 483e0920ac6e..000000000000
--- a/sci-libs/shapely/shapely-1.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Shapely"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
-SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.3
-"
-
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/matplotlib
-
-python_test() {
-	distutils_install_for_testing
-	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 6a9578279fd4..adf54499154d 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,8 +1,10 @@
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
+DIST votca-tools-2021.1.tar.gz 115082 BLAKE2B 994105769e9718fc4f6832fb88a958d0a769660a21d9de36d52e9f1ce3cf9f66d26cb138f300de8285117fb87890a7ace4fc5be5dfa1ec41b82ceff9bd680728 SHA512 9770f1e96b489413577e41858e659f11c0adc79070ae1058102c2ad2a771c3222fcdffd8646bae75b5d05450a7fa3b49eee7fce1ae16718dd809ff729b3dd25e
 DIST votca-tools-2021.tar.gz 114974 BLAKE2B 9f707a901b83f0d8a6c7e5c9b43b135c7539cf4f1fa44a4ed1a5c8f2f7066e1241515fc025ea436f2e52e6bf4aefb7c9a15575e8a588845dda7fbb6717f50b7e SHA512 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
 EBUILD votca-tools-1.5.1.ebuild 1087 BLAKE2B 00c2358c8c4e36c34dcf359cbfb8cf9962ca5cdf413fa78b7c86fafc6333a4c4ed01892e18a91a2d0bb8b0bb7f3b1c527510eb207cb7ddd87e557b8489b13f0d SHA512 b3ca29f58b0c65642985506cf3f32c6850483ba7e8e0763cc9194957523931e9a6f51c3a441ffcd550f154bb6ac6f234a244c16bb431ab29feb93c242bb0cc53
 EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68
+EBUILD votca-tools-2021.1.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 EBUILD votca-tools-2021.ebuild 792 BLAKE2B f185fed01b8cac544c15627419534edb811e9a2d3f8d418d4487396db7c566f4f171f2fdfe41ee650a0ede653ac0b2bb43f7a17e79d404ec6d15d07314b433b0 SHA512 cdd7bd917b6d5dfe476d46e22d4d821b709513116b73c41a71f5f9c1a5e2b0dace7f381788f3f0baf22c3dd945904203ef433ea67d32a23eea98ce408355bb97
-EBUILD votca-tools-9999.ebuild 817 BLAKE2B 0a40f725c05500548af930c546def4b08594533c6bcb2500ec011c075544017898cad004705673a156d8b88e0e6feed0bc7903d00548c7eb2025d1312ed315ba SHA512 d327536f0b9c4a047d26e9ad63f44750c11459b34709d7bdd24aee6f3908ffb87a6f43a6410518427bf168134695bc6f11b11b2723eaa2d29cfa039970411e90
+EBUILD votca-tools-9999.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-2021.1.ebuild b/sci-libs/votca-tools/votca-tools-2021.1.ebuild
new file mode 100644
index 000000000000..184243331d2d
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-2021.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	dev-libs/boost:=
+	dev-libs/expat
+	sci-libs/fftw:3.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( NOTICE README.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_RC_FILES=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index a0d08f7fa883..184243331d2d 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -39,6 +39,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_RC_FILES=OFF
 		-DENABLE_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 81398eba73d2..61c5072a121d 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,6 +16,6 @@ DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d
 DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4
-EBUILD vtk-8.2.0-r4.ebuild 10401 BLAKE2B fc059b71d7c029dc7205d99155b100ef524de47a47bdad8e80fb02419962fa1d98e46721a7b29ae5547d5b8229ce97bc3bb43db03272982a78c15cf20b06626c SHA512 d077d7f9ac8d05665793dfd7034060ca3fceac3697c4ea2a8c37f2351393c272a56690110efef6c519bf5615bef3903636917deefca504425cb40f7b7e273d71
-EBUILD vtk-9.0.1.ebuild 13699 BLAKE2B 72896657ead8d82bb025ba74474b012de76ed08501270a0063fc446d25e6a24fef40516d8ed76d0d6f5072da89cd0208e1cb799a29f42bd82b4daa8c9e9b0df6 SHA512 7f7734d12b466ee5cb5eb6c8ff2243415875232467cccc79ee9daff541282672c64e68064c7f24945e140944f9dbeb01ac5de0bbfc44f58b377a010a809e3cb5
+EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a
+EBUILD vtk-9.0.1.ebuild 13679 BLAKE2B 4b46f2a93590a6f7403e9ca4d491d632e2ca9bbc0ba0f45c5a4c541cb2bf351e69f9b498edfc46ecfd84e2c1eaef5673c035ee050b584844e3e665fbca2e031d SHA512 4515771d506b19696467eeb0146dffeacca46df9310ca3c1176c80f050dee05b189c109b12e508822478b820e1a247eb0ae16542ac23ed86d3330c6224875acb
 MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1
diff --git a/sci-libs/vtk/vtk-8.2.0-r4.ebuild b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
index 2051e4d46bd8..2cfd6476f0a5 100644
--- a/sci-libs/vtk/vtk-8.2.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
@@ -80,7 +80,7 @@ RDEPEND="
 	mpi? (
 		virtual/mpi[cxx,romio]
 		$(python_gen_cond_dep '
-			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+			python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
 		')
 	)
 	mysql? ( dev-db/mysql-connector-c )
@@ -90,7 +90,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/sip:5[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:5[${PYTHON_USEDEP}]
 		')
 	)
 	qt5? (
@@ -101,7 +101,7 @@ RDEPEND="
 		dev-qt/qtsql:5
 		dev-qt/qtx11extras:5
 		$(python_gen_cond_dep '
-			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+			python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 		')
 	)
 	R? ( dev-lang/R )
@@ -112,14 +112,14 @@ RDEPEND="
 	web? (
 		${WEBAPP_DEPEND}
 		$(python_gen_cond_dep '
-			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			dev-python/autobahn[${PYTHON_USEDEP}]
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/hyperlink[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/txaio[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
index fde829fd7376..6e0717f814c3 100644
--- a/sci-libs/vtk/vtk-9.0.1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # - add USE flag for remote modules? Those modules can be downloaded
 #	properly before building.
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
@@ -107,9 +107,9 @@ RDEPEND="
 	web? ( ${WEBAPP_DEPEND} )
 	$(python_gen_cond_dep '
 		python? (
-			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_MULTI_USEDEP}] )
-			gdal? ( sci-libs/gdal:=[python?,${PYTHON_MULTI_USEDEP}] )
-			mpi? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
+			gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
+			mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
 		)
 	')
 "
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9171dd5e88e5..d551b19bf890 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index c4c37fd617df..a957a05f9445 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,5 +19,5 @@ DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902
 EBUILD maxima-5.42.1-r1.ebuild 4915 BLAKE2B 6a1e69a325f186ca1c75c5ea04083778a147a58bcc8f5a92a9d2e9a8a4df3a9008864772afe7ca1e55e2e28361ba5ab3398627e217e03073f1d77c8334ba27dc SHA512 f749d004d177e75cba694729bdca07b361a0cd8280d4146faf525b076a2f6042ca0027626076c0d2184b0a48cc7f03000e44bd69ec1c7bb53caf424d8ed3e25e
 EBUILD maxima-5.44.0-r10.ebuild 6372 BLAKE2B e3297b624215d728f9e2496548dd7f8120a580769a4d9a4900732b81410f6e10df28b132bb89272668ad29fbab8c95507ea9c7d0854894bff23ce3e82597ba0f SHA512 1f8d36eb61225a4a76250808964a6a6352a642c031ee129680a4f5cc6b418515c34c5c275478a4b46fcc41caffa3cc80d3111205b530b2384b313b46b481ea1b
 EBUILD maxima-5.44.0-r9.ebuild 6298 BLAKE2B 8db82bbae80fd131141e5d5b8a700972865ae187b6b72956f14d48733ed91d54527e8784da044d63ee6c48f0c0604124dbe08aad856fbfd81bb61546aabb21d5 SHA512 f166a500b8bfc04de71d0851fe25fe8e9e48e5fe274d38099d5b9277c839ecb2fa4e6ec11c6b854921691b782a1c47b03001b0ac3723d6b9e42710bafc8cac78
-EBUILD maxima-5.45.1-r1.ebuild 6368 BLAKE2B 642dbc6ec8648978b235fa7302e880935b6fbc58bc966337d6ea0684f28db567410783d19496b212cb0636ded2734b22c228da40d879c9d38f4013d10853d304 SHA512 2efd0c2a23b155cb1c18bdf36c46a8bfe2cc12ea8541b8de02d992e0a4132225c94f502625a7418d599b80b3aa70317087a6bddc02998628f19e01d85c2e106c
+EBUILD maxima-5.45.1-r2.ebuild 6374 BLAKE2B bae227125971213b20fc68eb0e6e6e1b653e07969169edc6c0157b0567e4fa64d5c9dc8233e0b03bcc0d41a19757da740bfe6a87742b5d9be0ae18a6ce53f42d SHA512 7729217e3978f9d05bbfcef32127c8f43a820ad176195032c8a6d8fe26e95e69ff0369d1c0e5fb92925ce35c7c73adc531dc7f0175fddbfb5798d79932f56d43
 MISC metadata.xml 1733 BLAKE2B 30e06c199d4c4919ea90aa5a0b3091b124b4b43fc7791d758afdb0d94069edfafe386ddd7ddbeb9aa2589a5ec3866ecabd9d71c1b41380db6212529ad376c846 SHA512 2a9ccad0ef037a65f7dae3ac3769ab0bdf54ac8789387d3bcab0e022f9dfb77b019d14dc03bd7777937076e822c837511c12fd8198e7b9bd7eb6e621e46c0be4
diff --git a/sci-mathematics/maxima/maxima-5.45.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.45.1-r1.ebuild
deleted file mode 100644
index 43eddc8c8b58..000000000000
--- a/sci-mathematics/maxima/maxima-5.45.1-r1.ebuild
+++ /dev/null
@@ -1,236 +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 autotools elisp-common flag-o-matic python-single-r1 xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
-RESTRICT="!test? ( test )"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-LISP_DEPEND="
-	clisp? ( dev-lisp/clisp )
-	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
-	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
-	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls app-misc/rlwrap )
-	gcl? ( dev-lisp/gcl[ansi,readline] )
-	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
-"
-
-# Python is used in e.g. doc/info/build_html.sh to build the docs.
-# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
-# lisp engines are used to both compile and run maxima. It's possible
-# that they don't (all?) need to be listed in DEPEND; who knows.
-BDEPEND="
-	${PYTHON_DEPS}
-	${LISP_DEPEND}
-	test? ( sci-visualization/gnuplot )
-	sys-apps/texinfo
-"
-
-DEPEND="
-	${LISP_DEPEND}
-	virtual/libcrypt:=
-	emacs? ( >=app-editors/emacs-26:* )
-	gui? ( dev-lang/tk:0 )
-"
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-#
-# VTK is an optional plotting backend that can be enabled by
-# running "draw_renderer: 'vtk;" within maxima.
-#
-# It's NON-optional for the scene() command, but that command is
-# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
-# Thus we include VTK only as an optional dependency.
-#
-# We require app-misc/rlwrap for any lisps that don't support readline
-# themselves.
-RDEPEND="
-	${DEPEND}
-	X? (
-		x11-misc/xdg-utils
-		sci-visualization/gnuplot[gd]
-		vtk? (
-			${PYTHON_DEPS}
-			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-	emacs? (
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended
-	)"
-
-# Maxima can make use of X features like plotting (and launching a PNG
-# viewer) from the console, but you can't use the xmaxima GUI without X.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
-	gui? ( X )"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	# Set the PYTHON variable to whatever it should be.
-	python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/dont-hardcode-python.patch"
-	"${FILESDIR}/imaxima-0.patch"
-	"${FILESDIR}/xdg-utils-1.patch"
-	"${FILESDIR}/wish-2.patch"
-	"${FILESDIR}/rmaxima-0.patch"
-	"${FILESDIR}/emacs-0.patch"
-	"${FILESDIR}/clisp-1.patch"
-	"${FILESDIR}/clozurecl-3.patch"
-	"${FILESDIR}/ecls-4.patch"
-	"${FILESDIR}/cmucl-1.patch"
-	"${FILESDIR}/sbcl-2.patch"
-)
-
-src_prepare() {
-	default
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS=""
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "l10n_${lang/_/-}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	# Using raw-ldflags fixes the error,
-	#
-	#   x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
-	#   value (expected an integer): 1 -Wl
-	#
-	# when building the maxima.fas library for ECL. See upstream bugs:
-	#
-	#   * https://sourceforge.net/p/maxima/bugs/3759/
-	#   * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
-	#
-	# The 32-bit and 64-bit version of the clozurecl executable
-	# are both called "ccl" on Gentoo, so we need the additional
-	# use_with for clozurecl64. See bugs 665364 and 715278....
-	#
-	# The usex works around https://sourceforge.net/p/maxima/bugs/3757/
-	#
-	econf ${CONFS} \
-		LDFLAGS="$(raw-ldflags)" \
-		$(use_enable clisp) \
-		$(use_enable clozurecl ccl) \
-		$(use_enable clozurecl64 ccl64) \
-		$(usex clozurecl64 "--with-ccl64=ccl" "") \
-		$(use_enable cmucl) \
-		$(use_enable ecls ecl) \
-		$(use_enable emacs) \
-		$(use_enable gcl) \
-		$(use_with gui wish) \
-		$(use_enable sbcl) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	# The variable PYTHONBIN is used in one place while building the
-	# German documentation. Some day that script should be converted
-	# to use the value of @PYTHON@ obtained during ./configure.
-	emake PYTHONBIN="${PYTHON}"
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README-lisps.md
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-
-		if ! use gcl; then
-			# This emacs package is used to run gcl, maxima, gdb, etc.
-			# all at once and possibly in the same buffer. As such, it's
-			# no use without gcl (more to the point: it requires gcl.el).
-			find "${ED}" -name 'dbl.el' -type f -delete || die
-		fi
-	fi
-
-	if use ecls; then
-		# Use ECL to find the path where it expects to load packages from.
-		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild b/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
new file mode 100644
index 000000000000..532a39609b73
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
@@ -0,0 +1,236 @@
+# 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 elisp-common flag-o-matic python-single-r1 xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+RESTRICT="!test? ( test )"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+LISP_DEPEND="
+	clisp? ( dev-lisp/clisp:= )
+	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
+	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
+	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
+	gcl? ( dev-lisp/gcl[ansi,readline] )
+	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
+"
+
+# Python is used in e.g. doc/info/build_html.sh to build the docs.
+# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
+# lisp engines are used to both compile and run maxima. It's possible
+# that they don't (all?) need to be listed in DEPEND; who knows.
+BDEPEND="
+	${PYTHON_DEPS}
+	${LISP_DEPEND}
+	test? ( sci-visualization/gnuplot )
+	sys-apps/texinfo
+"
+
+DEPEND="
+	${LISP_DEPEND}
+	virtual/libcrypt:=
+	emacs? ( >=app-editors/emacs-26:* )
+	gui? ( dev-lang/tk:0 )
+"
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+#
+# VTK is an optional plotting backend that can be enabled by
+# running "draw_renderer: 'vtk;" within maxima.
+#
+# It's NON-optional for the scene() command, but that command is
+# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
+# Thus we include VTK only as an optional dependency.
+#
+# We require app-misc/rlwrap for any lisps that don't support readline
+# themselves.
+RDEPEND="
+	${DEPEND}
+	X? (
+		x11-misc/xdg-utils
+		sci-visualization/gnuplot[gd]
+		vtk? (
+			${PYTHON_DEPS}
+			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+	emacs? (
+		virtual/latex-base
+		app-emacs/auctex
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latexrecommended
+	)"
+
+# Maxima can make use of X features like plotting (and launching a PNG
+# viewer) from the console, but you can't use the xmaxima GUI without X.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+	gui? ( X )"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	# Set the PYTHON variable to whatever it should be.
+	python-single-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/dont-hardcode-python.patch"
+	"${FILESDIR}/imaxima-0.patch"
+	"${FILESDIR}/xdg-utils-1.patch"
+	"${FILESDIR}/wish-2.patch"
+	"${FILESDIR}/rmaxima-0.patch"
+	"${FILESDIR}/emacs-0.patch"
+	"${FILESDIR}/clisp-1.patch"
+	"${FILESDIR}/clozurecl-3.patch"
+	"${FILESDIR}/ecls-4.patch"
+	"${FILESDIR}/cmucl-1.patch"
+	"${FILESDIR}/sbcl-2.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS=""
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "l10n_${lang/_/-}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	# Using raw-ldflags fixes the error,
+	#
+	#   x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
+	#   value (expected an integer): 1 -Wl
+	#
+	# when building the maxima.fas library for ECL. See upstream bugs:
+	#
+	#   * https://sourceforge.net/p/maxima/bugs/3759/
+	#   * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
+	#
+	# The 32-bit and 64-bit version of the clozurecl executable
+	# are both called "ccl" on Gentoo, so we need the additional
+	# use_with for clozurecl64. See bugs 665364 and 715278....
+	#
+	# The usex works around https://sourceforge.net/p/maxima/bugs/3757/
+	#
+	econf ${CONFS} \
+		LDFLAGS="$(raw-ldflags)" \
+		$(use_enable clisp) \
+		$(use_enable clozurecl ccl) \
+		$(use_enable clozurecl64 ccl64) \
+		$(usex clozurecl64 "--with-ccl64=ccl" "") \
+		$(use_enable cmucl) \
+		$(use_enable ecls ecl) \
+		$(use_enable emacs) \
+		$(use_enable gcl) \
+		$(use_with gui wish) \
+		$(use_enable sbcl) \
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+	# The variable PYTHONBIN is used in one place while building the
+	# German documentation. Some day that script should be converted
+	# to use the value of @PYTHON@ obtained during ./configure.
+	emake PYTHONBIN="${PYTHON}"
+	if use emacs; then
+		pushd interfaces/emacs/emaxima > /dev/null
+		elisp-compile *.el
+		popd > /dev/null
+		pushd interfaces/emacs/imaxima > /dev/null
+		BYTECOMPFLAGS="-L . -L ../emaxima"
+		elisp-compile *.el
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README-lisps.md
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+
+		if ! use gcl; then
+			# This emacs package is used to run gcl, maxima, gdb, etc.
+			# all at once and possibly in the same buffer. As such, it's
+			# no use without gcl (more to the point: it requires gcl.el).
+			find "${ED}" -name 'dbl.el' -type f -delete || die
+		fi
+	fi
+
+	if use ecls; then
+		# Use ECL to find the path where it expects to load packages from.
+		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 97cf2eb58bec..78313af3cf1f 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,4 +1,4 @@
 AUX relational-2.5-no-qtwebkit.patch 3307 BLAKE2B d0a1c4aa6261e5f52017b73e6d3ab8d689d328cca2ce9af1af3ee916edd52f99a6f5782b5a5abc723589d8b11ab04c088e0d80a89306a105da55eb59941d6c78 SHA512 9ac91976ec18b87647767f6cff525fa32c0e35749a04ed9d280016ee3b0346f12fd341b22e36a8fa97650058c12b858dbbcdd0c3c1964f554342bc8ef6d059c2
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5-r2.ebuild 953 BLAKE2B 6bba4f6861a12843ee41eb2a7ddabb8bb8c1fdaa3c1636808f74c45f7b2ee8c0538ed4d3efbe5ec1ee2b292f9d47866eb058c9eef9491ee22abfc6c4b55507c6 SHA512 cfcf392622291188fb233c27c3c67b491b201f565e9b160ad4871bfdbcac4514e4e18d5e69f0db6bc604e913ed77ac931a7c749115634e4dcba1d3efd3a7a1d3
+EBUILD relational-2.5-r2.ebuild 945 BLAKE2B a54bb173d1128b3b7713e758ed0a86747a36099933745f75e97e10798266ab46225fba2810aec5bc8c5d40d4ad761778ccc73c4631491ab0d5188bb2993105a0 SHA512 dee6609f9a47111e431234f760356bfe6d62e2dcbd3a9bb7ec2d85f3c3f485cbd46349bf5bc73bb31f241a105782aebfdb46c75a553643b84dc7cc015e7eb3a5
 MISC metadata.xml 329 BLAKE2B af279e80c33a9c850fdf197cda6d3d649deccd92a4360f6524194ac549c3c02b46975067c8f5ee2dc45dc6f5e6ece260cdf8664ef9c916bdb3871b1020c685ec SHA512 27c79174fb317ea692be0a1f32fe608dc0947351875e0f0ec0acaaaa613dbac8929188522d41682f591da663a3ab934e5d362b71d9aad763248a6076f2057419
diff --git a/sci-mathematics/relational/relational-2.5-r2.ebuild b/sci-mathematics/relational/relational-2.5-r2.ebuild
index 708b76f72de9..41251c5f5f99 100644
--- a/sci-mathematics/relational/relational-2.5-r2.ebuild
+++ b/sci-mathematics/relational/relational-2.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-single-r1
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}"
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 09e146dc18c6..836101987736 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -6,6 +6,8 @@ AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511f
 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
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
+DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 EBUILD singular-4.2.0_p1.ebuild 2258 BLAKE2B d74e8ad0c98142364ff097e5e2d8585d01ba863021178d9c5206507c2318e71c0484bf620d77bae4927722395ef9b785d6e00be0d7d7bbd91086d71a2f54e143 SHA512 a9339d04e4beb91f440caede447bd565bf1576cab72b93e44ae39ce9be6ef26e294713b39526baa8c5ff68c867cbcddb9e87c42f19c27ca6e82786e4a5b2bf12
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
+EBUILD singular-4.2.1.ebuild 2564 BLAKE2B 8f849b934c52c6e367d70953e0f38c0043a3b0f35075858f3a19d0533e443c9fadab50ccad40d6b3ab8e8812b8b3cb2fe0b36ec9751f11e945ac2728cfc74640 SHA512 69979a38eb3e7c5b590c891595f91465cb3a2140825e0600626390aaa0f6e0a55f4a55a717938bf1923b3a8cb35df361c14a2c944101fba55274ef6cab3d6e45
 MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/singular/singular-4.2.1.ebuild b/sci-mathematics/singular/singular-4.2.1.ebuild
new file mode 100644
index 000000000000..0f3497acf49d
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.1.ebuild
@@ -0,0 +1,117 @@
+# 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
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Sources"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+IUSE="emacs examples +readline static-libs"
+
+RDEPEND="dev-libs/gmp:0
+	dev-libs/ntl:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	sci-mathematics/flint
+	sci-libs/cddlib
+	dev-lang/perl
+	readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Needed to avoid segfaults in the test suite until
+	#
+	#   https://github.com/Singular/Singular/issues/1105
+	#
+	# makes its way into a release.
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	econf \
+		--with-gmp \
+		--with-ntl \
+		--with-flint \
+		--enable-gfanlib \
+		--disable-debug \
+		--disable-doc \
+		--enable-factory \
+		--enable-libfac \
+		--disable-polymake \
+		--with-libparse \
+		--disable-optimizationflags \
+		--without-python \
+		--without-pythonmodule \
+		--disable-python \
+		--disable-python-module \
+		--disable-python_module \
+		--disable-pyobject-module \
+		$(use_enable static-libs static) \
+		$(use_enable emacs) \
+		$(use_with readline)
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		pushd "${S}"/emacs
+		elisp-compile *.el || die "elisp-compile failed"
+		popd
+	fi
+}
+
+src_install() {
+	# Do not compress singular's info file (singular.hlp)
+	# some consumer of that file do not know how to deal with compression
+	docompress -x /usr/share/info
+
+	default
+
+	dosym Singular /usr/bin/"${PN}"
+
+	# purge .la file
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+	# an already installed version of singular may be used and cause segfault
+	# See https://github.com/Singular/Sources/issues/980
+	SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+	einfo "Additional functionality can be enabled by installing"
+	einfo "sci-mathematics/4ti2"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 016d11a827ab..de4827fd48e3 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index ae246935131e..4bfb482a4dc6 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,5 +1,5 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
 DIST ViTables-3.0.2.tar.gz 921231 BLAKE2B 5800cf222260f0d4c4c7c652f8ecab32b764f3555d7a19bc3aca6acdb68648b0b381389737a67f8b2d558ba09dc9f9837103a6c3c27ca6f7b9c0b0ca31bf8978 SHA512 d9b5fc0c5c31cd663a5ce8af415b8e7feef89b5d542933dbb8809961b9bdf325d115238526856f928e8326192e73c8cd84879566d569d70c6418921dac444766
-EBUILD vitables-3.0.0-r2.ebuild 911 BLAKE2B 0c21c4e3f0f78870b274fe9311e8fcc4891d499ef9884f1adc63b9152acf394cc3dfbb6f696c1510840a348b6cc5f691aeac4c731d4b77f6bfb0d778cd3bb2f3 SHA512 ba19b6c130b03552497268fef74e5a731a9d4e3704dbf867fda6d4701751a1c122f26e89e073af7c0111d2398d708479b941717f9a1e4555c4d90d1c00d66922
-EBUILD vitables-3.0.2.ebuild 871 BLAKE2B 4ec706f87683e20878c6d5af838c72b3a673ded2e59c4b96984a16c24c8bada30d1e31f9e55fa3b9b7fd767726e9ac8eb7046b0138e38003e8da3410ca4208b1 SHA512 f9699b5e8d0973d704cb8325986f7c02a6760fbbe07383206bfed5371f4340f4b2d8a07775fa34a056eb8657b17c68cd7c0b0f80f2197bb98c945cc190f3bce7
+EBUILD vitables-3.0.0-r2.ebuild 891 BLAKE2B 2d964cdece0a4f0fe94383132c21539ef39c88b6885f3488a6aa2b0adaeea6a7b9f89d0fb5b2159a23890fd9cdbaa935135c1bd5c49f7ebb5f1867e584512a46 SHA512 e0957435e93f303db1a13e9463db8f56eeb7285ac34391ddb65d351d6434dcf460b5e692c727991994ce960fbc1d46c95cc367d46ece69d64d4a8f4730906cd7
+EBUILD vitables-3.0.2.ebuild 871 BLAKE2B 581a5cc815cd8a17a2e21c7e6fe93e77565a4fa519daaa099180699ed938627ebe2814990e2f93936ab9d7cf5f85aab87fc8ab6fe12542ec8bc08cffa116d798 SHA512 dacdb59394a6b598daadcda540692e56cdb3c0017310c75f3d49e2d1b39180b8e47a79a2ba2b40cdc2f27995738553a920b39284246552c5a537339ac93005d3
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
diff --git a/sci-misc/vitables/vitables-3.0.0-r2.ebuild b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
index 9dcf272e5e66..8d86ddb9e1fc 100644
--- a/sci-misc/vitables/vitables-3.0.0-r2.ebuild
+++ b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
@@ -20,9 +20,9 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/pytables[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
 	')"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-misc/vitables/vitables-3.0.2.ebuild b/sci-misc/vitables/vitables-3.0.2.ebuild
index d334a4dbd1b0..9a4c5490d510 100644
--- a/sci-misc/vitables/vitables-3.0.2.ebuild
+++ b/sci-misc/vitables/vitables-3.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 46ef8dcc34b2..a8bbb38a15b7 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 3f0af87faee9..4d0b80204ec1 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,4 +1,4 @@
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
-EBUILD espresso-4.1.3.ebuild 2717 BLAKE2B d462c6221b13b7feabf9e5a19dbcc3e3bf9218dbd10da194ca116590cb8b43fd47870ac75e9c2a6910cea0976b5ccecfa70d518327ce40569bc8891e1d0303ab SHA512 28ff98bb8ecf7e8b9121b737e777dfca2a665e4c30b83f8e44e7748eca99653276c2a17c982aa66d75be5b2cba4c9b22157aff019dd8dab8cac40e19ce3af759
-EBUILD espresso-9999.ebuild 2717 BLAKE2B d462c6221b13b7feabf9e5a19dbcc3e3bf9218dbd10da194ca116590cb8b43fd47870ac75e9c2a6910cea0976b5ccecfa70d518327ce40569bc8891e1d0303ab SHA512 28ff98bb8ecf7e8b9121b737e777dfca2a665e4c30b83f8e44e7748eca99653276c2a17c982aa66d75be5b2cba4c9b22157aff019dd8dab8cac40e19ce3af759
+EBUILD espresso-4.1.3.ebuild 2703 BLAKE2B f1b9f9798f07d6b5f64a23bccc1364609f05c2f1b9090ed478e208fc725f3e351bb0899414d2fea3d7a7dfb787fcb4f0e5c9436b520561b8021479971b743543 SHA512 c62e72e432146556e446616702251acb67142982100d4525fb323bd12de0f1cca8e53169b576de729d09e1964b92a2b06b96362fe70aeeff9bf5f326f54ed6df
+EBUILD espresso-9999.ebuild 2703 BLAKE2B f1b9f9798f07d6b5f64a23bccc1364609f05c2f1b9090ed478e208fc725f3e351bb0899414d2fea3d7a7dfb787fcb4f0e5c9436b520561b8021479971b743543 SHA512 c62e72e432146556e446616702251acb67142982100d4525fb323bd12de0f1cca8e53169b576de729d09e1964b92a2b06b96362fe70aeeff9bf5f326f54ed6df
 MISC metadata.xml 476 BLAKE2B 6c074886e03a8645cb40176234cfff18ec75c0c3faa9c72f2cce228cdcbb113eb870eb0aebde8c0c378aee65e54606addb114361255df082a00e4289cd9f0db1 SHA512 d50a5262cccf20c2949d76fbd7a17166985b018d7686deade58a2d748a91754f5691df28800f7d19f3c3f2a78755d3e90cf93f6273be849deea47ee9d7de0258
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index a60bb434ef8b..19e9be04e85a 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index a60bb434ef8b..19e9be04e85a 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index a00aa9da10e5..d0c5d4fca5e2 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -13,5 +13,5 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia8245.tgz 23737440 BLAKE2B 74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b SHA512 25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a
 EBUILD pythia-6.4.28-r2.ebuild 2015 BLAKE2B 8e26f38ac4ed140dbd49d9149a9bf56388d9809a26beb27bcd87f2f09503f9bdac7e28ea96413f0f849bfb1cf32c71f32efc2d8c1ca68a8d287168fb35ec5ddc SHA512 9d8527a168976ec0da2aff8ff220a294df566d9581913cb4561ef738eb33a6ec28b77e162fc5b6977cb06359d2264e198821833f5801293ab56a50d20431aaa8
-EBUILD pythia-8.2.45.ebuild 5696 BLAKE2B a6d951224e50d05ebad40247c5ba38e0515730bdfed77807ab64bfa6445bdab683c18b555bf42184c5dd84bc11cb857e2ac79b6e617092a5242e1217c063efe4 SHA512 da40dc43614288e10c54cd0e2f7d6105528a79d33a08022813655c46c4f7dbaac1af54c7ac29c56f3f0089a02c4c0e679bb4d28423183980d23cea9101c62421
+EBUILD pythia-8.2.45.ebuild 5696 BLAKE2B 542ce9a762f40743a9e73dda33fd034423c9c035736927ccd07c2554beaf67dfac9355baa9879593b91e940d376eeef5a14c6e560155b6fb6a59c6030f294d11 SHA512 64f8f670813709a920f29e65ef75717ab2d16b6bd0044fb2aed36f9307efb8f5a267ae339777a6c0deb165516bc88b9c86dd5d75735bb1f6be9bbdd254209b49
 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389
diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45.ebuild
index 0dc12374459b..64f18f325b58 100644
--- a/sci-physics/pythia/pythia-8.2.45.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -25,14 +25,14 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
 SLOT="8"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
+IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	fastjet? ( sci-physics/fastjet )
-	gzip? ( sys-libs/zlib )
 	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( sci-physics/lhapdf:= )"
+	lhapdf? ( sci-physics/lhapdf:= )
+	zlib? ( sys-libs/zlib )"
 # ROOT is used only when building related tests
 DEPEND="${RDEPEND}
 	test? (
@@ -113,7 +113,7 @@ src_configure() {
 		--prefix-lib="$(get_libdir)" \
 		--prefix-share="${EPYTHIADIR}" \
 		$(usex fastjet "--with-fastjet3" "") \
-		$(usex gzip "--with-gzip" "") \
+		$(usex zlib "--with-gzip" "") \
 		$(usex hepmc "--with-hepmc2" "") \
 		$(usex lhapdf "--with-lhapdf6
 			--with-lhapdf6-plugin=LHAPDF6.h
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 63314a2be259..5fa216ce04b9 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,8 +1,8 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 DIST root_v6.22.08.source.tar.gz 173079716 BLAKE2B 0b3c15dfedd0215334dcd59db133aa9097709996e0e9cc20a1ae96f954ee607cad314291148f78a31f24ba78dee84204e617e17a6ed8a390503b068e8120e9f3 SHA512 2355e20b8c4d7ad747c31956a3ad0f6e7b70039f3e6613182bd7c53d0e8776267ee85fc1d8aad9ed0d942e28f4124ad79a7dc1082bb1ea7974be2cb6a8a85b39
 DIST root_v6.24.02.source.tar.gz 185205849 BLAKE2B 2b8b7aaf6d1bf498a52f341128ee3202ae5166d6ad49d8a0a05da64d4ed2887b50c22e67a7ce694e85d4330a1002937e21a4746be0342a9e21631e4b88125535 SHA512 8ff64688c6c675e157a5db504f8347511752dd10142c70af677fde9396841eb0a76bb9ec43631e73c83b09f278e34706a5492e22db52b6c100578329cef3c461
-EBUILD root-6.22.08-r2.ebuild 7557 BLAKE2B 2e3c41b312dbdb8c11d4f67d8bb8dac15506431f1773d0597bcdc925b4c735b59749d893e8e5b26974e49bd9df54631fab49eadbe8eb379f10675134d8e5045d SHA512 29803b06c53036b5a5687713e836ae6188e1117e69861ab13593c77ffab4a56406115efe22385cc1dfdb1c67cab7e2f0f0654bfba89c198e5302c47e85bdd6b0
-EBUILD root-6.24.02-r1.ebuild 7796 BLAKE2B f725be73c40ff29fc384d82415862572fb078a088c9d5b288bd022231338cee252ef56ee49ea3f8203d8af5e9cc50f279696d85661b95dda6cbcc18a3573052a SHA512 26c396a72181963927092a81aa9ad951a032fa4e44368d74e4e2aeb30d0afb260243fe938c54a9562dbddbddefd45a9740e59335f7369c50e63d174a6326c13d
-EBUILD root-6.24.9999.ebuild 8267 BLAKE2B b6dc49068996de8546fc4a815dc6b5f77ad9d1b3213e0b9b1b21a245431c00e219080f9f678a9ea7fce34a9bff6652fd1f83b7d6649547ca81c67712ba52b84a SHA512 49d93ae101dc408d274f4b0c1be0c09b957f61f53336e1d520ed7f8217beb9c74297f7362f6866cbc7d6816cb56781a76042302280dc1891615b64a82c5ea927
-EBUILD root-9999.ebuild 8267 BLAKE2B b6dc49068996de8546fc4a815dc6b5f77ad9d1b3213e0b9b1b21a245431c00e219080f9f678a9ea7fce34a9bff6652fd1f83b7d6649547ca81c67712ba52b84a SHA512 49d93ae101dc408d274f4b0c1be0c09b957f61f53336e1d520ed7f8217beb9c74297f7362f6866cbc7d6816cb56781a76042302280dc1891615b64a82c5ea927
+EBUILD root-6.22.08-r2.ebuild 7549 BLAKE2B bc4922e1df99554dcdb864aee4825abe01e0e082434bad558b7f08d95a68684b9971cc60dd83bbacbb3a3cffcae242ff599b6aad763216432fd1ec91054210ac SHA512 95c26e0f519cfc60e68e631e6798239ceb74ff879cc6fe6de8e5ca5f2b7622a2a1e3d3d1208a1c002a80bd2fa879a1886e7309dd6badc1124c9f4ebc71a36ed2
+EBUILD root-6.24.02-r1.ebuild 7788 BLAKE2B 1a95495c58a99a6293882f5aa183a79371e2591955dfca3fc14030c285de64794a88f66ac61b35fee72e92f7a9c0a33d77df2baaedb5f3180fd590feca756658 SHA512 843936f1a6a0748493165b963f64cd48d6cc44396cf070b790e43d3218854901ea743dfafcca5cc2a1fadcc84d313edbc6e496c805260ff002c09a64c853cf79
+EBUILD root-6.24.9999.ebuild 8259 BLAKE2B c1b814b1e90ec14576f17d3f611ebc95a32cae022c5b34b012a0ec29b03d7df6257a37717593023706397bd822f7803f40a6f9a47c3c3fa10f1ce8e5268168f8 SHA512 9c13e27417e84e806ccce0c0f3c3efc0962889da31df9ec098a8ccc51885e584c6f12dad1dc58b7b9fde95bf0fd9a31d6d34d7b882b58a3cdd1b1e618c9aee16
+EBUILD root-9999.ebuild 8259 BLAKE2B c1b814b1e90ec14576f17d3f611ebc95a32cae022c5b34b012a0ec29b03d7df6257a37717593023706397bd822f7803f40a6f9a47c3c3fa10f1ce8e5268168f8 SHA512 9c13e27417e84e806ccce0c0f3c3efc0962889da31df9ec098a8ccc51885e584c6f12dad1dc58b7b9fde95bf0fd9a31d6d34d7b882b58a3cdd1b1e618c9aee16
 MISC metadata.xml 3149 BLAKE2B 88e20041b72bc4507f253ea0b9096567f6a7c5c7f7bf6851adfb69c24aedb73fb68b2541538cd01fd51d944425c22f4b7154379ac70d851659efeaa1e3a07337 SHA512 65a82570e75f9b4b3e6f8d1e1cfd1aad5f3e2199843853392b51ea1e1f4dcc7ef6500196aa0f759726cb0d0e17be19055d8c9c87e745fa11d337acc2eaf5ce74
diff --git a/sci-physics/root/root-6.22.08-r2.ebuild b/sci-physics/root/root-6.22.08-r2.ebuild
index b7c414808d02..17ce327af5dd 100644
--- a/sci-physics/root/root-6.22.08-r2.ebuild
+++ b/sci-physics/root/root-6.22.08-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
@@ -101,7 +101,7 @@ CDEPEND="
 	tbb? ( >=dev-cpp/tbb-2018 )
 	tmva? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 	vc? ( dev-libs/vc:= )
diff --git a/sci-physics/root/root-6.24.02-r1.ebuild b/sci-physics/root/root-6.24.02-r1.ebuild
index 00c2a627b4d3..19bce3d18d03 100644
--- a/sci-physics/root/root-6.24.02-r1.ebuild
+++ b/sci-physics/root/root-6.24.02-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
@@ -103,7 +103,7 @@ CDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tmva? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 	uring? ( sys-libs/liburing )
diff --git a/sci-physics/root/root-6.24.9999.ebuild b/sci-physics/root/root-6.24.9999.ebuild
index e91fa0be4928..cc894943f89b 100644
--- a/sci-physics/root/root-6.24.9999.ebuild
+++ b/sci-physics/root/root-6.24.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
@@ -114,7 +114,7 @@ CDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tmva? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 	uring? ( sys-libs/liburing )
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index e91fa0be4928..cc894943f89b 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
@@ -114,7 +114,7 @@ CDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tmva? (
 		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 	uring? ( sys-libs/liburing )
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index bd8870c5e2bb..bf35ee5e615e 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 7183b4d4a7b5..0f2bc366649a 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 1480 BLAKE2B 96d0ef8565607b7747ecb957b5d8e1e602105dcd9109fa75a02c3df7428de703c75cd80ae9dea9001e3cb5f6d6dfccc010b99639364f2ea1ec954991c7ec9386 SHA512 38f51107585e055446f8dcd475d5308e0d213438c5bd4a9785d652a899cbae4c75a7fc879a447b60b4f2013bb379528311652085394c0b53931a75efd01d67c3
+EBUILD epix-1.2.19.ebuild 1478 BLAKE2B b944042dbe906679c2599ca7395277d0a14bb4879c02867deed7d71ece89cfc9c2697afbaf52c0a1a96389736d23a98d8e4e69a1ee184542df2dc967706d769d SHA512 4d2ddb089c827a3ad768bfdeec78b4534ca5ccbd101fbd4a6e23b6e13d51dbacf4b91e5a0a167879f31ee68d825b5233c93211c528936c82f82abd5d9d112f3a
 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 f8355a91afbb..4c7691dc3565 100644
--- a/sci-visualization/epix/epix-1.2.19.ebuild
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
 DEPEND="
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 92bae553b142..aadf09d7f627 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -7,7 +7,7 @@ AUX paraview-5.9.0-gcc11-include.patch 1045 BLAKE2B 2b6b709cf081391f6b3c9c214ce7
 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248
 DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5
 DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2
-EBUILD paraview-5.8.1.ebuild 6365 BLAKE2B 429cad83359829027fd1c9744c027ff1d40de119f4deacee26c17d31db71ef4f9b6ff1edfd7c02de5b7e005e4e8641bb85adad07f204d37e21f4a71176fc4398 SHA512 da8f39e3998bcc96dbef127bf740a1057924202080410e9c89dd65fd47612a79e9df1a0d42ff14a555faef92e1b7b4462a79b24a516abbccc81ddfa4a50f495c
-EBUILD paraview-5.9.0.ebuild 5855 BLAKE2B daa0b325a8dd965966657f670dac51f499128f25d26f1611002c0048208ace6e33a9bf1c53c26de30d4fe6dd20f318bf2b4d37698703b2efa10a7c7ce10fe2ad SHA512 ef64bce5e9d07d5a25326b45abd7b838668800ae21e773d8c3c197bc26088787b0f0d78d7c39a5f7b2589ddcd3841096c26c0c6246ad9b9399df6a52b2d1a59f
-EBUILD paraview-5.9.1.ebuild 5855 BLAKE2B daa0b325a8dd965966657f670dac51f499128f25d26f1611002c0048208ace6e33a9bf1c53c26de30d4fe6dd20f318bf2b4d37698703b2efa10a7c7ce10fe2ad SHA512 ef64bce5e9d07d5a25326b45abd7b838668800ae21e773d8c3c197bc26088787b0f0d78d7c39a5f7b2589ddcd3841096c26c0c6246ad9b9399df6a52b2d1a59f
+EBUILD paraview-5.8.1.ebuild 6297 BLAKE2B 482f81ceec21718b73710e462e33c6108c66d823ecd087fbab98fd79c7a19a8ba8786ae677c373f909b3269bfd82beb7eb91bf847db74d18270556e4baf390fd SHA512 cfc17bb2510ea09e286ae4a2c4c92327426569777450dc5e2b7ad4971eb66231c06e6775f524ffd1dead9e8043797759d13c11b8773364df08db242f48968d56
+EBUILD paraview-5.9.0.ebuild 5787 BLAKE2B 44cbe70e16d604a7051620f596411c93414da8ba444a08c0dfbeb782f86e60c2af3dc47cb73db9e593393b1a7689ecabaa026361533c709e54244a84948169ce SHA512 b2121bd30d3b1536f45239afb11f0486a3590be7d8e1a1ab89c39d555ff82426bafe068b36b8a176c299d5848c97f842a8710bc8be96ef4cca626b82b3ea691e
+EBUILD paraview-5.9.1.ebuild 5787 BLAKE2B 44cbe70e16d604a7051620f596411c93414da8ba444a08c0dfbeb782f86e60c2af3dc47cb73db9e593393b1a7689ecabaa026361533c709e54244a84948169ce SHA512 b2121bd30d3b1536f45239afb11f0486a3590be7d8e1a1ab89c39d555ff82426bafe068b36b8a176c299d5848c97f842a8710bc8be96ef4cca626b82b3ea691e
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild
index 6182669ef170..cea5bd462e92 100644
--- a/sci-visualization/paraview/paraview-5.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
@@ -64,17 +64,17 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sip[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
 			mpi? ( dev-python/mpi4py )
-			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
 		')
 	)
 	qt5? (
@@ -95,7 +95,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	boost? (
 		$(python_gen_cond_dep '
-			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost[mpi?,${PYTHON_USEDEP}]
 		')
 	)
 	doc? ( app-doc/doxygen )"
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild
index 48a71695238e..ce3f2c9d4d44 100644
--- a/sci-visualization/paraview/paraview-5.9.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
@@ -64,17 +64,17 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sip[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
 			mpi? ( dev-python/mpi4py )
-			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
 		')
 	)
 	qt5? (
@@ -95,7 +95,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	boost? (
 		$(python_gen_cond_dep '
-			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost[mpi?,${PYTHON_USEDEP}]
 		')
 	)
 	doc? ( app-doc/doxygen )"
diff --git a/sci-visualization/paraview/paraview-5.9.1.ebuild b/sci-visualization/paraview/paraview-5.9.1.ebuild
index 48a71695238e..ce3f2c9d4d44 100644
--- a/sci-visualization/paraview/paraview-5.9.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
@@ -64,17 +64,17 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sip[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
 			mpi? ( dev-python/mpi4py )
-			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
 		')
 	)
 	qt5? (
@@ -95,7 +95,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	boost? (
 		$(python_gen_cond_dep '
-			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost[mpi?,${PYTHON_USEDEP}]
 		')
 	)
 	doc? ( app-doc/doxygen )"
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index c68e25fcdb54..471b4418b188 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,3 +1,3 @@
 DIST pythonprop-0.30.tar.gz 1141872 BLAKE2B 0703358221825bbeffb47cd5ff97a8de4c22ed9922347b96e359c7fbeffd6bae681a81d4938c03f4199ce583821d6e1006ce2e12aa718f50b5de69f2c0476a38 SHA512 421cade49a241d0dd38afa92e2c1874e2e6a0837ac7aeb9f4a294a2cec23e80e446e88a4de202de445cde73b9d816f4d6e487536be8c02017f1754c116fba310
-EBUILD pythonprop-0.30.ebuild 1209 BLAKE2B b6fdddb914661a982413460384323787d154522752d8d203f40738b5d65ac5f49d869ddcdd35f4793659b2636773ff60fe3d24b2431f070cf330086f1ca1d885 SHA512 8e756faf34bf12082a645ca36ed64b241e39aace8454cbf375455554414821ce993528f6bf6bf3022be2b9493cc4307755346a2f9fb9ff53c0aff7ee65dabdb6
+EBUILD pythonprop-0.30.ebuild 1185 BLAKE2B 94e6d7d42452d11e38b85f69a0590ce5ab27429551b0d7cab0baf2b48122316b7dd174dde15bb32ce4522e276e40fb90c5fe5654cca2157791c51b5bd77e801f SHA512 56a2e7a50c6a7809e271560f43e323896a0fe2cc7f75ac65e9015a9cbb697b456e9d9622ccefa2af58c9f46b6f87ee03b1a3f1403c0c8985d7f584f49e8e4ccc
 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
index 35305b711e3d..819d026aa0fb 100644
--- a/sci-visualization/pythonprop/pythonprop-0.30.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1
 
@@ -20,10 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		sci-libs/cartopy[${PYTHON_MULTI_USEDEP}]
-		dev-python/scipy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		sci-libs/cartopy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	')
 	dev-python/cairocffi
 	sci-electronics/voacapl
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7286e4f1b8ef..93f497aaa366 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index aa7969126867..d5e3a5e6d356 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -5,5 +5,5 @@ AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b
 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
 EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41
-EBUILD etckeeper-1.18.16.ebuild 1920 BLAKE2B 193e3a61c3d886e60bab88f06b92297edc84a6a3ceb0631b0abe64a97d510e622d8f0e5fe5dcc0f27cbc3b54b46e62a24987053d8632c8c825920a791649dba6 SHA512 9c0bf4d3d35847ad580d207d5cbb1fa0e28890146649c0d35f9dc8e8d1c15c17c51be919b3f5173252b0803e9d023f80a7119318618d26d9013885cef41c1835
+EBUILD etckeeper-1.18.16.ebuild 1927 BLAKE2B 6b7a2f353f7180df8124636c78a883ecf338363ba11bffba2fae5637b27f7f3cd90ae98c7fcbc2b1179e9cc64bf076bc2ba3d94dd67f5b5bff13534ad2629331 SHA512 ca26ddc53de6493165324c92fe5a3cbc3c1754627ae0dc9a18a8f2d1d4b1dbe388c310c701d2012faa51ef605043b1f1e2a23db6a2c9a4c575e0ac29fd9e1ed6
 MISC metadata.xml 784 BLAKE2B c9e0c9c6193bc006043882ca31347e796f8e6669d4ae6121bf4334b24209a69a128ea87fe797711a7bfd3238981017dbc889793eae8f3cdf4271542abe938fd6 SHA512 b896905b4940b22136b9f5a83db6d0625cd99ffbb8e586c2b1c29d8b780db1cd59a9eebaf72bea13a4e134f2014948fcf3c3247d38da06a49f952fd456d13181
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16.ebuild
index a0c6cadf479c..7338b278ab35 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index fbc3ee88531b..b5937777375b 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,10 +1,11 @@
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
 AUX file-5.40-revert-char-count.patch 1241 BLAKE2B 911d67cd51e6fc0a18075aed01ad79d240e4c7c556a58fb484781ba9e7bc4843f30ea008ff921a47434a8905bc04e25f3104f86a9942f80a5241f768a4de7494 SHA512 6341f85315c2f19d3714a0ef6e8cdbe3bdd1c84cbbef8d9c64597c27307c822b367298b63f313ccdebed6f84964c6f7411768ab1b578c1441e6dee4477f56175
 AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb639744f11f2fb094f0870d10071a472dc3e6036cfe6cce4a1570a0876fd6c7c3f8f7f4e1ae39aa46f7cc39ee7e49ea1c9c1b22a SHA512 a475835fac9556ef4a799a5b406acdbbdb7bd09233a5563a386f110355a8e5a4581eed69bcc968df12985f6e910ea7da0deec9f510dd891b633b369afd816ff8
+AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f49cf42420eb13444783301af5f5e380e67da932d298ed94fb64a2a1a50ca349b43d73b77d6495df090d8b3adddc2b236b7fe3a42 SHA512 b25110ca59be28ca67a972c9737315efe357c2bbb8dbae4e6ecf80283bb0e9db4184574bfef2d965087493ede4979f649a762fa9bef2415d2359db117dfdb04f
 AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
-EBUILD file-5.40-r3.ebuild 3477 BLAKE2B bc9788f59c6a5506a58664e5a2abf4f4ae410cc5b53900842f5fb7742033c137c12383941bc5716a7b333dbc554fa4313336cd7a459963d1a4aad6e4e1f2ae02 SHA512 86127e57f6b45b3420842c973af1ce29e61bc2c1e27d886245be7647159068432663db3cbc6a6eb3bfa89500fdab85deb3290297167307240b32d6f522243a46
+EBUILD file-5.40-r3.ebuild 3557 BLAKE2B 926b945285250c7083fd2dc2cb74158b67d97178c1072348edb6d6ffb09bf065af63c3cdd9f1df4a17aa5aa8156d5946c48b6d963f33cacd1cbc28e17a497e54 SHA512 862677ae177a9fc8a6d5c1f3c0c76dc0baa4369302495e5f51ceac1429be53323053522b7663050e89b47c71c1a2f52dcab9535cb6acc1c9bf36392431852d61
 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 90b41899e807..7cb5ba7a5cd9 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/file-5.40-seccomp-faccessat.patch"
 	"${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
 	"${FILESDIR}/file-5.40-revert-char-count.patch" #799188
+	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
 )
 
 src_prepare() {
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
new file mode 100644
index 000000000000..4cc648017860
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
@@ -0,0 +1,31 @@
+From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 15 Jun 2021 16:08:22 -0400
+Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
+
+sys/stat.h in musl does this:
+
+  #define fstatat64 fstatat
+
+Counteract this with an #undef.
+
+Bug: https://bugs.gentoo.org/789336
+---
+ src/seccomp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 3318367c..eb8b1e57 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -179,6 +179,7 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(fstat);
+  	ALLOW_RULE(fstat64);
+ #ifdef __NR_fstatat64
++#undef fstatat64
+ 	ALLOW_RULE(fstatat64);
+ #endif
+ 	ALLOW_RULE(futex);
+-- 
+2.32.0
+
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ccf2594b1684..bc6630fdee72 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,6 +3,6 @@ AUX fwupd-1.6.1-fix-python-detection.patch 1897 BLAKE2B 4c33cca345113fcae867b55e
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
-EBUILD fwupd-1.5.9-r1.ebuild 4398 BLAKE2B 8c5e659230931788d337fa7b9b9d6f86e781819d2fd96f4f061690202a1b0483b7707c641264120da3b868e1a5d6dd469818c0be6ce7d1d81235bb137f55c682 SHA512 a6697293e77036d791d370c106e0bb9de354a2776db5eca6734e976d60f5d8b3fa89c767fb1a32453db4b260d725c38e5e5e6cf147ea39d851f5d2317a3eb77f
-EBUILD fwupd-1.6.1-r1.ebuild 4392 BLAKE2B 3760d77a04baad7cd87b9ff4a2ffd1a60443c2fa799c197d5e5b9f3ef2c99e624dfac030cb0c4b892f9961777c48cc377b57ecaaa021f9d5e63a4a03a62b0218 SHA512 c1213a533d5ec136fc0311ad7ab1e50dabd578d2a2b2acadc6021421ea096ed2404affcdcee1b220eadb3bff1e4e596baec602c00b02c679a1fce5bef1ed5f9d
+EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
+EBUILD fwupd-1.6.1-r1.ebuild 4374 BLAKE2B 4081625c0d91e6d318e84ba368fa5abe96f3a6bcbf690ffde03d4995cd53d4ba2dcdea7c7b869da9fc29a0e00957a35de93376c9f49e6c2790103e80ddd7e134 SHA512 599c623fecd7dc801673cad0480c042eb7bc9095e74dcbf7d6431337916deb17a211d6c90cf12b4dc9ea0a3a111be6cdec34e91efc4d9b981f04d81088fa1367
 MISC metadata.xml 1273 BLAKE2B e58cbe75ac3cf69ef5f70b831617f0a6c268d8270263cfa005046120eeeac464aa70024ae7b5ffb5a4526c948070d55cfcb6b927ea03c660db91c7cadc86417f SHA512 b024927cfdf78d1ec6ac33a1e04a2c6f7b9397a3cbd0334bcc13e964f2f8f5b01fe50a4b0bea896cf8b6e491b33473d0ba9a7f87edb47fd3b0d3e63a919b0909
diff --git a/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
index 6eff5c18b24e..24591b583e26 100644
--- a/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -47,9 +47,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
diff --git a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
index e258342be627..29a6393d4e0a 100644
--- a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -48,9 +48,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index a72a3f891836..7eb32ee9eb76 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -3,7 +3,7 @@ AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 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 1317 BLAKE2B 66957609e2ba084bd42a3426b56b6f28373d180a22eb140a89d629b75d347e56820571943b1998fd3e19134c9c43c4ef9a11bedb7b20580acffb94ba631c3f98 SHA512 9daccd9888d62a118923dac26faf0e9e3d419cc029476cb526db16550fabb8df5aa5dfc34e2914bdf4517bfe7d57a0eb54ca20705e915ae15faee9b9f8a5963d
-EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
+EBUILD gptfdisk-1.0.6-r2.ebuild 1303 BLAKE2B fd1dd2d7b2ee4af590df70f9d4734c87609ff39418af8983c3de960ed6806b88701d5cb633e55f124d236b80fba7a274b41bd5a00478ab4b0327292aa7290a7b SHA512 aa22ca5d44716b209e45b01da15e3e07786275730003d0b75f8dea01a60d7f71bd0fe1e902e4f4268df03a64c5a72a2d6ae465962075687f6e2d4f43618e4f8b
+EBUILD gptfdisk-1.0.7-r2.ebuild 1303 BLAKE2B cbfb61efdd77d9b14b4a36bdee6cc853f37762ee6004c99fa1f3655d109af856d748f920ea3fbfa6249d5404fd9421685d604c828e00697cf2826d22feecb9ba SHA512 453cb55f924172b4a2d547007a5bd09d5366501678e9d20c66145b48227549557890e5a3df51f06c3f61a5ed51ecf5f80587746e34258f91aa40b6fc7166ac79
+EBUILD gptfdisk-1.0.8-r1.ebuild 1238 BLAKE2B 53bfb8b4699b245abeb1f602446bcf27e7cb76b8720ac23c54c30bd7e4a71f735d77c311c2ac29549ecdb24a5f04e8946a1815f5ea196be02f30a0b608857faf SHA512 c172a7c4a293623024f22a1854f07da405e82a424097c40515dbebe9828edfbe6e7519f5b28851eb83a3e807a19ee9a216463bdc347e0d0cb69e922c2c8b5bb5
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
deleted file mode 100644
index 26bfd7909288..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-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"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}.1-spurious_mbr_warnings.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s: cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..770e93982f0a
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+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"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}.1-spurious_mbr_warnings.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild
deleted file mode 100644
index fc304f20f405..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-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"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove_byteswap.patch" #797412
-)
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s: cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..06e5ca062f3a
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+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"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove_byteswap.patch" #797412
+)
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..e232a87e7866
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+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"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8.ebuild
deleted file mode 100644
index 253377c376a9..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-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"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s: cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 02172bd37e67..47fb37977f25 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,6 +5,6 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.14-r1.ebuild 1004 BLAKE2B a0ae52cf0e384e9ddd660aea23b308bef5b8f360d6594766e5c23a155e3e602fed58f3dd022ab2a48af0524feeb66995792e03b8bc7c630b74b9ce3e949250d2 SHA512 e924ad6c4569680348e5edce2d3fafebe0cc338b8dc0614e51868ea46a29ffe317e4ff764a3ea4bd8602a18a4ae0bc4ee478470a9b6441deb03deda82b2c89bc
+EBUILD haveged-1.9.14-r1.ebuild 1011 BLAKE2B f9dc5af910f01581714ee93ef04a2d316f243395332df2ae942b5cdf464fb721965c8bc0fe19df93ce519f63b4afb457e85c58ebd69f2febac341d611911ba1d SHA512 caf13dc9634e4b9e1035429cb60fc56678ab53642540c3c188096dadc4957e411173a12dc8cf74a8f2e32f10bb01f65610b83d2ec5502e35d44f7393b0e4681a
 EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
index b4b74f5b8745..3dafc5c5629d 100644
--- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 68575c374879..48f7d5f776e5 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,5 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
-EBUILD irqbalance-1.8.0.ebuild 1325 BLAKE2B 7c04c91640fdbc3d5c2ddf364b560e9e3f609ff40ec26090dd686b47409008882dd8a3455e906d70b462c52f3dc80b59066d30a61102435359eab92051c2611b SHA512 1eb504ef58ef7e606d5178542c09a5cbf7b1189c3bb44ce62233ac3e1b7095ffa4572e4692ef6ed4a572bca6a37464fc7a894965141eeaf231d25c1b67f106a5
+EBUILD irqbalance-1.8.0-r1.ebuild 1327 BLAKE2B e2e7a6f91917be742ac5015dd0a465a6858b738ac8638306d800aec8e9c3963121d170548572d03c56bdcab3c47714ab80e015ce9b066889aa9823a1d8937c10 SHA512 79a99042e0a300eac653a6ace0efe75ebd3aa50f3e8e00f8a24e3e2d677b0bcaae505f7d233a3047da5678b7b60e6230cac01bc94a933a43c3032bd3728ba2ef
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..35518b30ad63
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="caps +numa selinux tui"
+
+DEPEND="
+	dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+	tui? ( sys-libs/ncurses:=[unicode(+)] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Follow systemd policies
+	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+	sed \
+		-e 's/ $IRQBALANCE_ARGS//' \
+		-e '/EnvironmentFile/d' \
+		-i misc/irqbalance.service || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		$(use_with tui irqbalance-ui)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
deleted file mode 100644
index 9a6e0b50e649..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="caps +numa selinux tui"
-
-DEPEND="
-	dev-libs/glib:2
-	caps? ( sys-libs/libcap-ng )
-	numa? ( sys-process/numactl )
-	tui? ( sys-libs/ncurses:0=[unicode] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
-	CONFIG_CHECK="~PCI_MSI"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# Follow systemd policies
-	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
-	sed \
-		-e 's/ $IRQBALANCE_ARGS//' \
-		-e '/EnvironmentFile/d' \
-		-i misc/irqbalance.service || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with caps libcap-ng)
-		$(use_enable numa)
-		$(use_with tui irqbalance-ui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
-	systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 80b246be38c0..b8c58a6d2884 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,6 +1,8 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.5.tar.gz 474167 BLAKE2B 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241 SHA512 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2
+DIST logwatch-7.5.6.tar.gz 484873 BLAKE2B 18a10f7baade4650c836ad402fcb92096923e0a8b6890352916e3b514bf85fe5b5070c0a47059c68fd84624407006107332f75a5ce3164a25cfa05f28f2ec882 SHA512 fb490f5bc1bf469309ee9caa1e040d71b4332d7fb64f94865a9b5fe707a92cb10c207022ce5e279709bf3412605f67f7da11303d91aa078f680c598398aab2ab
 EBUILD logwatch-7.5.5.ebuild 2431 BLAKE2B ae8fff1ed90832f1ff9296ca8b3c6c3a97a16d9ba9268b988bc38b7f2426bb146b1b76c41c5f41c82a0dfa4cdfe7b227f6ca08a19870fc50d804ecbb03988f54 SHA512 d79ae36bd32a98bae350145687f23ef442aeb82a8706f41cb77e56ee5ccfddf996ea457bfcc4aae1ba11498f6d95c210859e511fd610017d270718db288215cf
-EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
+EBUILD logwatch-7.5.6.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
+EBUILD logwatch-9999.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.6.ebuild b/sys-apps/logwatch/logwatch-7.5.6.ebuild
new file mode 100644
index 000000000000..13d30026df24
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+PATCHES=()
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 247b3915d881..13d30026df24 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit tmpfiles
 
-PATCHES=()
-
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
 	inherit git-r3
@@ -20,9 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-DEPEND=""
 RDEPEND="virtual/cron
 	virtual/mta
 	virtual/mailx
@@ -33,6 +29,8 @@ RDEPEND="virtual/cron
 	dev-perl/Sys-CPU
 	dev-perl/Sys-MemInfo"
 
+PATCHES=()
+
 src_install() {
 	dodir /usr/share/logwatch/lib
 	dodir /usr/share/logwatch/scripts/services
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index b1bdc66c188e..878ebe19403d 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.11.ebuild 1741 BLAKE2B 10e2c786b94ec1da5380c4d6a63e23214272c01b12c72d996784151d46bf0f3f1a04859de02f9fd70983d8ccfe143f7d78e535db4a15756bffd403ac2565f3e9 SHA512 3d14586afcf8695398168b6c7fe8ff2893fae4065c71a2e6c9c2116edbd19f384f3956e003bec0552aa9612c4b020986e1ef051c8cf17523ed24ea1da8359962
-EBUILD man-pages-5.12.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
+EBUILD man-pages-5.11-r1.ebuild 1844 BLAKE2B 01ffab22fdb472dff042e9f6d99c4133de5c94903f9d64510dabccb4aa5756c5dc8f3e2ee098c8129312448a11d2a755d86ae5b6e2f4ce5c2f937fbf8c657c66 SHA512 558d9cff941082d9488e861a2832e9ef5943ed3dccdd20afb32e3fe0888bb6a203586ec6d1033ef78b974d670e114766c7a855894ab479ebe369de26fa1a1697
+EBUILD man-pages-5.12-r2.ebuild 1955 BLAKE2B a15709358bf511be71b57c9fc5a246d05bb6f461cdfdc06574138d6fdbeb8097fc6a9fa0b31d129077f8439ef2aeee1d6a2a0257ed66269b26910161672641a4 SHA512 bf6ef86098064bbea9611adaa748ce4684b4b57fc25484e7ecdd9e614cd24a2b54f1d52be57fd4a8f0c578b689e1de92a473f21a215d7a96f456ac2b6ed30be0
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.11-r1.ebuild b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
new file mode 100644
index 000000000000..003bfac75bbb
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
+	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
+	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	sys-apps/man-pages-posix
+"
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/man-pages/man-pages-5.11.ebuild b/sys-apps/man-pages/man-pages-5.11.ebuild
deleted file mode 100644
index 557612b11447..000000000000
--- a/sys-apps/man-pages/man-pages-5.11.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
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="
-	virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<dev-libs/libbsd-0.8.3-r1
-"
-PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
-	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	sys-apps/man-pages-posix
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.12-r2.ebuild b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
new file mode 100644
index 000000000000..fa7c93e7d50e
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
+	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
+	l10n_it? ( || (
+		app-i18n/man-pages-l10n[l10n_it(-)]
+		app-i18n/man-pages-it
+	) )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] )
+	l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] )
+	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	sys-apps/man-pages-posix
+"
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/man-pages/man-pages-5.12.ebuild b/sys-apps/man-pages/man-pages-5.12.ebuild
deleted file mode 100644
index 2a296f092cdc..000000000000
--- a/sys-apps/man-pages/man-pages-5.12.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
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="
-	virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<dev-libs/libbsd-0.8.3-r1
-"
-PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
-	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	sys-apps/man-pages-posix
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index a34443ed4e23..fa8eb8a2884e 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1693 BLAKE2B ce211686d5717abc6ba3e56f54f5dfaba24549c7f86cf5ca4c51ab14dddf46225b43039cfa605ae231b9d525da6bdeb3f094680597883147c98a4af33c7fc1a2 SHA512 5b57ad621bbeb599936b84b5402eb1dfffe4b032f69cd828c4551eac106cf7a6a51413de3ffb49cde2cdd55efbad5f7b0f58ff6fbaac77bce61ff1b4f6155ea0
+EBUILD miscfiles-1.5-r3.ebuild 1700 BLAKE2B 366872b7f95d837bfe179e40b2c0562bfd756e12619fd695c1427c965f1f59c5aab4e418578122b8e733b7fed373e993070d174489c5fe24215fb7a62a389941 SHA512 78ab9a62e854e0f2801119c309d25443d057577c6e406f03c06000461ed2131d7e1388b6065cd9524ac1c783f5ae51aca0d18e35f481459b0e2deec93df5397e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 6f2413f075aa..8237ad438342 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 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 ~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 ~x86-solaris"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 6e39fd16f2dc..1904d9a497e0 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -4,6 +4,6 @@ DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
 EBUILD nvme-cli-1.10.1.ebuild 977 BLAKE2B e971e0666096f3508d8db3d899e592f630edd1c56a84675d49c4d9df897d86317bf481d885ce211cc081692b53bf1bf76cd806e041956ffbbe9bb901d2179e9b SHA512 0c5327273daa6fd181ac3b04ba197d47c5ba0e43182a84e37cc3f6133313dcd6b6d781e0d00761f23fcda9e627f0928b84282cfc5c4ddcfd4d3f7c68fff9648b
 EBUILD nvme-cli-1.11.1.ebuild 841 BLAKE2B d9b6316b4d9a1c5d9d11e77ef45562dff8277d71f8f1180f71ed0bfaea8335d6b9b009e712c84ad91ac8eccfc3eda7d9aa5a7fa46c2705bd00e999b85167ced8 SHA512 3b00b5d217da4325fc1627b695968de0c0c621208cb0a95c06dd04a1c1ca991bbc2fb8971b16da309b8ae8e5c19a8b1b3aae572fd1149238451fa6afbf4818b8
-EBUILD nvme-cli-1.14.ebuild 841 BLAKE2B 5aabb0b181f4ecfd1d0ef049879bbf5ef245cc55c4f92cd194fb14fcce98c918af87d9dad9cf276b8b1eddd6e93c6675a18a93d2797f0f70cf5c087f3176ff7f SHA512 5110fdaaf47f85768775a5c1589b4002989526ce857b75e4a0536d8012539ebfd032eed4cbff3a3e2baf2ef0395f94f150e464fc9f8bed834910386da197e6f7
+EBUILD nvme-cli-1.14.ebuild 844 BLAKE2B b88134580f9f4fb22ffd24bd2e8aca6f7778bc7c68af526e1002963cabe9766f39c69513eac46a7e3426e755e4ba2e1dee651b45ca1ffdd6ae2362d5d5e3a91e SHA512 aa1fecc32da2ac0e456cd73f516e7760a45ccd91fa9b9d4f4fb080e93024c69b5476621a1cbe8d9fcb26292eca6ab79f0c5cd0c35122e2dd70a1f5304c520d26
 EBUILD nvme-cli-1.9-r3.ebuild 976 BLAKE2B b500757c242990e42c523da5d69675c0ee15fc5528923c6bd03d11b513cd3518986e866ac5a0e1503b55ffaa5748ebbef14ade322c731efcd6901ca1a55e084e SHA512 5868e20533d4b7c6c51bacc88c8ccf5a2ce37717e6e05ceb5a26de17192f548f72ede949002af9d86b03da91a45533809f188267925faae68e4b70afc9954d61
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.14.ebuild b/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
index da5f95ef1298..0b5c3803dc39 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
@@ -12,7 +12,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="+uuid"
 
 RDEPEND="uuid? ( sys-apps/util-linux:= )"
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index d8c830c31471..cd4521b71e94 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r3.ebuild 825 BLAKE2B 8822eb3c81a185df17655ab6a30e217aee29d3f73bf813940c7675fc5ad54501328af07add89a2d1ff5d627389a8e71274a74dcf640a788886ce28889e7f3f8d SHA512 1e3482aa5e92099673692ca08f8bd0cf98a9c9606ae1e3edc3afd80500918981c87deb59d3338d887162db97ea3ccec509aa7dd56ba3469c3e785ee8a8a78e8e
+EBUILD onerng-3.6-r3.ebuild 819 BLAKE2B afede19285d72bf4c49c0d3f7b78ff9fd90207b3ca59dc0ef29189298a410515dfe063db9d0a590d297c517646089ff998e01d808e781bbbd11d2f9440f388b4 SHA512 80d6c2463897ca4aa4e8a5d09210702f85f1cfcb20549da627358d1920ed7fcafda6b2b1a881a924fb4c926b1c0d31b62d3cf8d8525a7f93ecd7f0245e2d7b97
 MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/onerng-3.6-r3.ebuild b/sys-apps/onerng/onerng-3.6-r3.ebuild
index dd5803955bd2..f9a9cfd42f2c 100644
--- a/sys-apps/onerng/onerng-3.6-r3.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	${DEPEND}
 	${PYTHON_DEPS}
 	app-crypt/gnupg
-	$(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
 	sys-apps/rng-tools
 	sys-process/at
 "
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index b2e14c5a9588..4974929208fa 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,101 +1,60 @@
-DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
-DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
-DIST bytecount-0.6.0.crate 11905 BLAKE2B 7d935f86f0ab82c6c3d4974cd25ec3e193cdbea68b9534b1a461007d1486adc27274b43febd645db045cdd9b8101f93fb4b985ceb076c99a8f6efdc5e69ae855 SHA512 8e675f20b204d5828e79ba50012744b2f1b83f9d5d6355e6acb7d24cc4f7b1080ac120b94e65b6ea1d7604464ea0c6ad4f29880ff14895610889e4396f87062b
 DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
 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 clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
-DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
 DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
 DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
 DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e17eadd0d4abb8e34b0fc8784607f71eebaa2f308dedb3185969f092d4305cd1d2cef7a53f7d8774390e38f SHA512 6bc647425ec8be5995ad4798427a86e28282b06532b8e6a53745e2a2ac16652d087b84c0946a4858a49d98995b9e543e1764765d270bf5569cd2ad92d52b81f2
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
-DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST memmap2-0.3.0.crate 18045 BLAKE2B 13d5db82f7145cefe803eaa8980f314630f6113b291729e716b5159bda132431eb1f598d6030ab59e95c64ccd87999b57aecefecb4c12e717f43e085a7d19d3d SHA512 43a4a657d5c6d54d50f9411b3a5855d07388a84f521923f264f18039b58555bfe216c1fe90418ba383ab12218937b01b17be1c337b08df3b9ee7430e0466da6f
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
-DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
 DIST packed_simd_2-0.3.5.crate 98197 BLAKE2B fcf5ae5d7a833b1b6869381efa601e7e624dce4b416762acac658162c639a093c130ec688e5fe934e3b91482a9d74c54a6cf023f0c009930197885eaa64409ff SHA512 64903209d359e9108190778ec11a2f96036fc79aa1fbb9e874b37fc359407693180d7c0bbfb8dd74022358a8a19389c764c72eb760ad0500e5621cb85f2ffc53
 DIST pcre2-0.2.3.crate 19605 BLAKE2B 6fcf5f37b5f37d77b5c3568392ac056c0dfc58e16c1d9cdf2f6cb6c2c712619d1ac75d89e1ae49086e9c0c7d9128140ae57cbe065ef0ae21b91e2aec1c2a7249 SHA512 6771b27b800e3eebc34ae5dda48ca8bf60d5c3fd46fb424a669341909491ef476427b23f0aec3ec606aa03ed9606e46daf76010a7b9e3ffe1a76faab3314e74f
-DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
 DIST pcre2-sys-0.2.5.crate 2184907 BLAKE2B 3f249a0c0aede3b0c99a5fed1f80bac62f4591ae5aecf95e35e49fd82f66befe060343c210ac4735abf2cc29daecb656e64a467fd547f617eadf63f1c6d8bb77 SHA512 e18e14da73a84b09a2671881e12b1516f83c90ec0e4134afcab99b71688895f188e4f6bae0c7e3f18d0b7d69b3d19c44cccb4d8348fe613c2f8824edee4e35a6
-DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST proc-macro2-1.0.17.crate 35654 BLAKE2B 8728993d92facb86d5884a5716f697447d636ba28a3ac84e1ac7971fbe53b7fd960a5516989882eecccde20abfc9f1915c523277333ae98323b7dbc198c0fee6 SHA512 de34066c8f07ad5edaf2a7fb9b0e0e2b4d31e110a2280dce9960b20871cd69c4510ad7669634e734b3d4f06447277b62de028aad826f5a94697261a8bec2a0a9
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
-DIST quote-1.0.6.crate 24225 BLAKE2B e8706bf2e19b89855d5636704253d674fc9804e0d9713d1c1dccd5fe06af273f8604f80b6727f788de6416e62dde67a13abc2f3aa81cd5ea45eb0c73069ee300 SHA512 1febd6748602d4d96fbacb1f37bbc93c71d9fbeb9be7e9c6be2e871614048a1b2921c1ae702bd8db5d449308e7946ebff095689ef0bafe52af37c04936a8115e
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz 2211756 BLAKE2B 1c97a37e109f818bce8e974eb3a29eb8d1ca488e048caff658696211e8cad23728a767a2d6b97fed365d24f9545f1bc49a3e2687ab437eb4189993ad5fe30663 SHA512 814a6aa826f1183f40c5b74e66665b26e1377fe95d8b2cafceffa0b7ebf26ec89a515c74f5dbc2b9af441b2daacd239c7393047d8a75e944e42792ba451a77f9
-DIST ripgrep-12.1.1.tar.gz 480607 BLAKE2B f324a7966641843a95e7d4930507167844db2629e4b12e738df56d43edc68a707fdcc38eaa6f2445e3ddbafd13ec8888543866534b7a04724451e1457f589bba SHA512 9e2a16043be6c7727d49a44f6db7fdb41413efc869139186729985ff86dee5c6531c663352f4019b730eb3a6c46f26d46df3738d4a0cbbc39ab773f320eb9e59
 DIST ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz 2109801 BLAKE2B a2c9b967cae640bd0b71f565964443bfab5a0925b938cf94404bef29c79abab94bb81540693858de0e246217a834203b3e430d77fd23cf699af53b4c74e8eabc SHA512 cdc18bd31019fc7b8509224c2f52b230be33dee36deea2e4db1ee8c78ace406c7cd182814d056f4ce65ee533290a674822432777b61c2b4bc8cc4a4ea107cfde
 DIST ripgrep-13.0.0.tar.gz 505536 BLAKE2B fa37d3c36d56e460cdf51e544c320533f16b14fd2cd3105ad3a2db64e98d2821306da8b063e597e0441492cf3872fccdd0b5064b29a537e440227ac492304f09 SHA512 9321532e4bf633ecd200d98873b6773230d046d7bd075f223f09a68531cef4e4138f01c6b41e0f8697805963ae7e0d44d542c6d94025d9a06fbbef3562c17734
-DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
-DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
-DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.27.crate 202231 BLAKE2B 8fe663765f40cfb611e6eae5d51744adfb22adeb43da799c000b9ba856117631428341ad352608334bd57ac18aad6076e4574591ce7aa7908af90637ee363dc9 SHA512 3a3f2f6e55edf003ce13dfa35c5d1a03d875335ddb3d0093fd20c86231a246a61655e6f74f751a9265a6be18af20e794522b7b83d303ee363b891ac9a89c72ae
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
-DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-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
-EBUILD ripgrep-12.1.1.ebuild 2547 BLAKE2B 2f203154921a9852b6fdbba8c1f80298babeac2f35fef9afd7f771bc8ae3b8207926525ef48fbdc517dd3f516f41524f0549e6704abc5bef71aabfe246ab9800 SHA512 63fa804553bf1e8dbe861b3c5d392dca85ac66da8879f9497575f27d75e9f3d7ad5983f5c2ff45d94bc51b0506938a929c8a3fc57237c21bc45b37d999a174c6
-EBUILD ripgrep-13.0.0.ebuild 2533 BLAKE2B b8a3a2d26ea5dbef0528946c51b70565a9b882a3e01366996b12fa79f4ae39bb0f589180fae181f8d433f897e79a29482a079abd29d443b9df30eb716ed7a20d SHA512 231a71dec582d18c749db40e0f36fc9d9335d7f35ce4ba82cdc8489c7a7bca77ca4a7ad1cf9f936b9d97ffd92458b2de8dbcdcee0a47c2a47ef6951873197298
+EBUILD ripgrep-13.0.0.ebuild 2536 BLAKE2B ce02b15aa9e21bf0042401ada235240a53cd27154a18d834a45b2a34498abb68fd55b14e2454421d9325122d40355bb51c1d385437e8bb837038799b58efe9a1 SHA512 45ea2de4d1949dd35144b3ebe020074aa1908879ce91e327ef9bcacf1639d8a31ddd8364c8bf37239622e4289516095e1e58ec7da918cd5fe9559d93168d2ee2
 MISC metadata.xml 610 BLAKE2B 73fe0df1821000783c6f7faf7750e8078c29f760e81a82c36f3a29da53c1aeb195af6eaf3ff347eb3116c6f625bd011e8567e5157ad72d9b9669d6da212d1a56 SHA512 3c30cdd2c10f26d840ab64c8c76e6cf1124a9b3222393b76713f9babf5a066669386268a2c7b727abc1bf1acdb51d509d9a17f657bd54a7cf2572cf2bdf8fbe2
diff --git a/sys-apps/ripgrep/ripgrep-12.1.1.ebuild b/sys-apps/ripgrep/ripgrep-12.1.1.ebuild
deleted file mode 100644
index 67458dee3783..000000000000
--- a/sys-apps/ripgrep/ripgrep-12.1.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-atty-0.2.14
-autocfg-1.0.0
-base64-0.12.1
-bitflags-1.2.1
-bstr-0.2.13
-bytecount-0.6.0
-byteorder-1.3.4
-cc-1.0.54
-cfg-if-0.1.10
-clap-2.33.1
-crossbeam-channel-0.4.2
-crossbeam-utils-0.7.2
-encoding_rs-0.8.23
-encoding_rs_io-0.1.7
-fnv-1.0.7
-fs_extra-1.1.0
-glob-0.3.0
-hermit-abi-0.1.13
-itoa-0.4.5
-jemallocator-0.3.2
-jemalloc-sys-0.3.2
-lazy_static-1.4.0
-libc-0.2.71
-log-0.4.8
-maybe-uninit-2.0.0
-memchr-2.3.3
-memmap-0.7.0
-num_cpus-1.13.0
-packed_simd-0.3.3
-pcre2-0.2.3
-pcre2-sys-0.2.2
-pkg-config-0.3.17
-proc-macro2-1.0.17
-quote-1.0.6
-regex-1.3.9
-regex-automata-0.1.9
-regex-syntax-0.6.18
-ryu-1.0.4
-same-file-1.0.6
-serde-1.0.110
-serde_derive-1.0.110
-serde_json-1.0.53
-strsim-0.8.0
-syn-1.0.27
-termcolor-1.1.0
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-width-0.1.7
-unicode-xid-0.2.0
-walkdir-2.3.1
-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
-"
-
-inherit cargo bash-completion-r1
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/BurntSushi/${PN}/releases/download/${PV}/${P}-x86_64-unknown-linux-musl.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="pcre"
-
-DEPEND=""
-
-RDEPEND="pcre? ( dev-libs/libpcre2 )"
-
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-QA_FLAGS_IGNORED="usr/bin/rg"
-
-src_compile() {
-	# allow building on musl with dynamic linking support
-	# https://github.com/BurntSushi/rust-pcre2/issues/7
-	use elibc_musl && export PCRE2_SYS_STATIC=0
-	cargo_src_compile $(usex pcre "--features pcre2" "")
-}
-
-src_install() {
-	cargo_src_install $(usex pcre "--features pcre2" "")
-
-	# hack to find/install generated files
-	# stamp file can be present in multiple dirs if we build additional features
-	# so grab fist match only
-	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
-
-	newbashcomp "${BUILD_DIR}"/rg.bash rg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/rg.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-
-	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
-
-	# we use a manpage from pre-compiled tarball, so we can skip dependency on asciidoctor
-	doman "${WORKDIR}/${P}-x86_64-unknown-linux-musl/doc/rg.1"
-}
diff --git a/sys-apps/ripgrep/ripgrep-13.0.0.ebuild b/sys-apps/ripgrep/ripgrep-13.0.0.ebuild
index 4e691add8642..468459addbd8 100644
--- a/sys-apps/ripgrep/ripgrep-13.0.0.ebuild
+++ b/sys-apps/ripgrep/ripgrep-13.0.0.ebuild
@@ -72,7 +72,7 @@ SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="+pcre"
 
 DEPEND=""
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index e03ca7ffdd1f..6a4766f28570 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,5 +4,5 @@ AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
-EBUILD rng-tools-6.13.ebuild 1710 BLAKE2B 65df841cfeecdb4523b737c9d809a0b200514b0480c2210c062afbf131c5a2608dc6cab0c6e828bb974cc6e433ba90102e8712dfa097c63fc99cd085fa4b27f5 SHA512 8e8701bcdc62d91b61be93b5d98672540336882f75e4e48853bbf78abb15f5382f9bcb5ecd36c05083c1397de937cc4cfef1ff00222c9c99e3c1460d80351eb6
+EBUILD rng-tools-6.13.ebuild 1708 BLAKE2B 3f63b13e0dca5e6a0573b23044792e79ad167d28d42f3cf624bd2cbc082bbf04a3bb92f273de096de1200d6d1e2feb232d6ef432ac0740087017825375225f47 SHA512 f5df5fcc33af68cd487d1b7ad833bbfdbc3bf4443b7bdf29d31428a18bfc38e649a5b76ddc4a45433fba51e01af1f107e3b32fc9525ffa577f1454694be7e3bd
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
index b4a1ee5c7006..3b5e5e5b34ad 100644
--- a/sys-apps/rng-tools/rng-tools-6.13.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 081f12040a5d..77ed11729a16 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0b2cedf98577f9f3c2deff4bb881c906bab3a799616b43601d2dae494674ae439f6bf561bd82417 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b
 AUX roccat-tools-5.9.0-cmake_lua_impl.patch 236 BLAKE2B 833cb7662bdd1fc5942cfd3fd75fe3a7ce56616c8fb616403a056bbea6d0e5ecb8bd91b7ef39ecd12c30235172631eff839bc803910d1a8808c1d152db080bda SHA512 5bb4d236a053cbfed99f046d8cac4dcc1fb94535497e49f4be5338fc8c287623f4afeffa5164597d84aa16bca98b135d275f75e85df3e03bed95099caeb00d6c
 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
-EBUILD roccat-tools-5.9.0-r100.ebuild 3365 BLAKE2B bba0eafc756a93e220e3d75006c0e3b34f23c5b736a93f95b809a710fa53170d0206abd22282473d74668dee066176beff592e55f1d9eb6c08e90100bb22e11e SHA512 81a7861b19199516542923dec906d7d1dcb1244fa26f1368c00b2ce6a527122e1a506321bb44fda4a7d85d98d08d96f5a4d76917ab03df5846cec12c88f813ea
+EBUILD roccat-tools-5.9.0-r101.ebuild 3360 BLAKE2B c2a3f7f301e28cca3530c22a75aa932d0f729062e709cba5d4cd931fe07ccf87cc92becf5aaa2e6e3c51373735004d7062f5e4aa4502226250ab7c7145b45627 SHA512 0e4918c14cd7620d1a18820bd21d2b77b75fa8e2db91ec089525ce1d74c4ceaf96040329d349ecb0cccd6871f8897fe5d4323afed6b9a739e718a771c57c4cab
 MISC metadata.xml 327 BLAKE2B b3a42ce918857aaa3ebe1705560661d80d9dc1cce60b5d79bddc1ead356cced572fe18d8b8d18f6c8f2ebb80393cc02efc4df3ad711aca08a67a15a1abd93e60 SHA512 99ed72c1a2a183157d0aded6f95c41c81c9c3d97f81c7267743ad3431676e2af1d7e08e4904761583af17806f5befd7254ca9f2ad170266d038053c7076a630e
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0-r100.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0-r100.ebuild
deleted file mode 100644
index 1a5d2b88c0ab..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-5.9.0-r100.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit readme.gentoo-r1 cmake flag-o-matic lua-single toolchain-funcs udev user xdg
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES=(
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kiro
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_kova2016
-	input_devices_roccat_lua
-	input_devices_roccat_nyth
-	input_devices_roccat_pyra
-	input_devices_roccat_ryosmk
-	input_devices_roccat_ryosmkfx
-	input_devices_roccat_ryostkl
-	input_devices_roccat_savu
-	input_devices_roccat_skeltr
-	input_devices_roccat_sova
-	input_devices_roccat_suora
-	input_devices_roccat_tyon
-)
-
-IUSE="${IUSE_INPUT_DEVICES[@]}"
-
-REQUIRED_USE="
-	input_devices_roccat_ryosmk? ( ${LUA_REQUIRED_USE} )
-	input_devices_roccat_ryosmkfx? ( ${LUA_REQUIRED_USE} )
-	input_devices_roccat_ryostkl? ( ${LUA_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	>=dev-libs/libgaminggear-0.15.1
-	dev-libs/libgudev:=
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	virtual/libusb:1
-	input_devices_roccat_ryosmk? ( ${LUA_DEPS} )
-	input_devices_roccat_ryosmkfx? ( ${LUA_DEPS} )
-	input_devices_roccat_ryostkl? ( ${LUA_DEPS} )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.0-cmake_lua_impl.patch
-)
-
-DOCS=( Changelog KNOWN_LIMITATIONS README )
-
-pkg_setup() {
-	# Don't bother checking all the relevant USE flags, this is harmless
-	# to call even when no Lua implementations have been pulled in
-	# by dependencies.
-	lua-single_pkg_setup
-
-	enewgroup roccat
-
-	local model
-	for model in ${IUSE_INPUT_DEVICES[@]} ; do
-		use ${model} && USED_MODELS+="${model/input_devices_roccat_/;}"
-	done
-}
-
-# Required because xdg.eclass overrides src_prepare() from cmake.eclass
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	if has_version \>=x11-libs/pango-1.44.0 ; then
-		# Fix build with pango-1.44 which depends on harfbuzz
-		local PKGCONF="$(tc-getPKG_CONFIG)"
-		append-cflags "$(${PKGCONF} --cflags harfbuzz)"
-	fi
-
-	mycmakeargs=(
-		-DDEVICES="${USED_MODELS/;/}"
-		-DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-
-	local lua_use=(
-		input_devices_roccat_ryosmk
-		input_devices_roccat_ryosmkfx
-		input_devices_roccat_ryostkl
-	)
-	local luse
-	for luse in ${lua_use[@]} ; do
-		if use ${luse} ; then
-			mycmakeargs+=(
-				-DLUA_IMPL="${ELUA}"
-				-DWITH_LUA="$(ver_cut 1-2 $(lua_get_version))"
-			)
-			break
-		fi
-	done
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir ${stat_dir}
-	fowners root:roccat ${stat_dir}
-	fperms 2770 ${stat_dir}
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-	ewarn
-	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
-	ewarn "affected folder(s) in /var/lib/roccat"
-	ewarn
-}
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
new file mode 100644
index 000000000000..ee1371ca60cb
--- /dev/null
+++ b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit readme.gentoo-r1 cmake flag-o-matic lua-single toolchain-funcs udev xdg
+
+DESCRIPTION="Utility for advanced configuration of Roccat devices"
+
+HOMEPAGE="http://roccat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES=(
+	input_devices_roccat_arvo
+	input_devices_roccat_isku
+	input_devices_roccat_iskufx
+	input_devices_roccat_kiro
+	input_devices_roccat_kone
+	input_devices_roccat_koneplus
+	input_devices_roccat_konepure
+	input_devices_roccat_konepuremilitary
+	input_devices_roccat_konepureoptical
+	input_devices_roccat_konextd
+	input_devices_roccat_konextdoptical
+	input_devices_roccat_kovaplus
+	input_devices_roccat_kova2016
+	input_devices_roccat_lua
+	input_devices_roccat_nyth
+	input_devices_roccat_pyra
+	input_devices_roccat_ryosmk
+	input_devices_roccat_ryosmkfx
+	input_devices_roccat_ryostkl
+	input_devices_roccat_savu
+	input_devices_roccat_skeltr
+	input_devices_roccat_sova
+	input_devices_roccat_suora
+	input_devices_roccat_tyon
+)
+
+IUSE="${IUSE_INPUT_DEVICES[@]}"
+
+REQUIRED_USE="
+	input_devices_roccat_ryosmk? ( ${LUA_REQUIRED_USE} )
+	input_devices_roccat_ryosmkfx? ( ${LUA_REQUIRED_USE} )
+	input_devices_roccat_ryostkl? ( ${LUA_REQUIRED_USE} )
+"
+
+RDEPEND="
+	acct-group/roccat
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=dev-libs/libgaminggear-0.15.1
+	dev-libs/libgudev:=
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	virtual/libusb:1
+	input_devices_roccat_ryosmk? ( ${LUA_DEPS} )
+	input_devices_roccat_ryosmkfx? ( ${LUA_DEPS} )
+	input_devices_roccat_ryostkl? ( ${LUA_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.0-cmake_lua_impl.patch
+)
+
+DOCS=( Changelog KNOWN_LIMITATIONS README )
+
+pkg_setup() {
+	# Don't bother checking all the relevant USE flags, this is harmless
+	# to call even when no Lua implementations have been pulled in
+	# by dependencies.
+	lua-single_pkg_setup
+
+	local model
+	for model in ${IUSE_INPUT_DEVICES[@]} ; do
+		use ${model} && USED_MODELS+="${model/input_devices_roccat_/;}"
+	done
+}
+
+# Required because xdg.eclass overrides src_prepare() from cmake.eclass
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	if has_version \>=x11-libs/pango-1.44.0 ; then
+		# Fix build with pango-1.44 which depends on harfbuzz
+		local PKGCONF="$(tc-getPKG_CONFIG)"
+		append-cflags "$(${PKGCONF} --cflags harfbuzz)"
+	fi
+
+	mycmakeargs=(
+		-DDEVICES="${USED_MODELS/;/}"
+		-DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+
+	local lua_use=(
+		input_devices_roccat_ryosmk
+		input_devices_roccat_ryosmkfx
+		input_devices_roccat_ryostkl
+	)
+	local luse
+	for luse in ${lua_use[@]} ; do
+		if use ${luse} ; then
+			mycmakeargs+=(
+				-DLUA_IMPL="${ELUA}"
+				-DWITH_LUA="$(ver_cut 1-2 $(lua_get_version))"
+			)
+			break
+		fi
+	done
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	local stat_dir=/var/lib/roccat
+	keepdir ${stat_dir}
+	fowners root:roccat ${stat_dir}
+	fperms 2770 ${stat_dir}
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+	ewarn
+	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
+	ewarn "affected folder(s) in /var/lib/roccat"
+	ewarn
+}
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index aaa471cb4345..bc2a4576362e 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
 EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
-EBUILD selinux-python-3.2.ebuild 2387 BLAKE2B a3562c641efba34a9c207bac993b2cbba25fbbc6c232c665296fb9e99f6b34736c576edf69e9cb0770648c19d791afcd161c7a242a275e25758fabe836fa1308 SHA512 16c620571c290dbea57e25ad1c4f9ce2a3bf2542a7cbc5609aee7131a315c16f5f30608da552749c7df043deeaea1a75d9b040bd115c18b83eb55d46ce3076dd
-EBUILD selinux-python-9999.ebuild 2388 BLAKE2B 70c5228702559cce48ba1430a0d216a696ab8edb79c5a67611dd214ae3de4c3e95f9e5d93b71bde4e6da9dda0099ab20e6c4268ad1a7a429b76b7a4ed7fc57cd SHA512 c57c79af8c506b93997561024e5fa71191c94be9297eaefff074d5518069b8a3a15ca7ab7db96011c61b6d931c877445d60c2dd809ea765143d2e2ba5da55e2f
+EBUILD selinux-python-3.2.ebuild 3090 BLAKE2B 17200335ad8527c654fe58d7819537ee921e9f05e01cbe54c0e79443a46738642754bc6ff098506e2f8f4edc686b5ecfedb560dd0039b334fa07a7735bb8eda0 SHA512 7a9d8988aa4e6af503ab8205fff2a53c009c2a19fe874f6ce613ce7b34a74b0018f924d32fa63c79e636fa64c7d8887c7be6528ceec5d5949c2d7b2414ea8fd6
+EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.2.ebuild b/sys-apps/selinux-python/selinux-python-3.2.ebuild
index df7cfa14c519..d0d1993c20a3 100644
--- a/sys-apps/selinux-python/selinux-python-3.2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.2.ebuild
@@ -7,6 +7,8 @@ PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
+IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -24,14 +26,18 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libselinux-${PV}:=[python]
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
 	>=sys-libs/libsemanage-${PV}:=[python(+)]
 	>=sys-libs/libsepol-${PV}:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
 	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
 
 src_prepare() {
 	default
@@ -49,6 +55,26 @@ src_compile() {
 	python_foreach_impl building
 }
 
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
 src_install() {
 	installation() {
 		emake -C "${BUILD_DIR}" \
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 2d1cc6d2b32b..8e1f90984a8b 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -7,6 +7,8 @@ PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
+IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -24,14 +26,18 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libselinux-${PV}:=[python]
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
 	>=sys-libs/libsemanage-${PV}:=[python(+)]
 	>=sys-libs/libsepol-${PV}:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
 	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
 
 src_prepare() {
 	default
@@ -49,6 +55,26 @@ src_compile() {
 	python_foreach_impl building
 }
 
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
 src_install() {
 	installation() {
 		emake -C "${BUILD_DIR}" \
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 390e4ba8ecab..293b2138d298 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -5,5 +5,5 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
-EBUILD shadow-4.8.1-r3.ebuild 5918 BLAKE2B 340acae099fdaec90e1de8b3905e723c450f1b6961be8ca76495cde7b62e0c5b8fa9cb17db7503d87774c4d46c7dd64ee9be42cf05e2fc931fb522326a6eeda9 SHA512 446cd1935f9250b20fde1e5996394371120a566ee9e9827cd6d2e5fde74b0364b08e4245b29ec711a1cd0bb60585b2edafeffd72743173c1fc946fd594e70d33
+EBUILD shadow-4.8.1-r4.ebuild 6170 BLAKE2B 5e69b94f3a9e300eff2699144a343583b01e4be6427b38bee98d251db24b311450b2d0dedb0c47422497c6e2f4b3f115304f7d63250f74d6a09ad48e583da130 SHA512 47dc3428cbbe714a78d5cbbb022863c5106bea0ad31b6ffb5cad63acc518a81ded3215404b21fa41bcd38895f6e51ad6d0602e577fc2f057806834f1ffcf857a
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8.1-r3.ebuild b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
deleted file mode 100644
index 38ebf6be89e7..000000000000
--- a/sys-apps/shadow/shadow-4.8.1-r3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--enable-shared=no
-		--enable-static=yes
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.8.1-r4.ebuild b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
new file mode 100644
index 000000000000..3ef5b2f92a56
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20171215-r1 !=app-i18n/man-pages-ja-20180315-r0
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--enable-shared=no
+		--enable-static=yes
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index bcc3f514e10d..113a31f35c68 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -2,6 +2,6 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-EBUILD smartmontools-7.2.ebuild 4105 BLAKE2B 04ab5f70448fe786a0e0bc49d265b5d19fb4a8b5f4c6fb447256c7591f6bf80bbc06b334c2342a20b84eec2f52e32c99f53f668e0c099ce07802436b6cf59028 SHA512 7aee5b7eb2a9a1a4ab51aeeee5c06db1504bdcbd7193bcffca792916b9b571b0f6372f16f6d832d8f2c426d614ae144e65659afb9e7970bc3f162d20b5d743b5
-EBUILD smartmontools-9999.ebuild 4113 BLAKE2B 7e01726db047e2390c037cf75cd5a44da3f8749e0e39d2d6863d75fdf8acf9c5461a0df41898476a723d6e5774221335ab65c746d2e3d843311716d7819144e8 SHA512 a803668aba5cabb2653f29093bdcedab45dec38124baef8c39c5ac355199d3bba0779e3e76d73209cdfac721810bc12b414a07086c7b0f5749088b380b805fcb
+EBUILD smartmontools-7.2.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6
+EBUILD smartmontools-9999.ebuild 4120 BLAKE2B 8934c567f80a47f0a3d31a7e97b6a0821bb3cc34cc203c0c8568e78c2023b64bfbc938c4b68584bff6ec9eb41c46f7a6d7edcbc9f1f63a62fa0329b87412c2f8 SHA512 424b6c177004e0d7c706699343e0aa145470e95f6e65cb8d3b326e702c699a02e9bd4a640c30ffec7de635c9d7dfa4db1cd54e46b8d3cc010084103ed494526a
 MISC metadata.xml 628 BLAKE2B a619effbf00a8b83df53ae6b7e191ed97af2e996ba3f025328021b67b49a167c3eae0be016b1fe106bef263a8b29e5add385f067efaef18ea07da451ede84ebc SHA512 ae5c3076410f080d87db55935a6254768ed07faf5bafed2ed9bb9d469b263b6bd8d418a1e50d1030aa6873f0c82014887ef7f2df8e032b6487f782f72a1ea54e
diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild
index 0ab20504d088..39f90ac1de44 100644
--- a/sys-apps/smartmontools/smartmontools-7.2.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 8743a731e871..c3e86bfcdb7b 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index d3705b3f59e4..5ff3711c08b3 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -8,5 +8,5 @@ DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4
 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 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd
-EBUILD systemd-tmpfiles-248.3.ebuild 5460 BLAKE2B f4fb7202ef3ad1dcef75f0164310a2c98b2f63721459637f7c3ad7649f4cf747fca5dc9a92fcf442dfd5991d0cbb498a2b6d97b67b902c0c1bbd7a7977118d4c SHA512 35767f532eaaacf6d90ea2329ea9ae6d928e6c3a26e0c6dcdce08bbd6da42395322881ee4d03dc497124afae2cab812ab557eb963ef638e0bfa103f2fa11061f
+EBUILD systemd-tmpfiles-248.3.ebuild 5466 BLAKE2B ca9ce4c359614a3b2f632dd482758f87e977aa81a238efd39a70a4d3739888ef5ec763f0dec927aad41b97e72a5b9d8595992484fd43facef0cbf421ee91b45d SHA512 946c0c0127665c715b8986b416d4c08a1bc97953f0501dbfd283e95a5210138f6ebbcd26c8e939b64e614423f4b03b69781c5dc12ab85a8caa9a04028a077192
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
index ee49640987f2..ff052d6a4b1c 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-$
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index aa4a8ed19045..6443dbd9ed74 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,14 +1,12 @@
-AUX 249-hostnamed-error-variable.patch 1987 BLAKE2B 80f5d2518c4012f3c4011964896dc6f16ce7e799f82e0f0deb287e0b9fc880facf608deae740b6adef66f8c61645b16881b91d2b258ae69a62483cb2a99dc954 SHA512 fac633b3165497bbd3a7212fae3e67580bba5e48ff1ae4990d4831ac142384641cf5c3e70da2612d467a4ea4712c712c019f22a2d759d16cb9d3bd1e2af5dc8f
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
-AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
-EBUILD systemd-248.3-r1.ebuild 15147 BLAKE2B 0b80d3da5bda9497d35d76c791c165f9f4ec3ad2ad012cb487e3f69b3decf23de57d2755675b65e99471960928df80d9db52d63473ac82fff0a7703aff817a19 SHA512 626f66cf8b8018870b53b623fc68170c150a9c3e7b18cfd022d2d4e1f5d49582d7bcf5da23633a8b9fc1741182aabc715a4b2865df811149889d49d6ad7b3243
-EBUILD systemd-249-r3.ebuild 14904 BLAKE2B 653d9a76594ed8bd16e3b4047399dd6cffd45199d162d43c8631f9824071b23e468c8925b69509ea14b0749b79db883f9c4fd5d41f8d96f4bc91dcc2e82c7866 SHA512 0498a15ac9d8d15b9c3f639bd85f15015e3c2a87c44cf67b05a9f4eaa84602058967b70736046397a83ff69bfa90e75771a8398c87aac0d4729264fd65440fdf
+DIST systemd-stable-248.5.tar.gz 10388105 BLAKE2B 7976c31730bce6d90e14c26ddc5d240e5e3a9e9b16dae6186f7b65a4a8708427cde0314d5820ebb817f78061cd14e3aac53d9761f6e1a34a1e16262d63454df5 SHA512 38cdb31e2e5ba1186154da06368b0b467c452368f3dd667d7ef0fb907d314545f903ea9ade3550bf057e9e487d4fdb16a0fa5bce1d0134d2e17223c0795f55cf
+DIST systemd-stable-249.1.tar.gz 10590518 BLAKE2B 85eec7bc4f6af9a39fbf51e8fc65a2b02052a151ab6147e61485a307692a4984543b2506b71dae6715fc9447e85fba8052b847fbb2e5d14c23c7264b9d7fcf36 SHA512 e2c1dd39fc3b9a1a9c2aee4317dc1b2aa66cc47d0275fa4fa8214a9b43e37fd737daf1562db9aa94892128918473bad73cc16a6f0c657498389c3dadb6cf87de
+EBUILD systemd-248.5.ebuild 15190 BLAKE2B 62e9e842209da6ab45c25c4e4ff582477fd0f3b89c84b312a81155d69defa33833d767fb5fced0c3a56de24fd64c1c05ef4431a95b8f1ac7924f19ad9a46619f SHA512 f25e1f5e5ebcefca0f495e50cf7a9eceae12d48ca8e4b5156c1098a6767a00c21e57f12399d3996042071040daab03a4182d5fc71b6fea6722d8983892416bb2
+EBUILD systemd-249.1.ebuild 14853 BLAKE2B c0005455615de6e5e562b930601b02350049dc9fac5ec23928ed178c52568bb3505ca77942dff7e9c7eb24c0ebbb5f232df628ad45f4b88cbbee2c200fb2eaee SHA512 d4e85e01f3c771e4c9da039f34eea401bd5b83a72852ae865a1fb3b06414e0cf9f4b3602b22b7c18f80d371c40fdae40e77097cdcfece0c619216b65c408e36d
 EBUILD systemd-9999.ebuild 14812 BLAKE2B aee682e4b01400bd2fd3b347be8f219014681e2ce314ec64bc0d51c9187e1c06239efef9985b7c88580ec29e333f3ac959ab8df7d943b5be0ea3c3e3b7b1948f SHA512 0199f497a1d5607f7b1f751efdac6eed18eff34b1d6e8276bf6004778006cba09fe0cbc952e6a178efa44d77f959a2e8f6080c9cce6fa3f2b39097ff6bd59d8b
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/files/249-hostnamed-error-variable.patch b/sys-apps/systemd/files/249-hostnamed-error-variable.patch
deleted file mode 100644
index 7fe7af73a003..000000000000
--- a/sys-apps/systemd/files/249-hostnamed-error-variable.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 105a4245ff13d588e1e848e8ee3cffd6185bd0ae Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Thu, 8 Jul 2021 00:23:21 +0200
-Subject: [PATCH] hostnamed: correct variable with errno in fallback_chassis
-
-fixes assertion failure on arm:
-
-systemd-hostnamed[642]: Assertion '(_error) != 0' failed at src/hostname/hostnamed.c:207, function fallback_chassis(). Aborting.
----
- src/hostname/hostnamed.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index bd535ddc4d80..36702f2fb0cd 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
-@@ -204,14 +204,14 @@ static const char* fallback_chassis(void) {
- 
-         r = read_one_line_file("/sys/class/dmi/id/chassis_type", &type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed to read DMI chassis type, ignoring: %m");
-+                log_debug_errno(r, "Failed to read DMI chassis type, ignoring: %m");
-                 goto try_acpi;
-         }
- 
-         r = safe_atou(type, &t);
-         free(type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed to parse DMI chassis type, ignoring: %m");
-+                log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m");
-                 goto try_acpi;
-         }
- 
-@@ -260,14 +260,14 @@ static const char* fallback_chassis(void) {
- try_acpi:
-         r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed read ACPI PM profile, ignoring: %m");
-+                log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m");
-                 return NULL;
-         }
- 
-         r = safe_atou(type, &t);
-         free(type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed parse ACPI PM profile, ignoring: %m");
-+                log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m");
-                 return NULL;
-         }
- 
diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch
deleted file mode 100644
index 4d022b508ba6..000000000000
--- a/sys-apps/systemd/files/gentoo-pam.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 3 Nov 2020 10:42:51 -0500
-Subject: [PATCH] pam: include system-auth for systemd --user
-
----
- src/login/systemd-user.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
-index f6313f79fe..bcf84b4c64 100644
---- a/src/login/systemd-user.m4
-+++ b/src/login/systemd-user.m4
-@@ -5,7 +5,7 @@
- m4_ifdef(`ENABLE_HOMED',
- -account sufficient pam_systemd_home.so
- )m4_dnl
--account sufficient pam_unix.so
-+account include system-auth
- account required pam_permit.so
- 
- m4_ifdef(`HAVE_SELINUX',
-@@ -13,6 +13,7 @@ session required pam_selinux.so close
- session required pam_selinux.so nottys open
- )m4_dnl
- session required pam_loginuid.so
-+session include system-auth
- session optional pam_keyinit.so force revoke
- m4_ifdef(`ENABLE_HOMED',
- -session optional pam_systemd_home.so
--- 
-2.29.0
-
diff --git a/sys-apps/systemd/systemd-248.3-r1.ebuild b/sys-apps/systemd/systemd-248.3-r1.ebuild
deleted file mode 100644
index cbf86f5cc09b..000000000000
--- a/sys-apps/systemd/systemd-248.3-r1.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	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 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( >=sys-apps/hwids-20150417[udev] )
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-			"${FILESDIR}/gentoo-pam.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool hwdb)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-248.5.ebuild b/sys-apps/systemd/systemd-248.5.ebuild
new file mode 100644
index 000000000000..8bd8d0b12c40
--- /dev/null
+++ b/sys-apps/systemd/systemd-248.5.ebuild
@@ -0,0 +1,523 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	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 ~mips ppc ppc64 ~riscv sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool hwdb)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+
+		# static-libs
+		$(meson_use static-libs static-libudev)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-249-r3.ebuild b/sys-apps/systemd/systemd-249-r3.ebuild
deleted file mode 100644
index d11da3bdbde0..000000000000
--- a/sys-apps/systemd/systemd-249-r3.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( sys-apps/hwids[systemd(+),udev] )
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}/249-hostnamed-error-variable.patch"
-		"${FILESDIR}/249-libudev-static.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool hwdb)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	if use hwdb; then
-		systemd-hwdb --root="${ROOT}" update
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-249.1.ebuild b/sys-apps/systemd/systemd-249.1.ebuild
new file mode 100644
index 000000000000..aca935e27ce4
--- /dev/null
+++ b/sys-apps/systemd/systemd-249.1.ebuild
@@ -0,0 +1,509 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	hwdb? ( sys-apps/hwids[systemd(+),udev] )
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}/249-libudev-static.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool hwdb)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+
+		# static-libs
+		$(meson_use static-libs static-libudev)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	if use hwdb; then
+		systemd-hwdb --root="${ROOT}" update
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index f04cdaa6a74c..b0fb4b395534 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,4 +1,4 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
 DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589
-EBUILD tuned-2.15.0-r1.ebuild 1398 BLAKE2B 86d079a6b6661746b063f6229aada86f6c1b62a1d817e5e90fd5f1dba69ff3d49b797724c6662feae1234fb5c7edb4792a851ca7910e504b09ab8362640de04a SHA512 9ae8d5966bd251d936a9faee47d5146b5070b35cc31dcf2f8e210a94307aaf0a20540717b9b844c627595b5094fbfbd86a702d0ac05cb74acd3cd45ff6c37fd2
+EBUILD tuned-2.15.0-r1.ebuild 1360 BLAKE2B e0ba83ac9f68884ad57900f55a602242d902ffd8d94af9a58b9c7b825903d871d282f6357ea1a70b8294354c8597d14ccc82d79798daa560ff7a42b6efb3b2fb SHA512 25be2fd64fd25e53d86f8dfb6140bd6e0e899b7893c773412c802ee18b65cfa2703acce16caffcfc378f56564646481c114670893472433becee66451125923e
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.15.0-r1.ebuild b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
index e39575c6a99e..050ad815152f 100644
--- a/sys-apps/tuned/tuned-2.15.0-r1.ebuild
+++ b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-single-r1 xdg-utils
 
@@ -20,12 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
 	')"
 
 RDEPEND="
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index 1b0630d93b85..eb3958875ccd 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -1,3 +1,3 @@
 DIST ucspi-unix-1.0.tar.gz 17391 BLAKE2B 0605c770a5e898ff9fbe9eb1a50fddbe2fcb25b37168f7b6a2fed18a632504d0f80f5f0b39b812de7d4bd6845039e143eab8706429392f7b4178bbbe59713630 SHA512 dc79515908e34cd3bcc8c66f360fe3f4662a5be35c9876b07c609fac0f90e0f498d306d1796ebbade902c7affceece7d18f8acd178a850e42d6d6820d53c1d11
-EBUILD ucspi-unix-1.0.ebuild 793 BLAKE2B fb3779100a807f8d52383f563b6b9f508786c9a9aeb65a17df416894fefb00945beea972cc4e391ef6c6dc7601fc2a3ed252176015c5ffff52bd7e0000a20554 SHA512 b2f8f4a654bd5dc9f7a36036eafda64e59e532a8660c41df821fa1c2600102fac77b4d0a8a0a63fdf79369fb6564ea66fd50f7f9e69623578a15457279c2ac06
+EBUILD ucspi-unix-1.0.ebuild 800 BLAKE2B 251bd467f1acfff35eea422e21b871bc0038a0edce74160080481f7a686deacb80c253ef0504b23dd47c2cc1789e684f6d7ff5ea2ec181eb75734bf8040cbe5f SHA512 48be6ac60f983987a6308bacef83ef1331d83cbf9fe526c8efc97b7fa40c38dd29c7ad662944fe0aac29e4f60b6d1cb8ad1b0091ee5394cf09afd64252f25386
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
diff --git a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
index 393abef9c3fd..6a03bc143d24 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/ucspi-unix/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~riscv ~sparc x86"
 IUSE=""
 
 # We statically link bglibs.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index bc73ce4795bf..891553cd0c2e 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,10 @@ AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262
 AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
+DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
-EBUILD util-linux-2.36.2.ebuild 8942 BLAKE2B e26af16681c038a8d2818bfef7565b106711639e0fee55868a056496180648c6ae390e66595af22c1ac4c444052355ccd1a46ef359624b56ee1f8b3205ac2584 SHA512 4f9165ea6a2397b0b9df2971a8547d03005a3e1333673245b4d9397f2b78632cbab23bc12ccd4392ad6b90f1971fca764240730fd315eb22bfcb495937e5dc44
-EBUILD util-linux-2.37.ebuild 9998 BLAKE2B 034261b393a61b7cc2f2f17e9178b6187f5fc5b2504eb7a6e1a1862a67c69f225d86ec4472de47af7070a28b960e426eba40898ae5e982fb7ca962bacb628b49 SHA512 b7c28f43181c8ecad520d8117fac3e954b41b0c6de2c8208f9a1b288db8730af2f0a3c5773317f6c9af16e1a149fed4b4eb7a251ba3f4d305ee2d9a1fb081f53
-EBUILD util-linux-9999.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f
+EBUILD util-linux-2.36.2-r1.ebuild 8935 BLAKE2B 065f9a2c46802fdc656dfe1fb01b575aa769c087d295e646970efd6f16c20d3b10705c82dd1f536f0edde3a1422047bb8ac214361f3a2349c9b2295d5bfc5f05 SHA512 6100692d0d27f04f28112b4512a83ebb79805bfbdf1aba5c9b4f8a191deebf3efd4c1c45401bad0498ebf7d65edd9383e2c8a748ede22f733e09570cdeffb22b
+EBUILD util-linux-2.37-r1.ebuild 9991 BLAKE2B a6b00e3fd2aeb4fba72026456c02b243b950d5a6aa9f6166d8c2ef4015a5751d33be0ae28db15174770198e561b35476159baf03251e6cee860aee65ce82e8c3 SHA512 c76077d9f66cf106bc59e7075121d7c6d8c0260bf220b92e9f642bc1754973dbdbe410fb6d09cda02a40d85cfa15a22a1bcfceca77d50f4c50ce0a480f64a7e5
+EBUILD util-linux-2.37.1.ebuild 9219 BLAKE2B 29540366c24bcabd3ba816c927b950afa1e7785339ff3cb657e7cfdf70e713a49e42a314b3378694794b03b50d085912f47211f9ff1d30735f0c1ea778fbe679 SHA512 e97de69dd6c1bea120070bb36df737111db68c4108fe23bea58a99f2ca2815010b1fc7a2c7f7bd9b4eab7a560c08b70af7a1139cf66882359f762f5ce9662f87
+EBUILD util-linux-9999.ebuild 9219 BLAKE2B 29540366c24bcabd3ba816c927b950afa1e7785339ff3cb657e7cfdf70e713a49e42a314b3378694794b03b50d085912f47211f9ff1d30735f0c1ea778fbe679 SHA512 e97de69dd6c1bea120070bb36df737111db68c4108fe23bea58a99f2ca2815010b1fc7a2c7f7bd9b4eab7a560c08b70af7a1139cf66882359f762f5ce9662f87
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild
new file mode 100644
index 000000000000..a33c67583eab
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.36.2.ebuild b/sys-apps/util-linux/util-linux-2.36.2.ebuild
deleted file mode 100644
index dc8d4da2b30a..000000000000
--- a/sys-apps/util-linux/util-linux-2.36.2.ebuild
+++ /dev/null
@@ -1,315 +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 toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	ppc? ( sys-libs/librtas )
-	ppc64? ( sys-libs/librtas )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call (#689190)
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if ! use userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.37-r1.ebuild b/sys-apps/util-linux/util-linux-2.37-r1.ebuild
new file mode 100644
index 000000000000..22c0a4dea4bf
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.37-r1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!<app-shells/bash-completion-2.7-r1
+"
+
+# Required for man-page generation
+if [[ "${PV}" == 9999 ]] ; then
+	BDEPEND+="
+		dev-ruby/asciidoctor
+	"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# https://github.com/karelzak/util-linux/pull/1329
+	"${FILESDIR}/${P}-ppc-nortas.patch"
+
+	"${FILESDIR}/${P}-lcrypt_link_fix.patch" # 801403
+	"${FILESDIR}/${P}-lcrypt_use_LIBS.patch" # 801403
+	"${FILESDIR}/${P}-avoid_autoreconf.patch" # 801403
+)
+
+rm_man() {
+	[[ -n $1 ]] || die
+	local el
+	for el in $1 ; do
+		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
+			|| die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU ; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	else
+		# Conditionally remove some man-pages
+		use hardlink 	|| rm_man "hardlink"
+		use kill 	|| rm_man "kill"
+		use logger 	|| rm_man "logger"
+		use ncurses 	|| rm_man "pg"
+		use su 		|| rm_man "su"
+		use tty-helpers	|| rm_man "mesg wall write"
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU ; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# We ship pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU ; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU ; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ${PV} != 9999 ]] ; then
+		doman "${WORKDIR}"/man/man*/*
+	fi
+
+	if ! use userland_GNU ; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam ; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.1.ebuild
new file mode 100644
index 000000000000..141bdf409cb5
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.37.1.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!<app-shells/bash-completion-2.7-r1
+"
+
+# Required for man-page generation
+if [[ "${PV}" == 9999 ]] ; then
+	BDEPEND+="
+		dev-ruby/asciidoctor
+	"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU ; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU ; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# We ship pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU ; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU ; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU ; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam ; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.37.ebuild b/sys-apps/util-linux/util-linux-2.37.ebuild
deleted file mode 100644
index e12e94830621..000000000000
--- a/sys-apps/util-linux/util-linux-2.37.ebuild
+++ /dev/null
@@ -1,362 +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 toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	ppc? ( sys-libs/librtas )
-	ppc64? ( sys-libs/librtas )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1
-"
-
-# Required for man-page generation
-if [[ "${PV}" == 9999 ]] ; then
-	BDEPEND+="
-		dev-ruby/asciidoctor
-	"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/karelzak/util-linux/pull/1329
-	"${FILESDIR}/${P}-ppc-nortas.patch"
-
-	"${FILESDIR}/${P}-lcrypt_link_fix.patch" # 801403
-	"${FILESDIR}/${P}-lcrypt_use_LIBS.patch" # 801403
-	"${FILESDIR}/${P}-avoid_autoreconf.patch" # 801403
-)
-
-rm_man() {
-	[[ -n $1 ]] || die
-	local el
-	for el in $1 ; do
-		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
-			|| die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		# Conditionally remove some man-pages
-		use hardlink 	|| rm_man "hardlink"
-		use kill 	|| rm_man "kill"
-		use logger 	|| rm_man "logger"
-		use ncurses 	|| rm_man "pg"
-		use su 		|| rm_man "su"
-		use tty-helpers	|| rm_man "mesg wall write"
-	fi
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# We ship pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call (#689190)
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU ; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if [[ ${PV} != 9999 ]] ; then
-		doman "${WORKDIR}"/man/man*/*
-	fi
-
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam ; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 66a36a6cd0cb..141bdf409cb5 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -17,8 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	[[ "${PV}" = *_rc* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
 DESCRIPTION="Various useful Linux utilities"
@@ -38,7 +37,7 @@ RDEPEND="
 	cryptsetup? ( sys-fs/cryptsetup )
 	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? (
-		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
+		sys-libs/ncurses:=[unicode(+)?]
 		magic? ( sys-apps/file:0= )
 	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
@@ -87,18 +86,6 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-)
-
-rm_man() {
-	[[ -n $1 ]] || die
-	local el
-	for el in $1 ; do
-		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
-			|| die
-	done
-}
-
 src_prepare() {
 	default
 
@@ -117,14 +104,6 @@ src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
-	else
-		# Conditionally remove some man-pages
-		use hardlink 	|| rm_man "hardlink"
-		use kill 	|| rm_man "kill"
-		use logger 	|| rm_man "logger"
-		use ncurses 	|| rm_man "pg"
-		use su 		|| rm_man "su"
-		use tty-helpers	|| rm_man "mesg wall write"
 	fi
 
 	elibtoolize
@@ -320,10 +299,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if [[ ${PV} != 9999 ]] ; then
-		doman "${WORKDIR}"/man/man*/*
-	fi
-
 	if ! use userland_GNU ; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index b4da0be3be32..29676e1cf6b8 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index a1385d514c18..a8e68a9b853c 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -7,4 +7,4 @@ DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
 EBUILD fprintd-1.90.8.ebuild 1609 BLAKE2B b740300da0690938cd618f1ed5a1380634e0bb041ed0b2634b1327b22a34c7ce5c763d9df1a980aad21cddc191c252258c2ad2128436cc20c2dc796042c87725 SHA512 9ca0ab30704e9b13be1e4569cc6f3e2a4d9047c07d52c0a292dc19287149052bc3dddf0b0f9ceb53f6698231a4b2764680dc9d08f6f38302d0dfee6eb3c371a2
 EBUILD fprintd-1.90.9.ebuild 1618 BLAKE2B a5767a33cb7faa2ed8b510a909ed91eefd84362ebd9c9b31501adb8703ab00fe8a86d1490a72146fa33b3dff5d20e01f7843202c9f88e33c6883d7a7eca22982 SHA512 48b4664618f7ef21e2dc99878989738972462fcc698a43e103a698b1a42374022f467d52408d004c734c5cb3e49d821316e52e7242cb1accabb082f54f9b2abe
-MISC metadata.xml 497 BLAKE2B 7fda00be12c7ce6dac7a00baea03d91414279033d86c10a233f00db2c876c224043c21f16c52922ac548c17861f381fa3989f9895bce41a0f34afa1d75e2e883 SHA512 29b70d7a55147573fbac8c6a40c8b5b82ebb5c6a6f2852f49d872eac9a44290b4d07e0ba1d754ae5e6656e00de05a47db6eae2dba5bb1fa2993115ff7d8aeded
+MISC metadata.xml 269 BLAKE2B cb039f1da13c33bcfc399265c6003a2c4da752be38e7303379a80f46f7fba40d5aa12a3c06f4e4848d2aaa26302b3753a14819ec03e6f976a2bc7d7a9498a9cc SHA512 b6a151f66281c84e0b33d6a9de97fcf86bf16a0299ab076150935e48e2261f8a93f4b97a38ca374033015e0418569c1962136794850763e87039142df39db60f
diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml
index 3479f4f0534a..ca19af291d35 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
 	</upstream>
diff --git a/sys-auth/google-authenticator-wrappers/Manifest b/sys-auth/google-authenticator-wrappers/Manifest
index 02f40128c6c4..59d15f13aab6 100644
--- a/sys-auth/google-authenticator-wrappers/Manifest
+++ b/sys-auth/google-authenticator-wrappers/Manifest
@@ -3,5 +3,5 @@ DIST google-authenticator-wrappers-2.tar.gz 1615 BLAKE2B 313283bf2672e36883aa21d
 DIST google-authenticator-wrappers-3.tar.gz 6128 BLAKE2B a2c2b35a0c780213a6ba2940c05a205a8ccb043b6ff0808eb47a45c7d52da215293ca785c968f26ec99b7a97e770b127b391fb104b85db6c09efd6af31531786 SHA512 471beb9fdc0225d59efef5c24cbfe1beec5fc4916521c4205c8aec5c4b3dfb473e53fbc5ada337cf0118a715aee9f5e045411b6d43c301d94fc08cccdbc889da
 EBUILD google-authenticator-wrappers-1.ebuild 469 BLAKE2B 35e8ae29327e57e84f8b6defd7dc1a0fa1f9905e8a90462e197917264034201291ded2de59532cb69fe1e5c8d5c3220004322796cc384b971fd65e0fda62b2bc SHA512 20447ff2fe64fc11af1f59475af0a7f99f0812f02e3951b4089d93029ec3d70cb27dad41246647ded519eb3fd635bb8b39d997596dbb179755d9d12f6b3583be
 EBUILD google-authenticator-wrappers-2.ebuild 469 BLAKE2B 35e8ae29327e57e84f8b6defd7dc1a0fa1f9905e8a90462e197917264034201291ded2de59532cb69fe1e5c8d5c3220004322796cc384b971fd65e0fda62b2bc SHA512 20447ff2fe64fc11af1f59475af0a7f99f0812f02e3951b4089d93029ec3d70cb27dad41246647ded519eb3fd635bb8b39d997596dbb179755d9d12f6b3583be
-EBUILD google-authenticator-wrappers-3.ebuild 1386 BLAKE2B da1239123691032eb0e841fee577c31a66b4799c358335c14cc03fe0f2bf708364438c3d3a71b47e834e5a7b0131b83de20777facd45902eddb708ee7f1c42a8 SHA512 52616f7db843714edf444b660334e94bc96c274eff29963872f6e82563654960342763a957c28120a701292d9f315fe8e30580b197e0db44e96f5b3147a91cb4
+EBUILD google-authenticator-wrappers-3-r1.ebuild 1385 BLAKE2B 9a2a04860c8e31da0096324945fe72c3caab1780cdeb1e50b74cc43be64c385cc49be92aee326441ec317c3c35f08c290d3c628e76681c1d662b92e9ac1ea508 SHA512 55e8f54f28c32c7f85cc4f8652a0878a6b97435353417642359ea6751fe73a316a74cb52847eb69d6eac2a2d9d9f35e88fc3e96a4b6f4aed6063bbb92376af94
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3-r1.ebuild b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3-r1.ebuild
new file mode 100644
index 000000000000..6a1d10c36f62
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Set of scripts to manage google-auth setup on Gentoo Infra"
+HOMEPAGE="https://github.com/mgorny/google-authenticator-wrappers"
+SRC_URI="https://github.com/mgorny/google-authenticator-wrappers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/gauth
+	acct-user/gauth
+"
+RDEPEND="
+	${DEPEND}
+	sys-auth/google-authenticator
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 3; then
+				ewarn "google-authenticator-wrappers v3 switches the secret store mechanism"
+				ewarn "from user-owned files to /var/lib/gauth.  To migrate secrets, move"
+				ewarn "and chown, e.g.:"
+				ewarn
+				ewarn "  mv /home/myuser/.google_authenticator /var/lib/gauth/myuser"
+				ewarn "  chown gauth /var/lib/gauth/myuser"
+				ewarn
+				ewarn "If you do not migrate or reset secrets, second step authentication"
+				ewarn "will be disabled after the upgrade."
+				break
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAUTH_USERNAME=gauth
+	)
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	fowners gauth:gauth /var/lib/gauth /usr/bin/gauthctl /usr/bin/gauth-test
+	fperms ug+s /usr/bin/gauthctl /usr/bin/gauth-test
+}
diff --git a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild
deleted file mode 100644
index 0c4516dc36a1..000000000000
--- a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake user
-
-DESCRIPTION="Set of scripts to manage google-auth setup on Gentoo Infra"
-HOMEPAGE="https://github.com/mgorny/google-authenticator-wrappers"
-SRC_URI="https://github.com/mgorny/google-authenticator-wrappers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-auth/google-authenticator"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 3; then
-				ewarn "google-authenticator-wrappers v3 switches the secret store mechanism"
-				ewarn "from user-owned files to /var/lib/gauth.  To migrate secrets, move"
-				ewarn "and chown, e.g.:"
-				ewarn
-				ewarn "  mv /home/myuser/.google_authenticator /var/lib/gauth/myuser"
-				ewarn "  chown gauth /var/lib/gauth/myuser"
-				ewarn
-				ewarn "If you do not migrate or reset secrets, second step authentication"
-				ewarn "will be disabled after the upgrade."
-				break
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAUTH_USERNAME=gauth
-	)
-
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	enewgroup gauth
-	enewuser gauth -1 -1 -1 gauth
-	fowners gauth:gauth /var/lib/gauth /usr/bin/gauthctl /usr/bin/gauth-test
-	fperms ug+s /usr/bin/gauthctl /usr/bin/gauth-test
-}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 7ceb5df7abff..fbf87c92e779 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -5,4 +5,4 @@ DIST libfprint-1.90.7.tar.gz 6375722 BLAKE2B d0cb085c3846e870ff31dc346b8e138ab99
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
 EBUILD libfprint-1.90.6.ebuild 1233 BLAKE2B fe6ca6c080481351de8fcffeb81ea58e158d9233b03b31e5660ef9fea44dc134487d81492c5939f0b39d3476d8c19f8abef8e188e29e4c05001c327c07d8325a SHA512 ee88c8b1c6d3d2a19790d9964c7749197dc3180d346843a6f16bc87ec3b90b19821c89912ed49e121e34a19f720e3377801412c6fa46fcec3524ec262217101c
 EBUILD libfprint-1.90.7.ebuild 1241 BLAKE2B 0b0c6e59e956cb24de8f6b9fd6bde22681a00c1eea2d69f1b1906f691294001c719f1056905f85e77e7642beffacf25097d8528177d4b35a6239e99c63719637 SHA512 bd9d89ee6d359d69cf09da7e90a7629af7ba48f52d4acf1929e17971c2fdb7daf548089015d3449e81186702720f220dac8a31ada3665f72ea31d55df44177e5
-MISC metadata.xml 502 BLAKE2B 67f6489a608485b5f6d67aa8a86388d3fb66f1cc13420f366cdea2880beeebc8fc6b3b4923023b7c11fe6f4bf641d96a06ca7581102e07c73eaccfc922f72e40 SHA512 19c12450dbd790473b3d7c2004d2ce8cc985f86da2a007099c5f38abe546d89724a63f167fabacc9b49d6f5699cad5ef19442211a945b197d02cc4a98004f4f7
+MISC metadata.xml 274 BLAKE2B 64da657db8a6e6b7b660c6c2e27eea3b7fb2489f3ca5724876a60866c298f9ce4352421202fe94b838347c50d7602acbe5d97bdf19e50cfeca9ba2d1f8bf77b0 SHA512 7416ac7f1a568ec9e7cc5eadc228c93b76921f36e30de168de664c19dc97ed05fb23478355ae497598c164c6cfbfa2f7e502cbcfe960fae7b151486de679c2e4
diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index 0d5b92c82b4e..4a4ed8b1bfa2 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=libfprint</bugs-to>
 	</upstream>
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 53d3ec4e644c..97421bd52d79 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,5 +1,5 @@
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
 AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6bed7cf08cb57b742e71cba7adc7440c8564f6db208f6ef09ab4fe50a4381fb8988b4fed815d71cf3 SHA512 fc49ba42cc2b538fdbbd93f7422359d1410b4124e11afca7db0511da980360be14cf49aee829ed1f5762ad4723c68090088638c36d76b040fcafda063394adf2
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
-EBUILD munge-0.5.13-r1.ebuild 1412 BLAKE2B 3eeb41d2f701132567f85d5298eded7f12af5ca3fdf5dbeffd19a293a72c3aa7ad06cdc1340006e78941693b35d8d178b28bb0f0d0e4aca57efb410809b77b4b SHA512 f8386180880442e6f2dd547258f6630496039e9ae3867afea8caa7c0b6af068b24fee9ab5c62e0d4186b653cf210231073f2f5221d0959f7a94a90c80aab62cb
+EBUILD munge-0.5.13-r2.ebuild 1440 BLAKE2B 4d596d53723565d9fa0a00488ab62e0728f3dac134d4d1cf0a99ca8bd5fbdfe45e6a166034517e93fad6af43383b04183379436fa7b66cd27befaf9003e25e22 SHA512 49527c37a4142d7b85b8463952fe56ef366f5b8b2ceb26ca89463dfee33226c0ea13883dcc601bc3f8d2e8c916bc9940f0966a425363c2700cd40b53574db358
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
deleted file mode 100644
index 0376f12d7bc8..000000000000
--- a/sys-auth/munge/munge-0.5.13-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user prefix
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://github.com/dun/munge"
-SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug gcrypt static-libs"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_prepare() {
-	default
-
-	hprefixify config/x_ac_path_openssl.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	local d
-
-	default
-
-	# 450830
-	if [ -d "${ED}"/var/run ]; then
-		rm -rf "${ED}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	for d in "init.d" "default" "sysconfig"; do
-		if [ -d "${ED}"/etc/${d} ]; then
-			rm -r "${ED}"/etc/${d} || die
-		fi
-	done
-
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-auth/munge/munge-0.5.13-r2.ebuild b/sys-auth/munge/munge-0.5.13-r2.ebuild
new file mode 100644
index 000000000000..b10bf0e81697
--- /dev/null
+++ b/sys-auth/munge/munge-0.5.13-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix
+
+DESCRIPTION="An authentication service for creating and validating credentials"
+HOMEPAGE="https://github.com/dun/munge"
+SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="debug gcrypt static-libs"
+
+DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	!gcrypt? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/munge
+	acct-user/munge
+"
+
+src_prepare() {
+	default
+
+	hprefixify config/x_ac_path_openssl.m4
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--with-crypto-lib=$(usex gcrypt libgcrypt openssl)
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local d
+
+	default
+
+	# Bug 450830
+	if [ -d "${ED}"/var/run ]; then
+		rm -rf "${ED}"/var/run || die
+	fi
+
+	dodir /etc/munge
+	keepdir /var/{lib,log}/munge
+
+	for d in "init.d" "default" "sysconfig"; do
+		if [ -d "${ED}"/etc/${d} ]; then
+			rm -r "${ED}"/etc/${d} || die
+		fi
+	done
+
+	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
+	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 406ae57ae75d..5f86209f5a84 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -2,6 +2,6 @@ AUX mdns.allow 29 BLAKE2B 9227054a8809f3fdb2f08cf317bc72d8ba44e860cacdf781873799
 DIST nss-mdns-0.14.1.tar.gz 369978 BLAKE2B d1539ff5c1830a120d6ed4fafa36aa6effb9bb973b275317f5d8f4515aad7d2f69f095296a6b95ad8cc19d6eeb076b19b7987c5eabf29fd21f54cfe4a652ed3a SHA512 7c06b984443881a6c0a1f850ee33f14780562cc6168fe1cda176303eb799ece510d51d3830928616723bb95250ad6462978cd8b857f2b79d87116da2c1aeaa5e
 DIST nss-mdns-0.15.1.tar.gz 375154 BLAKE2B d848be9d957f81b62627b3c507e9c503fde4a760cec45b4bacb7fe826f5a16c1a0053ab43887daa7e6dc4cb5fd7332bbc30b18113ee1cf911ee15d6dfac97e52 SHA512 11a82ae9f209326b4501c7e6d33c9932b370c4dcacb64d6783140e25688ad6391bbd113e51ee470fd8be12669124eac331593cfd02a040383b4f964ed6ec6154
 EBUILD nss-mdns-0.14.1.ebuild 1697 BLAKE2B 09574d1809542b4fe22b5b31d9bc898653cbd723c0a5b09ba3fefdbc88a8ca6fbf213293f12bcb64f75809af9b16dbb6d71bac08ebfaab7abadf727b3e27105d SHA512 e7438a147a0672ad51de62c665200482e3bb1094288f1ca07dff7c292d2a3a517dddbfa58573deec6d00ec299a758b0a98115ae564494f943c72ca6643738482
-EBUILD nss-mdns-0.15.1.ebuild 1700 BLAKE2B 85643d6be3e723a7860d379e96d581d55a0c9148e19a7905d8e06a378135b72963402e1e875857cb5c70b14ece2be419c5051c62d25173329ed99f73e67d82cb SHA512 89a165ae10e825792d162563f8934a87579f8184007e56fd8c4d7773f742171741aaf96716bec7d8e27ddaf80891a8f987e4766a218749b1d3ff6fe3bf00ca81
+EBUILD nss-mdns-0.15.1.ebuild 1714 BLAKE2B 444b9924687dc6b8f35ec1da7bfb1fd38b35cdae16a95f74900e6a3b289e653d3349023613490dde7875949175bcf599d48fbaa6a1f4e62af5faccfd1e1127f0 SHA512 c3c9422ee04a5f0b63b2aeb6f04751bac44b26b46f03e4e43eeb7688497b2217538867f7fac3614278445e9d62a5408436323a2961876617ef853b1284914a82
 EBUILD nss-mdns-9999.ebuild 1706 BLAKE2B 1e2456a7c419cf5fc56548cc392b0d76bd15d69f3a409b29f57fef807a66a8a84c05cf5656bfddd188367ab8a0aa434bc911a9f7c787cbc387af1a39d8b48cd9 SHA512 ddcae51a8d0b00b0afeb54a4aa149ee5d5d7c8ae8df96eb5b1cb69abf0803a2c91ee8ddc341b30ed6d521a732461926dfa20015d36b5dd3ff14b60628dc3f662
 MISC metadata.xml 406 BLAKE2B a4ac86367cbd790b82fb219d1eacebc407bac3f008398749fb2a50d154505fe4d1c5e1e7655ee65281a71ee465560a56687321e6b3f2f5338356fbaa06b518a4 SHA512 db8510c4f8833c94977d7aad5a0c7b768b3ff7d3c3fee8d54bd9a985050e18a7338e5d217333191989eeed71fab47aec1e0ff5e80697d9415542b2b9e4ef263d
diff --git a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
index 3f730ac134f6..a7ff1c627a8b 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.15.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/pam_krb5/Manifest b/sys-auth/pam_krb5/Manifest
index 78de24385bf7..aa85466d91fa 100644
--- a/sys-auth/pam_krb5/Manifest
+++ b/sys-auth/pam_krb5/Manifest
@@ -1,3 +1,3 @@
 DIST pam-krb5-4.9.tar.gz 630425 BLAKE2B dc4a539c25c72c50c07ca3359d1dcdcb58b36ec48fc8fa40600c2fece2de8f3cc6af583fce2640ef2d515c342487f9398ed9153abb734ee2dd73b3d440bd00ab SHA512 0e93fbfacf56f9935902ead000dc46732c8a11cc2689c00b68cbaaf6519108a4ce53bb943479d01e439fb92bcc5c1a219d2b816a5ade2af54ea093bb78907201
-EBUILD pam_krb5-4.9.ebuild 752 BLAKE2B dc9162d27b414e3e31912144e2b8262294566ac636e3b37bb72d75f667c6c3802ade2b3867785d6eff40f9dfe90a40979d37dc6c140ad2d312d1d4117c9415bc SHA512 bd6184a5c926920a9a9b7fc0895a98278703c538330235dfa5a79275d8ee6f46c1b7c6a053a6f209eedecc09e2deb5facc7c5c52f91be0a6592201f71f4b8894
+EBUILD pam_krb5-4.9.ebuild 777 BLAKE2B a567bdc16a2d35eb4ca4a31e480d8f30ad51a28663ebaa0d4657796da3c02010206efaa757abfbffc05877cd2fca80002347ae833374a879c3ffd8dc28df2e20 SHA512 4249514e4ca4b95919e320c9ef758600877f18f5867dad5dfa9bc16b225232fd1e5b63f26ffd507c07a5dbbdce2011a52b698852de829011c33a307c086968ab
 MISC metadata.xml 358 BLAKE2B d634470f3a6ab1819bf5eac303d32581e6fe51a34f5b654957f9e903091c680c79786cf715de714b05409fa05502539fa7a689ed57931fa7107362a044c1d5a0 SHA512 3676a9d08d94e26a9ad0a25271a1475107ea6277f75a7b7dc3d8f4955d4211c44e557aa1a5cc98d6bce3983b01a80bd033832e13c7ad405bc1a3e436f69df43c
diff --git a/sys-auth/pam_krb5/pam_krb5-4.9.ebuild b/sys-auth/pam_krb5/pam_krb5-4.9.ebuild
index dcf926d45e69..15056eb4fa08 100644
--- a/sys-auth/pam_krb5/pam_krb5-4.9.ebuild
+++ b/sys-auth/pam_krb5/pam_krb5-4.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
@@ -11,13 +11,13 @@ SRC_URI="https://archives.eyrie.org/software/kerberos/pam-krb5-${PV}.tar.gz"
 
 LICENSE="|| ( BSD-2 GPL-2 )"
 SLOT="0"
-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"
 IUSE=""
 # tests fail without a /etc/krb5.conf
 RESTRICT="test"
 
-DEPEND="
-	virtual/krb5
+DEPEND="virtual/krb5
+	virtual/libcrypt:=
 	sys-libs/pam"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_mktemp/Manifest b/sys-auth/pam_mktemp/Manifest
index 1d3f0f5025ea..29e98268825c 100644
--- a/sys-auth/pam_mktemp/Manifest
+++ b/sys-auth/pam_mktemp/Manifest
@@ -1,4 +1,4 @@
 AUX pam_mktemp-1.1.1-e2fsprogs-libs.patch 1608 BLAKE2B a55016e42884ac7462579021d164ed196ae1f31e60886037e181c90733bfd1a6ff15a3432ffe61447a9cfd41c6231d94955819cee6cfe32e180c1004d83443c7 SHA512 92b1dbd350ccb4c0d96d3ac4aabf07a72d4d8088a8e0fab89005a500020407a64b76a2f501d59748f9a61afa96bc04e959bb29759a0aa912970d94132be0ce34
 DIST pam_mktemp-1.1.1.tar.gz 6754 BLAKE2B 5fc3cdf56c7bca9d46c339cc14eb13c74eb590ff4e19824dd2b6e313c2825ae18248873f0aca19a1c7ca8a4dfa5d6944ca9d07ea8355a4c0f7b57567a79b0e3c SHA512 e2e42115a1fe70c128397d842dc69f96863d721dfa886ebc21b5e8249333adc671d74213ecf1222d65417cd4747eb6114f515271fd7eac4376a2b7e28925996d
-EBUILD pam_mktemp-1.1.1.ebuild 1051 BLAKE2B a8d13e9eecae3a7b3e66b73f78aa1b66018288a7d2665d00846ecbb488933a89ead06ce948b35e4d8e71fb219e856fd6c42523afb2e02e22394b8be3e8f61cca SHA512 14ceb7da2b17d25d48cd92ad312a41a3c622ab544b47f0850fb04c0e6398000e37ea459bf4eda1ed5acaedc01c481a880138a861a954485384f588ccdfa8fa52
+EBUILD pam_mktemp-1.1.1.ebuild 1058 BLAKE2B 92ecd523e6c295c07a371c2f9f6ae4c25187fe4b6fe58025ac7e82c6595108e0c99834a0bbf36a4c81f2fb3e714953fab1cbd8c5b4b3c1146bdb8e8b9c18d050 SHA512 f41d1666aaf4988cfa327f323cb894a4b1438dbf9ef8f68908449e99beef3720b66c8f938e508b9d9b1df416535e850cbc081e6c5f47359f72cb665ee2e4070c
 MISC metadata.xml 366 BLAKE2B d3327e5be24ffe6ad99db5c12da945dbb6bb80aed57c47089fd6b538acc1c6415b8f213c8aa08d67627d31e8f5310d870a2ec5939db8920831056ddae4b3db13 SHA512 89eb18a095c66d81e1f27db737eccded4f20bec8c4aa9a38e8198054c0e01b545f432e460f88114a7606f8fb03ba3fc0f4ec9c5de82f5700a36a9a30560b4395
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index a0e3397d02c6..cb86501f1d1c 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 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="selinux +prevent-removal"
 
 RDEPEND="sys-libs/pam
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 2a61856f1838..b944b43dbd4c 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,5 +1,5 @@
 AUX seatd.initd 87 BLAKE2B e88a8c353191ad9b69c0ee263aee7a050333d43e8dd26c8b3ee40cfbcb17f9b7a9391720ac34d19f375a880fae8178cd7dfc0b45cc9565b4b073bbe43cadf5ce SHA512 a19171b55e6650a9237f89258d92aba18508684412fe8a072387c505945b8e54557bd52261de76230553a572d627f40e00770087040111a7473fadfe3c33c931
 DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a363960bac6c5aa7dac5355bdbd982232efd2f8078ad326ec0e6257f3ee7643384c88a3bbe15255d65f02540c SHA512 a6b1f11313411fe99e8bdd64aa493fc19bde7b0b927f21e2c3ec8a7fadc6cf2f04fcefa73fa033d971d1dc482665d3dc927ec168026289fe88b2593a45adbc0f
-EBUILD seatd-0.5.0.ebuild 1042 BLAKE2B a446d0fbfe79100e7496952993fc951c60cbd830f7b9080433a8fbb1fe15d101879ef4e5de1730ee6acd3642d00c7ce0655a5f7f04bac01a0b8e78a6b3b5bef4 SHA512 37030a1212041d703ca4af341ca6751c01cc3a9c6022cb8cc21a24c41eefad54fdede86ba59d43bdc6a32426a795dc05a8fda224e2d06d99fca7e497ded0eb88
+EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
 EBUILD seatd-9999.ebuild 1040 BLAKE2B 90669d39f22d7d125b293d23ad3187c9d019debb45d80ff79895243b91dafe0a8e994ab16b2932178a5bd6a6c1a582f1a7833c3c1425309f27c0b1b21134b50f SHA512 eaefd1ed17c983f46e462e3a3db3dc4991446dc48a799498767df562eea2199d62432e5b235c4406501791d4b87ddc1d407d2de9670026a3cd953cf851cdf859
 MISC metadata.xml 401 BLAKE2B 5d18c166454284e17627d57cef82c4be2baf41ce3de777a0388a83c5d93f23aebba8cbb4a309ee2d56bb40ce1081111e08c5a6573ba73778f1b8d7d93c890c9f SHA512 abcfb783a786d09ea6b52b6252cb4314273be58989c4e0938b2f99ad61b8d85914d86422964cefef574c68eda0698d725a811d73dea1c6ed18f7bec603df02d9
diff --git a/sys-auth/seatd/seatd-0.5.0.ebuild b/sys-auth/seatd/seatd-0.5.0.ebuild
index 8f8c121fdb7f..c5affa2fcc9a 100644
--- a/sys-auth/seatd/seatd-0.5.0.ebuild
+++ b/sys-auth/seatd/seatd-0.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index b993952010db..c28338d798ac 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,9 +1,9 @@
 AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
 DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
-DIST sssd-2.5.0.tar.gz 7474851 BLAKE2B 835ca53a7910f457666a92be62fe047dbcf52c56560dad60d6c6275dccca917b4349d053586c8c88da49f900d570c890faa7372783be35940ccd49d1fd4ec09d SHA512 80b5e81cedacdf0bbe724af20d69b918bb6cc353976c6c65421afcd5809d1723f523bc3c1be294b9e01cfda9617c2df5c6ceb007837f195eb1abc2abdab9858c
 DIST sssd-2.5.1.tar.gz 7492275 BLAKE2B 9f19d12cb0e071b15bd8fe2660ab9a2223d53267549602c4837f35ed852fa60022514a0bbd03c684c1f398d763120c5f706999d86432d9fe03c3715cb0d43000 SHA512 7441df3b5f1cc1eadb0c6853b048d780ecb36761876aaeb26b9a2d87729211d3ceeae01085dc3ec4fd1c5328f951c8abe854b1d01d91fae25466f930fe16e44a
+DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48
 EBUILD sssd-2.3.1-r2.ebuild 7563 BLAKE2B b7dd8d9487bf8081aff7a20866e63ea37f97c12f4c6075af8080cf120d060c3075d9f0fa87234f5db6d9aa74ab58d0d53b21f059133975a819ee1b963d7e888a SHA512 3980637d2480a2247b897c0412a18c53536481eaf624089f5d697353688b13181d3928e8d665829f411d7bcf3e7da95b51a6407072a5c9548c7f66b47e92b30c
-EBUILD sssd-2.5.0.ebuild 7712 BLAKE2B 4a24c8e318bf59b39b32e748ef3b9883d04f948ce728939a6be93d0aa24bcd5d79de7eefb377bbcab2fa08900650549c4b31101e40b5da6c96ed617b9dba4d52 SHA512 c8be74be419ee65473cb415f2b0b642c9f1b1ecdf523ddd587d36c77abfb5a49633476d0f3cd9813e7fd44abc5d6bb4d7b1456a74c324ebdd1cbd84782f7f79a
 EBUILD sssd-2.5.1.ebuild 7673 BLAKE2B 092df102af81094e598184c006d2669745fea384308dfc7655b35e84fd80dc56c5c9e587b9217b9ef822ad0893d0967827257f693ea5fb116b3ae9b4e7ad1b1f SHA512 85a3c54b36d15c0c4f9641c03b7893ca8994cb0f8218eb8039947dd500227640bc56bd6056cf94a60670b42c1b2d25d015383e5f0c47e95ccb33548550dec490
+EBUILD sssd-2.5.2.ebuild 7673 BLAKE2B 092df102af81094e598184c006d2669745fea384308dfc7655b35e84fd80dc56c5c9e587b9217b9ef822ad0893d0967827257f693ea5fb116b3ae9b4e7ad1b1f SHA512 85a3c54b36d15c0c4f9641c03b7893ca8994cb0f8218eb8039947dd500227640bc56bd6056cf94a60670b42c1b2d25d015383e5f0c47e95ccb33548550dec490
 MISC metadata.xml 1181 BLAKE2B 169890eab8d708cc561792859dd065849c6c1b5ea4b338133a9850979032ebfe292d200c0437bbded1369cebef60c3acb9e4c6a3af4384700bd703a90ecd67ac SHA512 b4fc2aefde3549d763dcd806a1314f8bb09d2b8a18652d6e5d4e6c6e61e345c3e05fc161adef31e93c99344b6a7e129fa10e6ed0c34445c0c6149c2fe9da23a9
diff --git a/sys-auth/sssd/sssd-2.5.0.ebuild b/sys-auth/sssd/sssd-2.5.0.ebuild
deleted file mode 100644
index f3bfe43fa440..000000000000
--- a/sys-auth/sssd/sssd-2.5.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://github.com/SSSD/sssd"
-SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="pac? ( samba )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( sudo )
-	valgrind? ( test )"
-
-DEPEND="
-	>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
-	app-crypt/p11-kit
-	>=dev-libs/ding-libs-0.2
-	dev-libs/glib:2
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=dev-libs/libpcre-8.30:=
-	>=dev-libs/popt-1.16
-	>=dev-libs/openssl-1.0.2:0=
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=net-dns/c-ares-1.7.4
-	>=net-nds/openldap-2.4.30[sasl]
-	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	virtual/libintl
-	locator? (
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	acl? ( net-fs/cifs-utils[acl] )
-	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
-	nls? ( >=sys-devel/gettext-0.18 )
-	pac? (
-		net-fs/samba
-	)
-	python? ( ${PYTHON_DEPS} )
-	samba? ( >=net-fs/samba-4.10.2[winbind] )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	systemd? (
-		dev-libs/jansson:0=
-		net-libs/http-parser:0=
-		net-misc/curl:0=
-	)
-	systemtap? ( dev-util/systemtap )"
-RDEPEND="${DEPEND}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
-BDEPEND=">=sys-devel/autoconf-2.69-r5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/check
-		dev-libs/softhsm:2
-		dev-util/cmocka
-		net-libs/gnutls[pkcs11,tools]
-		sys-libs/libfaketime
-		sys-libs/nss_wrapper
-		sys-libs/pam_wrapper
-		sys-libs/uid_wrapper
-		valgrind? ( dev-util/valgrind )
-	)
-	man? (
-		app-text/docbook-xml-dtd:4.4
-		>=dev-libs/libxslt-1.1.26
-		nls? ( app-text/po4a )
-	)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/var/run:/run:' \
-		"${S}"/src/examples/logrotate \
-		|| die
-
-	# disable flaky test, see https://github.com/SSSD/sssd/issues/5631
-	sed -i \
-		-e '/^\s*pam-srv-tests[ \\]*$/d' \
-		"${S}"/Makefile.am \
-		|| die
-
-	eautoreconf
-
-	multilib_copy_sources
-
-	if use python && multilib_is_native_abi; then
-		python_setup
-	fi
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		--with-pid-path="${EPREFIX}"/run
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-db-path="${EPREFIX}"/var/lib/sss/db
-		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
-		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
-		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
-		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
-		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
-		--with-log-path="${EPREFIX}"/var/log/sssd
-		--with-os=gentoo
-		--with-nscd="${EPREFIX}"/usr/sbin/nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-static
-		--sbindir=/usr/sbin
-		--enable-local-provider
-		$(multilib_native_use_with systemd kcm)
-		$(multilib_native_use_with systemd secrets)
-		$(use_with samba)
-		--with-smb-idmap-interface-version=6
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(use_enable pac pac-responder)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls)
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with man manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_with autofs)
-		$(multilib_native_with ssh)
-		$(use_enable systemtap)
-		$(use_enable valgrind)
-		--without-python2-bindings
-		$(multilib_native_use_with python python3-bindings)
-	)
-
-	# Annoyingly configure requires that you pick systemd XOR sysv
-	if use systemd; then
-		myconf+=(
-			--with-initscript="systemd"
-			--with-systemdunitdir=$(systemd_get_systemunitdir)
-		)
-	else
-		myconf+=(--with-initscript="sysv")
-	fi
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
-			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-secrets
-			--without-kcm
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-		use doc && emake docs
-		if use man || use nls; then
-			emake update-po
-		fi
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-		use pac && emake sssd_pac_plugin.la
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		local -x CK_TIMEOUT_MULTIPLIER=10
-		emake check VERBOSE=yes
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-		if use python; then
-			python_optimize
-			python_fix_shebang "${ED}"
-		fi
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-
-		if use pac; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
-			doexe .libs/sssd_pac_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	# strip empty dirs
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
-		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
-	fi
-
-	rm -r "${ED}"/run || die
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
-}
diff --git a/sys-auth/sssd/sssd-2.5.2.ebuild b/sys-auth/sssd/sssd-2.5.2.ebuild
new file mode 100644
index 000000000000..3c3af9abb66e
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.5.2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://github.com/SSSD/sssd"
+SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	pac? ( samba )
+	test? ( sudo )
+	valgrind? ( test )"
+
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/check
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/pam_wrapper
+		sys-libs/uid_wrapper
+		valgrind? ( dev-util/valgrind )
+	)
+	man? (
+		app-text/docbook-xml-dtd:4.4
+		>=dev-libs/libxslt-1.1.26
+		nls? ( app-text/po4a )
+	)"
+
+DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
+	app-crypt/p11-kit
+	>=dev-libs/ding-libs-0.2
+	dev-libs/glib:2
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=dev-libs/libpcre-8.30:=
+	>=dev-libs/popt-1.16
+	>=dev-libs/openssl-1.0.2:0=
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=net-dns/c-ares-1.7.4
+	>=net-nds/openldap-2.4.30[sasl]
+	>=sys-apps/dbus-1.6
+	>=sys-apps/keyutils-1.5:=
+	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	virtual/libintl
+	locator? (
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	acl? ( net-fs/cifs-utils[acl] )
+	netlink? ( dev-libs/libnl:3 )
+	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nls? ( >=sys-devel/gettext-0.18 )
+	pac? (
+		net-fs/samba
+	)
+	python? ( ${PYTHON_DEPS} )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	systemd? (
+		dev-libs/jansson:0=
+		net-libs/http-parser:0=
+		net-misc/curl:0=
+	)
+	systemtap? ( dev-util/systemtap )"
+RDEPEND="${DEPEND}
+	>=sys-libs/glibc-2.17[nscd]
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/var/run:/run:' \
+		"${S}"/src/examples/logrotate \
+		|| die
+
+	# disable flaky test, see https://github.com/SSSD/sssd/issues/5631
+	sed -i \
+		-e '/^\s*pam-srv-tests[ \\]*$/d' \
+		"${S}"/Makefile.am \
+		|| die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		--with-pid-path="${EPREFIX}"/run
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-db-path="${EPREFIX}"/var/lib/sss/db
+		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
+		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
+		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
+		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
+		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
+		--with-log-path="${EPREFIX}"/var/log/sssd
+		--with-os=gentoo
+		--with-nscd="${EPREFIX}"/usr/sbin/nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--disable-static
+		--sbindir=/usr/sbin
+		--enable-local-provider
+		$(multilib_native_use_with systemd kcm)
+		$(multilib_native_use_with systemd secrets)
+		$(use_with samba)
+		--with-smb-idmap-interface-version=6
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable pac pac-responder)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls)
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with man manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_with autofs)
+		$(multilib_native_with ssh)
+		$(use_enable systemtap)
+		$(use_enable valgrind)
+		--without-python2-bindings
+		$(multilib_native_use_with python python3-bindings)
+	)
+
+	# Annoyingly configure requires that you pick systemd XOR sysv
+	if use systemd; then
+		myconf+=(
+			--with-initscript="systemd"
+			--with-systemdunitdir=$(systemd_get_systemunitdir)
+		)
+	else
+		myconf+=(--with-initscript="sysv")
+	fi
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
+			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-kcm
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+		use doc && emake docs
+		if use man || use nls; then
+			emake update-po
+		fi
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+		use pac && emake sssd_pac_plugin.la
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		local -x CK_TIMEOUT_MULTIPLIER=10
+		emake check VERBOSE=yes
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+		if use python; then
+			python_optimize
+			python_fix_shebang "${ED}"
+		fi
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+
+		if use pac; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
+			doexe .libs/sssd_pac_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	# strip empty dirs
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
+		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
+	fi
+
+	rm -r "${ED}"/run || die
+}
+
+pkg_postinst() {
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 2066669fcef6..e0e768a16e30 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/buffer/Manifest b/sys-block/buffer/Manifest
index 1423d425998c..00b263177b98 100644
--- a/sys-block/buffer/Manifest
+++ b/sys-block/buffer/Manifest
@@ -1,4 +1,7 @@
 AUX 1.19-deb-gentoo.patch 8422 BLAKE2B d1c1628ae74f2454e17d176602610dd5356365e18e260f5ca32f26d8a19dd857be144c4116de244b5c143c61c4176582d4e3713c8c584a3a17b4d3ad1c1320ac SHA512 791d7990f900d70a229d77ea0eda67c99ea81697ca65f83bceea1131d0d5da94484c796ad601d8031da72fe24b2add6b0e4e86956c0ddb2fbe76cee6574ccb34
 DIST buffer-1.19.tgz 34960 BLAKE2B ce572e860e1315cf4d5b5f6de43906fbddada2d96c7d99e5930244ff2bc757327a867d7e67973f13616153c46d12bbdb093ed666b5e3fd73b8a0d4f8385b59b3 SHA512 9321f6e399cb3e58f3ffebb031b4d2b2fdda26149fb142515961a09b81b47c1bce01dd770da579bf49c3e71f8cee29c5dc2cc4063e67494e98a599f29076cc5c
+DIST buffer_1.19-12.debian.tar.xz 9924 BLAKE2B 9f6591e00d596257956e3230cbdf8e58392aa3666d7900c30ea26d103f03d25071ff1033fa72e7be799021ed4c32d43e0e5ad69d1457a5ee22c33e3ae6f8c058 SHA512 3bc9d8c281268d38c1cc3ac40727d747c91b605fc3128e285d24663f97396292a0ec40ede9205702793b5d090c4e172b0df28321921b000aa0fdcb2660319367
+DIST buffer_1.19.orig.tar.gz 17753 BLAKE2B 68e2026f29cb00c48c8f3638d97adeeee0d194d7a6db96cbded251b3f97d36ba2ac32a60660df8aa1d2c7b79dd774b543d3a460a5d76ab6ca408606a013b5648 SHA512 b724d8c3e21f29890659c95a61db8667846e49614455411995160bc8d5af8a37af91465ad5d882e6bd7883dbd7886215a8c1d530f7392c98cdcead4f4377aa7f
 EBUILD buffer-1.19-r3.ebuild 668 BLAKE2B 712eb3b2872cb66894ece916573b443f6d4f70f932fd3b79659354f10635de6eeeafcb36d78aa989288a7f90d7e58d53bdd1f797c89a286a33e35395f6993765 SHA512 18977f06f1a74d675e527fa03f6c09b1d01b0b59d456c566b724fa1f880627188e2fe5d359a12c9c8540f0b70f4fde7402da315aa757cdefb96c846f2514944b
+EBUILD buffer-1.19-r4.ebuild 1213 BLAKE2B d4f88f4803a1566121ab47afb125d2daea7f4acb36b0188959fcaeaf0a0e210f709f228af2a4d0a18078f505bd12ace07d1386209849edee69de7dab9cd0c657 SHA512 dffba76eaa5e075a70d33d807d8b1610a3dcb8a1a172ebf3dd4633ece52434e92ef43afe1b2a3048fa91d92939723026a6a22192eb05a6ebc259255e35260f92
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/buffer/buffer-1.19-r4.ebuild b/sys-block/buffer/buffer-1.19-r4.ebuild
new file mode 100644
index 000000000000..b933ee375e56
--- /dev/null
+++ b/sys-block/buffer/buffer-1.19-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="a tapedrive tool for speeding up reading from and writing to tape"
+HOMEPAGE="http://www.microwerks.net/~hugo/"
+
+DEBIAN_PR=12
+DEBIAN_P="${PN}_${PV}"
+DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PR}.debian.tar.xz"
+# We do NOT rename the Debian .orig.tar.gz file at this point
+# Because Gentoo shipped a very slightly DIFFERENT buffer-1.19.tgz than Debian!
+# Enough to make the debian patchset not apply directly. Debian patchset
+# contains the same changes plus more fixes.
+SRC_URI="
+	mirror://debian/pool/main/b/${PN}/${DEBIAN_P}.orig.tar.gz
+	mirror://debian/pool/main/b/${PN}/${DEBIAN_PATCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	for f in $(<"${WORKDIR}"/debian/patches/series) ; do
+		p="${WORKDIR}"/debian/patches/${f}.patch
+		ln -sf "${f}" "${p}" || die
+		einfo $p
+		eapply -p1 "${p}" || die
+	done
+	cd "${S}"
+	emake clean
+	eapply_user
+}
+
+src_compile() {
+	append-lfs-flags
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin buffer
+	dodoc README
+	newman buffer.man buffer.1
+}
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index d35609e1df32..c3e0e1bc3af4 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1,5 @@
 DIST gparted-1.3.0.tar.gz 4167440 BLAKE2B 87af5285a54af2ceb75eb6580b6492f7bcf6d8d2a9b4d614761b60c2b1776b2a8e14064ed5a77091074c5c5ff87169f3525fec2f37a280d35289677aaf75eba5 SHA512 8349ebdf2312e32df9f40d24aa42a4604897ebae72e58fd1046ab0897b3380a762b49f74bdcf3bd570b4e7a3468b6f225c22290c6b1b799911da17408912288b
+DIST gparted-1.3.1.tar.gz 4169647 BLAKE2B 0e79ea51df79460ae70e15a0f4d5bb1158dd808b52224bdf78f153bada278e6a8cb1606aa99e564016db0b4755e4063e0db151628d8d03904626e9f5648d61a1 SHA512 2dd2b1eae72f627d8f302d34286e684c6b884faf0246f1f534795213d243a9416ff2a7ead48f44958de1ce00248550336176c0df2469ede825b22ed1b5915c76
 EBUILD gparted-1.3.0.ebuild 2669 BLAKE2B d18dda2669d388b281c4a6f97af1bdf6d363e24963762e9b7bddb2aa90203238d6322a16c2ecbfcd7930e03d128ca39e4d621a5adba404810c1c2c9de46cd5dc SHA512 3780a7fd984016f9285668ce474b367c901e9f9d6308a3ad66a0061cf39a9281eb56d6fd518f26623ebc1f71f9de51f4ef31f91f5b49d2dcbef28216177178ff
+EBUILD gparted-1.3.1.ebuild 2753 BLAKE2B aeea85e9b023b07cc5b56b13ec2ef9a06caa1c1cae1fd30585ef5162bf3143d09590e78251634333b954a85b09b0c2d1a945a9ab618cda48af4d2f4f64f0805f SHA512 104e3f32a176e097f074945b633b3da004245000be7fac60183bcf942ab3c3aa670eb02b591ef366a7b7c11a52210cc8bfca419aeb6d2f18c0c6aff95ae5c720
 MISC metadata.xml 914 BLAKE2B 2b13b160df0e1de5c1466716012819cef64a008b714ecc40856b12b6a81e8d8e4291f1903300eaad015726fcf5c7cca155dfd56e0464a95ed4912a7b715ae6c2 SHA512 87f7a5223c17cf3bfeff25ef25f4f0970140cad4c37b24154ac24afae9430bcd33ef8adc48777dfeb38cd8b24c94f936ee992fc8f63e6a6220db5fdf073614b4
diff --git a/sys-block/gparted/gparted-1.3.1.ebuild b/sys-block/gparted/gparted-1.3.1.ebuild
new file mode 100644
index 000000000000..919eed8b3de0
--- /dev/null
+++ b/sys-block/gparted/gparted-1.3.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 optfeature virtualx
+
+DESCRIPTION="Partition editor for graphically managing your disk partitions"
+HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="kde policykit wayland"
+
+DEPEND="
+	!policykit? (
+		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	>=dev-cpp/glibmm-2.56.1:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.58.3-r1:2
+	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.10.1:2
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/util-linux-2.33.2
+	wayland? ( x11-apps/xhost )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.51.0-r2
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
+
+	if ! use policykit; then
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
+		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
+	fi
+
+	mv "${ED}"/usr/share/{appdata,metainfo}
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	optfeature_header
+	optfeature "BTRFS support"                   sys-fs/btrfs-progs
+	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
+	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
+	optfeature "exFAT support"                   sys-fs/exfatprogs
+	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
+	optfeature "F2FS support"                    sys-fs/f2fs-tools
+	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
+	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
+	optfeature "JFS support"                     sys-fs/jfsutils
+	optfeature "MDADM support"                   sys-fs/mdadm
+	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
+	optfeature "Reiser4 support"                 sys-fs/reiser4progs
+	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
+	optfeature "UDF support"                     sys-fs/udftools
+	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
+}
diff --git a/sys-block/libzbd/Manifest b/sys-block/libzbd/Manifest
index 39ace6da2cc4..88013f274f93 100644
--- a/sys-block/libzbd/Manifest
+++ b/sys-block/libzbd/Manifest
@@ -1,3 +1,3 @@
 DIST libzbd-1.2.0.tar.gz 56107 BLAKE2B 0b20ced5cb0abc6ac5d303a1b583b1a8c0b3c89936cf664dd227832d5a704f6665a82e0d1c7cf80c381400b4edcff6c9e0b192c10deaf00c89009b40edde8676 SHA512 d165640331c7a87c4660f3f707c0510fa7a21edd194e66e96abe6ad3698dc4652a6a673ac8ac1929b0f603df49c1621f398cfb81b7ab8f9dba6353fa9f05d94f
-EBUILD libzbd-1.2.0-r1.ebuild 966 BLAKE2B 8d5023c0af0e8ec151b41a648847c94800ef639cf46e7dd21cc5aa1692fc698a913a977773a02d26f5699c111cfa7c2fb66851545f40faec83e2900021b0ff22 SHA512 93c953a0507d5a38ea2479761e3c89b8875c6c529495acc2a6d977d50294bf2dd2c1a32aac19b59009a923b5dd1115ae7ebf0e526020fdae8b4bc80f14a7edaf
+EBUILD libzbd-1.2.0-r1.ebuild 965 BLAKE2B 809374e2b2c47de46351dc03cbe6acd34e806f90eb4bfa41e76f26869949f29703b6e7c218ce560cea1a3dbc975af85c7384c4952b62b8b52a3972d7fee3c37f SHA512 2162fa6c3ec233571549683b074ff09e0726fe9c210f51010f24c7c3fbea58acf687e95405202e5f0a5ad394a9d85e47abc5e05519617c19885283b394de7d9b
 MISC metadata.xml 360 BLAKE2B a4923a3ae6bd9db591be3a443a7acb0e3a7d1142f72c9f0e38fffa3aa01749058f68d540eb68df67e8368e2981e18b02ea1d3bb4e314afb152ef1c83dbe93cf2 SHA512 270e3d73adc2c49d2d96f4be69a90acc71087113958174acc4ca9b7dd5593765b0bfc593a3ead251a85e5dd25784f19822aa0c8d133c3429d3168b723a1ab7b2
diff --git a/sys-block/libzbd/libzbd-1.2.0-r1.ebuild b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
index ca893c6e8be5..a4d306774d1c 100644
--- a/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
+++ b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/westerndigitalcorporation/${PN}/archive/v${PV}.tar.g
 # Examples/tools are GPL-3+, library is LGPL-3+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 # PKG_CHECK_MODULES is only for GTK right now
diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index 3911cd3f4d0c..397e30a6cbc0 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,3 +1,3 @@
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
-EBUILD ndctl-71.1-r1.ebuild 1204 BLAKE2B d29233d2a53bba510d941469339cf7ccd8278357c4b0a2abb6791da0c499125d52ee08321300224a493bb2d74046dc65f22f4d08977d21cac1134424cd27714a SHA512 0484b3f1f1c69e677836913762b5deeb2698e2140053081988c0229856378b0d03fbfef66376a093dfcbd323057924c7323c2dd3b5c2a823156f6679ae46c9e4
+EBUILD ndctl-71.1-r1.ebuild 1203 BLAKE2B 8a5c0832c4ee85cb04f512e87dccd937c223870e1476ce1d080dc64184bd2681546795ad6d0b609510f4ffdc8e0987e148630afc170a0d68215ae73bdfaf1d93 SHA512 46b8429fa942fb278a72ffd6980932359acba2146e5ff72070e56c3240144e9a4535836902cf5eab4edbc47a61bfb4d434f31e6d30220f0166f62b61827a53ec
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/sys-block/ndctl/ndctl-71.1-r1.ebuild b/sys-block/ndctl/ndctl-71.1-r1.ebuild
index 1ba6ed6f2b16..4f2aa941c70a 100644
--- a/sys-block/ndctl/ndctl-71.1-r1.ebuild
+++ b/sys-block/ndctl/ndctl-71.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="bash-completion systemd test"
 
 DEPEND="
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index de36b230343a..64df1c49b016 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,3 +1,3 @@
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
-EBUILD seekwatcher-0.13.ebuild 779 BLAKE2B 53695e8c27b5eee561259a49e87056b664a6b01270e947a69c387131b696fd311fa44494c354f266613f5e991a396dacd173203bc375f1ef06235834210e5c59 SHA512 35068e58aec5545ea3acfbef9ad8050ae3a53f6ffddb27774242255037c931d0caf44357bf3236537bb84e0b47e36443a2101829ec5e1faa95c709cb94d50745
+EBUILD seekwatcher-0.13.ebuild 759 BLAKE2B e445dc4b51855d7a3931aca36beb75d7be927814879b661925f411a19924bc19194b72c6db3a19e7047b356f45efa4492778cb513e919a7e331957c2c649f5a7 SHA512 bbd28a0f93a42bcf6c4d3340837f29546186ea1a964a7dc08ebe79a886b2b2b0c4ea66ebafef8e7166167778d88e7705800dff48f14885c30de2b90a2a4d0e4a
 MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
diff --git a/sys-block/seekwatcher/seekwatcher-0.13.ebuild b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
index 933f9ad935e5..cd7db81f1af5 100644
--- a/sys-block/seekwatcher/seekwatcher-0.13.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
@@ -19,14 +19,14 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
 	')
 "
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 	')
 	sys-block/blktrace
 "
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index 17d8f35b1c3f..b81fd6cd9c6d 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,4 +1,4 @@
 DIST whdd-3.0.1.tar.gz 45671 BLAKE2B f16bcfc09356f43b5ae303e007cc3f0930316c67aa3c8622ffc7a3f6ee0f1c5339d7ff32e9b4707a42388fc955f70bf7d3ccc4bd36082d5592a5852d646832c7 SHA512 2cc207d5f0e5da1018ce4ec46f369cdd5c3ed2e55c063f583f8ca68f37949265d4ed8b6ea3ff9133a44cf254a95c3e819ba90f9d822aa3bc2f994cb16d0dc877
-EBUILD whdd-3.0.1.ebuild 636 BLAKE2B c11d7a6617e8cf207f5cb4b0a5026e21793ee4bea16af0f9a5f3994eed8caad9e9946420feade3c96edfc7cfeda4425b52e611c69aaf6c723144667702a6ed38 SHA512 5c5b9799d8ce65b92dddf747b04411c0fc4491f9778ba686060f7d3e274155f6f98f1a695095861d3ec28e5deb670fc8d013238835abe7f4b00061c4ed8f5b7f
-EBUILD whdd-9999.ebuild 638 BLAKE2B b5137c5d93a0a46da27775c23b64346d5b25f2b53314ba817f074028b847b90ae5a2aceb8efb53423472417562262cf6d128ec6323d697dc24bfbf579ff15b03 SHA512 4ed10befcbdf6292be4d9d4b9e42ebfaac029410b9706fb2f6d0d2fd21800fc1f60bff411cbf0e7beae72a3c37e97b3adc8df07fe25480e86a9fde17b293b80e
+EBUILD whdd-3.0.1-r1.ebuild 638 BLAKE2B 87887c8dcbaed76cf5047501f6ec4066ac3338b114a0328fc89c6b81ca74633a255112b34ab5e274b260d3b6110aacfec40258c3e443a700f26e74d419b03958 SHA512 6c19872765434979c4b4faa901cf0d6392dcbdc155873c432d02b6514a8cca90a5cbfdd8e9ebd05c880f0624dbf66558ad20c1139e6fa35115c82dbda6bf4031
+EBUILD whdd-9999.ebuild 640 BLAKE2B 06acec3ac035a1f173f7f433c8acfa4f80019909c18a58ef9e1e6779bd579926e89bc9e267bc4e155bc8ce3687fb06f1072bf65c6e42309cf05d97e0996077f7 SHA512 faa73e5e38d059f8d586e6f1bffcfee5b39e06fc26cea241ffc9dde2813491eae8341efa1c6d393fc6eb61c8f57eef88de321483a41a2becf3ef5e6b5f66ba33
 MISC metadata.xml 325 BLAKE2B 4a164b15722878b9245897bdee75a486272fce67b8b0a6fcac04ac4ad4933ab9bbeb05bd0bb5273d56fe75fe72d468b5efd76d5c4e9bce53920af87ae3a0cce4 SHA512 5c0da6b1d5e04ff3adfe9f1eb4af339f72045eb38a9993a7c6db5b8a9c302e7c7651a0e245f82912d8db2ec9e450bb55ffeab398559d8f66dd084b106d40bf1a
diff --git a/sys-block/whdd/whdd-3.0.1-r1.ebuild b/sys-block/whdd/whdd-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..f096397d84b6
--- /dev/null
+++ b/sys-block/whdd/whdd-3.0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Diagnostic and recovery tool for block devices"
+HOMEPAGE="https://whdd.github.io"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	inherit vcs-snapshot
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-util/dialog:=
+	sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}
+	sys-apps/smartmontools"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-block/whdd/whdd-3.0.1.ebuild b/sys-block/whdd/whdd-3.0.1.ebuild
deleted file mode 100644
index bfc5dada862e..000000000000
--- a/sys-block/whdd/whdd-3.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Diagnostic and recovery tool for block devices"
-HOMEPAGE="https://whdd.github.io"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	inherit vcs-snapshot
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/dialog:=
-	sys-libs/ncurses:0=[unicode]"
-RDEPEND="${DEPEND}
-	sys-apps/smartmontools"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-block/whdd/whdd-9999.ebuild b/sys-block/whdd/whdd-9999.ebuild
index 12d895e39ab9..3754a8962502 100644
--- a/sys-block/whdd/whdd-9999.ebuild
+++ b/sys-block/whdd/whdd-9999.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 
 DEPEND="
 	dev-util/dialog:=
-	sys-libs/ncurses:0=[unicode]"
+	sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}
 	sys-apps/smartmontools"
 
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 8a5aabd915a9..b9892d53113b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 443d9226102a..2629024db2b8 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -6,6 +6,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 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-r4.ebuild b/sys-boot/elilo/elilo-3.16-r4.ebuild
deleted file mode 100644
index 8a796f6bd916..000000000000
--- a/sys-boot/elilo/elilo-3.16-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-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/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 6365bd8f3773..b715b641df42 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +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
-EBUILD woeusb-5.1.2.ebuild 699 BLAKE2B 53a49822ed6b709665b30e012da3c08a1c9c67481caca1e223b81f618b4f559692bfeac7246104c92d06b28401584b4b413268d945a6b5f6687e1c7f445f223f SHA512 5869c9f80674c7d419276c6b7f4d032f486fba312626a7529a28cfc0da61d6f4297cfe97a81f8a4ac57f8dc17910aaafbfca190310b2b4898b63b22c366e0d58
-MISC metadata.xml 473 BLAKE2B c799db6c2eb4a7c3ce65860cb5deabdd9ce211015dbb22a6bc5ba641081cd08114b15f82beb095813673835aa7bbe79243cb054bca8439769a9f9630d59f6fba SHA512 b39ae796636cf8f7c368a74cc497ab9a1be27a3b94b50a391c6aa5c4b1a8ee8c726e6733c8745021e5d0305652182ebc25edfd2a2ce2593b561483f68f19b4f3
+EBUILD woeusb-5.1.2-r1.ebuild 748 BLAKE2B 1cea90984c3793b29f66ca62c8197dde0d6b929847ed1a6852e678fc4c25e414d18311299d94b2fba50126a5217cf470e13e6f0c7c2ea5bf101eecd633554f21 SHA512 458bea42c3e862d94e8d4fdd05cc7d83c13dc8f42f0e3b619b55c406b0fb6d08cee354e9fbf4a9bc770fc9fa96dcc0bae9dd8fc95049fe1b7f8e8294371d373d
+MISC metadata.xml 245 BLAKE2B bfd23a6ca9bbc58d5bcda7f3a62e7edb6b9f2faa37ea34a72a5044dcd5849cdda0d2d67a1bf52cbaab31092316177f241eed584ac711bc79e4f62b7cf463da3f SHA512 24267d023f9a39c29ca4c3db77b59f33f55b0ecc5730fd239c9f9f1da1576b7fe9c50939a72b516ad71d9945c515a5898555641f8a08254aea140343cb2c0e93
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 1974cac0c1ce..2e286e79255c 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
 	</upstream>
diff --git a/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..4f1d25c96d02
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+S="${WORKDIR}/WoeUSB-${PV}"
+
+LICENSE="CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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}"
+
+src_prepare() {
+	default
+
+	sed -i "s/@@WOEUSB_VERSION@@/${PV}/" sbin/${PN} share/man/man1/${PN}.1 || die
+}
+
+src_install() {
+	dosbin sbin/${PN}
+	doman share/man/man1/${PN}.1
+
+	einstalldocs
+}
diff --git a/sys-boot/woeusb/woeusb-5.1.2.ebuild b/sys-boot/woeusb/woeusb-5.1.2.ebuild
deleted file mode 100644
index 77f857db0839..000000000000
--- a/sys-boot/woeusb/woeusb-5.1.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=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 806aa22205fd..ad0a4c24b6fe 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 96941eb47f0a..4f324be36c9f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -57,6 +57,6 @@ EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718
 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.4-r2.ebuild 11990 BLAKE2B 396daa63143a2e70921039f3dff9af8107d9d708c1864994f64ea5b251924f72af92af2fb0e512d0d7b8545ab32c7b70078e2f076a7a4939999611316d55015e SHA512 44a6d31278d8885398af0bcafd36e16a0abd25dfc66d4242294ae84c3db631967bbc786cafaa54abeda5d981e8711453732e9ecc8332213cac224b357b8f7f17
 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.4-r2.ebuild b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
index 834efe8eb5e6..ab8e538d648c 100644
--- a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index b90cece11767..bd2537be43f4 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -2,7 +2,7 @@ AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114
 AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc
 DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
 DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2
-EBUILD charliecloud-0.23.ebuild 2161 BLAKE2B afb61b96bcc421d8b12e57b140847dafd6de6b7276bd73dd98847c469e584cc2905c6446b9ca72f6b800717b72ac29f7335ce98ac1c97919232525e7f409084e SHA512 66d8c7ef58d8d70a8336b055f1c0a1697d171262e406888172da39db988587e3ced07ebe9fc7cfa5863199badcff576fe1decdbc66c20868c5dc4179ce8a11a3
-EBUILD charliecloud-0.24.ebuild 2120 BLAKE2B 60548b6ea87b1fbcb8314eba4f01d3a9df7e79ea4efb62f57371d4dda459fd94fc8042c98a30c2dd60d4caa12a3699ec9d4713f0fb1fe2476e5c4df76274d427 SHA512 4a2f9fa0332f446a110adec9ad9c670ec0c980f1481809aa8301d8567c53a4c6034d6e8ec58566a04fc49fd12f0b25f0fa2010f14a7a3fe45e8a8ccdd47e4465
-EBUILD charliecloud-9999.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
+EBUILD charliecloud-0.23.ebuild 2135 BLAKE2B 10dc6c2b9868f78187aefe278d84cbb5d5a2c6cd3171d654a6492d43900819f3da6fc68ebdd5db5dc17659cae45b4043e81ab5c4c1a2d86754d656b0d20a4cf4 SHA512 2fa0001a06fb162d74f174ae3999facd2c596f86c61a71fc993500c82fb9b3e4cd5ae0bfbaed1783ebb1d43e50efb8af1c34bc5fdfb59769ea8bac8feaf11121
+EBUILD charliecloud-0.24.ebuild 2094 BLAKE2B b8cb9d6b8ae0572a4627df81862f306f5fdbe8ad78113138294d7d90ddf1caa76cedd8f08f0712b1eaf4bcf1e0afb2cf41dd0201b53f8684914e347c690f8f9c SHA512 c3fe87c6eb12e77f1ebddff61a3d0dec32cb79f0adb0148008b2b602ad8fd306bb1f200f771d4100672cabc58bf62bc08f9fff3ed541b31949d0b7db2bc92275
+EBUILD charliecloud-9999.ebuild 2044 BLAKE2B 2d16f1e2434e94fc78ae6bbd5e5b7775a0c74b901df37eefe4e2484d62242c779b0ac9f88fa059941e13541dd7b08af805424b3a3be0946b4b4a111aea096ca8 SHA512 b7a09c5842074a2cef33ae22d96410f8947011a8a4875cba6ca635f642b45804d9acdc68262ddc2ee7dcd4495fead73c30ebc03530fe03c8692876af7350c75f
 MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index 612b89ec6158..b514ad3c817a 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
index d7ab23b95398..969b56a74d47 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index ae43a8ed1073..20ef1b5db540 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 871ce96dc9de..c799d76d344e 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,4 +1,4 @@
 AUX charm-6.5.1-charmc-gentoo.patch 1305 BLAKE2B 21c85a455c6fbe0f0b745d6a3f9808a3d05f90a26cf0f0f9b66f8a12a34b53ffb9963512918c269506047675cbb24f7d1d2cb2ecaf986465b6c961a1df1c42a5 SHA512 994becbf0e40c0e181222a854df98e3c7b571b517a24a0548ad323ac116f146f11b7d2e6ec4f8289ffb5926dda57d92831412e9367951387d1e224208306ed03
 DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1
-EBUILD charm-6.8.2.ebuild 5302 BLAKE2B 717b5a82859e72567db609dd86f5433dc2555fd798f3e8f4effd94915a98fc448ac014b191f787d1c7de945901e286db63808c2cd5e8dba186819285a653eeb7 SHA512 b0b6eabc6e971cd07183650884b10e7b6af21eed3c80d8b849801b78d09293951c3f913ef52d97439e37afa0839cc4012d138ec89ddd73601305a519e2af275e
+EBUILD charm-6.8.2.ebuild 5260 BLAKE2B f18ac35aabb158e3c473a12f30f2c8371944d24d6454e3fc54d508ca1709af9f56d477a9afb066bd68bab0db29f66b8d48237d2e6c370142282b751b3d454f0b SHA512 b33b90d8cf1d21277dd89414340f290de3b5eaefb6e827c9ef36c19c6bd0d5a77c4fcc1a48ec3980fb803b6814be69bd72f138d35be27646058162c15c5c08bd
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index c11f5157ca9d..1ff82273b8c5 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 FORTRAN_STANDARD="90"
 
-inherit epatch flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
+inherit flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -19,9 +19,8 @@ IUSE="charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi nu
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="
 	${RDEPEND}
-	net-libs/libtirpc
-	virtual/pkgconfig
-"
+	net-libs/libtirpc"
+BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
@@ -98,6 +97,8 @@ src_prepare() {
 
 	# Fix QA notice. Filed report with upstream.
 	append-cflags -DALLOCA_H
+
+	eapply_user
 }
 
 src_compile() {
@@ -124,7 +125,7 @@ src_install() {
 	# Make charmc play well with gentoo before we move it into /usr/bin. This
 	# patch cannot be applied during src_prepare() because the charmc wrapper
 	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
+	eapply "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
 
 	sed -e "s|gentoo-include|${P}|" \
 		-e "s|gentoo-libdir|$(get_libdir)|g" \
@@ -160,12 +161,9 @@ src_install() {
 			i=$(readlink -e "${i}") || die
 		fi
 		[[ -s $i ]] || continue
-		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}"
+		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib.a "${i}"
 	done
 
-	# Basic docs.
-	dodoc CHANGES README
-
 	# Install examples.
 	if use examples; then
 		find examples/ -name 'Makefile' | xargs sed \
@@ -174,8 +172,8 @@ src_install() {
 		find examples/ -name 'Makefile' | xargs sed \
 			-r "s:./charmrun:./charmrun ++local:" -i || \
 			die "Failed to fix examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/charm++/*
+		docinto examples
+		dodoc -r examples/charm++/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/sys-cluster/charmdebug/Manifest b/sys-cluster/charmdebug/Manifest
index c2834864be75..e6e4cb10e6ba 100644
--- a/sys-cluster/charmdebug/Manifest
+++ b/sys-cluster/charmdebug/Manifest
@@ -1,3 +1,3 @@
 DIST charmdebug_6.2.0.tar.gz 269703 BLAKE2B 1ec530fc1259e5772522aad28aa0e6112c132e297061997b43afdf093adb0a1252bd6b23abee4f2a099935c5c7972e8ddda7ec7c98a3226e1107cea38beeddc8 SHA512 03f894c36d4231381cac22c05bc08b6673c3df23259f44539b8bea5c8e812ce53124e832f0df789c45aa15cfbfb3edb69bc4634c1839cef3b42340b19094f5e2
-EBUILD charmdebug-6.2.0-r1.ebuild 637 BLAKE2B 9d95cf7513d193cfa06424914a6ca156d20dc8344a8792e965c90e1cd2895ad70d036238df06aa06b184a3d7a3c4b4571fe6a1784e2c13a5a58a6b3def4ef0bc SHA512 54537a76b89cff5d9bedb67fcb6b4dc42bb6d23c3740d8968dc43140571761b3a460aa177dd2df8166d2e20dee31fa8f8b7403226b3a404ed4c528bb48801cf8
+EBUILD charmdebug-6.2.0-r1.ebuild 634 BLAKE2B 7ae388a4783b9118d70fd62ad259bd5acacbfa4555b793d47128c383b7a192aeba2d7a7f1b9d5ee2ec0bd08dbed366a701aefea02a650bc4bf66446a6de130aa SHA512 0e35c3bea4e487dd3278d22ae807741623eba0e620d27fdaee173257c19afac1630395ca4df207b3b0e16ccdbd1840ae767b3d426c0cca3e69a8b63845c52664
 MISC metadata.xml 363 BLAKE2B cb9a59d42563980d281a41507415ae9dbbbc9f8cad94d71a271986cc54fe8b9053ced9f02f1c29d819461c33c471c7131bdadbe26ceac4da031ef28e6437afa4 SHA512 49a2f641562ba04ec39effc18cd4a917e6147307f6c780836d60db936b7d38ed9144a816420c00096290ca16256cb5cc88913d481a6e838498ab2ac9775c22d1
diff --git a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
index 117b686bf762..6ae34fcc64ae 100644
--- a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
+++ b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit java-pkg-2
 
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 7f18cbec974c..dc82e7b5a5aa 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,7 +1,4 @@
 AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc7d3fe1d0ecf45cb079673c5777acdc8ed3de63fb64848ce0e33e536f86e7dc74c86eb08e7a32da6e12fa SHA512 ef59ad02a608810750cc0241f4d0eb7584624e419f735e0e69b61c2865b68241e9b90a1d817bb838d744d955d9c67708fb89c36df35b17a0f8ef6243904b32c5
-DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
-EBUILD cluster-glue-1.0.11.ebuild 2078 BLAKE2B 36377e5f84e8003c8e69a84756a51173de97e73c4a4d88b23db30d3fa9b986327514fa49e1ec5be35755fa9cb5c0c29e9a3879d04e24663859d417fdbe128abd SHA512 9e238976bb00e4a7b729b759725bef282dae2014bd55e424d8a03b889ac9112ca842dbf5704b8fe2eeadb329af410fc17e83aa5741a11569d91ee8321639b4b0
-EBUILD cluster-glue-1.0.12-r1.ebuild 2240 BLAKE2B de1e40f565e52e90b6842b35dd6ac49327073529aeeb31cec7e99ea172f652ef125b06e8d79ad02917d1ca49d8548965653261d8c123a8f2c0a643feadd63fd9 SHA512 6e9058ff4f8523196ec8d2a5282357c4c94d21eb9e790924ebb94754c6a4786b2143fccacbeb219830447bf84d9e62abee287af22692279b3ffb039d06cdce27
-EBUILD cluster-glue-1.0.12.ebuild 2096 BLAKE2B 3a99470b4c90567f6d3732b76b7b72204d0beee5fedd331e98f7b076765304abe7e20e756bfd4e629f0e8dfed549106516e3a9c43926ed62878fb697eaa3405d SHA512 bff597a019175f6d31e973130256a3543c69900e9874f26287305b2885aa13fa8ec693113e276cbe68dfff4b929deef98de0ababf1604ab3cc4ba9b155a1c85f
+EBUILD cluster-glue-1.0.12-r2.ebuild 2183 BLAKE2B dfbb68a8981c6ac1aa4b8d06dd4f5fa6877c8676e942c68dfabdade6ae495dfce68de7d0d018fd2edbf6fe2be7f8f94675685a872b38578a3f93738cb55e0901 SHA512 6ae8641950c8948fb1e633690904ef713fd1599bc83288290230b8a2b468767ebde3992ac6cef24b1d38b4e1d7f8f2e0c8c82f2b1d2b19d51a4ad4d441f2ba96
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
deleted file mode 100644
index b61d99db6fbe..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb3/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
deleted file mode 100644
index e37323b4c22c..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/cluster-}"
-inherit autotools flag-o-matic multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc ipmilan libnet static-libs"
-
-RDEPEND="
-	app-arch/bzip2
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libltdl:=
-	dev-libs/libxml2
-	ipmilan? ( sys-libs/openipmi )
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 -1 /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e 's/\\$(/$(/g' -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable ipmilan) \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/heartbeat/cores/{hacluster,nobody,root}
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
new file mode 100644
index 000000000000..c3100b232fb4
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/cluster-}"
+
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+	acct-group/haclient
+	acct-user/hacluster
+	app-arch/bzip2
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libltdl:=
+	dev-libs/libxml2
+	ipmilan? ( sys-libs/openipmi )
+	libnet? ( net-libs/libnet:1.1 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+"
+
+src_prepare() {
+	default
+	sed -e 's/\\$(/$(/g' -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+		-i doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+
+	local myeconfargs=(
+		$(use_enable ipmilan)
+		$(use_enable libnet)
+		$(use_enable static-libs static)
+		$(usex doc '--enable-doc' '')
+		--disable-fatal-warnings
+		--localstatedir=/var
+		--with-ocf-root=/usr/$(get_libdir)/ocf
+		--with-group-id=$(id -g hacluster)
+		--with-ccmuser-id=$(id -u hacluster)
+		--with-daemon-user=hacluster --with-daemon-group=haclient
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/heartbeat/cores/{hacluster,nobody,root}
+	keepdir /var/lib/heartbeat/lrm
+
+	# init.d file
+	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+	sed -i \
+		-e "s:%libdir%:$(get_libdir):" \
+		"${T}/heartbeat-logd.init" || die
+	# newinitd "${T}/heartbeat-logd.init" heartbeat-logd
+	rm "${D}"/etc/init.d/logd
+
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+	chown -R hacluster:haclient /var/lib/heartbeat/cores
+	chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
deleted file mode 100644
index ea054ce70395..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-text/asciidoc
-	app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 414443615a84..9bd7e38ad5ff 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,8 +1,5 @@
-AUX hpx-1.6.0-cmake.patch 1135 BLAKE2B f8568002d02a86da600e0efa740f0a73a5e01f8cf8cba925fee727d5ff76e7c5d98961aace52a7d8188c88154b294540d5f4c7ab1d2a888026ce9b2a0ec9e27c SHA512 cf93f71e52fd49ca5d1aaaaa128e69f13e8b3808e5ee3a70bba7ce47b4539e6761a56d6a15a6106e825f8c6a9fec36fb4d43ec221a857091972d1d9b0c900dc0
-AUX hpx-1.6.0-docs.patch 4445 BLAKE2B 82d6288d0743b2d512f37e22dda7f33226e76ace62d96dab4b2d78f95cf80ec8cf247952d1632daabd8acd7d5b5f475103b5f924f11e778c70ae138fb100a2d1 SHA512 bc121d3709312cc510547286d4e25002f87659b4eea8de2f2b3247811c02d04fc2d694d1403164e6942e8e6b8090e622f020d41e0100a5349a6c4330a3725702
-AUX hpx-1.6.0-python.patch 1099 BLAKE2B e38ee7c0a724e521f67f2e018e83739db14476126b4a81dbc474537ef350c47fe9cf14cbc8b8e194067098c88034834f70027df1098006486b2c561564ad9313 SHA512 943fdffc0fce180a69a57819a84eed97a335efdfe939e33834cc3ff6485db22760eee80accf1ec63b59872d2352ca100af4445dae5966f7315a43cd8b7ae0d78
-AUX hpx-1.6.0-tests.patch 4965 BLAKE2B dfbc54a24095ce171657185a3f9ee3c1574bd08647397a6be0e80abd9934548bf03e03fd846813ac2067db28ec2349f8a07f7e203292c7710108af4bdf8aee7d SHA512 765295865ee2d5c581c976a36def227361b26d8dfb3262d21956a954a63122722a4160d5c49168b1dcea1703e60bedc4e7bade5d44bf2fe1a159827327a9b606
-DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
-EBUILD hpx-1.6.0.ebuild 2613 BLAKE2B d359f8307fa633ce2dd23ead6ebc0280548761c5f44ed9dcfd6520e0312678e831a4ad9b0c506c578a95f621ca10bcf57977027e77e3d45c079b1638bc589451 SHA512 7857998bea3fecaee3014a6c472a043362c3045b66653a14f9e09b2bac3964810ceb300fb06c73dc251fc1d1779dd01efc4255c916467375f5c41d2defb290a8
-EBUILD hpx-9999.ebuild 2479 BLAKE2B b231c4bd3c31aabe377d3eaac23233c6d52e589e08fe332ddacd88919de691e019bd9408ae25683623caf2f03b433f94fa8f1b201975e03e228964df0b0d37d4 SHA512 693efe1598700f659a804f89993a92acaf563cc378ae9c6a1753aa6470493e78767b8c1554bc5bb2eb2b9ebcdd7460aef0372e897c50126f12472b1a33098fdb
+AUX hpx-1.7.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
+DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
+EBUILD hpx-1.7.0.ebuild 2212 BLAKE2B a576d3f1c6a5ddbe1e6206e0a32ceed4eb11c485e6bc1ed87c34db13dace98239abdf3c473b343885ee66d341d0924eafc518e0f1825d383ea018670019f754c SHA512 b9c1eff106beae95826d1c27d2243b72cb9aef80be2463fa25472a675da8aeb23bd55a306b85a59eea0861f8938482ac1782ac4d831407224f7dbd3ddd6cd72f
+EBUILD hpx-9999.ebuild 2166 BLAKE2B 140771daafdbe48c992eac7c0672112ed738e7f71a8e837e5cf9a329adbd9ff026af6f3cba0e68f318f859500a8675f74d0384882eb2a584ae50c4dea80e08d7 SHA512 177ac7e60273d1b0a7eddb115f2ac5acd40c703bd3899f6dfa4bf69953bd1d8f68dc606615edd1cf9cdb7623f6403521d18bea79d25a2a00b9252df45ce78da2
 MISC metadata.xml 1219 BLAKE2B de2e75ab303cc78d91a327e4887bcb312095757503a93ecd646abbc7e8e44c9d9872768bdc5bdd8200894d904e6306cd6540edf5579a64e686ceed9694701715 SHA512 d696bba0202c159da2a1b887cb66838f1a967a0053ebce6d131dd3dc670a69cf6313ca027a3e2fe9f7c302fbcd1cafb1b3ffe7b057b8d268056640c44b2e3776
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
deleted file mode 100644
index 646084e77294..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sat, 19 Sep 2020 13:19:42 +0200
-Subject: [PATCH 2/3] tests: Remove unused cmake options
-
-This fixes the following warnings:
-
-| * One or more CMake variables were not used by the project:
-| *   BOOST_ROOT
-| *   SETUP_TYPE
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/unit/build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index 3798549da0a8..7d3bfea1044e 100644
---- a/tests/unit/build/CMakeLists.txt
-+++ b/tests/unit/build/CMakeLists.txt
-@@ -54,7 +54,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir)
-     ${name}.make_configure
-     COMMAND
-       "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" ${test_dir}
--      -DHPX_DIR=${hpx_dir} -DBOOST_ROOT=${BOOST_ROOT}
-+      -DHPX_DIR=${hpx_dir}
-       ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
-       -DCMAKE_BUILD_TYPE=$<CONFIGURATION>
-     VERBATIM
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
deleted file mode 100644
index 3823bab918bd..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Mon, 22 Feb 2021 20:36:14 +0100
-Subject: [PATCH 3/3] static_reinit: Remove export macro
-
-This macro leads to doc generation fail:
-
-|/home/kurt/git/hpx/build/docs/sphinx/libs/static_reinit/api.rst:29: WARNING:cpp:identifier reference target not found: HPX_EXPORT_REINITIALIZABLE_STATIC
-
-... and it results in an exception in sphinx:
-
-|Traceback (most recent call last):
-|  File "/usr/lib/python3.7/site-packages/sphinx/cmd/build.py", line 280, in build_main
-|    app.build(args.force_all, filenames)
-|  File "/usr/lib/python3.7/site-packages/sphinx/application.py", line 348, in build
-|    self.builder.build_update()
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 299, in build_update
-|    len(to_build))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 361, in build
-|    self.write(docnames, list(updated_docnames), method)
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 535, in write
-|    self._write_serial(sorted(docnames))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 542, in _write_serial
-|    doctree = self.env.get_and_resolve_doctree(docname, self)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 539, in get_and_resolve_doctree
-|    self.apply_post_transforms(doctree, docname)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 585, in apply_post_transforms
-|    transformer.apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/__init__.py", line 87, in apply_transforms
-|    super().apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/docutils/transforms/__init__.py", line 171, in apply_transforms
-|    transform.apply(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 44, in apply
-|    self.run(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 88, in run
-|    typ, target, node, contnode)
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7502, in resolve_xref
-|    target, node, contnode)[0]
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7375, in _resolve_xref_inner
-|    assert parentSymbol  # should be there
-|AssertionError
-
-Actually the macro is not needed. So, just remove it until sphinx is fixed.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- .../hpx/static_reinit/reinitializable_static.hpp   | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-index 51ccbf2481b2..b8661d1c84cb 100644
---- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-+++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-@@ -18,14 +18,6 @@
- #include <mutex>
- #include <type_traits>
- 
--// clang-format off
--#if !defined(HPX_WINDOWS)
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_CORE_EXPORT
--#else
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC
--#endif
--// clang-format on
--
- namespace hpx { namespace util {
-     ///////////////////////////////////////////////////////////////////////////
-     //  Provides thread-safe initialization of a single static instance of T.
-@@ -40,11 +32,11 @@ namespace hpx { namespace util {
-     //  functions used by the HPX runtime system to reinitialize the held data
-     //  structures.
-     template <typename T, typename Tag = T, std::size_t N = 1>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static;
-+    struct HPX_EXPORT reinitializable_static;
- 
-     //////////////////////////////////////////////////////////////////////////
-     template <typename T, typename Tag, std::size_t N>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static
-+    struct HPX_EXPORT reinitializable_static
-     {
-     public:
-         HPX_NON_COPYABLE(reinitializable_static);
-@@ -160,5 +152,3 @@ namespace hpx { namespace util {
-     template <typename T, typename Tag, std::size_t N>
-     std::once_flag reinitializable_static<T, Tag, N>::constructed_;
- }}    // namespace hpx::util
--
--#undef HPX_EXPORT_REINITIALIZABLE_STATIC
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-python.patch b/sys-cluster/hpx/files/hpx-1.6.0-python.patch
deleted file mode 100644
index 412e7289bc5b..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-python.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Tue, 17 Mar 2020 16:20:35 +0100
-Subject: [PATCH 1/3] cmake: python: Use standard python interpreter
-
-These scripts are needed during build and run time. So, use a python interpreter
-which works for both cases.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- cmake/templates/hpxcxx.in    | 2 +-
- cmake/templates/hpxrun.py.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
-index 81f38f89367d..a0fd7837b066 100755
---- a/cmake/templates/hpxcxx.in
-+++ b/cmake/templates/hpxcxx.in
-@@ -1,4 +1,4 @@
--#! @PYTHON_EXECUTABLE@
-+#! /usr/bin/env python
- #
- # Copyright (c) 2014 Steven R. Brandt
- #
-diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
-index 60e59cc118d9..0c32bba98917 100755
---- a/cmake/templates/hpxrun.py.in
-+++ b/cmake/templates/hpxrun.py.in
-@@ -1,4 +1,4 @@
--#! @PYTHON_EXECUTABLE@
-+#! /usr/bin/env python
- #
- # Copyright (c) 2014 Thomas Heller
- #
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
deleted file mode 100644
index 8a6884a57a1b..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 26 Feb 2021 18:28:14 +0100
-Subject: [PATCH] test: Disable failing tests
-
-The following tests fail within portage:
-
-|199 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Timeout)
-|250 - tests.unit.modules.compute.numa_allocator (Failed)
-|268 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed)
-|318 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find2
-|967 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Timeout)
-|968 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
-
-Disable them.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- libs/full/async_mpi/tests/unit/CMakeLists.txt      |  2 +-
- libs/full/compute/tests/unit/CMakeLists.txt        |  6 +++---
- .../tests/regressions/CMakeLists.txt               |  8 ++++----
- .../segmented_algorithms/tests/unit/CMakeLists.txt |  2 +-
- tests/unit/parcelset/CMakeLists.txt                | 14 +++++++-------
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/libs/full/async_mpi/tests/unit/CMakeLists.txt b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-index 8f2d77fc3567..9cd7d39597b3 100644
---- a/libs/full/async_mpi/tests/unit/CMakeLists.txt
-+++ b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # Distributed under the Boost Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
--set(tests mpi_ring_async_executor)
-+# set(tests mpi_ring_async_executor)
- 
- set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2
-                                        RUNWRAPPER mpi
-diff --git a/libs/full/compute/tests/unit/CMakeLists.txt b/libs/full/compute/tests/unit/CMakeLists.txt
-index 7c700d5ae639..c655772234b8 100644
---- a/libs/full/compute/tests/unit/CMakeLists.txt
-+++ b/libs/full/compute/tests/unit/CMakeLists.txt
-@@ -7,9 +7,9 @@
- 
- set(tests block_allocator)
- 
--if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
--  set(tests ${tests} numa_allocator)
--endif()
-+# if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
-+#   set(tests ${tests} numa_allocator)
-+# endif()
- 
- # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all'
- set(numa_allocator_PARAMETERS
-diff --git a/libs/full/performance_counters/tests/regressions/CMakeLists.txt b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-index 9939ef701e3b..f0647b27a2dc 100644
---- a/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-+++ b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-@@ -7,10 +7,10 @@
- 
- set(tests discover_counters_1787 statistics_2666 uptime_1737)
- 
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
--  set(tests ${tests} dynamic_counters_loaded_1508)
--  set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
--endif()
-+# if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+#   set(tests ${tests} dynamic_counters_loaded_1508)
-+#   set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
-+# endif()
- 
- foreach(test ${tests})
-   set(sources ${test}.cpp)
-diff --git a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-index 7cfd7e596de5..b35c1de7ac94 100644
---- a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-+++ b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(tests
-     partitioned_vector_adjacent_difference1
-     partitioned_vector_adjacent_difference2
-     partitioned_vector_adjacent_find1
--    partitioned_vector_adjacent_find2
-+    # partitioned_vector_adjacent_find2
-     partitioned_vector_all_of1
-     partitioned_vector_all_of2
-     partitioned_vector_any_of1
-diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
-index 1981e2baf8cd..b374292ceee7 100644
---- a/tests/unit/parcelset/CMakeLists.txt
-+++ b/tests/unit/parcelset/CMakeLists.txt
-@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2)
- set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
- set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
- 
--if(HPX_WITH_PARCEL_COALESCING)
--  set(tests ${tests} put_parcels_with_coalescing)
--  set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
--  set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
--                                        parcel_coalescing
--  )
--endif()
-+# if(HPX_WITH_PARCEL_COALESCING)
-+#   set(tests ${tests} put_parcels_with_coalescing)
-+#   set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-+#   set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
-+#                                         parcel_coalescing
-+#   )
-+# endif()
- 
- if(HPX_WITH_COMPRESSION_BZIP2
-    OR HPX_WITH_COMPRESSION_ZLIB
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.7.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
new file mode 100644
index 000000000000..21b7ce3ceeff
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Tue, 17 Mar 2020 16:20:35 +0100
+Subject: [PATCH 1/4] cmake: python: Use standard python interpreter
+
+These scripts are needed during build and run time. So, use a python interpreter
+which works for both cases.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ cmake/templates/hpxcxx.in    |    2 +-
+ cmake/templates/hpxrun.py.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/cmake/templates/hpxcxx.in
++++ b/cmake/templates/hpxcxx.in
+@@ -1,4 +1,4 @@
+-#! @PYTHON_EXECUTABLE@
++#! /usr/bin/env python
+ #
+ # Copyright (c) 2014 Steven R. Brandt
+ #
+--- a/cmake/templates/hpxrun.py.in
++++ b/cmake/templates/hpxrun.py.in
+@@ -1,4 +1,4 @@
+-#! @PYTHON_EXECUTABLE@
++#! /usr/bin/env python
+ #
+ # Copyright (c) 2014 Thomas Heller
+ #
diff --git a/sys-cluster/hpx/hpx-1.6.0.ebuild b/sys-cluster/hpx/hpx-1.6.0.ebuild
deleted file mode 100644
index e5e15ce69bc6..000000000000
--- a/sys-cluster/hpx/hpx-1.6.0.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-inherit check-reqs cmake multiprocessing python-single-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	?? ( jemalloc perftools tbb )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			dev-python/breathe[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost:=
-	sys-apps/hwloc
-	sys-libs/zlib
-	mpi? ( virtual/mpi )
-	papi? ( dev-libs/papi )
-	perftools? ( dev-util/google-perftools )
-	tbb? ( dev-cpp/tbb )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-docs.patch"
-	"${FILESDIR}/${P}-python.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-hpx_memory_requirement() {
-	# HPX needs enough main memory for compiling
-	# rule of thumb: 1G per job
-	if [[ -z ${MAKEOPTS} ]] ; then
-		echo "2G"
-	else
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		echo "${jobs}G"
-	fi
-}
-
-pkg_pretend() {
-	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
-	check-reqs_pkg_setup
-}
-
-pkg_setup() {
-	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
-		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
-		-DHPX_WITH_PAPI=$(usex papi)
-		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
-	)
-	if use jemalloc; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
-	elif use perftools; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc )
-	elif use tbb; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc )
-	else
-		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-	use examples && dodoc -r examples/
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-cluster/hpx/hpx-1.7.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
new file mode 100644
index 000000000000..2ab8ea741f30
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.7.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
+else
+	SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit check-reqs cmake multiprocessing python-single-r1
+
+DESCRIPTION="C++ runtime system for parallel and distributed applications"
+HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc perftools tbb )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/asio
+	dev-libs/boost:=
+	sys-apps/hwloc
+	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
+	mpi? ( virtual/mpi )
+	papi? ( dev-libs/papi )
+	perftools? ( dev-util/google-perftools )
+	tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python.patch"
+)
+
+hpx_memory_requirement() {
+	# HPX needs enough main memory for compiling
+	# rule of thumb: 1G per job
+	if [[ -z ${MAKEOPTS} ]] ; then
+		echo "2G"
+	else
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		echo "${jobs}G"
+	fi
+}
+
+pkg_pretend() {
+	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
+	check-reqs_pkg_setup
+}
+
+pkg_setup() {
+	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHPX_WITH_EXAMPLES=OFF
+		-DHPX_WITH_DOCUMENTATION=OFF
+		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
+		-DHPX_WITH_PAPI=$(usex papi)
+		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
+		-DBUILD_TESTING=OFF
+	)
+	if use jemalloc; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
+	elif use perftools; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc )
+	elif use tbb; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc )
+	else
+		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	use examples && dodoc -r examples/
+	python_fix_shebang "${ED}"
+}
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 93a9bd8f1bd3..7f80474d33a5 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/asio
 	dev-libs/boost:=
 	sys-apps/hwloc
 	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
 	mpi? ( virtual/mpi )
 	papi? ( dev-libs/papi )
 	perftools? ( dev-util/google-perftools )
@@ -77,11 +70,11 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_DOCUMENTATION=OFF
 		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
 		-DHPX_WITH_PAPI=$(usex papi)
 		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	if use jemalloc; then
 		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -98,12 +91,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
 }
 
 src_install() {
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 6bcb1d57772b..7e8716eba592 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,4 +1,4 @@
-DIST libquo-1.2.9.tar.gz 788507 BLAKE2B c6240ea265dfc34fd02b04f5ff9dcfa194c82789d3caa9553eb65ad25e9e883dfd320d4b095693b88778e74cbd11c207bcc9c5c133f03ec5a25e7c633853cd0d SHA512 732a737b9d53ca7b530ae5ecfd79cc9200f86e6a39f4c529975b204631165a178f6bb87228985222bf623f2581ecc29c774e8480ce9ebfcace12e14c49f98e62
-EBUILD libquo-1.2.9.ebuild 748 BLAKE2B b72c7d2128efa255d527b50bf8f83ef108d7373947d9be889e01abb959f0d6dd82c22b50e2bc8f5f0efe08f85ed17e7cb517a16df8b4542283ff0dc839db0309 SHA512 aa39f78529087c644e05b72c6003530e761c21c83c86ac55dbdd7994e895fac73be0f31735e7687bf286d9e36c139fe62c59cc7169f3908c61f8e31c8c82661e
-EBUILD libquo-9999.ebuild 797 BLAKE2B 3f0cda11e4ed46cea03cef462c99ba5151e26b6869077d1015629e1d67b8665f7194f93ded85dca04dae7c6dba24e8885d0c35ae95c47c889457c49911c7baca SHA512 6c6e659fa9f7595a3750abdaaef7884eb57eb33d26d8a2d57c11636e213c8f273f4d6e80548d8966ed3ff86c0aa804210c9b23c1c37ed5e541247a4bfa9f4829
+DIST libquo-1.3.1.tar.gz 1020369 BLAKE2B d7c3906e1211239a1329fd17799b45441bdf45e252ba57d13e4faece8d89b5964c558ab5b71295541d76568fea7530f868f82979998402533506c8eaf6485229 SHA512 02ab71f0c35a143b4be1960cebef23fcfd2ad7cc81edfd917d09482662ba3993045434c623caf19cf2983b3790ebc0e53bba7d9895b089eadaf39589ddff1579
+EBUILD libquo-1.3.1.ebuild 797 BLAKE2B d0a6c0041957f2558d2b21c916c0b59cd7c10138ed157df5cc85136bb8e0092414394327e25281e6d3a4205fe095e1941e49898f3204e153a9cfa5d23e771c77 SHA512 394ab7af05b6cb84051e0193d5075f970bdefa9f96881dc52e2bf03673df21e4400fae5db8e2b8c07fd0ceaf726d5f8ed02552dcb80ffefa9d81ae51ae3fdd13
+EBUILD libquo-9999.ebuild 797 BLAKE2B d0a6c0041957f2558d2b21c916c0b59cd7c10138ed157df5cc85136bb8e0092414394327e25281e6d3a4205fe095e1941e49898f3204e153a9cfa5d23e771c77 SHA512 394ab7af05b6cb84051e0193d5075f970bdefa9f96881dc52e2bf03673df21e4400fae5db8e2b8c07fd0ceaf726d5f8ed02552dcb80ffefa9d81ae51ae3fdd13
 MISC metadata.xml 443 BLAKE2B 0473c666449ae5b5d1175a18ad8a014cba768c751a3f77027f227a1d1c59a061b06d0f25609297c3a7291d6fb80ed7a773043f04acc875a7f5d86510f99a54e1 SHA512 24f513273a47dfe443e18a9be97a710d523353daa131ea686de70ec13780d89c64bd7019ad83cf8aec8eeb1c63cd9cd3073cc86cdc27cfd361c5bc9197dba611
diff --git a/sys-cluster/libquo/libquo-1.2.9.ebuild b/sys-cluster/libquo/libquo-1.2.9.ebuild
deleted file mode 100644
index 9fec47663d07..000000000000
--- a/sys-cluster/libquo/libquo-1.2.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit fortran-2
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
-	inherit git-r3
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="run-time tuning of process binding policies made easy"
-HOMEPAGE="https://lanl.github.io/libquo/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="fortran static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/mpi[fortran?]
-	sys-process/numactl
-	sys-apps/hwloc[numa,xml]
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf CC=mpicc FC=$(usex fortran mpif90 false)
-}
diff --git a/sys-cluster/libquo/libquo-1.3.1.ebuild b/sys-cluster/libquo/libquo-1.3.1.ebuild
new file mode 100644
index 000000000000..04abe2b0571d
--- /dev/null
+++ b/sys-cluster/libquo/libquo-1.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
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit fortran-2
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Run-time tuning of process binding policies made easy"
+HOMEPAGE="https://lanl.github.io/libquo/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="fortran static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	virtual/mpi[fortran?]
+	sys-process/numactl
+	sys-apps/hwloc[numa,xml]
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf CC=mpicc FC=$(usex fortran mpif90 false)
+}
diff --git a/sys-cluster/libquo/libquo-9999.ebuild b/sys-cluster/libquo/libquo-9999.ebuild
index d63aea6b63ed..04abe2b0571d 100644
--- a/sys-cluster/libquo/libquo-9999.ebuild
+++ b/sys-cluster/libquo/libquo-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="run-time tuning of process binding policies made easy"
+DESCRIPTION="Run-time tuning of process binding policies made easy"
 HOMEPAGE="https://lanl.github.io/libquo/"
 
 LICENSE="BSD"
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 86b33f8fe4e3..11ebc43fa85f 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -7,12 +7,12 @@ DIST rdma-core-31.0.tar.gz 1501133 BLAKE2B 5e67d68ab8eb4019ffb18e7d1995caa8e84a2
 DIST rdma-core-32.0.tar.gz 1525119 BLAKE2B 8f754c04be3f13a90a162fde09f96b26d66534aa7284c12e6c0765390f00412cf34052cc1c313f01df8b8bc49cad459a72350cea6e08316387cd6016fd7cb019 SHA512 fbc458e47801b8869fa0a6a045c2ecf10b9021f8fe115cedad8601a4672f116f393a353dcac238ad297935950a09be4a6faa45e373ea6248711d077a57737c16
 DIST rdma-core-33.0.tar.gz 1549162 BLAKE2B 7b7c8711eaeb9e66159962bcf0f70644cbb4af96df70f3c9ee6e9d9c8c3e4de5d3248666a0b3fe490537f91cc18c5d09448c72b98c45585e0645594deedee071 SHA512 64ace358c6336519131aea858012e22791bf2ab95f06d655a87835361b5822f5ce0c29db8ddb83121a62f4606418d5fa11358e7ad84da4f93f6233fb3947e52c
 DIST rdma-core-34.0.tar.gz 1571236 BLAKE2B 1c6799ba742926ef99f8fa7a0e20d7b910e0f3157e5de4350f7068d7d6f4fa79b8fa6be631e9675517bd12b91083c5e92157a1c097691ead0888823702c3583a SHA512 33ce5fbf0d468a31f7ac0e513cf107e3d730f5db279368aa986536f70d684f40e7bacdf965d18b77922272b0420a6cd973c0b73371758107d8f7751be5851ee7
-EBUILD rdma-core-30.0-r2.ebuild 2612 BLAKE2B ac5fd647c8e3d284c3740d49c6ce3be1b67b3c03901140a3154f0e77cb4636b32e4f67df92b7fdd2ee9ce3b0c052eed2874dda9b2804008f5fb3ce3f52a18c5e SHA512 e9d13c3d92a8472de4e3ceca7d528cba38c0e2d324c502701b3e82e5b3e317d843b92aa381b0167b801ffffc5315fe9383cfbeadd72a88bfe9212d6899191e7a
-EBUILD rdma-core-31.0.ebuild 2619 BLAKE2B 2563779f64b2378d87cb5df47d7f3074b01b43339e2c7c6e93169204084dad5007247370d43423c3e6cac087dfba158b32fec71a1ce0ef199ddc556bdbccae24 SHA512 5c825e8d8b16be6e7580c17db834c8fe24d84b44a1c1b8d6204ff84070883cf2944d0e1497539d880148bb246430c2ade0ec9dd7c50227c1441dcec34c8e768d
-EBUILD rdma-core-32.0-r1.ebuild 2620 BLAKE2B d875ab3d3fe649f623868e503e28f535ad7f807395525220bce59ff88f23a69bfd62a714bee5f3622cd2f5598b2169ebbe44e15a47b4b58cee377aee933e8781 SHA512 95b564f900b303fcb5e653b36d3b63f265eacb2efe0b3adc629eb25fc59e2e2ac94d0d907fb4ce5dc5d730537359b8d5626727c0b5c1461a300fa0e6cd410487
-EBUILD rdma-core-32.0.ebuild 2618 BLAKE2B 71aa52d7b976db1818d97b0a7f4ad26d690b7d41712eaa5cea4815682c7fb2d967bbbf6110cf225269f2de4f08d5b2252d3f9a4a4c078c39e1cbe7948661ded8 SHA512 4dd03f4ccb4e215b8824dfb5a6a0cf403eaf75de391d9773e1cc19793e77b1f4a6003bdf759106a3fddd6828b0f01febfcd33a826b163581b59428464b328158
-EBUILD rdma-core-33.0-r1.ebuild 2619 BLAKE2B bc6af816ec30372d50ea5d9c37842b6e8e5a6eb5cfb38a10632c500c1f7662382d6b3baa33ff9fa6bbc43f639852d5814462616e8e3aa6a8c7b7b2352142e5e0 SHA512 31620a498137e0ae17f6142f3fdac394c0a6e8d7e4474ffe412aefd593be31fe858b89aeb3a0372b8edaeca9d202226a1abb3338f765ed5f3bdfb440f54c2de9
-EBUILD rdma-core-33.0.ebuild 2619 BLAKE2B 2563779f64b2378d87cb5df47d7f3074b01b43339e2c7c6e93169204084dad5007247370d43423c3e6cac087dfba158b32fec71a1ce0ef199ddc556bdbccae24 SHA512 5c825e8d8b16be6e7580c17db834c8fe24d84b44a1c1b8d6204ff84070883cf2944d0e1497539d880148bb246430c2ade0ec9dd7c50227c1441dcec34c8e768d
-EBUILD rdma-core-34.0.ebuild 2619 BLAKE2B bc6af816ec30372d50ea5d9c37842b6e8e5a6eb5cfb38a10632c500c1f7662382d6b3baa33ff9fa6bbc43f639852d5814462616e8e3aa6a8c7b7b2352142e5e0 SHA512 31620a498137e0ae17f6142f3fdac394c0a6e8d7e4474ffe412aefd593be31fe858b89aeb3a0372b8edaeca9d202226a1abb3338f765ed5f3bdfb440f54c2de9
-EBUILD rdma-core-9999.ebuild 2618 BLAKE2B ab7c9bff79ab80e1e767080dae7418b2a03f1bb267d5edf456078ea2aefe3e6f2b2fbe7e1462350d1ca70aa18022458b3014461d7175758f4f6242072dde5554 SHA512 d7e6e05f41b840d8e61459280483bb93ce0a7790f6a829f2267b6a76f4372916f0c200fb235af727b99cbda8fdff6e222a16f7f39cc8c717d826094d40f347f9
+EBUILD rdma-core-30.0-r2.ebuild 2602 BLAKE2B 8e5974940353bddc406142c15e3adfad07b4706d8196a194dd35ce9381c4e7b4e394de4f59d16f5ead5087a0db466d1c54ab17f55aff5ee759c645219636a34f SHA512 590d01af90cb6d5fff462a264e8d2688599ea190dc5f2f425189be316509d51a20c4035c7ac00dfc5e79d47a1e176ab914fe8f6ff0bafa618311cb3d58b3e985
+EBUILD rdma-core-31.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
+EBUILD rdma-core-32.0-r1.ebuild 2610 BLAKE2B af8b426ce6be058696ba668464734e3577987370a0cf9bd33f047c3dc3d54e09e01cde49b75ae100ae555b03dc7fe79901010e5cdf2d5dc9b57e86915b9b4be6 SHA512 44478c203f8bb06c7762c034f44e419d29897cca9107f2d4a24e2191a519aad042564affd4ec79907c613f9e21558507dde06a4380eebb888d1e824d99bf919a
+EBUILD rdma-core-32.0.ebuild 2608 BLAKE2B 235855c21f120e74a1367f5c564cb46991833cb248626c4fda210b46ed5d4965e38944c7b0e3f81951edbb09e1f3a7fc102be0869dc5b9039e96c7efd394446b SHA512 5b9b743e72f2b55570ec6ad6423dbe740322ef277b3380c41fd35e0c10b082b16a6f20a399d8d82b3c84eb443ea82731960097c68eac3aab474dcd865d09c9a0
+EBUILD rdma-core-33.0-r1.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc31464fef1babe9756a90404d239fdea9212b7ce85578d46c616db60dbfbb38dc8c046eb944f92c1dbe2be4a6cd5603d54 SHA512 4bd352e52d03598b10a9aab90adf4078f1d814f34a1734d7918776902c15cda2ae80ea6302ec0dafdb0cd36ebd8939c70aff0fface1fb241654b2409ad1df5d1
+EBUILD rdma-core-33.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
+EBUILD rdma-core-34.0.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc31464fef1babe9756a90404d239fdea9212b7ce85578d46c616db60dbfbb38dc8c046eb944f92c1dbe2be4a6cd5603d54 SHA512 4bd352e52d03598b10a9aab90adf4078f1d814f34a1734d7918776902c15cda2ae80ea6302ec0dafdb0cd36ebd8939c70aff0fface1fb241654b2409ad1df5d1
+EBUILD rdma-core-9999.ebuild 2608 BLAKE2B 2693dc295b8f2c8f7217d4837341704dfeb3f20cb77756cd7c09d5d7ddea1af3113656842606afd1531f2164518f60125c05907e7430486ea379db4b642cab64 SHA512 f3c011c46112b4fbbaf492ebfccd02627878ae68e7645b52122fd8e0acf15bf578b5ee6ec5c75604143e2b298fc876e34e1b3977d0ecfc69607f588b0835eeb3
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
index ce83f105d8b7..8e0eb47b56e5 100644
--- a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-31.0.ebuild b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
index de6187a84feb..de6cba3f608f 100644
--- a/sys-cluster/rdma-core/rdma-core-31.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
index ce3ac942f512..1be58becd2dc 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-32.0.ebuild b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
index 0eb085a071bc..978a54169e3f 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
index 2eed6260b0d3..34e0711a9344 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-33.0.ebuild b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
index de6187a84feb..de6cba3f608f 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-34.0.ebuild b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
index 2eed6260b0d3..34e0711a9344 100644
--- a/sys-cluster/rdma-core/rdma-core-34.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index e5d5b606af7f..8d9538a1c0b0 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index b32f84d8f1c5..ad831a1c2115 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,3 @@
-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 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild b/sys-cluster/singularity/singularity-3.7.4.ebuild
deleted file mode 100644
index c018b5042e0b..000000000000
--- a/sys-cluster/singularity/singularity-3.7.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io"
-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"
-IUSE="examples +network +suid"
-
-# Do not complain about CFLAGS etc. since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-COMMON="sys-libs/libseccomp"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON}
-	>=dev-lang/go-1.13.0
-	app-crypt/gpgme
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup"
-RDEPEND="${COMMON}
-	sys-fs/squashfs-tools"
-
-CONFIG_CHECK="~SQUASHFS"
-
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	local myconfargs=(
-		-c "$(tc-getBUILD_CC)" \
-		-x "$(tc-getBUILD_CXX)" \
-		-C "$(tc-getCC)" \
-		-X "$(tc-getCXX)" \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--runstatedir=/run \
-		--localstatedir=/var \
-		$(usex network "" "--without-network") \
-		$(usex suid "" "--without-suid")
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C builddir install
-	keepdir /var/singularity/mnt/session
-
-	# As of version 3.5.3 this seems to be very much broken, affecting
-	# commands which have got nothing to do with singularity (example:
-	# completion on 'udisks mount -b /dev/' rejects all files from that
-	# directory other than 'autofs'). Moreover, this should go into
-	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
-	# Hopefully temporary, which is why we delete this at install time
-	# instead of patching build scripts not to generate bash-completion
-	# data in the first place.
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2abdc832e2fa..72978c6abdff 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 3432acdf16f1..0d09a37f73b2 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -2,6 +2,9 @@ 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
+DIST binutils-2.37-patches-1.tar.xz 11960 BLAKE2B ea60d0db3b61d350a00626ab3ec76e919f15afcc52411c70cab4c5fda80bc0d250ef098847893724365b6c3e789f3f76fd84eda9d31d60295719da622533127f SHA512 608a600d977b9558054ed2278901f50d9d23c5786c271d7849ff884b4e268e1821db26b7c6f5e6cf0f57a7e44e88e4ce0f2441975f7d8401ada0d5451bdefc5f
+DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 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
+EBUILD binutils-hppa64-2.37.ebuild 12395 BLAKE2B ab894ec84fb4020f7ebffbd5b277ab8c858257644bcfb6c1ea529eb175f8b8f39a12b01461cd8546c81e23685305d5148e6308fb52d8268cc0dd9f6636f8e093 SHA512 850d44ffaf8513b09faab101b4c4c6fa0a2348444435eb77be0be7ec47f2ea0922dab6f8d59babd3aea49ed1e164806fd5603afd82d5b92a2929ce809851460e
 MISC metadata.xml 767 BLAKE2B 1b1533f4fce4b4ea9e2bebbe19c55d55d226120dd255fa421b46971ac554696209fa9df92e40279561876895392827415ee77f7502fec5b0ac684a60f0697de6 SHA512 3aa7ebfd1f6efc14d1d6b19406e08c100854c1e1b933cd8682e90825e8fcb71ec3086e2772422931fe88797c1b54d02422e0700488637f6bd594bf6d1d6181a9
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild
new file mode 100644
index 000000000000..6f12e4dcbc49
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild
@@ -0,0 +1,439 @@
+# 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="cet 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}
+		;;
+	*)
+		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
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+	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 423e9982fcc2..e3657049b912 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -14,10 +14,13 @@ 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
+DIST binutils-2.37-patches-1.tar.xz 11960 BLAKE2B ea60d0db3b61d350a00626ab3ec76e919f15afcc52411c70cab4c5fda80bc0d250ef098847893724365b6c3e789f3f76fd84eda9d31d60295719da622533127f SHA512 608a600d977b9558054ed2278901f50d9d23c5786c271d7849ff884b4e268e1821db26b7c6f5e6cf0f57a7e44e88e4ce0f2441975f7d8401ada0d5451bdefc5f
+DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 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
 EBUILD binutils-2.35.2.ebuild 12886 BLAKE2B f917e60ca6585449a67d14de97f653617f0ae86a9fc7f5442443314ca25d4dae6b05338b7d76455a2b64ca5077a57837699417f56752a53678f21b2dc8174cf0 SHA512 963629da28ae4bc0ec436341269f03f2eaa7bf40d2ffa7d7c9a1ee4ac2c29ee8a8ded88cd3263b9155be7d66b6267f941dede3aa0246eb5540831a543b780db1
 EBUILD binutils-2.36.1-r1.ebuild 12795 BLAKE2B b9134c029636f8129dff88479cc7a98d49b35d97f07e06299ba1b72b85d4ca9a70a9e3976838b1f826f47361851baa41070a4ae8a3c3fa036509ef4431a9af7f SHA512 284fdf19b3d84f530f5dd6d83cf98a2360b2d5c196f1d2018887c2b1f85eaf09f3535cee487ba92b6e63fd374dcc2f7ed30c3a024208ec045ca27717e983e65e
+EBUILD binutils-2.37.ebuild 12811 BLAKE2B e2e34afd60867af801e379645a92ccee1375cac16b9844792c8642c24d39a4449df9791ac404ac4d8ea3a7f054f64f475bafc6e6fdf32245fd24c953a15433a9 SHA512 4493d0ee24f5bc06184c8febd5418f415fa9c1b256f85a4c37e34b83d1dfc10cb45fce2a75371bbb7aa8253d52701cb48f5414d0f203d45a114e66d617a1c23c
 EBUILD binutils-9999.ebuild 12811 BLAKE2B e2e34afd60867af801e379645a92ccee1375cac16b9844792c8642c24d39a4449df9791ac404ac4d8ea3a7f054f64f475bafc6e6fdf32245fd24c953a15433a9 SHA512 4493d0ee24f5bc06184c8febd5418f415fa9c1b256f85a4c37e34b83d1dfc10cb45fce2a75371bbb7aa8253d52701cb48f5414d0f203d45a114e66d617a1c23c
 MISC metadata.xml 726 BLAKE2B 152b58d7d48d653882735395f6cb40b3634b0480c1f9c7ac2bf2055e7f821962c4ee8d7de85f418258a713c1b17fc991cbcfcbe127b91ca2058ef7a71b5b6d17 SHA512 dfb3c44075c587ba6ce24ad280c387d4383b440077c5fa0fb4df1a715e4fdcde3898da866a30df862f8b1975939643f873fddc92fc575f254976d87fc53adbfd
diff --git a/sys-devel/binutils/binutils-2.37.ebuild b/sys-devel/binutils/binutils-2.37.ebuild
new file mode 100644
index 000000000000..014a2d716125
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.37.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here  (ignored for live ebuilds)
+# 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
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SLOT=${PV}
+else
+	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+	PATCH_DEV=${PATCH_DEV:-slyfox}
+	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+	SLOT=$(ver_cut 1-2)
+	# live ebuild
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+#
+# 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
+		sys-devel/bc
+	)
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patch || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	mkdir -p "${MY_BUILDDIR}" || die
+}
+
+src_prepare() {
+	local patchsetname
+	if [[ ${PV} == 9999* ]] ; then
+		patchsetname="from git master"
+	else
+		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
+	fi
+
+	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+		if ! use vanilla; then
+			einfo "Applying binutils patchset ${patchsetname}"
+			eapply "${WORKDIR}/patch"
+			einfo "Done."
+		fi
+	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
+		# Available from 2.35 on
+		--enable-textrel-check=warning
+		--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
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+	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
+}
+
+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/bmake/Manifest b/sys-devel/bmake/Manifest
index c30c1d596401..1a425aaa317f 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,6 +1,8 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35
+DIST bmake-20210621.tar.gz 758062 BLAKE2B ba2dd62c752e649a4bb939dbbb948b13f9f5494c047e20149fe3ef94601a84044a70120e717af4d6ac76b4c7fcb57c4f742a12923fe945cc7a675295a4d4e1f9 SHA512 75419782f097204e74cef1028ad96ac92e93de5f89844923f7a559de18555e815653fef150ccd2d63376cc697c849cedd28b4d066077aeb52daf8e2d0fcbfddf
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20210420.ebuild 1265 BLAKE2B 085219c02d197e22d6afad2f68cc030cf25bb0d846cffa21a931f1f123a8319c858fc4fe1f3def677cf75684efc891d0e2394a79f675723ef78413b52cae2b44 SHA512 d900abeb3ca40e87e6fa2daeb270e7a4641c68f2be0dfd78c15d6b649401cdd7b7f473c368bc48167654af86b5c3db1c2c17ef35f235e8a491ee4d283a6b3aea
+EBUILD bmake-20210621.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
 MISC metadata.xml 356 BLAKE2B c8acffcd095f37e19987d6d116df6654453aab320818262c98e1ccec0871084adb919e408599eb6b4460544c2ec8660abe1e0add7a858d41dc48492f78d1c53d SHA512 c63247454ecc0add57dc73ae2e16421dab39ad199d592c459366b567f3ef3f63c706cb66ac3bdadfafe8a995216e35dc3f90f22ad45a7c078b302b48116f4645
diff --git a/sys-devel/bmake/bmake-20210621.ebuild b/sys-devel/bmake/bmake-20210621.ebuild
new file mode 100644
index 000000000000..5d5f15630855
--- /dev/null
+++ b/sys-devel/bmake/bmake-20210621.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MK_VER=20210330
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Skip failing test (sandbox and csh)
+PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
+
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
+}
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+
+	# the 'ternary' test uses ${A} internally, which
+	# conflicts with Gentoo's ${A}, hence unset it for
+	# the tests temporarily.
+	env -u A MAKEFLAGS= \
+		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 1d77aa3cc1da..1b5ff861372a 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,4 +1,6 @@
 DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c
+DIST crossdev-20210718.tar.xz 28640 BLAKE2B 1e9b9313a5c9a1cb4d82f00e4979794d61b9eaa0035c575ac55092c6c015d820a590c5816d212a4ffad95b96a3dd99a9b94ca7c20b78a7d7b062f16dec6ed329 SHA512 e1a37aebf759abaa30f071f43a528f9059b83456e71fd86fc8202a7eff5c506c1f34fdd260c7b91a03f491b9f2a107ce6a65c2314845a352176fcc5a27a766e2
 EBUILD crossdev-20210621.ebuild 835 BLAKE2B 7bd6d380e0f5350789565ae0015f0af94867dfb66a34f8e0444976628a882a339ed301604e52173c3198ccc356fcdd5c995df119751083ba5c158d46071be0f3 SHA512 e7878f12d7bc34b4b4071109f2aee8a2c97a3cead759dfc1ea7577a04ac5931b93bc450daef6f0ed7d24dcbd6efc2ccdbf53d2ab58775ae71b136d00ce9daecc
-EBUILD crossdev-99999999.ebuild 849 BLAKE2B 97867ab9bc03eace8979101a71a718e7a96ec83eb3f18f720bd0f1d90011dc1d15b49f23f6ea096f63f91ca2f95c9e2b3a9ea9c5e9a18c861f3345f055cac0d6 SHA512 6417d57459a0e10fbab5b4ccf0fb529011e503e6e4b6968a4ce79f71cce95e5844d9a37e4302bbee33db02ec680021f5b3b13038f92a489c167eb35ef4e36119
+EBUILD crossdev-20210718.ebuild 843 BLAKE2B 7b7c9367ce02aa03ba5bc7a011cf34c34d834e901b8ba70fb9794191ef5fd03e76d7a1fcaa0e7b422385684c899c42b344ca639491a55af23533e3ab6aa14c44 SHA512 d8b99fbc92399e8a5c54a7886f797a4c2de314de7135d055da252d118212b5d15e7cd206db7fc9fd0d2deabbd5e9c573647c1d42de25e7b20508d59afe875884
+EBUILD crossdev-99999999.ebuild 849 BLAKE2B 4cfec8c7a42eef2c0802ece43629d0ec28a4d0aa5dfe8202c7b18cbe1605692dbc26d3c30a37ced649b69aca04d7d78a26f7811079d4803d8346b53578ecde91 SHA512 0b0b84ff9ec78ae09dbc4ebee6f2e6ce80afe116d0e1fb38bb82b73d378860ece7a8426f454344717e65b3268186cb25e2e003eb718aa3117e34b88704ea0314
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20210718.ebuild b/sys-devel/crossdev/crossdev-20210718.ebuild
new file mode 100644
index 000000000000..ffa357b2d207
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20210718.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="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-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index e04a77bf18a1..93a07aa0b20d 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 44d4a5c4dc69..47944519043a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -22,7 +22,7 @@ DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6
 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.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-r2.ebuild 447 BLAKE2B fd9df7b68bfdc3bb0d4bf04aea7242cf9974d321b7f1258c3b5510dd4f51fd3a57666c1143a3fe14111562cd6421f3d27747c39cd34138f3377f2c83f5f31944 SHA512 7f3111ec92476ead84ec8b40071c66f0a55f737fce16e60285f27c922e3e352d36ea2d59a9e6a6877d5219e9d32648e0ceb772b79d9d382886f55ac9f31b56b7
 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-r2.ebuild 454 BLAKE2B e99d90cca50914b672f9462925c18484b55d73478e3cdfb45f9d9999333cbadb64047087aac25775e494c750159fa118fd0014843cc93d7b2046f6458ef80a52 SHA512 0209cbe81e71912fe53cbef3ca3bd048951b132f79c2d3a39b9a847032f3f172c1f5259d13f23b0a3d9bfec274c98807b233b06233333ebf28b4f00656e67285
@@ -34,5 +34,5 @@ EBUILD gcc-8.5.0-r1.ebuild 452 BLAKE2B 5ac3065a75d23a3e5237ba6fa1b7961fc643338e5
 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 447 BLAKE2B ec9816f03fa2a18c0ec61d209ed1997f8150852ce548e7e28f3b2aa3c4566cfccd095a4cc50d25e6dfc373f533f4e6754b3f45506be4a88b1b395c1105702f42 SHA512 20830d6739ab72d65a3aca53f879ce7ae4dcaa5b151eeeec24ee5aeac20ca13b949d8ece516add29031806d46fd44141b338f7341663ae448b6e220ed01cfba0
+EBUILD gcc-9.4.0.ebuild 446 BLAKE2B bc1bdb85654cb172cbb6b7bc9a5164bad70aa68ee63dd4267c7898dbdc537d651f1abd0e554b3d9f848a46cabc637879c7675486f28b489dd45c4431959af01f SHA512 1370557f7590447d70b38e3034e69532223d00f5cb69d68e6bc2b538d8855545c88e76962bfb5f5f254267ae8b126716acd3e986c0c41f6265df9ab46a1938d3
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.3.0-r2.ebuild b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
index 6fa2c485813b..2690dfece96e 100644
--- a/sys-devel/gcc/gcc-10.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-9.4.0.ebuild b/sys-devel/gcc/gcc-9.4.0.ebuild
index 96796a936b12..32d5ca3f1f38 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-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index b12065900556..24ecc4cfc54b 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,5 +1,5 @@
 AUX icecream-1.0.0-libcap-ng.patch 195 BLAKE2B b6ff2376e02cfd0a1b486c53d5be1012223d16794c718a9aa64dcb89f720884c6a5d01656d99ea69cc44de2ad34731b744a9558702294189d01d01d0d330595f SHA512 31f69f07ad55465103587239249d2fd173dc3b920a026c7754635a3ada39696c1ccccbe636ced0ca2a2283b4adb8f23083a32586c2e803c1f18ad4afd3cc8746
 AUX icecream-r2 1733 BLAKE2B dbd919701df670e7cd1b47cb39fa55eb18c6e539ffa637e2a505ee60b15bb9febd54237b57f42214769e273f5a5fd29cfcc9e29a0a941807388fd9cc7d133226 SHA512 033ce0d49445db3afcbdd6724863651d4951b8f36f6253a13854abe9ee976419687579089aa1c5c808eed08aad357e34bb9f1e70570857cc39f2515ac2f211b0
 DIST icecc-1.0.0.tar.bz2 485534 BLAKE2B 31a978a4a461f20716a95277426e79d4c298c212d36361dbbd68c5affcbbbe2f0c71f743cc7b731d86fbb5f09ab556182482f56e1382be8572d019f80a004fc8 SHA512 4292ecef6232112c3f4531cb2290a55f70c5c24095fef0865af2526d49fc10a043ffb06d22552e161f671c18ff1ab62795c3a63e2c8cb26f869cf65d0938af2a
-EBUILD icecream-1.0.0-r2.ebuild 1311 BLAKE2B e3f5978b1a91aa40e9a0c6ca36313195615abdd81944a05cfca90cd2d368455d5ca5f744f003ce0415f5054236c5155e01bc1a12ebe13ae207c0781de42808e6 SHA512 4918feba78ed446500f249cb1efbb3321519cb47842b0d0125e7a43c507d212e3fd0bdef89f01ad232971ece70e91f60f4aacc1a56a00c19c87cbdefee848d68
+EBUILD icecream-1.0.0-r3.ebuild 1274 BLAKE2B 2967a7bec5f09e6477a099f6c49323e3a94a721ac84555deee6719737da356d3f214835d8d6c9a00f7e4a5f81d8cda9ac624aa18ac8ac289097a161518cce408 SHA512 7fac57e7f533db016f503f47256076d5ba5b13a83d68237a192c2b22d2914984342874bb47b6cafabe5b915297b2c5912a3fe66e2d16e4cc6fc20a94160626e9
 MISC metadata.xml 336 BLAKE2B 8afb6d3c4afba1360088774c52191105de43349ce50f7cf011849546f0b546bd458c4c22fb6114226bcf095e54c87edd5cabe23c9fea3b99e56fbb981c350029 SHA512 04906e11a26061264e31910f7055cc5a3cd8ac1ce0f2bc7529b191adfc167c891285d6a86415fd3ec4c447c25111c43910f7611bd6ad0af58b30427a03b405de
diff --git a/sys-devel/icecream/icecream-1.0.0-r2.ebuild b/sys-devel/icecream/icecream-1.0.0-r2.ebuild
deleted file mode 100644
index e7cc21f4e7fe..000000000000
--- a/sys-devel/icecream/icecream-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/icecream/icecc}"
-
-inherit user
-
-DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="https://github.com/icecc/icecream"
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	sys-libs/libcap-ng
-"
-RDEPEND="
-	${DEPEND}
-	dev-util/shadowman
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libcap-ng.patch"
-)
-
-pkg_setup() {
-	enewgroup icecream
-	enewuser icecream -1 -1 /var/cache/icecream icecream
-}
-
-src_configure() {
-	econf \
-		--enable-shared --disable-static \
-		--enable-clang-wrappers \
-		--enable-clang-rewrite-includes
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newconfd suse/sysconfig.icecream icecream
-	newinitd "${FILESDIR}"/icecream-r2 icecream
-
-	insinto /etc/logrotate.d
-	newins suse/logrotate icecream
-
-	insinto /usr/share/shadowman/tools
-	newins - icecc <<<'/usr/libexec/icecc/bin'
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove icecc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update icecc
-	fi
-}
diff --git a/sys-devel/icecream/icecream-1.0.0-r3.ebuild b/sys-devel/icecream/icecream-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..53e06f4ae2be
--- /dev/null
+++ b/sys-devel/icecream/icecream-1.0.0-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/icecream/icecc}"
+
+DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
+HOMEPAGE="https://github.com/icecc/icecream"
+SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="sys-libs/libcap-ng"
+RDEPEND="
+	${DEPEND}
+	acct-group/icecream
+	acct-user/icecream
+	dev-util/shadowman
+"
+
+PATCHES=( "${FILESDIR}/${P}-libcap-ng.patch" )
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared --disable-static
+		--enable-clang-wrappers
+		--enable-clang-rewrite-includes
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newconfd suse/sysconfig.icecream icecream
+	newinitd "${FILESDIR}"/icecream-r2 icecream
+
+	insinto /etc/logrotate.d
+	newins suse/logrotate icecream
+
+	insinto /usr/share/shadowman/tools
+	newins - icecc <<<'/usr/libexec/icecc/bin'
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
+		eselect compiler-shadow remove icecc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]]; then
+		eselect compiler-shadow update icecc
+	fi
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7eca20e48d0d..aa625193993b 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 80e76341e978..662c5c2fb675 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
 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.12.1.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
+EBUILD btrfs-progs-5.10.1.ebuild 3058 BLAKE2B 561b88a1cd1009fd9fe45bc6a1e29c01a5a4bad16dcfda748c87bb02f38084ae822d2b406f94771a8dd0e775bd430b51100b2d70b84e7c3c07312ea6ffc32a50 SHA512 5b7c79c83ec1e549e7d8feb9b7f898fe5682ecf51094345b47174ec0ed3e44bee349db4e44c811508b9ca9df6fe96afa7cd87a8a94dab22150a192f9a70432e3
+EBUILD btrfs-progs-5.12.1.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
+EBUILD btrfs-progs-5.13.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
+EBUILD btrfs-progs-9999.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
index 3a62ead80149..9a8ec6aa8d5f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 0ded602e7c95..2970763fbf73 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -5,6 +5,6 @@ AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab5
 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-EBUILD dd-rescue-1.99.11.ebuild 2374 BLAKE2B fdff6926987018a00f43f04d60e979c96e2023221eceff4f6075f5ecc03a7801c2dcf02e5bd0f8e7cd852ced215a4a26e22c9013a2785f19dd020d851aad77f9 SHA512 5882cdde9a0f693446400ae53d0c9105d496f8fff2e17c66e1e0a24b5b6b26c61e2995fcbb41c9cb6ceb025daebdde21456a52fb5e8b186372f503cb9f310db4
+EBUILD dd-rescue-1.99.11.ebuild 2381 BLAKE2B 901bc00304978c28bf32c1609a510a375fe3512af94859c689ccf259f5fdc2a9e8fb89ae86bbc0136875c63d101e608c6ca34121e7073298512efbcaeca85e74 SHA512 496c4f4bfe2191d26f2d2c9cdacca0a1ff9b16909b7100757fb8616cf3ca79cf8ea439094513818a3fa1691f452894ccef02ba86deadd1f788cf7618e9f8b8b1
 EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
index 8a52492e4e00..5b84b240edb4 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index eba1cc88fa29..183fa9faf7b7 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,11 +5,12 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.10.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
-EBUILD eudev-3.2.5.ebuild 6813 BLAKE2B 2a3a5a7594a975a3de14e73de39c56f15fd36451b971beb2d04402aa760085a8a599c896ffa9608af6bb11bb7e5de7b1b96d1981648667f909d109906f235394 SHA512 48c14aa3400d9abcd159216185f39b3560860122c2b6090bffb3a8be3149e13574471bf345fcebb99eaf5fe0e430c3d7726494ce63056db30b4556368f7a63e7
-EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
-EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
-EBUILD eudev-3.2.9.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
-EBUILD eudev-4.9999.ebuild 6111 BLAKE2B 534328760b1714d5a487fe36a8b717fcf5588128bf9d2702fc7739dea1a58b514f231e0cbd9d50dd5c455d0c106f0d0c155cdb89dec881188c0c78791977ad13 SHA512 c101dd4ea16381991470e13388d80b86ddd8930cc2e03993f338b374b1ea27777fcb6f8f934ecfed67e297f3219c3252dd11886133596e2c5aa28f5e981edf24
-EBUILD eudev-9999.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
+EBUILD eudev-3.2.10-r1.ebuild 6980 BLAKE2B e6fcf8106c961eb1984ffe875a984b105210b828840a472022c9e719ec1e9bbc32ae48e4c95ea8adbe704bd59a06a317b99f87d0922772c7a1834a3d984b1e5b SHA512 d7c4fcaea483235143e21b7fd9976050bd272b9dbab3eaf3b39222f1380c895d2491a483ed021e1cac536bc49da8af323e0adc92157029585a93574edd738893
+EBUILD eudev-3.2.10.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585
+EBUILD eudev-3.2.5.ebuild 6833 BLAKE2B e1a9f2ce47f6df7ed61f0544d7c134898a25d84b73842a66b94c95135bcf6ba95483999025a763264c2a44b6d5fbac0f34bc4e7051b420e90aaf50fa1cbda75f SHA512 ebadb7eb40160b3b85432cbf6b59285b47f4cbeaea7de47a3ce72fc6558edcfdcbb3956980ca3a3933c3f6887330fe0d7bcebafc1d579a42283d20b124c7d4e3
+EBUILD eudev-3.2.7-r2.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba
+EBUILD eudev-3.2.8.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba
+EBUILD eudev-3.2.9.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585
+EBUILD eudev-4.9999.ebuild 6105 BLAKE2B edad7d04272f0430ad3e8a347ad3f043a295298d04156ada8576757db2a4d0bfc8732f295ca6db69cb14ee2a47ef376160e06358aa25c17a2f21e2346394149e SHA512 e265895d5feeab3053595e9b84db879a4b87829b0aa28383ec16ad213cea56e6231d8742ace9c303397d261e4fad3e11dab3b2a10025e29cb65504d69e4e7426
+EBUILD eudev-9999.ebuild 6968 BLAKE2B 31272c7f13a0c06fddc6c2ffbe7bbcce75e1a9e1deb79960c2d27c509802acc85694de3d048b628b4b575c1cfc6bdf6e8b8ae8c1576201b35fff7cca9d03dc81 SHA512 8577f6c5dcccc932835efc88106feb9f1a04fffa51cb1770f9f3add1670283718ee8038f8771577d2d3033fbc58011c3c011e9a57fecad5ca2623391f5ff2862
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.10-r1.ebuild b/sys-fs/eudev/eudev-3.2.10-r1.ebuild
new file mode 100644
index 000000000000..4c0eb02700d6
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.2.10-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+KV_min=2.6.39
+
+inherit autotools linux-info multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	eapply_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
+		--enable-split-usr
+		--enable-manpages
+		--disable-hwdb
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
+			$(use_enable introspection)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-introspection
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
+	# process it as a list.  We only care about the zero case (new install) or the case where
+	# the same version is being re-emerged.  If there is a second version, allow it to abort.
+	local rv rvres=doitnew
+	for rv in ${REPLACING_VERSIONS} ; do
+		if [[ ${rvres} == doit* ]]; then
+			if [[ ${rv%-r*} == ${PV} ]]; then
+				rvres=doit
+			else
+				rvres=${rv}
+			fi
+		fi
+	done
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+	if [[ ${rvres} != doitnew ]]; then
+		ewarn
+		ewarn "You need to restart eudev as soon as possible to make the"
+		ewarn "upgrade go into effect:"
+		ewarn "\t/etc/init.d/udev --nodeps restart"
+	fi
+
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
+}
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index 3296733f6bf4..c2910b122451 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index e7cf8529cb8d..8dad253df479 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
index 25d8b24c74ea..1038cbac1eec 100644
--- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild
+++ b/sys-fs/eudev/eudev-3.2.7-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"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild
index 25d8b24c74ea..1038cbac1eec 100644
--- a/sys-fs/eudev/eudev-3.2.8.ebuild
+++ b/sys-fs/eudev/eudev-3.2.8.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"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 3296733f6bf4..c2910b122451 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index 49cfe608ea80..3299349b6218 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.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="6"
@@ -26,6 +26,7 @@ IUSE="+blkid efi +hwdb +kmod selinux smack test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
@@ -37,7 +38,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 25d8b24c74ea..1ed46df87518 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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="6"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
@@ -36,7 +37,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index 7078d8e1489b..eb54b6573bbf 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 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a
-MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d
+MISC metadata.xml 329 BLAKE2B 86103da6ac4e1b0ae84bf3b8040f350727946da374d553817011ad206847a774fa7e9221536ce4b79f1d1a159c7518c2e63b9b5e0e1ba59c6b0277c68a39ecef SHA512 39d3d11f092338aae0e895f8e3cb110d8320a5830fd6acf0215d5920263cce410754985c25693e54a9b46212aaf6efe212fd0cea6634d2fc4405e744bf9ea01d
diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml
index a45016676e49..2f0394991b92 100644
--- a/sys-fs/genfstab/metadata.xml
+++ b/sys-fs/genfstab/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index ca308963ef47..1ae759d77294 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -3,5 +3,8 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
 DIST lxcfs-4.0.8.tar.gz 458975 BLAKE2B 19ac81c36c3aad0ee3301eda73aa29399304dff1c827041678be73c4134181667a4d92b3efa37a44b2853b825031fef2e07e7cbfcaf552676a01f5f9faedf9c3 SHA512 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e
 DIST lxcfs-4.0.8.tar.gz.asc 833 BLAKE2B da4ef0f8d6dea59d83f708b6aa7c1835773537e3111d8e9aaf4a7c111d21a0b57486cc9828919bea55ea06ee6bf3e03eeae89eb26199e287066b309d6d798c8d SHA512 f8fc10e52472fff599df7e008d34346489754d64347d005794a4b280949130bb0370ade0d65c9eb182914cae3a6c55f9872bc38481b0b64ea1218c8d1640a74f
+DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe
+DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e
 EBUILD lxcfs-4.0.8.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76
+EBUILD lxcfs-4.0.9.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
new file mode 100644
index 000000000000..61b57c9974a8
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+# Test files need to be updated to fuse:3, #764620
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo --disable-static
+}
+
+src_test() {
+	cd tests/ || die
+	emake tests
+	./main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 0f373b56d4ec..a2524b0e14a4 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,7 @@
-DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
 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
+DIST mtools-4.0.33.tar.bz2 439522 BLAKE2B fac0880a7f0967f6998b8e234b7c61a58ed28205738f92db4ea0a039f5a883cfb68df492788174720068a2f976d37032630abfcca0461fcc72133b564bed472b SHA512 6dd47d422e999100a7834bac0e1e6e5e26387f8462bd84c5934da7c24f1cf90674dc873878bc37c2051dd7df717f85793861fed8544f77aecfc30a6cecd7bf43
+DIST mtools-4.0.34.tar.bz2 453751 BLAKE2B 9e4874bd724e2a62e23d7b7def601e41ba6676d2b9c37d198f0b521938297664dcd1d2fc75531c79acc93e9c642ea4555b174007ca6d2fd27cbad1b9a3d61f1c SHA512 5a401ac17b9021e5e957bbd911810958f3d665d2ada8b60e723d72709e687c804bbecdb09b50fc23a9876540abead3894213e5f668f23356c629261b40980535
 EBUILD mtools-4.0.31.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
-EBUILD mtools-4.0.32.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.33.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.34.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.27.ebuild b/sys-fs/mtools/mtools-4.0.27.ebuild
deleted file mode 100644
index eba20aaf2121..000000000000
--- a/sys-fs/mtools/mtools-4.0.27.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 flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-RDEPEND="
-	!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.32.ebuild b/sys-fs/mtools/mtools-4.0.33.ebuild
index 3ebdd3b6df91..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.32.ebuild
+++ b/sys-fs/mtools/mtools-4.0.33.ebuild
diff --git a/sys-fs/mtools/mtools-4.0.34.ebuild b/sys-fs/mtools/mtools-4.0.34.ebuild
new file mode 100644
index 000000000000..3ebdd3b6df91
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.34.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index ea24bf9c2757..8f9cff9aed5c 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -10,4 +10,4 @@ AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAK
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
 EBUILD mtpfs-1.1-r5.ebuild 1248 BLAKE2B dac042ee8488b5a310154756668066cbe6972be15378ba10f416d2c0ca42b86afd0b502aa64e9b81cff5567a381900593cbae58e6ecd85145e02d56dbe1aae98 SHA512 5a9f59cadd34ca4baedde8e7b1619ee22f8311225625c6782f9a5ea216138fa7a7754bca842342c0527219d5679b60ac6e38bebca07d4819b4498c6e7874f2a3
-MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
+MISC metadata.xml 571 BLAKE2B 68b875e88a89c915067db4911eaa0d0a64a4e9054eecf489b2a222371c4d56beef2c46e2d1f7e773b70d6b9d249c2d00fb49cc51a7a4c285dd8d7959372d9041 SHA512 976c4699853d0ad7e9f299f89c60a04170a31546fa55a3a253ae7659bc31c43607a586d4b377a622bee88adfbaf32e288beed67676cfca56c955fd330f3fd5f6
diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index cc200ab69553..cb18a07276ce 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -5,11 +5,6 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-
 	<longdescription>
 		MTPfs is a FUSE filesystem that supports reading and writing from any
 		MTP device, as supported by libmtp. MTPfs includes extra features such
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index c55aa4c754b0..a415cbdb673d 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
 DIST ncdu-1.15.1.tar.gz 148242 BLAKE2B c49fc706c852f081256437bcb566d0dd4cc34682693186dd84321f4c6831ac982206d59b15f3afa7a2cb25d4affcce7ff84fcc0bf922558241df1ac13212ec7a SHA512 572379264b9bd0d782151bd2f79add0e7a6d092029a041ff8f9288e928a4b6a6733467bca7c1702cbb44c3861279da1bc3d4278df6fba1814fe1dc909f2d8087
 DIST ncdu-1.16.tar.gz 149705 BLAKE2B 61d004581bdcf1885bec24d0a1de4fc890fe91bba511abbdbc507a48f31946caf5c7324979e8410e53cfca8ada1b20342b737dc4e8b1f034f2fca5aea84e4369 SHA512 ac8b7e573332e4e006bf743224096b697517b6899744f189ea5a31665c1ef5e50c7fdaaa0a50a8d7bc3d471656f1f1c6681c21368bdaf983257d8cc311a0dfd0
-EBUILD ncdu-1.15.1.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
-EBUILD ncdu-1.16.ebuild 442 BLAKE2B 4916d389647db80c3358d6a36115d8846e180dbc4dbdd889aee35e93fbef4151f7538989ab00a7831b54ad9e7d085e7b04d9a495e3d368f08c4e9c94dd3aa6b5 SHA512 92ec86e41ab1681f89a41fb34671a44818f7751a8d86684bf6df6214b2b0cd1cb15e8639b38680ab3bab954d67e4aabb742b1d497b12ee13868b971bd5652468
+EBUILD ncdu-1.15.1-r1.ebuild 434 BLAKE2B f25cfd209692d138a2c192f68b459c51c8c8b670888d6778a6291bea02530f62ae744b5317d5da9f28387c3f0af993302b6e2cc7f1374a349ed812c803f78c9f SHA512 ea403df7b180959ad2dc8494b48caa8f521b30f8976bf6e00b5b2f6eb6fa89c6df53e65f332be1c4eb59512eaed14587b22597f96fc071d1823929fff4c27ef7
+EBUILD ncdu-1.16-r1.ebuild 444 BLAKE2B 3023c33a6618e88beaa816a1b89c27350412b8b0ee8095267d1778af069b45df1f60d13054b28bcb549b934e673c86313f84d904903997e0c658ebd75fceee85 SHA512 8c830b4e8a6b1b07efdeaadf766cf9b5bf369d1dab3311be8102b101ddab503e8f9a36883087a973612d514174b570fdb591ca2cabed55e2bcf3ff9e959367f2
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild b/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild
new file mode 100644
index 000000000000..748704d358b5
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/sys-fs/ncdu/ncdu-1.15.1.ebuild b/sys-fs/ncdu/ncdu-1.15.1.ebuild
deleted file mode 100644
index b0e05454504a..000000000000
--- a/sys-fs/ncdu/ncdu-1.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-fs/ncdu/ncdu-1.16-r1.ebuild b/sys-fs/ncdu/ncdu-1.16-r1.ebuild
new file mode 100644
index 000000000000..22076a152350
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-1.16-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+
+RDEPEND="${DEPEND}"
diff --git a/sys-fs/ncdu/ncdu-1.16.ebuild b/sys-fs/ncdu/ncdu-1.16.ebuild
deleted file mode 100644
index 4148fd7e31c8..000000000000
--- a/sys-fs/ncdu/ncdu-1.16.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="sys-libs/ncurses:0=[unicode]"
-
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 37c84d9d5e21..db17cd499f83 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,6 +1,6 @@
 DIST squashfs-tools-ng-1.1.1.tar.xz 1170232 BLAKE2B 8224b59f70c3c02df3762024510c75a038f8d9f1853575ccfa527173a528f17bd68ae4ec1d2448563aa504f683f5d9152cb07545db6b965f36a224dc95841f17 SHA512 2a7aa689b49fe06ec77e9b9c3bdcf264d05a478aa08543d8e8bc22ef45f10f351b49706485ed93cbd5adc537cd066f94e70952867838ec51859e8f6ce34607f4
 DIST squashfs-tools-ng-1.1.2.tar.xz 1178028 BLAKE2B f54419cdb57ace39a85dfa3a691adcdb637939ef7cc0419e596fb7a7b1fe24d469d2f2104c745303159c64f0692d45562562b6acf4cce3bfa49ef7a59a892cde SHA512 3f66cd9034997104e2d3281e271e8ccfbdd6ecaa98313636dcfd5251717e173ceede27b4a94342b011707fc1e96884ec733423f978697c6420915d96c153cf3e
-EBUILD squashfs-tools-ng-1.1.1.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-EBUILD squashfs-tools-ng-1.1.2.ebuild 1122 BLAKE2B fa54789fe9987f868abe97325d54d26092dbe6f78551fa3835804a156b055cf4cff237148e04f09a9937623612c37d57b1841b1b065891d290fe74c4b2b7ca02 SHA512 2f99f16d6c83c01aaecd50191b2becc76c0ba8db2f0a607e0831f5a6206878e02d97cd2b2919220c050859a7890f4e812745362053a39c95c84e91f3898f60d8
-EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
+EBUILD squashfs-tools-ng-1.1.1.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-1.1.2.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-9999.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+MISC metadata.xml 452 BLAKE2B 5c3c39049e66a5a41bed571814e6596f4d382b0e0d26fe0ecc47efcc7cf49911fbb44e0fa1e51d15003c3319e2fec07c61fe32f35f3dc36afdb0d16773d43caf SHA512 4f9da113fb9ae5edeb519f63ca56db88c4d4b6ba523990045557ea07574a051ffc5b0474f9b774af9f87e0686df902f752bcb794a014dd8501b45fa51f4df95b
diff --git a/sys-fs/squashfs-tools-ng/metadata.xml b/sys-fs/squashfs-tools-ng/metadata.xml
index 9d2517015161..024d650b54ff 100644
--- a/sys-fs/squashfs-tools-ng/metadata.xml
+++ b/sys-fs/squashfs-tools-ng/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="tools">Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools</flag>
-		<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AgentD/squashfs-tools-ng</remote-id>
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
index 22a2dbc93b62..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
index 3e96fd1fdfe9..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index 22a2dbc93b62..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d60c4ccf33f4..23555f1d0860 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
+DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0
 EBUILD squashfs-tools-4.4_p1.ebuild 1315 BLAKE2B 5b64d6ab302b07973be65fc4d93219f32e93d348f2c4db4122ba87f47b589d70966ba511fd14de6ae3eb4f34296d4a0c610dbee28b0f5c7086543f3f8d79aa35 SHA512 1e299fcd3c0f6e9920b4f28549bc42dc7900e62b82adcbd57428edf22f65a449e4f4821fe223d4af2310746159635a3fbcda0b7bfcecf451c9c64500597cb1cd
+EBUILD squashfs-tools-4.5.ebuild 1322 BLAKE2B f24a5b268493d2e9a1bc8791a89f76c9ec584dc11d3521b68e2786fb1d07eaf6a16d05d1db3d601cc2d1c90c69316fc779192dc520337f1f3eca9ba3ca486191 SHA512 0e61fb08df1e07ce2d8b6f512740c621c89a978361bf8dc994266be3a6f5bd292b7e58b8aa35f481e3ee5ffaf05c51bc6bb3943927d0dda5da712295bb17da49
 MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
new file mode 100644
index 000000000000..da568d9d59e9
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_p/-git.}
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/"
+SRC_URI="
+	https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug lz4 lzma lzo xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	zstd? ( app-arch/zstd )
+"
+DEPEND=${RDEPEND}
+
+use10() { usex "${1}" 1 0; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 lzma)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
+}
+
+src_install() {
+	dobin squashfs-tools/{mksquashfs,unsquashfs}
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index baf1d364ff58..805c1d0b0c4d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,10 +5,10 @@ DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-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 5435 BLAKE2B 73db98a1a0f358cfde36d7ab34e61ec52a69ba6cd2189536aa3adb3d09c6e946c3d5d6d726616cc9feeb3d7c4c39aab3d3a8826ab62ac07506838448518edff9 SHA512 415134bdcc7221eba54e940be02d081e89228b54ae3efa03ee6c1abb5458592440b26cab31a0ea6e21a288933cd2ff16330cb8c9ba91f2df323a34b65fe0a600
-EBUILD udev-249-r1.ebuild 5736 BLAKE2B dafb410a1b719d4febd2366584b55c66b5967e2eaf9d14225be7a5a8ca55222f66c4c4ac15741834d15085349186be4cdecfc58ffd710b5292f53f2b5ce8a723 SHA512 af851c186240a0814dbb1992884cd7f01b7b24520138e2147a001f7de05a73b28daa06ab6a99395f09db9167345e118b8f90f46adcaac6905207ef4367ce1836
-EBUILD udev-9999.ebuild 5695 BLAKE2B b32ab2f191c4163bf0949446646dd24fcf2b6e1c08454922108e0e41cc7fc6709ee4f27504ac4bd49a387958f2c3c2359b3e4e9d1869510a632dfb77589057ec SHA512 254593d7c82cef560530a29453ac96292bc84558188e55d5533e3e77916f9cd0708fae3ad1caba750e121de1aab90d4eed098920365583361e2cb4f76d676b50
+EBUILD udev-245.5-r1.ebuild 5968 BLAKE2B 67f2fddbebf375b7901ffc12c0f0c50f4745acf0a24d5e5b5955910a1f1403c523a024538e29b41985a2638e3f35e919517e1789a22208b975c31b0499d62815 SHA512 0d805c6259030058a1e22b0a69bb427df1c8eacc7d4c0fe5a78c76ddbb3e5da5995d24f1832cd70db12735c58ffef3a70a2d8accfddd8c4c423b8152996cac1a
+EBUILD udev-246-r1.ebuild 5967 BLAKE2B 3b1af1762b4a31f83084cc616770769e54772ab4be84e279e56764e0c9693da670e91f67acaa102de44e2d8eb469a84b1a3e7dca4a3053e388fe270d939b736b SHA512 ff1cbb4d84cc5caf468db8b79750bf0631c26d65200bc2f76c4776ac84e6bceebc189d7f8fd8733ff29f67cf826484eaa5dd162c03682bee2233181279a40cf1
+EBUILD udev-247.2.ebuild 5688 BLAKE2B da40822cb40389a42ef0e11f65fefa8d13b121b8e10a3cc6bb68056a081f2aafe12cabb7394b9b022fc8c3fc5718e5d6b2b3cd8f8ce04457e1a766e882abc5cc SHA512 83f80cbe8f786264b86dd3b880759d3519942805f2625e3e171e88601ede87cb488c4b3ec98e8a5e7e3f3023a2a244c6c3cd465fdb82f1e148883a88757891ba
+EBUILD udev-248.ebuild 5475 BLAKE2B 70b628ed25d8f5b39c556e680bece42604ba30ff083fe7e0f2e77a677dc8f89a7aafcea7fadfec4f756aad03c0f9b19dae34f1a43bff724444fa429d55ab183d SHA512 1954e732be787b8a9b9454ae0987bbc2276de6b7e71ec8d260d5e1c835bb9a1f68c04843709f42c791e58ad43c70f5146f5faeaf1e776353119b5ad15404d901
+EBUILD udev-249-r1.ebuild 5776 BLAKE2B 909f1699e70b77b0347f35fa3353cc16021870aea15fbdf4faca6623327a22237ca78a9891e4e141cf72ae682023611155234cac4fb6008e6ccc1cfb97d9eef5 SHA512 1ec11b20403555deb4d7725289af1a214550aa92d3aea2d39807a1d26a73764e499eed1b3b8deec9300e406c5eb9efab24ae01d365fb9055728660b2c74bacba
+EBUILD udev-9999.ebuild 5735 BLAKE2B 7847f1af44dd1dd3b85b9144c690066260297ab2beba5cc86be946838f3a07b7976b108629f8d50424b6cc3bfe37e60c3ed87262a44465d42c68c689fb70db16 SHA512 68ee2e626625d6fbd7c7747b0e6788329b3a81015ebe3f6db1d65bc3bca8cbe8e56792ffe2a9acb736395c2549d0f6969f1fadd2cd00eec950ed5726674c05dd
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index aa7adfc82320..1322ad2f6057 100644
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild
index 51979da0f5c8..5fc08f3b74af 100644
--- a/sys-fs/udev/udev-246-r1.ebuild
+++ b/sys-fs/udev/udev-246-r1.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild
index 276bd37716fe..b1dfe60bc551 100644
--- a/sys-fs/udev/udev-247.2.ebuild
+++ b/sys-fs/udev/udev-247.2.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
index 48130385ec4b..090111f3ac0d 100644
--- a/sys-fs/udev/udev-248.ebuild
+++ b/sys-fs/udev/udev-248.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
index 412b8abefde7..4b808e917a4d 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 889f61023243..9cb8cd5f731a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl )
 	kmod? ( >=sys-apps/kmod-15 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 21bfb06d5b8c..04b319318d4b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index a8f70f780647..0beb8aacd6cc 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,23 +1,11 @@
-AUX 050-Makefile-fix-VERSION-again.patch 1057 BLAKE2B 8373a43030c02bc0273aacb3f0f286d4f98812039c459ec16607e3e5b9bd83c367420c6b67d7cc8d2f6d9469bca2e5e5770f20390348e50abdbec7f12c4f36a3 SHA512 89e5ae4cf88d65ec5f31384c334b46f8e6e74a31e0225a62523524f87f35ead8cae221d3a0f8e5f837a1e22b51833db75b2d3f3b07fa3ac4ded5dac9012a8027
-AUX 050-Makefile-merge-main-version-and-git-version-earlier.patch 3071 BLAKE2B 0d20b6ca7bb92aca21b3afaaee6fffb94c23de806ebe46383074979e0afedc893aec478122391d7c6015882b7882dd3f6e4124fa1f6fa1dc0bb48beae50d4d9d SHA512 ad9219c66b0a921b2fcb9dc325d1afd4c17d447228ee3b95b7a7e799acdc9d48d1d963842643d6ee6e90f8891d5c924c707331041cde53701261cb670adbcd33
-AUX 050-btrfs-force-preload-btrfs-module.patch 960 BLAKE2B 9837361b8f3559d87dc39374ca9cd8e2717f257dbb428d542e356672623c6b02d2a8aea5c0cbd2c64b01564a1ec08fc7288b993f46c7043327300ca684469168 SHA512 8fcd5579486ce2afc3164970bcd2eb23306d00bef3ce1458fd6f41664299a16c5772ed3f0d823861b698b01cf7a495412afb7f3a200e4c07e96ca3b617d8d6bf
-AUX 050-busybox-module-fix.patch 3468 BLAKE2B a5292669c358f46ededf184e654213298e1e2a193e27b90cdb3913149cae40c2bfb70a8a211515ea7d3109fe87676ad71f93166dce793b7033ecfc05691e822c SHA512 a85d8f157d466e642c53436276777e6caf42aa3280cfa2d635c1541919484c50cccc232802131ce6776b1059151bdcfabdd3e4f69d697012d2e4d24a4793794b
-AUX 050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch 3655 BLAKE2B dc48d86fa1d78622bf0a7e5714de23d046515d3ad866f321769b0c56c243bdc6d6b45c69eb09e02477a79d90a546bdfcd767551b838f647f07179c9174ff46f7 SHA512 774602605b552343b0f26bcc7311c118bbb816bae9a1d798e650b72105c7a44ada8bfe238a66619ef6ee345534ef6a6d3c6449eaad51ba0ecf483fcc4aac1fb8
-AUX 050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch 2779 BLAKE2B edb10ef79fd22863aef5184ca0d7abc88602cf3e8a3cfd198047e0970d10e9aa56e1222dc44a089afb3a0f15caa87e4e3233b32980b5fd56e9975196350000f4 SHA512 a31cfceb9ab53e53ce3f69ed6388bf7cfcf40ad7b036197194f34cd973a74e28ac8bfb7bf7d79068b48fc8c5feaf26540948b8008c1fdab997587bf4b31f8b71
-AUX 050-lvm-fix-removal-of-pvscan-from-udev-rules.patch 1270 BLAKE2B ac4b93d0ed469ca9d2ba2ad9ca83b1f0efce590758bdd824278e9409fd4706e975d3fa9a10733775cc5b0a3a4665260d8869291de5a1f89c810c01a7cf0889e4 SHA512 7466c66f570c9a097b701a91d2735469187e879d2dec2ff2d10322ad39c86f3a5c70fc778d13b42014ba9754a6d1bea6d37f3ee456cbe4ec075dd676cf09093d
-AUX 050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch 1627 BLAKE2B c45b8efef1612ede5021be1bfe2135586286b4ac8d501ce6cde518eefb699c143fec1ec858e4320ba473feb06e88896ab0f4b2f738c6a5a98c20a161d11f508a SHA512 e070f24f0d0e95a14ee503e0cbc62d87b32ad678c12a8054c1a0c505d9ae833cd37052d51fe8d1a2a608fd06a8894d06ea4da626aadf5e9e4dd39b2ea883aaae
-AUX 050-systemd-remove-obsolete-syslog-parameter.patch 8176 BLAKE2B abf1619f4010cd38d98814f8827d592394a7ed7acc4c19392751adea4a98ce4acfce12bae1c2d264c392c73081ae04a205cfccd3591de651b87301352bbbe68c SHA512 3609ea93b85f79d3451fc810164c1be61def3f8e016a1fc0963088f2a690c56680d0c49bad5f8398af80150bd07bf953de50fe8832a5b88da5c01eead5fdbe7f
-AUX 051-dracut.sh-move-ldconfig.patch 2064 BLAKE2B 91d60d66cc3dd788f97900e4765761b918425abb603ce09b3101ec242222f17e6e7166af7faaa8ad47cff7aa1a9259af90832066ee67f7bee25c400bdfd302cb SHA512 060f968f39bd11822b1154baa7d28a1190ead371f57e43d4a997e8013f39d48e1509908b2fe3859b9315de57dc4ed03b8e4beab1ec743dc56186c9e6a1d9c116
 AUX 053-network-manager.patch 840 BLAKE2B d9dca01ad97015d636dfda3eb2b99a9289dabbc2554ea79159f6e971ab0baa912d21866204d91b4e6cdf9f8f5d953f2ca045aa7979396237e8af053f09e9e173 SHA512 63babf06fc3ad151c2026267cb766817a7902858ddab0cb625551c95a1c83d44b8cafa1bf22ce4e124aa5968b258c6946dadfdd5375f2c532b19173b84623008
+AUX 055-fix-base-do-not-quote-initargs-for-switch_root.patch 1095 BLAKE2B 35e2fbc027db3c6e642939d2139a2ef22b7273d4a11e957fb9e6376b14b8ba26daf39281bb8494251b9940a54cd78b42c357f88bc7469a64307a936b62fc1ca1 SHA512 f59624deb66644e8488e15079d8dbfa1e428bdd325ecd3f879fd1f07869ca7aae001109dabd1816875aeeb5962c05496ce0e2261ee3562fa1800a5e4b61d446a
+AUX 055-fix-crypt-remove-quotes-from-cryptsetupopts.patch 1404 BLAKE2B 4956f8df0b76c204279032fdf545f230f063fd7ea5393e3ade80587e10eb50dfba2e0677da04e641da17d1ce79564b3084274c739b3af59dab2226852b0835b2 SHA512 11243e311aeae6b9f1b6481521a92e4fd962e5fd24b1bd279e04f1f1618ba4ae0c4243d94274dda8e16d0311c377e0fbf2bae5c64c508e29caaf64d123c365a3
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a
-DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
-DIST dracut-051.tar.xz 346500 BLAKE2B 38129b6b713b3338bbb2554fffd611f80216969eebac9fca7fb72df2db2036d4fbe66ebd54e646e562e24801e61064e54b62f066bab9e77ca88814100ebdd8ff SHA512 f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8
 DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
 DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
-EBUILD dracut-050-r2.ebuild 5188 BLAKE2B 2ad317c0431d3d29bed17260d7a115c2affe911f20d08e4fb7a9b03bc9a271245c520c3c221e72ab8c9ea75a7a082df680d585cbfbd95bcad7d3d88336757073 SHA512 f4c72035af1a9c4baae689ccc26cd29a97371a6c05f8f7d4709e2e8c2659baf8d22bef4b8db7d0da8eb85ed2146c2c21367b5d4e50f36219b20d73846e654299
-EBUILD dracut-051-r1.ebuild 4646 BLAKE2B 981c0e9b8121a7b57405ee16d83304733830b077df166e4ed8c26b081d6302151c209d666b4ee1b1277b7f8a362d9e6e8e55138ac48f740b2bb35a325566057b SHA512 49b78798b58b09ed1268e80834de6f3547337a06c5232ad226dc59156167cd122899bff60cfa6051d04131416fda15cf6e606774d653461e1d91495d8b4a5fad
 EBUILD dracut-053-r1.ebuild 4521 BLAKE2B bfd4df6329b2d0bfc7178dbd7a31194d10a89613aa71bd5233e13638a1f2c6b67d3bc96b9299bd0dd70695749532435640e76097bc51911ad434389636a38202 SHA512 70a9f084a8b163481aeca5a5610c0553c1634de083cf7fd2c5ea014989e32ad624c2f212bd57f5f60c51dd67dbcfec2e749b4b0ed69150b9c5cc4aa828bb74bd
-EBUILD dracut-055.ebuild 4792 BLAKE2B 0a1a700f00c370c7de6db5e90f11d7c93dfedf7cf42838018cd047203333e3f44383446292da3008979c63b13e1622483cb87ae475ad1613b20b4711c1741dd3 SHA512 54b5ca49fe62ff36314ddf0937b9d400bc3891638b06c2dbf82cf946c5808bf2237b9d51406bfbd2b7c162d99cbb402b77155b8260e4cf97bb3f658b03e6d452
+EBUILD dracut-055-r1.ebuild 4933 BLAKE2B 73b98eee8ed4e730ac123a9bcfd9b5ac64a5599509dd455d9ddbe2bede413227e93105414e5b6239a134131cb31f7e5a349b5baa0e4a773134e55bd6428c87c6 SHA512 ef5570b924ea8c4d92735ff50725357e5da86707aa2776d347ed9eadbe9cb39c5b880d8128fc81d94e37035c5402852105c06474ba689dfe55d560c033386af0
 EBUILD dracut-9999.ebuild 4792 BLAKE2B 0a1a700f00c370c7de6db5e90f11d7c93dfedf7cf42838018cd047203333e3f44383446292da3008979c63b13e1622483cb87ae475ad1613b20b4711c1741dd3 SHA512 54b5ca49fe62ff36314ddf0937b9d400bc3891638b06c2dbf82cf946c5808bf2237b9d51406bfbd2b7c162d99cbb402b77155b8260e4cf97bb3f658b03e6d452
 MISC metadata.xml 478 BLAKE2B 28130c92964b57a250220a1f5792459c8c35f5308a9f6713f60cb0492175fb6f296a77535dcb59db47db5cc3e8c3a56e7828e28d3519610a119bac500b844f4f SHA512 75bd848d2f69e892d6d4623fb00d36ac5572f19ce89db246f668c3f15581c1bd74987988c46c6dc656bd1d75342d98a47b7af57e0f646c39572ccb1b398f6090
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild
deleted file mode 100644
index 4eb3b1db06d8..000000000000
--- a/sys-kernel/dracut/dracut-050-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-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
-	)
-"
-DEPEND="
-	>=sys-apps/kmod-23
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
-	"${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
-	"${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
-	"${FILESDIR}"/050-btrfs-force-preload-btrfs-module.patch
-	"${FILESDIR}"/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
-	"${FILESDIR}"/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
-	"${FILESDIR}"/050-busybox-module-fix.patch
-	"${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch
-	"${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
-	"${FILESDIR}"/gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-
-	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
-		# Source tarball from github doesn't include this file
-		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-	fi
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	optfeature "Networking support" net-misc/networkmanager
-	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with rsyslog" app-admin/rsyslog
-	optfeature \
-		"Enable rngd service to help generating entropy early during boot" \
-		sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-051-r1.ebuild b/sys-kernel/dracut/dracut-051-r1.ebuild
deleted file mode 100644
index 4c6865f55771..000000000000
--- a/sys-kernel/dracut/dracut-051-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-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
-	)
-"
-DEPEND="
-	>=sys-apps/kmod-23
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}"/051-dracut.sh-move-ldconfig.patch
-	"${FILESDIR}"/gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-
-	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
-		# Source tarball from github doesn't include this file
-		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-	fi
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	optfeature "Networking support" net-misc/networkmanager
-	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with rsyslog" app-admin/rsyslog
-	optfeature \
-		"Enable rngd service to help generating entropy early during boot" \
-		sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-055-r1.ebuild b/sys-kernel/dracut/dracut-055-r1.ebuild
new file mode 100644
index 000000000000..e45745cf50f6
--- /dev/null
+++ b/sys-kernel/dracut/dracut-055-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+
+RESTRICT="!test? ( test )"
+
+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
+	)
+"
+DEPEND="
+	>=sys-apps/kmod-23
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}"/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
+	"${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch
+	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+
+	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+		# Source tarball from github doesn't include this file
+		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		# Tests need root privileges, bug #298014
+		ewarn "Skipping tests: Not running as root."
+	elif [[ ! -w /dev/kvm ]]; then
+		ewarn "Skipping tests: Unable to access /dev/kvm."
+	else
+		emake -C test check
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		NEWS.md
+		README.md
+		docs/README.cross
+		docs/README.generic
+		docs/README.kernel
+		docs/SECURITY.md
+	)
+
+	default
+
+	docinto html
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	optfeature "Networking support" net-misc/networkmanager
+	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with rsyslog" app-admin/rsyslog
+	optfeature \
+		"Enable rngd service to help generating entropy early during boot" \
+		sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/dracut-055.ebuild b/sys-kernel/dracut/dracut-055.ebuild
deleted file mode 100644
index 3b042f3de741..000000000000
--- a/sys-kernel/dracut/dracut-055.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux test"
-
-RESTRICT="!test? ( test )"
-
-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
-	)
-"
-DEPEND="
-	>=sys-apps/kmod-23
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-
-	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
-		# Source tarball from github doesn't include this file
-		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		# Tests need root privileges, bug #298014
-		ewarn "Skipping tests: Not running as root."
-	elif [[ ! -w /dev/kvm ]]; then
-		ewarn "Skipping tests: Unable to access /dev/kvm."
-	else
-		emake -C test check
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		NEWS.md
-		README.md
-		docs/README.cross
-		docs/README.generic
-		docs/README.kernel
-		docs/SECURITY.md
-	)
-
-	default
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	optfeature "Networking support" net-misc/networkmanager
-	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with rsyslog" app-admin/rsyslog
-	optfeature \
-		"Enable rngd service to help generating entropy early during boot" \
-		sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch b/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
deleted file mode 100644
index a091e4c9facc..000000000000
--- a/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a76aa8e39016a8564adb0f18f93bbf2e15d3243f Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sun, 8 Mar 2020 05:47:50 +0300
-Subject: [PATCH] Makefile: fix VERSION again
-
-The variable is not undefined anymore after the first assignment, so
-we should check if variable is empty instead.
----
- Makefile | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c69e2dfc..02e2c4b5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,13 @@
- -include dracut-version.sh
- 
- DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
--DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
-+ifeq ($(DRACUT_MAIN_VERSION),)
-+DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
-+endif
- DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
--DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
-+ifeq ($(DRACUT_FULL_VERSION),)
-+DRACUT_FULL_VERSION = $(DRACUT_VERSION)
-+endif
- 
- -include Makefile.inc
- 
--- 
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch b/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
deleted file mode 100644
index 49c532b92995..000000000000
--- a/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From eb8a7a96351b6e1cfd9dc34f1e854333a8f4a4e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Fri, 6 Mar 2020 08:46:36 +0700
-Subject: [PATCH] Makefile: merge main-version and git-version earlier
-
-With GNU Make 4.3 on both ArchLinux, and VoidLinux,
-GITVERION is always empty because of bad substitution.
-Change '\#' to simply '#' can fix it,
-but we don't need that complation.
-
-We can merge DRACUT_MAIN_VERSION and GITVERSION into DRACUT_FULL_VERSION.
-Because, GITVERSION will be attached back to DRACUT_MAIN_VERSION in all
-situation.
-
-While we're at it, detect if we're in git worktree by:
-limiting GIT_CEILING_DIRECTORIES to parent directory of
-dracut's top level directory; instead of checking for .git directory,
-in order to support git-worktree, in such case, .git will be a file, see
-gitrepository-layout(5)
----
- Makefile | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 22b584f1..c69e2dfc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,9 @@
- -include dracut-version.sh
- 
--DRACUT_MAIN_VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || :)
-+DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
- DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
--GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
-+DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
-+DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
- 
- -include Makefile.inc
- 
-@@ -92,14 +93,14 @@ endif
- 
- %.xml: %.asc
- 	@rm -f -- "$@"
--	asciidoc -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" -d manpage -b docbook -o "$@" $<
-+	asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
- 
- dracut.8: dracut.usage.asc dracut.8.asc
- 
- dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
- 	@rm -f -- dracut.xml
- 	asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
--		-a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" \
-+		-a "version=$(DRACUT_FULL_VERSION)" \
- 		-a numbered \
- 		-d book -b docbook -o dracut.xml dracut.asc
- 	@rm -f -- dracut.html
-@@ -112,7 +113,7 @@ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
- dracut.pc: Makefile.inc Makefile
- 	@echo "Name: dracut" > dracut.pc
- 	@echo "Description: dracut" >> dracut.pc
--	@echo "Version: $(DRACUT_MAIN_VERSION)$(GITVERSION)" >> dracut.pc
-+	@echo "Version: $(DRACUT_FULL_VERSION)" >> dracut.pc
- 	@echo "dracutdir=$(pkglibdir)" >> dracut.pc
- 	@echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
- 	@echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
-@@ -182,7 +183,7 @@ endif
- 
- dracut-version.sh:
- 	@rm -f dracut-version.sh
--	@echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)$(GITVERSION)" > dracut-version.sh
-+	@echo "DRACUT_VERSION=$(DRACUT_FULL_VERSION)" > dracut-version.sh
- 
- clean:
- 	$(RM) *~
--- 
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
deleted file mode 100644
index 386722c2ae82..000000000000
--- a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0402b3777b1c64bd716f588ff7457b905e98489d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 11 Mar 2020 12:56:52 +0100
-Subject: [PATCH] btrfs: force preload btrfs module
-
-fixes https://github.com/dracutdevs/dracut/issues/658
-
-raid6_pq and xor takes time doing benchmarking
-
-[    3.983009] request_module fs-btrfs succeeded, but still no fs?
----
- modules.d/90btrfs/module-setup.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
-index b0d0058b..66a254e1 100755
---- a/modules.d/90btrfs/module-setup.sh
-+++ b/modules.d/90btrfs/module-setup.sh
-@@ -48,5 +48,7 @@ install() {
- 
-     inst_multiple -o btrfsck btrfs-zero-log
-     inst $(command -v btrfs) /sbin/btrfs
-+    # Hack for slow machines
-+    # see https://github.com/dracutdevs/dracut/issues/658
-+    echo "rd.driver.pre=btrfs" > ${initdir}/etc/cmdline.d/00-btrfs.conf
- }
--
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-busybox-module-fix.patch b/sys-kernel/dracut/files/050-busybox-module-fix.patch
deleted file mode 100644
index faaf026e536a..000000000000
--- a/sys-kernel/dracut/files/050-busybox-module-fix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From f769154bccf22d2b5caf5e4888f88bf7edde2662 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 25 May 2020 19:02:05 +0300
-Subject: [PATCH 1/2] dracut-functions: fix find_binary() to return full path
-
-Fixes: a01204202b30 (Allow running on a cross-compiled rootfs)
----
- dracut-functions.sh | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3cb9c7af..b5c28248 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -41,31 +41,36 @@ str_ends() { [ "${1%*"$2"}" != "$1" ]; }
- # search in the usual places to find the binary.
- find_binary() {
-     local _delim
-+    local _path
-     local l
-     local p
-     [[ -z ${1##/*} ]] || _delim="/"
- 
-     if [[ "$1" == *.so* ]]; then
-         for l in libdirs ; do
--            if { $DRACUT_LDD "$dracutsysrootdir$l$_delim$1" &>/dev/null; };  then
--                printf "%s\n" "$1"
-+            _path="${l}${_delim}${1}"
-+            if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; };  then
-+                printf "%s\n" "${_path}"
-                 return 0
-             fi
-         done
--        if { $DRACUT_LDD "$dracutsysrootdir$_delim$1" &>/dev/null; }; then
--            printf "%s\n" "$1"
-+        _path="${_delim}${1}"
-+        if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; }; then
-+            printf "%s\n" "${_path}"
-             return 0
-         fi
-     fi
-     if [[ "$1" == */* ]]; then
--        if [[ -L $dracutsysrootdir$_delim$1 ]] || [[ -x $dracutsysrootdir$_delim$1 ]]; then
--            printf "%s\n" "$1"
-+        _path="${_delim}${1}"
-+        if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]]; then
-+            printf "%s\n" "${_path}"
-             return 0
-         fi
-     fi
-     for p in $DRACUT_PATH ; do
--        if [[ -L $dracutsysrootdir$p$_delim$1 ]] || [[ -x $dracutsysrootdir$p$_delim$1 ]];  then
--            printf "%s\n" "$1"
-+        _path="${p}${_delim}${1}"
-+        if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]];  then
-+            printf "%s\n" "${_path}"
-             return 0
-         fi
-     done
--- 
-2.26.2
-
-From 50cc23ba32b0fda63eff7623b529dbeb4e6a38c6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 25 May 2020 17:49:20 +0300
-Subject: [PATCH 2/2] busybox: simplify listing of supported utilities
-
-'--list' option is supported since busybox-1.20.0, which was released
-in 2010.
----
- modules.d/05busybox/module-setup.sh | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh
-index ecbd6a13..5d88c5d1 100755
---- a/modules.d/05busybox/module-setup.sh
-+++ b/modules.d/05busybox/module-setup.sh
-@@ -14,15 +14,16 @@ depends() {
- 
- # called by dracut
- install() {
--    local _i _progs _path _busybox
-+    local _i _path _busybox
-+    local _progs=()
-     _busybox=$(type -P busybox)
-     inst $_busybox /usr/bin/busybox
--    for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
--    do
--        _progs="$_progs $_i"
-+    for _i in $($_busybox --list); do
-+        [[ ${_i} == busybox ]] && continue
-+        _progs+=("${_i}")
-     done
- 
--    for _i in $_progs; do
-+    for _i in "${_progs[@]}"; do
-         _path=$(find_binary "$_i")
-         [ -z "$_path" ] && continue
-         ln_r /usr/bin/busybox $_path
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
deleted file mode 100644
index 11ca7add6d6f..000000000000
--- a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 8e1a4dc5f8a777fc718db490414ffdc9dc755f66 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas@archlinux.org>
-Date: Sat, 18 Apr 2020 14:55:41 +0200
-Subject: [PATCH] dracut-lib.sh: quote variables in parameter expansion
- patterns
-
-According to POSIX.1-2017, 2.6.2 Parameter Expansion:
-
-${parameter%[word]} [...] The word shall be expanded to produce a
-pattern.
-
-This means if word contains variables that itself contain special
-characters like asterisks or backslashes, these are treated as pattern
-characters unless the variable is quoted. Try e.g. the following example
-in bash, dash or (busybox) ash:
-
-i='a\c'; j='\'; echo "${i%$j*}"
-
-This prints "a\c" because "$j*" is expanded to "\*", escaping the
-asterisk. In contrast,
-
-i='a\c'; j='\'; echo "${i%"$j"*}"
-
-produces the expected result "a" because the backslash is not specially
-treated any more after quoting.
-
-The quotes that this commit adds have been previously removed in commit
-f9c96cf56fed390841eac05c43826e62014c9188, citing issues with busybox
-hush without further specifying the actual error. I tested a recent
-busybox build (upstream commit 9aa751b08ab03d6396f86c3df77937a19687981b)
-and couldn't find any problems. Note that the above example always
-produces "a\c" in hush regardless of quoting $j, making hush unsuitable
-for use with dracut, but using quotes in parameter expansions generally
-works.
-
-The unquoted variables break the "rd.luks.uuid/name" kernel command line
-options in dracut 050 because
-
-str_replace "$luksname" '\' '\\'
-
-in modules.d/90crypt/parse-crypt.sh is not able to escape the
-backslashes any more, see GH-723, GH-727: backslashes in the
-systemd-cryptsetup@.service unit name stay unescaped for use in udev
-(cf. commit 0f6d93eb9d63695a64002ec8b0421fbc9fc8a7a3), leading to
-failures in starting the unit.
-
-This partially reverts commit f9c96cf56fed390841eac05c43826e62014c9188.
----
- modules.d/99base/dracut-lib.sh | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index c53cd13b..c57523d3 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -24,7 +24,7 @@ debug_on() {
- 
- # returns OK if $1 contains literal string $2 (and isn't empty)
- strstr() {
--    [ "${1##*$2*}" != "$1" ]
-+    [ "${1##*"$2"*}" != "$1" ]
- }
- 
- # returns OK if $1 matches (completely) glob pattern $2
-@@ -43,18 +43,18 @@ strglobin() {
- 
- # returns OK if $1 contains literal string $2 at the beginning, and isn't empty
- str_starts() {
--    [ "${1#$2*}" != "$1" ]
-+    [ "${1#"$2"*}" != "$1" ]
- }
- 
- # returns OK if $1 contains literal string $2 at the end, and isn't empty
- str_ends() {
--    [ "${1%*$2}" != "$1" ]
-+    [ "${1%*"$2"}" != "$1" ]
- }
- 
- trim() {
-     local var="$*"
--    var="${var#${var%%[![:space:]]*}}"   # remove leading whitespace characters
--    var="${var%${var##*[![:space:]]}}"   # remove trailing whitespace characters
-+    var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-+    var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
-     printf "%s" "$var"
- }
- 
-@@ -108,9 +108,9 @@ str_replace() {
-     local out=''
- 
-     while strstr "${in}" "$s"; do
--        chop="${in%%$s*}"
-+        chop="${in%%"$s"*}"
-         out="${out}${chop}$r"
--        in="${in#*$s}"
-+        in="${in#*"$s"}"
-     done
-     echo "${out}${in}"
- }
-@@ -396,7 +396,7 @@ splitsep() {
-     while [ -n "$str" -a "$#" -gt 1 ]; do
-         tmp="${str%%$sep*}"
-         eval "$1='${tmp}'"
--        str="${str#$tmp}"
-+        str="${str#"$tmp"}"
-         str="${str#$sep}"
-         shift
-     done
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch b/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
deleted file mode 100644
index cf54cabb5eb6..000000000000
--- a/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0386e4627779cb51f4292b3c642d90586d5e71b4 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Wed, 29 Jan 2020 23:53:29 +0100
-Subject: [PATCH] dracut.sh: don't call fsfreeze on subvol of root file system
-
-dracut.sh already doesn't call fsfreeze if the output file is on
-the root file system. For btrfs, however, this is not sufficient.
-Because fsfreeze is a superblock operation, and all btrfs subvolumes
-share the same superblock, fsfreeze may freeze the entire system
-if the subvolume on which the output file is written and / are
-subvolumes of the same file system. Avoid this by comparing file
-system UUIDs for btrfs.
-
-Fixes: de576db3c225 ("call fsfreeze(8) on /boot to flush initramfs data & metadata to media")
----
- dracut.sh | 36 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index af346f3a..c14f6c0b 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2075,6 +2075,40 @@ fi
- 
- command -v restorecon &>/dev/null && restorecon -- "$outfile"
- 
-+btrfs_uuid() {
-+    btrfs filesystem show "$1" | sed -n '1s/^.*uuid: //p'
-+}
-+
-+freeze_ok_for_btrfs() {
-+    local mnt uuid1 uuid2
-+    # If the output file is on btrfs, we need to make sure that it's
-+    # not on a subvolume of the same file system as the root FS.
-+    # Otherwise, fsfreeze() might freeze the entire system.
-+    # This is most conveniently checked by comparing the FS uuid.
-+
-+    [[ "$(stat -f -c %T -- "/")" == "btrfs" ]] || return 0
-+    mnt=$(stat -c %m -- "$1")
-+    uuid1=$(btrfs_uuid "$mnt")
-+    uuid2=$(btrfs_uuid "/")
-+    [[ "$uuid1" && "$uuid2" && "$uuid1" != "$uuid2" ]]
-+}
-+
-+freeze_ok_for_fstype() {
-+    local outfile=$1
-+    local fstype
-+
-+    [[ "$(stat -c %m -- "$outfile")" == "/" ]] && return 1
-+    fstype=$(stat -f -c %T -- "$outfile")
-+    case $fstype in
-+        msdos)
-+            return 1;;
-+        btrfs)
-+            freeze_ok_for_btrfs "$outfile";;
-+        *)
-+            return 0;;
-+    esac
-+}
-+
- # We sync/fsfreeze only if we're operating on a live booted system.
- # It's possible for e.g. `kernel` to be installed as an RPM BuildRequires or equivalent,
- # and there's no reason to sync, and *definitely* no reason to fsfreeze.
-@@ -2087,7 +2121,7 @@ if test -d $dracutsysrootdir/run/systemd/system; then
-     fi
- 
-     # use fsfreeze only if we're not writing to /
--    if [[ "$(stat -c %m -- "$outfile")" != "/" && "$(stat -f -c %T -- "$outfile")" != "msdos" ]]; then
-+    if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
-         if ! $(fsfreeze -f $(dirname "$outfile") 2>/dev/null && fsfreeze -u $(dirname "$outfile") 2>/dev/null); then
-             dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
-         fi
--- 
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
deleted file mode 100644
index 8b93afc358ea..000000000000
--- a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07417b7fc5cb261187519c916e4735189f20f4c6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sat, 23 May 2020 18:03:47 +0300
-Subject: [PATCH] lvm: fix removal of pvscan from udev rules
-
-udev rules provided by lvm 2.02.128 and newer uses '+=' instead of '='.
----
- modules.d/90lvm/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index d6d2c185..52c803f7 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -101,7 +101,7 @@ install() {
-             sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \
-                 ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
-             sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
--            sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
-+            sed -i -e 's/^ENV{SYSTEMD_WANTS}+\?=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
-         else
-             sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \
-                 ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
deleted file mode 100644
index d97193c9b13d..000000000000
--- a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3dcaa97ca4dcfa8092252a22df62c60941e59ce3 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 11 Mar 2020 09:40:50 +0100
-Subject: [PATCH] network-manager: ensure that nm-run.sh is executed when
- needed
-
-The network-manager command line hook must install a
-initqueue/finished hook to ensure that nm-run.sh is executed when
-there are network connections to activate.
-
-Fixes: #694
----
- modules.d/35network-manager/nm-config.sh | 11 +++++++++++
- modules.d/35network-manager/nm-run.sh    |  2 ++
- 2 files changed, 13 insertions(+)
-
-diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
-index 1efa737c..39a1c8bd 100755
---- a/modules.d/35network-manager/nm-config.sh
-+++ b/modules.d/35network-manager/nm-config.sh
-@@ -5,3 +5,14 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
- fi
- 
- /usr/libexec/nm-initrd-generator -- $(getcmdline)
-+
-+if getargbool 0 rd.neednet; then
-+  for i in /usr/lib/NetworkManager/system-connections/* \
-+           /run/NetworkManager/system-connections/* \
-+           /etc/NetworkManager/system-connections/* \
-+           /etc/sysconfig/network-scripts/ifcfg-*; do
-+    [ -f "$i" ] || continue
-+    echo '[ -f /tmp/nm.done ]' >$hookdir/initqueue/finished/nm.sh
-+    break
-+  done
-+fi
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index 4079b735..fc5280a1 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -22,3 +22,5 @@ do
-     source_hook initqueue/online $ifname
-     /sbin/netroot $ifname
- done
-+
-+> /tmp/nm.done
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
deleted file mode 100644
index f24cf11b37b3..000000000000
--- a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 265f696b532f63f0ac1f9f341e0469a6eafe2fdd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:26:00 +0000
-Subject: [PATCH 01/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/90stratis/stratisd-init.service | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
-index 318e8c27..1be2e33b 100644
---- a/modules.d/90stratis/stratisd-init.service
-+++ b/modules.d/90stratis/stratisd-init.service
-@@ -8,8 +8,6 @@ DefaultDependencies=no
- Type=simple
- ExecStart=/sbin/stratisd-init --debug
- KillSignal=SIGINT
--StandardOutput=syslog
--StandardError=syslog
- 
- [Install]
- WantedBy=sysinit.target
--- 
-2.26.2
-
-From 38ba90bf88b38228e128c65be40a2da287c0b1ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:29:34 +0000
-Subject: [PATCH 02/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/99squash/squash-mnt-clear.service | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service
-index 84441f60..9d94c524 100644
---- a/modules.d/99squash/squash-mnt-clear.service
-+++ b/modules.d/99squash/squash-mnt-clear.service
-@@ -12,6 +12,6 @@ ConditionPathExists=/squash/root
- Type=oneshot
- RemainAfterExit=no
- StandardInput=null
--StandardOutput=syslog+console
--StandardError=syslog+console
-+StandardOutput=journal+console
-+StandardError=journal+console
- ExecStart=/squash/clear-squash.sh
--- 
-2.26.2
-
-From 5cb2a4004d18e4b96ddc18f221fae922350a9000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:31:17 +0000
-Subject: [PATCH 03/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-trigger.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service
-index 7bf16167..6f1ba521 100644
---- a/modules.d/98dracut-systemd/dracut-pre-trigger.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service
-@@ -20,8 +20,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-trigger
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From 317d841c788e841d3533515ceda5597a099eb64e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:31:59 +0000
-Subject: [PATCH 04/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-initqueue.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
-index 207d545d..3a8679a5 100644
---- a/modules.d/98dracut-systemd/dracut-initqueue.service
-+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
-@@ -21,8 +21,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-initqueue
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From 0c1bd016ecfb9c6d194c4356199b509d90db4071 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:32:44 +0000
-Subject: [PATCH 05/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-pivot.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service
-index 9a1f0854..e893d1dd 100644
---- a/modules.d/98dracut-systemd/dracut-pre-pivot.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service
-@@ -27,8 +27,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-pivot
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From e1130a83405648777210fdc99f7eee087eebaadc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:33:33 +0000
-Subject: [PATCH 06/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-udev.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
-index 570ec02d..e4092e35 100644
---- a/modules.d/98dracut-systemd/dracut-pre-udev.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
-@@ -24,8 +24,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-udev
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From c437933cb0490e800e776cb7695d2ea0e95056a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:34:17 +0000
-Subject: [PATCH 07/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-mount.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service
-index d3909689..18c9730c 100644
---- a/modules.d/98dracut-systemd/dracut-pre-mount.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-mount.service
-@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-mount
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From d9149c6ca7c52c204c1b346e9b6a32bbadd0b2ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:35:02 +0000
-Subject: [PATCH 08/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-cmdline.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service
-index e577ec88..a8078bd2 100644
---- a/modules.d/98dracut-systemd/dracut-cmdline.service
-+++ b/modules.d/98dracut-systemd/dracut-cmdline.service
-@@ -23,8 +23,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-cmdline
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
-From 8cb5ac1b30be458df9497911ba601d90e68f4d5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:35:38 +0000
-Subject: [PATCH 09/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-mount.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service
-index 77d34f62..c88e6d84 100644
---- a/modules.d/98dracut-systemd/dracut-mount.service
-+++ b/modules.d/98dracut-systemd/dracut-mount.service
-@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-mount
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
- 
--- 
-2.26.2
-
diff --git a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
deleted file mode 100644
index d6d97f7bb948..000000000000
--- a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 48258fae9fa58046d7d1a246ea3d821530180643 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 18 Dec 2020 00:01:32 +0300
-Subject: [PATCH] dracut.sh: Move ldconfig after library workaround
-
-This fixes boot failures when libgcc_s.so.1 is in a non-standard
-directory.
-
-Bug: https://bugs.gentoo.org/760249
-Fixes: de3cb0e3214c (dracut.sh: Move the library workaround after squash)
----
- dracut.sh | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 0f4648397..c6c361acc 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1724,20 +1724,6 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
-     fi
- done
- 
--if [[ $kernel_only != yes ]]; then
--    # make sure that library links are correct and up to date
--    for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
--        [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
--    done
--    if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
--        if [[ $EUID = 0 ]]; then
--            derror "ldconfig exited ungracefully"
--        else
--            derror "ldconfig might need uid=0 (root) for chroot()"
--        fi
--    fi
--fi
--
- if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then
-     dinfo "*** Hardlinking files ***"
-     hardlink "$initdir" 2>&1
-@@ -1920,6 +1906,20 @@ if [[ $kernel_only != yes ]]; then
-     fi
- fi
- 
-+if [[ $kernel_only != yes ]]; then
-+    # make sure that library links are correct and up to date
-+    for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
-+        [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
-+    done
-+    if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
-+        if [[ $EUID = 0 ]]; then
-+            derror "ldconfig exited ungracefully"
-+        else
-+            derror "ldconfig might need uid=0 (root) for chroot()"
-+        fi
-+    fi
-+fi
-+
- if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
-     dinfo "*** Stripping files ***"
-     find "$initdir" -type f \
diff --git a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
new file mode 100644
index 000000000000..5568c22aede6
--- /dev/null
+++ b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
@@ -0,0 +1,32 @@
+From 285e2ad01035743ff51005a74e486e09fcbb0a0d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 23 Jul 2021 14:35:07 -0400
+Subject: [PATCH] fix(base): do not quote $initargs for switch_root
+
+We want word splitting to occur so that the arguments are passed
+separately, and we don't end up passing an empty string if no arguments
+are specified.
+
+Bug: https://bugs.gentoo.org/803548
+Fixes: 2fabaaa62dcfd31e593ca45e1374e55adae29d6b
+---
+ modules.d/99base/init.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
+index 978adb6f..ab62bb44 100755
+--- a/modules.d/99base/init.sh
++++ b/modules.d/99base/init.sh
+@@ -387,7 +387,8 @@ if [ -f /etc/capsdrop ]; then
+         }
+ else
+     unset RD_DEBUG
+-    exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" "$initargs" || {
++    # shellcheck disable=SC2086
++    exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" $initargs || {
+         warn "Something went very badly wrong in the initramfs.  Please "
+         warn "file a bug against dracut."
+         emergency_shell
+-- 
+2.32.0
+
diff --git a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
new file mode 100644
index 000000000000..355cdc461abc
--- /dev/null
+++ b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
@@ -0,0 +1,39 @@
+From e0abf88a15d23fbf793cf872397016ad86aeaaa8 Mon Sep 17 00:00:00 2001
+From: lapseofreason <lapseofreason0@gmail.com>
+Date: Tue, 8 Jun 2021 16:01:58 +0200
+Subject: [PATCH] fix(crypt): remove quotes from cryptsetupopts
+
+Fixes #1528.
+---
+ modules.d/90crypt/cryptroot-ask.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
+index 37a4deea..b1f8df81 100755
+--- a/modules.d/90crypt/cryptroot-ask.sh
++++ b/modules.d/90crypt/cryptroot-ask.sh
+@@ -138,8 +138,9 @@ unset allowdiscards
+ ask_passphrase=1
+ 
+ if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
++    # shellcheck disable=SC2086
+     if readkey "$luksfile" / "$device" \
+-        | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname"; then
++        | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"; then
+         ask_passphrase=0
+     fi
+ elif [ "$is_keysource" -ne 0 ]; then
+@@ -164,8 +165,9 @@ else
+         unset tmp
+ 
+         info "Using '$keypath' on '$keydev'"
++        # shellcheck disable=SC2086
+         readkey "$keypath" "$keydev" "$device" \
+-            | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname" \
++            | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname" \
+             && ask_passphrase=0
+         unset keypath keydev
+         break
+-- 
+2.32.0
+
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 468ac591dd28..a8d65bce06ae 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,7 +3,6 @@ AUX genkernel-4.2.1-post-release-fixes.patch 1792 BLAKE2B 1291c8246c69a5541a07d2
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
-DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 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
@@ -11,7 +10,6 @@ DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca9
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 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 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.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
@@ -25,12 +23,9 @@ DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c1346
 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
 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.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-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
@@ -43,16 +38,13 @@ DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe
 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
-DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
-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.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 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.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
@@ -62,8 +54,7 @@ DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d933
 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.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.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
+MISC metadata.xml 529 BLAKE2B 3c658909fb001540e7485aa7d8efa842b24ea925f16ce64a9156d64762357c639d5df01f005a6804bf30cc60e286a7a634914c859951a5691d134a4065556a08 SHA512 2fccba6ed9bad196b26eedff936e245e822c3a55163c2a02e3d21cd4a25703afc27c890bc5dbdd57b2a65f2dcb092697add9507f7e3266f8d59abe429b2940f5
diff --git a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
deleted file mode 100644
index 2f5c7f2a94be..000000000000
--- a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
+++ /dev/null
@@ -1,159 +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=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${PN}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${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/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	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"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	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
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-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}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	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
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}
diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
index f0f17e763182..066bcd4a268b 100644
--- a/sys-kernel/genkernel/metadata.xml
+++ b/sys-kernel/genkernel/metadata.xml
@@ -5,7 +5,6 @@
 		<email>genkernel@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="cryptsetup">Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag>
 		<flag name="firmware">Prefer system firmware <pkg>sys-kernel/linux-firmware</pkg> over local copy.</flag>
 	</use>
 	<!--
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b7298e24d742..aec2feeac84b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,91 +1,31 @@
-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.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
-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.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
-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-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
-DIST gentoo-kernel-5.10.48-1.amd64.xpak 65536136 BLAKE2B be9827d86c0fe12b750aa5ea9236287a80612774e04e2226828d1224428133fcea711690b0680e9831235d6b38a6c96cdea5b0047b54291d27178d3d562e18f7 SHA512 9d029ac037d5ec184c12bc9a7f4b6383205185dfa88a9624c5b207087c4094a020f9c972ddf233ec2a0335aef9ca65feebb92b9b7a6241d04fe6f098e251297a
-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.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.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
-DIST gentoo-kernel-5.4.130-1.amd64.xpak 61373618 BLAKE2B 4431a12633d68d87e95826fa71e45fc61a7a6c53f3d8879583ac74802c00460048400386da61b625ebcb7eb192302cf5ca0d63a95597d51ccf144ece5c168ba5 SHA512 c84fda865821ca57b77ee2f93dd7986688a115d2a90b99ee4154bcb2f1fc6c7ad96c729a0f484ee25e70318f30935aba0eb4b228631a90d9ec6d936c3c076b00
-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 genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06
+DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
+DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
+DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
+DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
+DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
+DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
+DIST gentoo-kernel-5.10.52-1.amd64.xpak 65489696 BLAKE2B a2db9e17da673f174515c38e2107d36ffb99ce1478f2852a3f953c0ca4732acdc556806738172342002f73232f960fcaeecc3d31700b9b3d0c1359dfd493e74b SHA512 bb20d147d15358ca0adaf54d32f7c42d4b8c62073c4a7ccb09ae939f5757b42bb988176dd60946f2720d046061a9517426f0f92074257515216f66c548d6c6b1
+DIST gentoo-kernel-5.10.52-1.arm64.xpak 59035661 BLAKE2B b6084e13be321a59402a79ece7bc3c302b1b49e4a0ab24ac456185590fa8c5a555833db68ddebd1905da4bffce3b8f7ad17b86bcf882cdb839d88c8d4d135912 SHA512 1853c88f26a1d2d26b67a37cb40faaab6ef9b4af7ac77fc1b83d0b6603c1addf299f58e34a5608e6a056aeb81d0e9c2058fd1eee056f5f150cf4507327d6c8f2
+DIST gentoo-kernel-5.10.52-1.x86.xpak 57220562 BLAKE2B 89a0555e23ba7c5493b1d3865665497f821d7a256166cc4a92e5854fc506ca8aa5b883b84f4a97771934fc6ac5d61b1a213aaa66767e1881a487db5ca6dee216 SHA512 a12657010017d2d2ae317ad234b8f114daca90f94eab0cd42e3776fa7d6d933b8c8ab507412b43a11aada62a863993f63243c56dd906b4b85796f968dfcd2ca9
+DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
+DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
+DIST gentoo-kernel-5.12.19-1.x86.xpak 58076509 BLAKE2B 0e4aca91c834b23fb169bb6fabab13130de811c15f89e6341ad2a36ac230071ced6c6d7bd30be0f0f3860d09968449c1933cd33ed021213c667304070b80f9a7 SHA512 9786f106ed59661546d9f035e25c39f4c7a4a41f51afa96700867e47bab19e148e8a42c79bc3b7780967c2f82f1fef6920f220fb5fccd6f267a2c6e6a3081126
+DIST gentoo-kernel-5.13.4-2.amd64.xpak 67284746 BLAKE2B 945d5bb6271142f32f421702969ebffe70ca5232f54bd8a1b48a559971510eb623e7a9b803b044cd17273d27606ad37744e8fbd2812cacf46973f3152ee91939 SHA512 af4cb262af32136138754401682de9f7c781929a0a950d2453738300025b06973a3001d1f2c23496e04a3367f12e07ef897ff858ca9325de59309924c04fdc98
+DIST gentoo-kernel-5.13.4-2.x86.xpak 58486426 BLAKE2B b27a59ce5344db5dd255c831a0752a6a2489611e134891d04040023dbc90d3c7bb49e27762efd0ded4ab95a35f92abc48d051d8e65dc4b620ef74bdce9a93ef0 SHA512 2375c524589c509a0025a92842497674b79b791280a115c14a85d8ea5ad97e595c83efbe91ccfe3ebec098444ad4f299d889f97edc953f8122e70251da228139
+DIST gentoo-kernel-5.4.134-1.amd64.xpak 61349154 BLAKE2B c7627b1a8ad85b22450ae1b47a26f9144707f8a2173b01859ea1d876cf4d96e9fcc27be439e6c0239d7494795cc62fa931ecc71be84f9f898ec017a79d82dcf9 SHA512 d4c6613ed069a0ec2dbb5f5bb317abe952309f6ba6fbb163cbf1392478b1756dd129e51665b3b4e9c939395f5cdbc553003d7f0201098f959be9d29233a48cc9
+DIST gentoo-kernel-5.4.134-1.arm64.xpak 56052116 BLAKE2B 6a901fb6a639470145c8b58e435cfe4a380ebd402397ca34eace732936fda8e38a8e92e0f49d747e6f1ae8fb5410960e236ea2cc22dbc7f25ac833275b9b6fea SHA512 216287843b7d1e740afa3c88376e5d5ae99d88882b6669c753fdd341d7f9cd84ee8cbf28fb08f6101b9a9263ce20c6ddeeececf078c7387e571eac53baa52204
+DIST gentoo-kernel-5.4.134-1.x86.xpak 53144418 BLAKE2B d11e4de3fddb270cc41c9ad49c048df0af8e578f9ef0d811dbc4d930c7b399b7bfff724db889e3e8ce9332920b5f736594923646f7c1c8eb9f07371a85f0a1c9 SHA512 7fc2a72b5f7b636312ff28a2beb07a4514093499bb498bd43574cfd5178490c94628391acfb0da1c08569cbe0cc629373a1b9828398418f82c1745961c6508e1
 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.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-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.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.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
+EBUILD gentoo-kernel-bin-5.10.52-r2.ebuild 2542 BLAKE2B 94a3c7ae2989e70e7616432f987e2170659d4a56d92616d9d45f5f7d3efd6b073f88a588f5827688454fb548ab2b1dd385fddb84aa1c148c8773fa1c0617d9c3 SHA512 4f10a66a18c4e68d1628736634dc90618f60cd9537601d423ddf6052ed6b547c98885a94a08bfdb0de24ebde10d2eae2f210443327523954a4c07c9bd8b577b5
+EBUILD gentoo-kernel-bin-5.10.52.ebuild 2673 BLAKE2B a7b7a81fa642b2b51f0cac4d00766525f5bcd8cffe9ff07243f541ca1de6d2bbd7ce3eaa770e65c7e6ba7e70b4ea638ae894ab4b577a14d2dbc2659c46e168b2 SHA512 e3ff10bae46d58670a497400b163b01a50e63a179a8454bff58fa4b7cf476b39901ffd253f664361fe83588c806481f71b2f939d8e141345cb4775ac6c9bf2c4
+EBUILD gentoo-kernel-bin-5.12.19-r2.ebuild 2544 BLAKE2B 7f3517bdd2c1bc73ded6502b5ed35fc403fd5013075a4e9e21335bb610be88ab6e17cb298d74e739beb3e330a7e3d52fe2a3e24cf0d254eaf61590f3a413f92e SHA512 abf32b339058742ec4e95e8ac134bec00d68a5a599efc6ff208299370e2032ea8dc9600eaa21e23047289ce9ec807819a26c232c17893d52e180a852034c70f2
+EBUILD gentoo-kernel-bin-5.12.19.ebuild 2675 BLAKE2B 72309c486946ff627032085b25686e89b43a29fe5c68ecd57be8b6ae8556d76651ea1a41b88f99fc5317880df9589ae6ce49d580d1df3f0d6c7409bf7227ce72 SHA512 5378f15c4f5e70117f8e12726a27d81e26f91e2443936eca2ce086a16dcb61eba1d28f16ae42d5b2f97c88e96e5fbf95b71ecdb79f2a8526627236ed5b408ea4
+EBUILD gentoo-kernel-bin-5.13.4.ebuild 2675 BLAKE2B 130373d1d19ec38f27a88c664b79614dc32ba3f46468789cb2e6ed60e1be0891ec06efb805ede18d0a2489b1d46ac5a76a713b3bc9f49b5387c05d24e8e470b2 SHA512 9ddb9bb07355891b490a406721d78b322daad2d818e87c891a4ae000aecebe4d9b1f1a9996e1f0273e4bc1a364b744282532830d110961cafbc5876e246db477
+EBUILD gentoo-kernel-bin-5.4.134-r2.ebuild 2542 BLAKE2B 9727a87501a83e6d8ced5d1a6c9fa58a737d86eb549cbabc827af379e9e7aea63024f66f0b55f0306212a0b5502c63df810cfebd55e4d6e3de11c37c6cef826e SHA512 738f3f502781058fb53463b5199686c21ce7d08135c6e91a0a0f586c2ee24e70e52f5f7a3d676d2a6f1cf6439037b5ceb05977fa2fa59e9e9e1eb9c6a6e41014
+EBUILD gentoo-kernel-bin-5.4.134.ebuild 2673 BLAKE2B 504684885b7e4d71ef6bf6379565f478cc9714f5334f74e6d8b4f2c974a86176bf6c4e3033784e6296797fe1ad63c81fe3ccacbb5330e55fa2895b6ad3ca471e SHA512 af5e9435a6803789dfcf3b36755f30db552261e362197a8328f8096a9803c27e60db3a60ac5c57c5b6ad357a0bcffa5a5a093d201e8673902a9ef6aacdb282a7
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
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
deleted file mode 100644
index 7b7cd8e944d3..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47-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.10.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.ebuild
deleted file mode 100644
index ce8b125f8437..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.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.48-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.48-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.48-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.10.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.48.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.48.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.49-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49-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.10.49.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49.ebuild
deleted file mode 100644
index 9c5c8c94672d..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49.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##*.} + 5 ))
-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.50-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50-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.10.50.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50.ebuild
deleted file mode 100644
index b23f3e054425..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50.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##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52-r2.ebuild
new file mode 100644
index 000000000000..927c424823b1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52.ebuild
new file mode 100644
index 000000000000..d57653f5556a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.52.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.15-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.15-r1.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.15-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.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.15.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.15.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.16-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16-r1.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16-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.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16.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.17-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17-r1.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17-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.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17.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.19-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.19-r2.ebuild
new file mode 100644
index 000000000000..28f4e3e3b9bc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.19-r2.ebuild
@@ -0,0 +1,115 @@
+# 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.12.19.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.19.ebuild
new file mode 100644
index 000000000000..6208453ad7c9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.19.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##*.} + 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.13.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.4.ebuild
new file mode 100644
index 000000000000..eccf41fdb26b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.4.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##*.} + 2 ))
+BINPKG=${P/-bin/}-2
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild
deleted file mode 100644
index 7b7cd8e944d3..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-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.129.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.ebuild
deleted file mode 100644
index ce8b125f8437..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.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.4.130-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.130-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.130-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.130.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.130.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.130.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.4.131-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131-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.131.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131.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.4.132-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132-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.132.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132.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.4.134-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.134-r2.ebuild
new file mode 100644
index 000000000000..d17061ca0042
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.134-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.134.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.134.ebuild
new file mode 100644
index 000000000000..6ae02b3618da
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.134.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 5fedb4970562..680ae716a0bd 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,61 +1,37 @@
 AUX 5.10.47-ppc64-kvm.patch 2365 BLAKE2B 4932dc893c372de7059f14ce0e1c0c3b33e21dbfa9f743411e6a5186e430ff75d62610ab0de2c0061dbe0e103609fba2e5c76bf7e7f34b5346db3f12439dd835 SHA512 a8d95435437aade216fe9fcde894fc5e632a0f5089eb73a083e6d3638dda20f746509c0df808f58d4de3ab909a3d5cb349a45ba182e6e62bcbcdc858c60a517a
-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-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.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 genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06
+DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
+DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
+DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
+DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
+DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
+DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
+DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
-DIST kernel-aarch64-fedora.config.5.11.21 225958 BLAKE2B 69f8cc7bd78ecebc08aace077af06ca09d0a891db5ad8e3d6391024eef3e8fc9d284fc8b9a9cf9a23d9494edf31e2e51bc7b4e2752e7f207e97cff31748e81f5 SHA512 57eb0b3add7e8348fd62557598c2c8ff412812d40438121cf0f14543d2046aa4a7b87f6f4e3c34c9f471b91209857f54c5a540de48df4a7a082ddec125558467
 DIST kernel-aarch64-fedora.config.5.12.5 229203 BLAKE2B 056ab111c4bf623f4476ebb38d409048198442040611af2d84801106875e5ec05506ac0c4e1c1124bf9f3700e59cbf94e6d467be22c2c9e1a95619461a1867b0 SHA512 a2495ab8ec406a3b29a099b0e2285420940b1dfffeefcaf8bb69e4ed54fb2714b537e40eb2818468be2d1d2e8217cf8d7b9f123b791676866a2a79a98407e4c3
+DIST kernel-aarch64-fedora.config.5.13.4 232080 BLAKE2B 519680a5c8d71e1273e4a26e366a50b6b048a04219f4cfd44d940b45e75691851b37561c60e9492eb3a2ad942812c81f63f43d8830b741fa16ff11f3c6788414 SHA512 b50e9cb63b0173b3ea5e7beb83c4b6eb2dc3f7922856bb14415916be94632808ad68d77bdd8aedffec2de4b56204f632d2dfb9d94c409ad8fb57abccc36d260e
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
-DIST kernel-i686-fedora.config.5.11.21 208103 BLAKE2B 3320a1249da7945f82344001210d9eb3596b71dab764b8e29835d936f9f9c9ba1cc270507544db0b7a4d26b0c6586ba8bd02a0905bc4f3f67aa077dec6551c87 SHA512 192eb33bcf0fb3a4b402d82f684d5e06a6d1cca01c6bfad6daa87057d6b593a34fc36f92a2c830dc7711548a16546de9ec97250a4c15012982091b766d205a4c
 DIST kernel-i686-fedora.config.5.12.5 210160 BLAKE2B d06f57b85b9f7d65da47817e5143af804cdbf34625f74d27b7598f3fd0fdec090f7b46479c991d2ec00a35bd5780120ad7b698b89269266e905a135098b40f24 SHA512 21b0fe9c600c5f5302edcc850717872dc8707d1791f87029075be4ab30f2f2fe28b1b042dd9d5b5dfcedc020e4f192a3083c1780dfb3d275aa47fc0f9b1a7908
+DIST kernel-i686-fedora.config.5.13.4 212557 BLAKE2B 627e0e61f2f73d0104958f4e00008a263d2c9c1d2c29c5f3656f2f79e1df84526bb204cf465477e706ac09ae73eba4c9e0ddf961dc74ea595928d81e562daf2b SHA512 2f0d1225db705eca214208992eb49b0acf5b290a7ca4c154e044164b8883ff0d450e00068d7967a873881c987f77712a233cd8cf4f255320f56c3c14d2338867
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
-DIST kernel-ppc64le-fedora.config.5.11.21 194946 BLAKE2B 458f926b8005f4902e03a368ebdba27ae26fcf1820890122e884c66692a767efff86a6d1007fdfab534cdc5821131f73b55974027efc9cdf2fbd5c278a7d071b SHA512 c14e89cc5ec794ab764dae3859d82c30561c21fa11ef8912120750c803da2ce77cacc8cb1a3ebb439a6a638a6514952c07f25e543e996e33fc0aea43b777ab62
 DIST kernel-ppc64le-fedora.config.5.12.5 197238 BLAKE2B e273514c3b4eb29309bf35351127cdc00903e4642f0a4f75633f80041d8c953046f734eaa0f6e8c7e2aecfbbafee86bf945f5a18399a668253fba225c2edb999 SHA512 bb6f71858a41b833491e2cea22a3d724512b41d04bd6b17d16087f4b7747b340354c41e32d7bf234d8dd1a64adc500206d67a030948100483791dc1ec0732a41
+DIST kernel-ppc64le-fedora.config.5.13.4 199741 BLAKE2B 51be57672f1efd9ef303032b3dde2a5042168567073a2f3a20116344cd2fb5ca132ea3a0f6def2412f6b42e8cf4891a8be9f12ec13508ab3a19b0148414e6407 SHA512 a0c0766718e3be47ab0095dac7f1736b99ca857decf4017c7ff99cb36205c0967382a5156606defaa43663bc0f7b630b8aeb86e0e3361b2a87a66ea3938822e2
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
-DIST kernel-x86_64-fedora.config.5.11.21 208946 BLAKE2B e3489a83c4c80a5f16c9928417e46cf8cc7b19a0d6696417046911531b23a47a2bd7afcc017b7c7e0d72ce0cd1c7c868f2dac2de8f3ea1c18c3bea7fba0268f2 SHA512 8107291889e464e42f4cbc517b5105cb170e16c3a36131c093480b662103559bc66ba58294697ae27eba916f863d1d3ffc0a316507fa63a1dd97d5a177880814
 DIST kernel-x86_64-fedora.config.5.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
+DIST kernel-x86_64-fedora.config.5.13.4 213590 BLAKE2B c788bf52587b13f16248b617c27a5be70fae526bc4dffa7106cf02e98317f820b424f598bd77953f928d6648a2fabc342ee5a5db3f7434e4dbb0eeec53b3689e SHA512 0d151740b27eae0e971d201650e518785826bf29410a6a1e4c3b893d460887d052850e19d62d6c0ddffb60f01a86fa27060441b33af541d2303cde1f1367b22a
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-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.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-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.15.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
-EBUILD gentoo-kernel-5.12.16.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
-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
+EBUILD gentoo-kernel-5.10.52.ebuild 3109 BLAKE2B e15cfaa865253cf75ee6f462e61e15efdd223f3d2d637129120fbf0be1336e036047544a6451ee953c934a0cf51a796ca0483b1ebe67953491848ee19b5f92aa SHA512 7db37241c9919432c31cfe8fa644f48a8aeb16e5e2a04b38c163c7628c8dd85db3e4c2b5afdc8de0ed1a94d77ae31f22ba3a08c1a8fc5e84e74232d26d47e00b
+EBUILD gentoo-kernel-5.12.19.ebuild 3112 BLAKE2B ba1162989a26898748ff8c46f5bd36b6d21de3db498c2017835fc20b874a1ff94171e7917a1f4fa27e20569b05217478a45371224b5e5fb2c0ea88061d1e9533 SHA512 5e2fe2a48dc9c4615e0eddb044bd09b94e29a68afdf36272ab547251649480bf011e9a52a6df4f607c99a4b8eb3af068ef1301a3da26d0bd7cd28e9b45eedcb7
+EBUILD gentoo-kernel-5.13.4.ebuild 3111 BLAKE2B 3859cb3c0ec0f218941b11f20e5239715555dd5cba9faff8c8f53608a27c2f727a11df7ef70e0289dbd6dd0cf8ede9b2b3b1f60f81292704b0375c456da7cfee SHA512 81fa1c65dc0a31e03499242e71c74970aa181f86e7ec3701a95841e25b6e4a7f4262b445b39888cb8383e1b2083dddc855e6d29754f80066ac7c983c75f94d7c
+EBUILD gentoo-kernel-5.4.134.ebuild 2816 BLAKE2B d309bcad3bdb461a42844e76b61e76b6a2cc935af6e2c2623126b2e121532e84bd28ebc067beac0fc5259f67a9be36869e7e7c1bdbcbff15674f6760d98c153c SHA512 a75e9374a0cb22935c56aa2050a8b8e3f8e30377807e25bf99bf6cd2c28f703caa25dd1b7a132151745f0c910d412b2e6959bead16ccf1051578e4995e1875d9
 MISC metadata.xml 464 BLAKE2B 8f1b0ec7ef58c31bba668cd26cb39bdd0e676c22fc9def7802ea02c6fdaa32ca2d129519c51dcf7a6711ff2f5e22b3e8fa10ed5667b129f9be698bf828644c98 SHA512 2b01cf5cd40c16da8bfe767614ec47c8b95ed915a9cf3208276dbd75c9e7c065cc43c036d0e141433b6d19c2cee88fc8ae344ed596d8c1caa31c05e722373a06
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild
deleted file mode 100644
index caee494ebeba..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild
+++ /dev/null
@@ -1,106 +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
-		"${FILESDIR}"/5.10.47-ppc64-kvm.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.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.48.ebuild
deleted file mode 100644
index 50cb582f5f92..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.48.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
-
-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
-		# NOTE: please ppc64 kvm patch while it applies
-		# should land to genpatches or upstream at .49 or .50
-		"${FILESDIR}"/5.10.47-ppc64-kvm.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.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild
deleted file mode 100644
index 45a37c020601..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.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##*.} + 5 ))
-# 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.50.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50.ebuild
deleted file mode 100644
index 660215fc8655..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50.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##*.} + 6 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52.ebuild
new file mode 100644
index 000000000000..d2d382e2357d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.52.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild
deleted file mode 100644
index f7430af864e4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.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.11.21
-CONFIG_HASH=8b43a43382cabcf6d64266565ccc052c6e5d58a6
-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 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.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.15.ebuild
deleted file mode 100644
index 8cc6b8c1b940..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.15.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.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16.ebuild
deleted file mode 100644
index 8cc6b8c1b940..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16.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.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.ebuild
deleted file mode 100644
index 8cc6b8c1b940..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.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.19.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19.ebuild
new file mode 100644
index 000000000000..f1b0f7b7a0ed
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19.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##*.} + 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4.ebuild
new file mode 100644
index 000000000000..51fb697a114a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4.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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild
deleted file mode 100644
index bfc431677a85..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.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##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130.ebuild
deleted file mode 100644
index 1bf22439675a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130.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##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.ebuild
deleted file mode 100644
index 1bf22439675a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.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##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.ebuild
deleted file mode 100644
index 1bf22439675a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.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##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134.ebuild
new file mode 100644
index 000000000000..e1936bc8f394
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.134.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm64 ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8299bc22a3db..9254b219fe8f 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,111 +1,27 @@
-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-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
-DIST genpatches-4.14-248.base.tar.xz 5122664 BLAKE2B 1f43c126a36a9fa540512b1d0a38e1af593099d57134dea02f8dfe5355c981026a01c7a2e91024833f7182803a3a67d769f8178df266ca780d229ac6466da49c SHA512 9a7fa678db39b6413cd5664a73564f137f9a9de0effb7ecc8ea775ad1af9c0ab9e3ff3edfab616d4459996f0688d49fade076c39ae6058ccf338b622fb1e33a8
-DIST genpatches-4.14-248.experimental.tar.xz 5712 BLAKE2B 3d988dd1ea6036fdc974b1292b6ee6d397c24f0b574e341b663d5311999f01449faeefc5b8d307b173d295d57a197fc2d26ab3cbfbf960af604ac928887e9f92 SHA512 c5c68478493ca32aabdf01547c64069f9ac7506d12a59636b3b41dfeee182c27aba02e65e50c557a772f050233ff651a0396c4c28e89b51207468c7143115b4f
-DIST genpatches-4.14-248.extras.tar.xz 3340 BLAKE2B a0906876bb9d64c2039957485672c795a9026d055c570e4d0156c05af0bc23ad066c67ee21e6f9bba41c36f36693e1ea7fe7d167a2d1a9e05f4413cf4a034744 SHA512 4360b20d8e8e00b2ca5c0f1d0a5878d6f44a74dccb0cdb34d2176cb01ea1b7dd8cf27cf5547b776189d8645e526cacd2fa7ef5f8f5706b1ff1260e8b70be0f32
-DIST genpatches-4.14-249.base.tar.xz 5128896 BLAKE2B c5ea0e008c99c5792de62af5ce8c6829c4540ce2178a611fbc268032bf916c65e7a5be68b1c2fc2ba984d24e042bd0a3863bf15b491306990bb97032114f8ec8 SHA512 6520dcaf9aee4334d3bbbdfd82b023a1bab316eafaf535d3360bef5d2a12d42a936b93c24f55cc3b11a59fee2e53d1b2ed3b7994862f06ec66b6ca767e6cca8f
-DIST genpatches-4.14-249.experimental.tar.xz 5704 BLAKE2B 1af9937c158f9229d445b0f657a13b544f9b4d213246458c1a4373155ae57e85bf9695649cce87a8d3952eeb36f31dc6893bbd752532478867e3a9b51e526b3e SHA512 9624e9052ee9b69df6d9db63825a47cd113ddb2505ba29cd0cc002f3fe5a30167dcbccf0bdd42659b600a12f4640e444d665cc6a3aeb18102b28cd41240ef46b
-DIST genpatches-4.14-249.extras.tar.xz 3340 BLAKE2B 0c33e0d9b6ec90831af0a42660dcf2114116186e2f47dd98a4cb4efa34c7ec42f95f79badd71c32c6f9235fe0b2eee07fec2070387ed5859c663eae9924f9fc3 SHA512 10aad39f5adf040a81a0e56d80ec4c2779870195bd174bf359a7228a286149d7ac9eccfa57731654ac469b4a0d1a3df4c40975bf7ef12c22aa348b3eb880a909
-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-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
-DIST genpatches-4.19-195.base.tar.xz 4734836 BLAKE2B 740d5514d2c380d417c766696f0c012a0aaeb52111edfd69b369751684fb9bbc3e7bb8839e0b273445670d1423c2296c05831928d062959d336b3696cd228079 SHA512 1dd57bd3857ac7b6686f8c47bcf4e52f550dc4511452b3fc6c8fac29388a2eafd61da9c9c4a239a473d1e1e81c1b3d6d5b763f70c35955964258ee91d43e54ef
-DIST genpatches-4.19-195.experimental.tar.xz 5468 BLAKE2B 06acac718651e1f03380531d0af9775c1ec7d5084d3befa992098b4140f71c9818f8802e3e4506c41b1bcd56b6b683d971d5b86a8ac726b46a646258b57062cc SHA512 87e3d412c6ab7d242a74f5ba57e970ec996c2a0efbbfee86e76f5fd92d77cb15d1533187799ad3cae61c1608effb620e399253223845186ef395ac4e35f637b3
-DIST genpatches-4.19-195.extras.tar.xz 3316 BLAKE2B 453752d45bb34f5d0763087ddbcf418158ae6739783c9775b01442cfc33adcea85fe5e874ebb8dad77f5267bef62f58d327762df6d61036293c72a229a063018 SHA512 e78c6b63311bbb67a650f4d9e258b0209a5cb182eaa1e8db68423b6e199d7050bb293e2966667c2e430aaaa06ec5372b3d9fbea8effd7eaf6cf388fde9d338ad
-DIST genpatches-4.19-196.base.tar.xz 4746104 BLAKE2B 3b72fc3ae81dc5df6d437d888f030b14e456911c14578459018096a0b00e80b5187894d1321de6a36081e201d751e26ac040aa73c7cfbb69d7a1d071135243f2 SHA512 8a303a77d86e0f3e44f9b329d23721dccff8f373babfcf916e3d4d9de8aa969f4e99d56c9f3cacd0670d1f451a39bb8e6d2b676a25af6441e76cc325dbfffc0f
-DIST genpatches-4.19-196.experimental.tar.xz 5468 BLAKE2B c250bcc9a869e6500685dfd8518be35637f4b13ae3c0d478547dbf1a831e700a8a0635b86e5d3cd4a0336443afa3da99a25eb0691cdd3549f59271eb99937b33 SHA512 eabecaf60dae5daac22645b31fe60e2be89733af99c933380d37a9261edef848505d943f1d32c4d49fbe17095e3a161e188a988c6cecea5d5b45932d4d1b86c8
-DIST genpatches-4.19-196.extras.tar.xz 3316 BLAKE2B 842e58bbbcd28356d449dfd58cf4e6f3af081ad188a1c8da7b108aaf40d0e7832030a34b27f5a6cc9e230e3dac8fc4afd7610e2c02a40cec4957e1ab60312c06 SHA512 66846db87ed23ce86f0f8bf5aa1a81b60d969d95a2daa82d7de3e7db8039b220be810913fb4066f10f13268c551d51a5d9e99eb125d00910e7c4ee044e72246a
-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-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
-DIST genpatches-4.4-276.base.tar.xz 4186868 BLAKE2B e4ee2e457da31e2d92c4614ffe7fd8c1af8733862629646d3589573956ec5da9cd4be480c5c7ca1733ed9ac185177a5e77a876285f5f380b490a9413995df93a SHA512 40f38aeac93647723d349988e085e5a80d00ecb6a94006c81a69bc0f4a45664a50283417042aa4067c68c59a48b144a6935c573a9f6a36521026fc94077cc63f
-DIST genpatches-4.4-276.experimental.tar.xz 83272 BLAKE2B 617eac9c6de63dbe59e51b27856963a3d54f96bd12a7156ac204eb45a495187583f35748de7a67a31b6743cd0d39a66ae6225731c7ea3c8838ce0f347aba620e SHA512 3f92c01d5da5f7bed700aa2aef1b3f8825354e9e40e010cd7b542d6bf90602a9fd0c5b1d7ac5b05ed4ee61bbec47a3b3c4468ece3907df01c62128acab97f10c
-DIST genpatches-4.4-276.extras.tar.xz 1788 BLAKE2B d62fccfdb7f6a4f8c7644c299030da02f1159705218022324360927f2298e6f80712f596cfe614263324e4dd16c64c886ad5aca7770af8f8a18806dfebca0363 SHA512 5a89a907bfe32f94156d2507a30f31646bb1e5f3b16902fdee1ec521314e26e90df02083bf63c08835f1fef3cba88844ce2ac87462465d18847eac517258c95e
-DIST genpatches-4.4-277.base.tar.xz 4187416 BLAKE2B c2779d779e5ed44d7f128c2800101667b66c88f85adaef263cd223035379c841e3b985be06a3528420d24ead90d7dee7d5a30a2153a7485fc94a9a7726ec06f9 SHA512 4c43c5557a7a3309bfd1a30bd973e2cf1ed50cac975faf30dd413161cbdb54be1b77031d742ca72b41ce84b60954402e0e821c20061c4f4255cf044997d4fc73
-DIST genpatches-4.4-277.experimental.tar.xz 83292 BLAKE2B 8079a93d182e10b8f5bdbcb431f5ea3ecfb1287118bf8108c094dbd2a2f2fb7c4175de8da6d91bf3b848a8ab093078b4c442432cffcfe2cebd39145b0ab01939 SHA512 6bbc0dcbbc59b4206c1c48d9c1b13915255542071fb8f95897a4ee2d9fc5d1cf8365f6842e6879706f0891b7853c33ed59fb8daac157ccfa9d5328d1d24716b1
-DIST genpatches-4.4-277.extras.tar.xz 1788 BLAKE2B a29ac28fe994f402aa15021d8e2651b77db84ee1c4b02fda927cec43f4950925d532d8c16976caae67dfaaea4468ffa56f3960b01c82d4185b9debf378e54258 SHA512 0b779c3cf24e77967ff5fa10be178b1856c9e808d7566500d4ede99a7b0903f27705c4d28a213974c134daadbf1c8612ff01a55fb678633a4c883703d522accb
-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-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
-DIST genpatches-4.9-278.base.tar.xz 4724556 BLAKE2B 2bc0bd9624b337a61f7c2d4a87d962ab1b7c87ed7db24026fd43abb55860abe351e975317b4777babede271bc60eb62e1c7d41ef3ba3534678a70769538fc0ba SHA512 9445e011bd192abc5216fc54496be2da5fb57712e3659cb51daf47ca220bfd736bf62556b4a063817f452d23ce607a8407e6e1bed381a546f7f256d0fd0e2680
-DIST genpatches-4.9-278.experimental.tar.xz 106372 BLAKE2B d77128a3af702f481067a3bd99a893f61e0628df5c99af319b46225bad80898ab2d86e6de84fb07d141f1c5e278101868c54bcf252c9fa54ed4d916c9e3b41ce SHA512 12647bcc98a6403d9db6d131348e06e45ade59e7baa6a533e029362b5b57286577425f1153619b38061d9a44ef9e43d29780d454cfb5f947ee7ee2a6581e9f31
-DIST genpatches-4.9-278.extras.tar.xz 3340 BLAKE2B daf3dafb2bd985edb098bc20d29b95f030b236c46c64c5ffe9d98a8fb5837f80a7bf87d3b265ef6ad4d5aa8cfb9e262117c5d7942cf2a33f8b1ae080daa07f07 SHA512 6b7b95bb5a910d06f574fc3e22f60c6fb66f3a48ce56ff783483673e0c4570a4049740279d6bf28a25279b0885e60f7be8de1f91a58d42e7a629905abf6a7b87
-DIST genpatches-4.9-279.base.tar.xz 4727296 BLAKE2B 2a313b828c0a511726bfb0ff0508a6ffc6bc31d468571960af25fdaa41a5dbc278b0fab0a8c1bd69576fe1eedd39740e9e69d7c20dd8a90e591845591b71a69a SHA512 d9f72c859c0b7d511f02007b9401c4750331a4b0c4cc85e4dcb93204c2e2a19d8290e0f9eccde3575c3dc0c4fbdc73c5f87a6f8a4b9fe28a2ca47763b0c8e456
-DIST genpatches-4.9-279.experimental.tar.xz 106392 BLAKE2B 0ddde7930525240570dca9b33e64762e1f4adb92996f11b5fb329b731c66e571af4caff6d36952941ba15c2465ad90a01636a0d5473e9f0214a8dc0260f42d38 SHA512 3ef46c0cb06943481053eea4036def27584599a37b11bc1c318e09df884d0cb2870c17b6369f814032511b34023d25dcc14aaef636833143fe75d99629ce180c
-DIST genpatches-4.9-279.extras.tar.xz 3340 BLAKE2B d07f121d92d4940b4a98b388f0cf9e38ad5475d36103b80eb24a257e2f487e7f784c4467e46447da22e2f5c7840bb5205b4c38e5581dbec8fe3bd6cfa70a1985 SHA512 9188a6902710430706f5d85b46dc457c341a32d220525b63ac65a571934f8755881d7b6d4358df811f97037bce07d12581889945c665c7b6c81cc256ea579980
-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-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
-DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
-DIST genpatches-5.10-52.experimental.tar.xz 16884 BLAKE2B 5a9482c0a7cd212859fd6db4f06b492417ce748a1daaeac31f47fc77a54921c362d8fb8cba73d5616e430df3688162e2b7c7e837ba9b802d7f014886cd521597 SHA512 f00ed9a3dc176632c2eabd73874a3e9b2137160064aa3c5b5d7b938650fda40b3a3836e575d80c8c35f8ce435926091cff826963270c491b80a5457c9be1ebd9
-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.experimental.tar.xz 16872 BLAKE2B 934efa18181eb347c56d06c5b0a13dfd6234eeab5f3456e7e876b60ec31c9aaeb613db09ca220644d3fe30681fa6b821847e9d96bf4b295bb4192fd0d5c82b05 SHA512 158e7b8a3d288b741122ee856f89e3304e4083581f224e7e795ea6f5d81065d9f820a9869e48d88a44860ed59715dc015c6bfb6f0a862a2f265c841ab94ad096
-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.experimental.tar.xz 16868 BLAKE2B af882931bd84ccc327825237f71dce6ea78af43a48e338c9e0580ce140562953fde5ef9d5d35e6cd81428771565cf8a99da1cdc2154adfbe0022cfca93101e26 SHA512 58c6d20ce2bc06e50b7697e2705e6cae16d82fadb5f86a6213f26cdc0aeea7bf40f34335a405caae3106f629d09fe8944bd85c7cae2a09231dc2bd5a8a0e5d84
-DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
-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
-DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59ed6ccd6f29a1a139132364aa2ad7c89b0af4df6df75e800cc14b444edb9897f4474015369b9cea878fef487c8a3e2123a715 SHA512 f4b5773b9885817889895725ece76d50da95439769d96fd4058d690937027ee6baffec62941b15df04b7e12df29d1177257daba39c41418e2f2a400565aacaf9
-DIST genpatches-5.12-17.experimental.tar.xz 70208 BLAKE2B 2a4761c7c02bed4c7e262fd184bab46de128ace7abd31c2e54e650bab03e9dfa43a261531abe6b2d783672e613afa1f76d94c499ca9bc8e6b6c08dc82396082b SHA512 ed3d516c6428737a4e71f01247528bbcc1a3f77186d1ed0b674e6589a96806e5c5d961d04878a58001ef6ac0be2459fb9e3ef30e8882627bee231edc808380cb
-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.experimental.tar.xz 70196 BLAKE2B 0942cc1e961588fe66eb8390b8523894619cc64cc287ed6b9af1d97704537e501b31f14a91e35b51012a2ed23dab390b36e28447a16cbe5e2e6fe14b75088459 SHA512 206713e09aecc5a49562b4416572bd66a891cb5f7dda5a1d42edbcbc8c394f9829aae4bb7cc7b094650a523bbbcbb71b8df3eaf02c2e156572e5ffe4f69eeb78
-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.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-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-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
-DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
-DIST genpatches-5.4-134.experimental.tar.xz 16908 BLAKE2B c099f7a7939394ad8a9a984b5e558e0b26a7af53077f8c2059702695dabdcac7eb824539a597668e8a0130e8a9451a63101c6b5b6992b18c725c4375e67aad69 SHA512 c68777539b7e64f67a462832e10803531f5d69bcff25bc31d76b5b1ed3b7404386cbb9cdcdff9ca58ceecdeba28885abc1658669a28b171915c4dcf896c6815e
-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.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 genpatches-4.14-250.base.tar.xz 5185608 BLAKE2B 9f4bcf1e974bfd276b8fe557a2c3abf99602e123b18108b8aad82dc4f41c8de1065f01faebdf7cbd83dfeb192045ccac2865cc8e600953be629d4d66ba2f0839 SHA512 89bd5674abe0f9bc185174ed8dc2874cf0bff33796cac3cd8cd5372a94619c6bd68c09ac9980e7600fd441e5293520ae935c63aa1053e1cd78d8a5f72df0136b
+DIST genpatches-4.14-250.experimental.tar.xz 5708 BLAKE2B 0558256b46ad8e648039ef4fa53168a3e42cf08de2729c7d1a15a2b61fe43deb285fba05d00343494fe4a0329cd48298e6d9b428d224e15c6434f961857f83a2 SHA512 e683f3b8aba2c5280d03dab54d39eb4ee4ff6f929694fc4de89290bb5a28b120446fc95576abf51d2d66b4232c2724880238b809d83dab687fe872b93f0bb8c1
+DIST genpatches-4.14-250.extras.tar.xz 3340 BLAKE2B a8601179ede30ef4dcfdcc3b79f59313b097e76b6b494745d51e42f9552ab2bb738a973a4c58473aef418bcf7e733dc42b574b6f0387fad4a0712af9baac342c SHA512 664b243f816e1f8e85845b8f7b70e6b0e92ff8643e410afb223dd2f252dc6f5e927ae0a01127e75c65b49e6db9bad5c998e24b6bf0685bd1495f25104f370759
+DIST genpatches-4.19-197.base.tar.xz 4827304 BLAKE2B e6f711dab44d013bd46a969279502cfece6a360773ce8e943e7de07b0208373ca1cf0658844a344d4c5f7c7bc664cc04934224725e7ceec87d572aa0af3bf4d9 SHA512 3d4c02f0af8cba6cd0a86fd9576c64123c67d703987798c1b4f7d4983ef628092a7878a9c146dc801d06efece5171f9305c9738f804c4f71bae00477d830b851
+DIST genpatches-4.19-197.experimental.tar.xz 5472 BLAKE2B 36c7e3fc57f08147e49ad15a13ee336ed7d46ab4d14320955ee16d4e96b3c74214b99d32c6e35204f397984f7dd57ddca51c3197567efb0a08ce77aaa8177010 SHA512 087f40ea713591dc1275da5ce5cb94a4bf6163594057c3cf9359893d146ddd14728816552ea9f22e189148bd39cd35ac647cd7c1beaec6534d061bbdddfeb53f
+DIST genpatches-4.19-197.extras.tar.xz 3320 BLAKE2B 37274f82572529441a009299cfc332ffddc76e4bd34c07e8fa10849df4218d21cf4f852179d7b58acc162ef32ad823f5770a1027f4cce9ca797e65958ae80f8c SHA512 b4207a2d10a778c9c722decc23b7aa96aac22678bbe67a838afddaa5fee669539f721f92bb1eff95475f8f056ab70380d957cb8b9ca3ea2767893c3220074b56
+DIST genpatches-4.4-278.base.tar.xz 4220100 BLAKE2B 29b976c1d04a2303c9af683ca73ddeb5c7ed0a5b2c9dd01dfbfb8a91ef7747846a7db390721e3b31ce16df6ffb4a73f8c881cf8a1018124052638cddf945040b SHA512 c7f645028bcf397c8c6a4eeb6fa133e5cdd88c2ecf765796e3042848988dd7228ded865860b05c5a1b591e8ceb44e8569a3f38f74ad26e9c63182bc1b8a0de55
+DIST genpatches-4.4-278.experimental.tar.xz 83276 BLAKE2B 326de10594ddc544219d09778f9a50b4c8e80e29c74f1f67d6d591cfc87bf1b507941edf9efb01ae32eb296810b2c6a2268754c8bf133a59b30e3ca613ece860 SHA512 41dfda8d0425c9482c888298a0ede667826645977339e8991c134747ff081b5df67a2ac543ee4412c39961767b60846b7f6b8b3eca83ea8c243cd5a1ce383d86
+DIST genpatches-4.4-278.extras.tar.xz 1788 BLAKE2B 2068810485c3e86622d1131b8695518ff56534f6af5095df48a357716ee095453f406d06543617eff8feac06d4e227fc3710b230181fdcfe8ab8d4ce4b9173a8 SHA512 5e89f24ac7e6a45d682463d9c2526334f9b619f092e340cabdf5a24612bc5ad21c6e3b8760e57e43a82a527dec05b3f0ae6663e4a7bde809a5a020194d9d8200
+DIST genpatches-4.9-280.base.tar.xz 4768964 BLAKE2B c35dfd4d2582b6d915306927920954b8d98b066c52b46fd72a4028f3450e1c4dcf475028c9ddbedf49cab0babc1425f1f60970866698826d018ce4d40ad37f50 SHA512 8140cd9eb97a1a92bd8a7e02668f5317658ade0d13d7348c77eb19eb02cbf115c8ac6033f4606ff581be8f580b606c62100686c83df5381a8dd7c66c6a8d6f5b
+DIST genpatches-4.9-280.experimental.tar.xz 106396 BLAKE2B 093294344dccb1608fdfd6bbad0facc436b3948a832ff9f607c759559e3c59d02fd9b4d94b09fc3def40ee0cde12e773c911e356ba3ffdf10d5bd0132490cddb SHA512 761b109895cba5ddb0103bc902a6422d048c39b4dc3b194e6c65cefe39b707a1cb61a690dabf416baed0ef4b812acb312225381537ed997e3533e00668305b6f
+DIST genpatches-4.9-280.extras.tar.xz 3340 BLAKE2B cd0fdd227d9188dc7e61f5a2793602168b6b3b1a3427a028429cd48cd161c61e73d4b884bbd555b2d08a79478c178a6dd089a4398b2d4c4352bb6c365996d248 SHA512 d95fc7133e2dd8dfd7265173b3a6e1d90ea671b55d396396a437bad2f88142f514f1d79a61faceee25c556bcdbf2d42820d60b4b94d89a61680b4b8e519dbbe7
+DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06
+DIST genpatches-5.10-58.experimental.tar.xz 16888 BLAKE2B 612c0ebb760571891d4a05cff1f63396457a7da98d29698a87954da7c12dacd79e635072254fa7016b99012c65543ec7cc7670239c12520e29d48428738b019c SHA512 0dfe7846a5cb99ad0fcd01bb8a772401dc93e3ed91387cade18daed2ca884fbc484598dd27d5b1b07bea934c73049342457fdc6051946e68c08d5a045764b307
+DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
+DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
+DIST genpatches-5.12-22.experimental.tar.xz 70168 BLAKE2B ad642f4dd65ab934f7ad5de9e30bd9aff1a52da5d32e958e753c73b19e8d9a7987a0181e5048c9e47675bcea2a1bd4df1e71f900eea976fd484560fabf332dcf SHA512 1169012901b5e5363242398fd3b6fbbef3db0d62df9d3c24e4e4336a6de917abb58f7d4be4c2ed064d697b6121d4833bbcefacdf2e3babb411960da5f4c46b5f
+DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
+DIST genpatches-5.13-6.experimental.tar.xz 67640 BLAKE2B d5fc5275ca0668becdacdc7dacec2ca395967e33868de28c56a18d10764d1315bd0366d579a34fb9eb25471dc098f39f097e5e4f85b8cd5a8f3fa1d5708e715a SHA512 94db0f615c37c8059a7038071cc928ad1cd067cb21059ffd8398c490ae9a4966eed460a0242a906ffa099ad5f2d80b707da780b670641b00685296e9eb37bdcc
+DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
+DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
+DIST genpatches-5.4-138.experimental.tar.xz 16916 BLAKE2B b654b54afcc3352f989428189f0cb3011aa197dee7559aa8851f6e98f09dfcc91eedf2161a5b1773aef83054b50e03edb3bbbc147820ce4281f91d65e3923138 SHA512 c9dcf8fae83d2c9c51e2a3638ee43689f5587fc05897c26c016f524c4c41842e3a5f7edc642084e0f7c1631532cabeeba3fdd912160ba4cd6d79fa9d1f40d842
+DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 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
@@ -114,40 +30,12 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 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.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 731 BLAKE2B b7562b2deb5cc2c393715dccc6de35d4924fe77518874732d97aba46e6966db1716cdfef560148094b7f387a9627a61fdfaeffcac6202c5a752941554ed894b4 SHA512 628d2980bec33b85403276d624db54f35aa26364ea2ebe7d853786012ddfd54f627c29bcccd9843485120aabd82b95acaef3d9f5fa292d1e0f7b0ed5d90d6b8a
-EBUILD gentoo-sources-4.19.184.ebuild 730 BLAKE2B ddf0c5eb2cd1d4f63fcbcb73f785d64ce9528f93b402c3ffcb9833f5e20b106270281ca1f029c73e34b171e3295d3e731408628488fcb2d29837856f456c1bca SHA512 c90d6fa4f952be01379ce52faf5eace8012b3f3fbe484e226dd794e57c565abc0e386d99af8784f299a908b5c411c3da227257ff3aa79266f0e8fe6d25b6e416
-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 731 BLAKE2B 72189a16b1b6b6495bdf1c83d017982d32976a5c1857ce4a423ef671a30f36cf0ceac411a84df15cb19fc23b9dcf9ca3e31d04dbec9d46b322874f7f1da93b4f SHA512 d064f0732aedf7f3f7b80afe55fcf57fe8a7720f0b2dd8f86443be62d2ae5287178c600033b59bebdb2849a8e7f57703dee5d4cd5d6566569fe3c2f91f0bd871
-EBUILD gentoo-sources-4.4.264.ebuild 730 BLAKE2B b225029e1e846bef13164648f68ddc270c3f0b0e288c4b9ebc1fb70f9452199a35d789aafe1d87abb5b1e239e88649deea2ae76ed4b7d7c510f3a5490b652f67 SHA512 8f29096cdc3a3d39f91d0298b1e0ce3cd2b8196639a46fb44ad63f9559a626af2966926721f1bc7cda3e8211d38094ccb4c59717355a2ab21a1f8760247032d7
-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 731 BLAKE2B 91ca4ac459629b148082292bf6e7ce2a2ff52cd0625b775b0e1e03e3ce7e587521aa47594f7d5f8518c1e1a86f72e882669fc0da8e35c00e856b34ad3eab42eb SHA512 1ea0f051b468b919ac541204aac9ff65f89143b1da6bd2c52b7c9fb5d8a493dd095eb1a6bf3d37b5e0fc6663761254d4910f86a1c92498bd7ecd948e71b42563
-EBUILD gentoo-sources-4.9.264.ebuild 730 BLAKE2B 2a501bdbfaf50966fa41f4f55e8299c66cf17a55dd511a79c6b07e773c97a8425591459a8fafa808d8f2a66c2abb04e9c04c3f2cd58c8ff3fbcd0545512d1a9a SHA512 5f577814debb29ce50991b639299f390a7806ae46436172fa043cc7bf17aad07bebbf6913d3f86eb39db567946d36e5bfd9cc42e31ab3ae604c988f590408e24
-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 731 BLAKE2B 4fdca5ebbf5fab26380c2b57c2a4fca441fcff67a3b8a876663e5c75c5ac556b9725fa7977c3de38e6fc4ff81a49c5bc1dbfce7673e473d801a8d48db5b84c29 SHA512 07128bd5c5f17220bc31ede4696eeb295134227dcb3416e045987dadba8f9822d037ed6d5dd45fdaedb3de7188fba152bb0e05afdc7c0d8f2282002e34c637d7
-EBUILD gentoo-sources-5.10.27.ebuild 735 BLAKE2B 98d0fd573c312cd08b5dc8611caf34fa674597ca8848c1a7447027172a123f4b505e0e19dadc944e89fdef0edc7ad46e8a85601c188babbeb9e52505a78ec3df SHA512 c54e0337f08b52db08de8a4aeb884ea302582aa06fc768462959731d2e2d800e383e3ccbcdc0ef3269f53a9b4a2cac34b291af343ba533f09ec500e51298c71c
-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.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.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.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.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 731 BLAKE2B 351da3aea83b95dc4db3723394804986b3a5c4d530775c156716d6de8f821f82ba7afcec66dc05d9612303f2c593621fd35116841625ffe8d06d0ea83dc0d2ec SHA512 f54d0ee21a2e138d844f36ee3f5f09b146c6bcd0b3393dca39b2e9a38a44809fa5ac0d8d7fe226c5dbf70f691c4bf8945eafdb1df98deaf9da46d8de9a2e5884
-EBUILD gentoo-sources-5.4.132.ebuild 736 BLAKE2B da34b33dcefef9940b57f43accdf74b591d410db1097af4ec291e4cf52f50aad0c69c647c1613792f11846b33f0c1cd91374c01f2c8122313c05879b0df0d193 SHA512 13af297c52628b695bbd12a065bd50e5740f891463e0bba2a3ec766c4ac6072f4f42d2163dbc89f2c97e7876a77b4fa4729fe7b1579262c1171f985d1641ed1f
+EBUILD gentoo-sources-4.14.240.ebuild 730 BLAKE2B 8ae20f5740a13a0eab73e5d1c6c748f3eb39f21a852f2c82a28f10936d859c5de5604874b632e0ba79be4b0d3e7691a4bc450fb7398ff2665d7203ba09841b7e SHA512 3bab8a192e1a2d3efff596ba8c5d97169bf8e65df52a3c92255dac7a1d1563c05dc8e8c155f5b7e4fc1a26629bad29c37e0bef891473f49010bcf151c84d2192
+EBUILD gentoo-sources-4.19.198.ebuild 730 BLAKE2B eb4a1da4f6a8ccc42f5915db24aa5566740e75f65692f6073408ad5237c4b12591e9d553c85d80dfb0dd4bef8f4ed1ff74fd05fff8178f773e67a829d44e70e2 SHA512 a04c571b2db0a3a5b5d7ca27049011aad0f90232f089428001629a79c1a7c496f6f5222ff9cefa17b238f0baac820693b59005a2ddf8c549c3ce7a01affd5d6f
+EBUILD gentoo-sources-4.4.276.ebuild 730 BLAKE2B 8c06c87da83c0d058b3a48f1653b1792a930556ae9f526d3b831e13c5c71eed74590bd635d119f84f6194b1f693a44aeef61efc683954c46b9624915d0f3a339 SHA512 2f6be2ba0b757464c8d2419bcd5703f01cae5835c9988274dee7a5f95908eeba7ed57cb8318f017695a513c05601fcbfeaf412b42c949046e24aa6c6b7927c2a
+EBUILD gentoo-sources-4.9.276.ebuild 730 BLAKE2B 8a46b97e4c93477c65c065d1387882a202bad7f3e63e26be690122e2b3f4072c5d384a690888738d86d59d4049e5ea64a64caae3fb0dac17cca4585b8929c613 SHA512 e25cc8fd11b1d3369ab27fc91b9dd77cd4d2c6c060ee194ff1c2b802048e2f5a1936878f2263ad9f38161abac2f95a39498701bc80889a9fc41a4238a25a04d6
+EBUILD gentoo-sources-5.10.52.ebuild 735 BLAKE2B 8f23c05d24848eb773c073eaa34d1276ff4bb6ad64c40cd72210beb6dcff6b18dc93a26bccc38e363b0b97c680ed7322e7b34ee3bbd9883e0529c508029a8a47 SHA512 061223e3a3d795eb4480fdd39d5e8d75d9454b599afb1326cc0e51d0ca0544306bde81568467ab623681d7be06cb6d18ce6a2c9f940888590a18b548075f7d80
+EBUILD gentoo-sources-5.12.19.ebuild 742 BLAKE2B 9bee131b78a23937df942aa798c46becb32f986636724c0175343acd3edb2c9440aa7e5db5653e5c69257944f8160b74e6618992543ee81cd463973b09850ac5 SHA512 70f9dcb289d34a30caa8db6ae7677d2907e216f4f98c28c37c127f09fbb2782f93e0984ebb3672b2f90e89dd363a0804aa1e6e2cb55bcb77f6fe5ec267de03a5
+EBUILD gentoo-sources-5.13.4.ebuild 741 BLAKE2B f0487ca8d40583bcc4579008a474f44071dd6e5abd5135dacb19ef5b090dfff529443df2f9a9d05d02e725fa7701d70e77a4af659f37b17fad8625be213efb46 SHA512 dd24c1ded718b2790c55b49b79dced7279f08e7199adfd79bc7eccf158ac550e3a5e0fd546618d75451b4b959e226b9df9fd38b421437ceac38a907d6bdd3a16
+EBUILD gentoo-sources-5.4.134.ebuild 729 BLAKE2B 0faaeb7dc582de55d17f6bebee8c474e7c3f08543826ea61c6f92fd280ff86cbdf46387afe115de73445c393d3922756cde6963fe99ffbed641e0c7ce29e3d28 SHA512 f58cddec29089ffbee4db5007863f89dc5a69610756047609fb2011a56b7f2b5458f7d6424dcae79198ac07015ae174291ea2197e60e8b4a2ec1d917698d0fcc
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.ebuild
deleted file mode 100644
index c01fbfe98313..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.228.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="238"
-
-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.237.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.237.ebuild
deleted file mode 100644
index 08d8231e4ba9..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.237.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="247"
-
-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.238.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.238.ebuild
deleted file mode 100644
index b5392b73b156..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.238.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="248"
-
-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
deleted file mode 100644
index a95331ec5f27..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.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="249"
-
-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.240.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.240.ebuild
new file mode 100644
index 000000000000..82d952bd0390
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.240.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="250"
+
+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.184.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.184.ebuild
deleted file mode 100644
index d6691e4c3d70..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.184.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="183"
-
-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.195.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.195.ebuild
deleted file mode 100644
index aad1bfe96d2e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.195.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="194"
-
-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.196.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.196.ebuild
deleted file mode 100644
index 733c5439b4e0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.196.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="195"
-
-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
deleted file mode 100644
index a95b50fca65c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.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="196"
-
-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.198.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.198.ebuild
new file mode 100644
index 000000000000..a169b3a9f07e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.198.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="197"
+
+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.264.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.264.ebuild
deleted file mode 100644
index c858ba360fea..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.264.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="266"
-
-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.273.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.273.ebuild
deleted file mode 100644
index c1d00315e710..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.273.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.4.274.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.274.ebuild
deleted file mode 100644
index c44ff3d043a4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.274.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.4.275.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild
deleted file mode 100644
index bc4f2dd9d414..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.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="277"
-
-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.276.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.276.ebuild
new file mode 100644
index 000000000000..f7999a348bfd
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.276.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="278"
+
+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.264.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.264.ebuild
deleted file mode 100644
index 515e5da95d47..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.264.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="268"
-
-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.273.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.273.ebuild
deleted file mode 100644
index 6f9d9a27c692..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.273.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="277"
-
-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.274.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.274.ebuild
deleted file mode 100644
index 8bbf5bc73c32..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.274.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="278"
-
-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
deleted file mode 100644
index 1ffbf3ff98db..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.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="279"
-
-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.276.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.276.ebuild
new file mode 100644
index 000000000000..75600dcc668b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.276.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="280"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild
deleted file mode 100644
index 5181badfeb37..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.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="30"
-
-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.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.47.ebuild
deleted file mode 100644
index 124fc76139a2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.47.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="51"
-
-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.48-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.48-r1.ebuild
deleted file mode 100644
index cfb44d60d9b0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.48-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="53"
-
-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.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.48.ebuild
deleted file mode 100644
index 5c82c7660285..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.48.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="52"
-
-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
deleted file mode 100644
index 44e27263ca05..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-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="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.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49.ebuild
deleted file mode 100644
index 9a5b5914fe74..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.49.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="54"
-
-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
deleted file mode 100644
index ec269bd57e76..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.50.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="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.10.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.52.ebuild
new file mode 100644
index 000000000000..e310888767bf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.52.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="58"
+
+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.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.13.ebuild
deleted file mode 100644
index 245d107b1d1d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.13.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="16"
-
-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.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.14.ebuild
deleted file mode 100644
index 5b45a190a078..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.14.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="17"
-
-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.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.15.ebuild
deleted file mode 100644
index bba8ea44f320..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.15.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="18"
-
-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.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.16.ebuild
deleted file mode 100644
index 4be3f5da3db9..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.16.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="19"
-
-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
deleted file mode 100644
index c48337532672..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.17.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="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.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.19.ebuild
new file mode 100644
index 000000000000..4fafa50a16ea
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.12.19.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="22"
+
+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-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.0-r1.ebuild
deleted file mode 100644
index 73aa5ecc4bdb..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.13.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="2"
-
-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.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.1.ebuild
deleted file mode 100644
index 61270806671b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.13.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="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-
-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
deleted file mode 100644
index 354185ded37b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.13.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"
-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.13.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.4.ebuild
new file mode 100644
index 000000000000..78750d535f6e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.4.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="6"
+
+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.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.109.ebuild
deleted file mode 100644
index 7d8b17529f7d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.109.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="112"
-
-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.129.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.129.ebuild
deleted file mode 100644
index bc350b625340..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.129.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="133"
-
-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.130.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.130.ebuild
deleted file mode 100644
index d2886b07d721..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.130.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="134"
-
-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
deleted file mode 100644
index 12352ff8ed5b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.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="135"
-
-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.132.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.132.ebuild
deleted file mode 100644
index 71daa7dab960..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.132.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="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/gentoo-sources/gentoo-sources-5.4.134.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.134.ebuild
new file mode 100644
index 000000000000..90b22e147fb4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.134.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="138"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 4f8adfd671ee..4b640e51ff71 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,6 @@
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST patch-5.14-rc1.patch 68962675 BLAKE2B 0f5bc5de6167c3f2b884354a54dd9cbedc3d89508e9861ef7bebe181c650ab9dde4f604f8c5e77c27eef9c213345ac85d8c65e0c9a7f48cc918a2ad681fc3e59 SHA512 e68522063c08adf11c8cbdb86aa439347ed833be77cf189655e14df6e2e9c18479a69bfbcb8258411e896f32b15c53f8df04402f6ba0434179c3d37e0cabc5b9
+DIST patch-5.14-rc2.patch 69403130 BLAKE2B 56a55e40625fbdf9b9324ffbdae401bc9202cb63ea3d787960a93c0f72a10aeffcc7e2988f873ca916d434981e949c1ff2e1e09941d93ff119c5d9da295e3628 SHA512 5962339c1e84c2e760d76aca6c4d0f74fbc80bd997f55f85ad22745d5db43846ad86270862206684304a42e3b25d1c505df58da4e0f0460b82e7c7a12e97a70b
 EBUILD git-sources-5.14_rc1.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
+EBUILD git-sources-5.14_rc2.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.14_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.14_rc2.ebuild
new file mode 100644
index 000000000000..d43c5c0ce00d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.14_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.13"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 7069ad582603..dfa81c39a163 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -22,6 +22,7 @@ DIST pf-sources-5.12_p4.patch 5002181 BLAKE2B 6e018a8c9f4eaec7b565fb3ad38cf371a5
 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.13_p2.patch 2756507 BLAKE2B 8602f98e8fc857621418513956ed9103404d4e690420f3631c9c63ce4939a4cbdd4c05ddcc0c43c9db82369337e220c9bded31055b567f138249bf3e089eea95 SHA512 2b18e4b7d408b1cdb0c857e2bab71fbc9b20cc7616608f6056940ecb1318192539abfaf1147e663b7285085fee4d7c9117fe5a33e0db7ce0ef6e76ee27757169
+DIST pf-sources-5.13_p3.patch 5055786 BLAKE2B c19d0d447bdd6c8204a0c61a84592ee0d6f7fd09a4142af2f8cf9d075311dc7fbad94c78261415b6d8c0f8cc9ef408c2b8e35ee2780320b61e1050e332cdf5d2 SHA512 bff89ba11ab81b5ac3903bdbf271952a59ecf360d071a9c2c375c1eb4a4e2c478e354f7119e3ce97fd6996709d733cf305ab2ecd9eaf8655e414f0b55494da11
 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
@@ -31,4 +32,5 @@ EBUILD pf-sources-5.12_p4.ebuild 2600 BLAKE2B 2f0f87c73b392c19c1cc81533ad6dfa847
 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.13_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
+EBUILD pf-sources-5.13_p3.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.13_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.13_p3.ebuild
new file mode 100644
index 000000000000..8dbab3d94ab7
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.13_p3.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/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 606d24a9bbd4..0341bbe38535 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -19,43 +19,43 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.214-rt104.patch.xz 239668 BLAKE2B 15ae88e1ea0cd4744a691cedf8b6e013f5368fb200661480033fe1b7dacd414b2de79867bb65e0e0ef309ad537b7196830c5c20904ca144e2814067ffa493024 SHA512 2d082c55d0432d703a61c170b83cc85ccce992f97e231a270b3b27482b80623ac13989f077c645d678775b38bdbf9076ef97daf5f820b1a129c0ad30fc913031
-DIST patch-4.14.214.xz 4091072 BLAKE2B 988dba7a74b48e50f344021ae091f1a9f6b31db3766a1f2e912c29a8fe3d772f798bf313537d9c28fe946d2f8e092fffc13c86d8d7c2e3bbcf78628465fbaaff SHA512 8ea4cc08bbca884871140908a764153bbc48c1e8226b6a8991516554f6ef81c776eb234571fdb28f316306d412d5531cce8617948a3995853c8f914eb909f497
 DIST patch-4.14.226-rt109.patch.xz 239564 BLAKE2B d481d3b128c2e1d1ae346829ad760ae86b7caec723723edb5dea1cb81a4c9392286a20cbcea26882e8df1a2e72717ba5a78564832245e16ff520e0eb4ff020d0 SHA512 155149e7e56b28cbe6a75728095e34404e2e19db4fa0d963b062489b4100909093b7ce1bf5b6e6a4ed2a031df393bceafd645039bc38a10d8c4d988245607825
 DIST patch-4.14.226.xz 4185676 BLAKE2B e22d2eed7809b60bb7a2737b833e677b921df3daab800dd862e74c9afdc4490b3a65eaa024ec71b02c68575d8f8c8fb9cd05fcc49323df94e97a47a3607d3586 SHA512 ed54187a35668b82ab6eda764fcaec3abfa666dd9ee34c1c674fd531b75b82d8dc1b59ef548264380391916804e65207f5fd68885ff8d4b6fbdef367ec9ddd3f
-DIST patch-4.19.165-rt70.patch.xz 167252 BLAKE2B 3bd01ae7eaf3a3ae5927b3707ebb8955fec6617b67c4385a8c4f9275febf95995bbffc93c64ce46b3bf63d4ac08b0ffa7939020ab79aa5cd220cf10dc5eddc7e SHA512 0e377013088227516b04152fa8c616c91742d8e7f8e390dc2809f87db3dc5dc2a5b30a92c170d4fdd54fe1e351153acb309745246d440474ed52cae6fe483b9a
-DIST patch-4.19.165.xz 3718612 BLAKE2B 3fc93a4ff91ecb802e1f9e40858701a1bbb80a08a5c49efc90c6f867872c970504dec6fd4f32b9dc7e9bdbac23b42e579b1d7b4651928b0348faafa245b45b26 SHA512 0de845f4768fabbc796b97223d79b3be25c8c3dcffcf1948450afe11c4070ac16aecdcbf6c17020dff5f88ff5d198c956f8357198ee27eccf994f81ee4a08260
+DIST patch-4.14.239-rt119.patch.xz 240792 BLAKE2B 961f72eb1cf48574754cc2edc3b893a2d37fe397ea6a518086662b8db55912676eaeaf4416c8cea48a36e88699932134a12a7a928450224b44338ae608dbf63e SHA512 6dbf75beaa8ac8ed8c9dc22ab3a01d7e654eb0216eb32e14066f6aeef01ae75b83a7ad579196caee4e390e33b962c75ace78c90258c2b22c06149efa84b806df
+DIST patch-4.14.239.xz 4328180 BLAKE2B 75c1b4410196289ce504da4422d92c27210031ae7026bba08f5c6042cdd437e97044589f89105fb27aade20271bd22e0a22189d2c5a7a3fedfb861926fd20f8b SHA512 69e01fe11b21c98c4022c22ff692d266f100e720fbf30fccf492a04903139e5f2f5aef12aa234be29b7fb094f91339d37202476f6547f76809a8d2a19989cca4
 DIST patch-4.19.188-rt77.patch.xz 167348 BLAKE2B 695cdc8b346d0e70f9ed3f47b8d2829c8ee5fda586a885f51140e0dda29d0970f71be815db43d18e866f7b809424e80c05b10365a074824cab3f5e637640c4cc SHA512 7e5671c08c06f4ca1d52e8f7f67cf7e908e3d7ab58ef297a54caccd749dd6863afe8f7211027cc536635a2a59303e0ba6388ae35dc870b2cf463f039257deb45
 DIST patch-4.19.188.xz 3922492 BLAKE2B 9cbdc79387a6fc0029eb1779751f4fdcf66812e737ec541b993e6ccdc2f34caf432f65a5feb6e43d6386fbb347527d3493dbe9c3f2f4a5c4fcbde9c71a084db3 SHA512 b45d328ffcc1256e002c963c87df72cd396bf4bd69cfb6538aee10a10145f30317d43fafb0aa6fe48970db7a400b4b67833ccbeff9ba6758b299195f583765b5
-DIST patch-4.4.249-rt212.patch.xz 195172 BLAKE2B a2c8dc6946f232068030c5e4d58dde55610a797b971cf4d7a60552d83a60861d3329c86d59673fcbea15aeecf8d2e479278588981db63bc2846ce36756a28169 SHA512 52e2b2b79882e4667957a323df4010fc35e69142baa9f1c84480a3beafd7c9eb6ce927887d2d825dbd360ef8d35ed9d6150ffb4cb863b794c637b7df53d713a2
-DIST patch-4.4.249.xz 3426840 BLAKE2B 80230e488bea4899d489ca1710b487e59c13668d46850ef7418b85c8bad3adea382a07672449d7ecc2b16e23dbffd6a25fd2616faab0b30965216551b75ae42c SHA512 5fb31aeb0792105aeb98d6313879fc211c3053234a13cfccd20a36e3bfa485a584f01f3bf068f1bf0529f8adc34e10296b5144dfe48472fc0998571ae41626dd
+DIST patch-4.19.196-rt83.patch.xz 167356 BLAKE2B 1ebd82096b6823e11b6194de7ba714e86c4d1f0a76666db478ac059f891b9c6e812287536c3ca9873c26485bc57e7bde7b77e39e4fe94b0c0aa5e042943e9573 SHA512 d5492da169bee3b55ef50387fe07f79d716fe315e2b420c5fe8e2c7da67cb2d5962cf7253ecaf2f9d543e66eb4e07c21cbe95fafabc9e3e516ab15c67201bd92
+DIST patch-4.19.196.xz 4068400 BLAKE2B f0dc28f984586a38466bd753001d124b13fa7a6a909461427ac5e33fa3dce659d96e07977e3cbe95db1a8728adcfb996b1ba136bd4bde1a9a2134174cfb539b6 SHA512 538028d0899a36ded4fe7d9082b3b30b413bba3ab8e9d987bf380e6f678ea8dbb0328042330908b6978c8057a32c13ba0f5bf5e3ca27676306c0b001dab36bed
 DIST patch-4.4.267-rt221.patch.xz 194908 BLAKE2B 7e230a1e15305a7c95587c5cd5ca208d6be8989d5b4fe01ea1430d1845a30f06409c46961a053ae40273e558b333b6075cd45dcb98724e86f6b33a0877e1fc2b SHA512 5cf38181a96f82f1a9071cb14ef933f526076b59797e8827de14030f166f9788d43064414d1db22369a90014c58117072d44d2938b11105aee9ef30d32df73ab
 DIST patch-4.4.267.xz 3522868 BLAKE2B 76dc5251a90421c7b594686dbf09938d5f7475f6113241831e139eb4684fb6042e690e98c613b585eaf46d5e548927e2a8ea4d8947df01330237e241aa00c6f0 SHA512 85b835314ca8f59cb8ab8f5a5f0d7539a842ebbc8c5ad76f49b49701ec653857b5f59af0bf4c3dabe11e14831ffd4d31c0849398e25905ae86b8f829d90ff25d
-DIST patch-4.9.247-rt162.patch.xz 175304 BLAKE2B 5c481b074b9ca70bb3b978f079190d161951dea48d71c537b6d1c32ce5fc9fbffff2c8a339931dd7084b1a0445d557c1ab666bb0e8ca6d5c846b408e3c71f870 SHA512 91da91e4540883464bdcfbd764d8531dafcc49fcebb748fa91c158f218f26b8d5424d4723e3b6ba8e5f9c81246e5ffa3addd652a6ec013c7131deb7d9cc673f5
-DIST patch-4.9.247.xz 3788468 BLAKE2B a866ac523f2612b384794cf07a18ed1a414c8d34c501fb02a7e40792e73bdc576c65e7ec77fab3f04cee4dbd4534f45811c729a6bc17f044ed2196a0fe6877a8 SHA512 4af0e2c93e70af1119f28ea68f3ed1a56226fc0e00d0ec8d12e42498623afe74cfbcd44db3087bfb7748b7148deb3836c7924369e6e6102809a40084bf242a1d
+DIST patch-4.4.270-rt222.patch.xz 194964 BLAKE2B 30b77f231a12af581d5fdc0cc12b3172a629efa7e2b9dccd2b18cf6430e5a43ea5417905b81e4cf48d0f71d713cd9fa654dab87280880249356169b3935dd748 SHA512 372ebb040b2eb7a0d0edc1f0848ca50a36fc788b8c600daf289df53f9c99d4deca91186c76128fbdea74586eda875eff6900f02736edd06012ae9a605d2901db
+DIST patch-4.4.270.xz 3555344 BLAKE2B cc3cc56e68c72f8b9c8276657d010f5a5ad281f2744c317d64b47527e3b1ea9c2ecdb6e4c3d09b8ac9581b5783bb82d083af2d0b0f107ad5d9c08414913c927b SHA512 715e8242fe1a133d3b9f25058b5a5e780476feb3f17712fdc5f27a6a5082ede1ff173b59297ea29f3bff7afc3ec582340f61e0090f98bee0542392006d634ad7
 DIST patch-4.9.263-rt177.patch.xz 170188 BLAKE2B 6d8373a2064030872063942f64b4213ec51139428114b3012d93e56627ce965aa92f6d060cc648f52468b26b66b7e090ea7965872ee9cef67aa230ce852f28b7 SHA512 1ab845f4b130fbe6ab834b3638d1275285d6b681fcc67427795e3b22ef7086d154dd38d8a65f8eb548b27dc6f803871e5bda3f2af8a81db43bc0e37d8b6998de
 DIST patch-4.9.263.xz 3915708 BLAKE2B 6a8bdbeac9e41263b8002fa773f5c5c0877d91a6903b2f5d1895eeac6601bdca634a568ff3d258722ccba044b2d8e675cd8d3c26a2e84ee7091a063ada94eb0d SHA512 e01713011651af09672fcba8683c815f339293cef986568c8da1eab3740d2ec1f8fa1526ab98f3fd4866342d62a6ce803a5c231caebb14c1a9b3f1a4cf6480e8
+DIST patch-4.9.275-rt184.patch.xz 168052 BLAKE2B f896a2f6ac35790e51cdd56edce2ca1d115bf3d0c78defeb2f178cf39412c4a280ce41068d340298e776226cdb436be549fdafbbb11fc5fcc1d7b0ff27340b7f SHA512 82c0615e4d6ecbd12d09c014b64913115bd5b27a92788d5c7cc9f27d5de42bde304303ff9679d3486fcc25a9901dcf177dd8b7a5bc668730bde5e8ff4d3ff885
+DIST patch-4.9.275.xz 4008012 BLAKE2B f79df47900dda5fbf517142f9aa0d6b77e73435d3534070df323635666d74feaf362689a78982c6c04155da684abdbde1347ae3236245155d59576d81340bdcd SHA512 deb78bd9699449a952486bfd155bf23f14ed68632a55923abe3e210c4ea2787c875c7975bc9b0084adfe5e34d33f334f687fa67ceec26f99c6bec70f8739deaf
 DIST patch-5.10.30-rt37.patch.xz 172880 BLAKE2B b5cafb2cb4708ea5c093a25ce5900825435305c68dffdae10cfc1de958c9c09472bab6971c49a6236524d5bc8ba0ec1e15692b4da3210b6116eb534fc9ffd212 SHA512 9782f0020806f28438c4816dce8bca7fa0a90a432f583a9750b963dfb586d819d7169e9339925d665509412fcc331280b52c69b42c157d590028d6edddff069f
 DIST patch-5.10.30.xz 1037532 BLAKE2B 0ec1aa0ea4ab96933f413236f45974084dc43ef80598afdf43675ce679ba4611e45b22bd4db93e02f5a7167865aeceb620df373dbf8de2ed4de67378993ddecc SHA512 7a806161b905090759694a33432ae5a1be96ddf7f6b27c0619ff542c67c9e2c6859694751fc1e5d920dcbd96a0f6b05d0aaec71767ea4c0880afda6b71806d76
-DIST patch-5.10.4-rt22.patch.xz 164244 BLAKE2B e28485e4fb87a7237fafa0853da05c8c7a92d4e1de0a53387837897abb2204f63b9cf9b6a2c1798f09b32a72fac65fcdbcbf97775d38ef85ed61020484a47a21 SHA512 d925b83b257b68001dc284bb9bb690e5a1b0643b464d3e4fcf2c00ec3b23e12584a0f5186a877226fa5c8126db9e2f45abf3957dea020c28cee20780a8ba03a0
-DIST patch-5.10.4.xz 199992 BLAKE2B b79c50e4f52dfef44ddf137e1f69c47b0172771543afe6598cbcc263330634414d992e32e2be33e7682bc4c2f229a6f7a08a5ff02ebbda682a11cb70dbc01b56 SHA512 893733c9b9290f7a91bfb31ca9baa762a6460665b59efad6ee194b67807ae3990cf44464a32ea4a7e9620b58d7810ff15a30a7d92f0bf1b14cff3b5730fce49c
+DIST patch-5.10.47-rt46.patch.xz 173188 BLAKE2B b08678f6652680ba2acbcf10a4bf071e614d7e669c44314b749433c7f34450b151d8d1817286da9d1aae89d767bc0627a5ae2abcf456fcda0afa88765b4584d2 SHA512 98307090414b3229258cd66aeeff1004da9c4e1e61b4492108e4051792ff0cd9e92bb89a0486554437a346a783f83bf615b3c2a3b0aadf6a823dff56b41d39d7
+DIST patch-5.10.47.xz 1555924 BLAKE2B 2252a04c02d5dd135b6ae7be91c42564ec7ac3b4d13422e362f352b7b19f44175f1ab82b05b6a0c308584de4a5999c1df671e3b38085028c86bc84787be5aaec SHA512 633f527b053cc9d10eacc96466909c16be7c7b2815f190b63f523d666c0226f1504adf5eb5fe63335624d5adab2c233e63ac80e6fa8e48a10be92303a95e0d3e
 DIST patch-5.11.4-rt11.patch.xz 129792 BLAKE2B bbc87d478a9635ebd5f1aae0cb010fdafbb697702e0493288dbad9f78f8f76a44eb7360066a73656e20a8acc9ff143f3600097644b0678ad92ad6aef72816c1c SHA512 e37ebf7e6c0f669f35bbc96bbbb096ae37541aeb65c540caa1201fcc11ebd7b7cca1a6a5f42b92e1da4040c92f882fb7830d054051d5b37a7b178a2de5ca3e24
 DIST patch-5.11.4.xz 277800 BLAKE2B 0f1d9783baeebbd28252eecafc88892b3f76df3f19a1193f5291e84e2bb7e1f11e9a3b093135044a7e39ff1276eedffb9b35f2666995e19369b53bf95387ac92 SHA512 dc4013908431289fed4153af402f33d12c2c20b1606ed08f2c1f0988953261a21385e8d9612c7def952b04727a3b8629fb7fe8c4fa2bef4862ec6f9105359790
 DIST patch-5.4.109-rt56.patch.xz 182720 BLAKE2B cf87f20f32b692e832e1a0a93a2c1b09ad40cae0d3c971f70f2fd82a68a43dc5b6475758a4d725b74c0116d39522a712353e6cb7efb3970bfa794b85e863731c SHA512 c6a8bde71e90342d2cb7cc4a085d11c93818dac2a4c29d66b1c4f5591ee1b793a98a9eb614622882492e5ec79c0fd5f93669e9bf2c3518b4a456fc7b116dc905
 DIST patch-5.4.109.xz 2776096 BLAKE2B 1b705558335df5ef12ee3f01654532b7bcefe23242599c749f31ca9d2c6509a81660e8977eb43c4dd052d586d47537d9d58a82930b9587d69142211baed25bdd SHA512 2033c11b03a6cac1770dbc9188c84881538212f7ed9bc419f594b637aef88934d9602c95d3d4d20af8e0a0a56a135a25905d4a6a358fb2334c9132082b66eb76
-DIST patch-5.4.84-rt47.patch.xz 182616 BLAKE2B d37a562eb0dc9d0f60277e9e76479165d67187e6194f8f81bd45e7b176cbb0de2920ae5d34302c335eb16579a79b471eb52d9e78472ebdbb12979aa9602b9c9e SHA512 9135aeb5184790a41022fad6e0676fc7ee12a38aa67b87c839bc2da6ce1ccff2a46f757ad8ff22d8071dd98c9321841b8e908c549d995f0298f478814be7e6e9
-DIST patch-5.4.84.xz 2416844 BLAKE2B 5cb38a3b3a3cfafb7a82299aaf059934d5b64c3d6a9ffae7f273a55b493f0fb743ec7e258b37b57e1a9900d801010bbe60e5d4b62bc1d0467268d2725837fc5f SHA512 35d05cda2e19f4af36e74607ea7fea028b203bb99bc5b1df9e7339697448cf27e276a232ba0fb1b6313cd7a102333843cdf0dfbf0b27b2a86e0565f2a11234c0
-EBUILD rt-sources-4.14.214_p104.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+DIST patch-5.4.129-rt61.patch.xz 182772 BLAKE2B d6486f817dba60ddd6526fc98b1a381f5f8c6323fbaa2aff780942fbd26ece2af57c7c39e4b11c87b7bad0c607ec291f6e37ee107d3372bd9cedc1ccc8eeaae7 SHA512 4c70914fa4940d7dee257c02ab95384ccd53329306074a8f54d58481c6979762db49ddfe849c7e10b6bb82eecfdbfd89043b584c7ee281430c4772ac17a588ce
+DIST patch-5.4.129.xz 3068036 BLAKE2B ca95c9fce66dfcc83c5c8252475d79d3d6a66d3d06308520e4643854089c6051266663ae1a1f461443ab9abf24255c219beaaf235b21053981cfb0d850e711e8 SHA512 9b5cc80c89caa74b3b700b6defc5c4e214e09ac3fffb9b7cb364daaec1e81242bd3d03d36ceae7688eee43bf9fb471385ef65ef1fc477ef1a33dab0c2a516e2c
 EBUILD rt-sources-4.14.226_p109.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.19.165_p70.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+EBUILD rt-sources-4.14.239_p119.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
 EBUILD rt-sources-4.19.188_p77.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.4.249_p212.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+EBUILD rt-sources-4.19.196_p83.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
 EBUILD rt-sources-4.4.267_p221.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
-EBUILD rt-sources-4.9.247_p162.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+EBUILD rt-sources-4.4.270_p222.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
 EBUILD rt-sources-4.9.263_p177.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
+EBUILD rt-sources-4.9.275_p184.ebuild 1464 BLAKE2B ddc018406df3107ed0f43be4ee02187984f2ef7d8472c533fae2eb220c4b90e17467dc4d4464433bd97e9ad17a753be439ca06f82a1b06e37c3b2282b1679bf3 SHA512 1a5232f979c82d7c98274c9cff83d2790b007905a8aed1421105edd8f20f70f556b13fe5fd2ac3d76735bc34cd3c379060346a8a4b06df1680a8dc1c9caa1b1b
 EBUILD rt-sources-5.10.30_p37.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
-EBUILD rt-sources-5.10.4_p22.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
+EBUILD rt-sources-5.10.47_p46.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
 EBUILD rt-sources-5.11.4_p11.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
 EBUILD rt-sources-5.4.109_p56.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
-EBUILD rt-sources-5.4.84_p47.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
+EBUILD rt-sources-5.4.129_p61.ebuild 1459 BLAKE2B e681a684eb60ff8d452cd46bcc082f953469bc62146b8b9177ce1da781c660cf3236d7aa2297760a6a149cfd8586239e86d87bfef6179b9c368cfdea322aa507 SHA512 c57527da612fe41ef958fd4e2e4a4a1e683ea1ab20699184bdd305cadc1face8c386aa1671998b33302d45e89c16c582f02701160067759b05b7ba170487614c
 MISC metadata.xml 425 BLAKE2B 4550a69c8caa253029b71eeb5d7c408e986250ffa876b84bb427bf1f14b800ff7f090f03be3b064af231b94bdde92591bb9fcea64ff2f3f92e3d68462bb0ec6a SHA512 697c4045761fb0e516cb64e97a817f6b8b36a86d0cf982eb0df746011837163bf8810b85241580cbe7bf98202a4dd2e69142422904488961512edb2343fe2536
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.214_p104.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.239_p119.ebuild
index ef7d6b4dfa7c..ef7d6b4dfa7c 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.214_p104.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.14.239_p119.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.165_p70.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.196_p83.ebuild
index ef7d6b4dfa7c..ef7d6b4dfa7c 100644
--- a/sys-kernel/rt-sources/rt-sources-4.19.165_p70.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.19.196_p83.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.249_p212.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.270_p222.ebuild
index ef7d6b4dfa7c..ef7d6b4dfa7c 100644
--- a/sys-kernel/rt-sources/rt-sources-4.4.249_p212.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.4.270_p222.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.247_p162.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.275_p184.ebuild
index ef7d6b4dfa7c..ef7d6b4dfa7c 100644
--- a/sys-kernel/rt-sources/rt-sources-4.9.247_p162.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.9.275_p184.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.4_p22.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.47_p46.ebuild
index fd00d5070643..fd00d5070643 100644
--- a/sys-kernel/rt-sources/rt-sources-5.10.4_p22.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.10.47_p46.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.84_p47.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.129_p61.ebuild
index fd00d5070643..fd00d5070643 100644
--- a/sys-kernel/rt-sources/rt-sources-5.4.84_p47.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.4.129_p61.ebuild
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7a37b444b79a..b0064213918c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,48 +1,32 @@
 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
+DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.12.5 229203 BLAKE2B 056ab111c4bf623f4476ebb38d409048198442040611af2d84801106875e5ec05506ac0c4e1c1124bf9f3700e59cbf94e6d467be22c2c9e1a95619461a1867b0 SHA512 a2495ab8ec406a3b29a099b0e2285420940b1dfffeefcaf8bb69e4ed54fb2714b537e40eb2818468be2d1d2e8217cf8d7b9f123b791676866a2a79a98407e4c3
+DIST kernel-aarch64-fedora.config.5.13.4 232080 BLAKE2B 519680a5c8d71e1273e4a26e366a50b6b048a04219f4cfd44d940b45e75691851b37561c60e9492eb3a2ad942812c81f63f43d8830b741fa16ff11f3c6788414 SHA512 b50e9cb63b0173b3ea5e7beb83c4b6eb2dc3f7922856bb14415916be94632808ad68d77bdd8aedffec2de4b56204f632d2dfb9d94c409ad8fb57abccc36d260e
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.12.5 210160 BLAKE2B d06f57b85b9f7d65da47817e5143af804cdbf34625f74d27b7598f3fd0fdec090f7b46479c991d2ec00a35bd5780120ad7b698b89269266e905a135098b40f24 SHA512 21b0fe9c600c5f5302edcc850717872dc8707d1791f87029075be4ab30f2f2fe28b1b042dd9d5b5dfcedc020e4f192a3083c1780dfb3d275aa47fc0f9b1a7908
+DIST kernel-i686-fedora.config.5.13.4 212557 BLAKE2B 627e0e61f2f73d0104958f4e00008a263d2c9c1d2c29c5f3656f2f79e1df84526bb204cf465477e706ac09ae73eba4c9e0ddf961dc74ea595928d81e562daf2b SHA512 2f0d1225db705eca214208992eb49b0acf5b290a7ca4c154e044164b8883ff0d450e00068d7967a873881c987f77712a233cd8cf4f255320f56c3c14d2338867
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.12.5 197238 BLAKE2B e273514c3b4eb29309bf35351127cdc00903e4642f0a4f75633f80041d8c953046f734eaa0f6e8c7e2aecfbbafee86bf945f5a18399a668253fba225c2edb999 SHA512 bb6f71858a41b833491e2cea22a3d724512b41d04bd6b17d16087f4b7747b340354c41e32d7bf234d8dd1a64adc500206d67a030948100483791dc1ec0732a41
+DIST kernel-ppc64le-fedora.config.5.13.4 199741 BLAKE2B 51be57672f1efd9ef303032b3dde2a5042168567073a2f3a20116344cd2fb5ca132ea3a0f6def2412f6b42e8cf4891a8be9f12ec13508ab3a19b0148414e6407 SHA512 a0c0766718e3be47ab0095dac7f1736b99ca857decf4017c7ff99cb36205c0967382a5156606defaa43663bc0f7b630b8aeb86e0e3361b2a87a66ea3938822e2
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 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-fedora.config.5.13.4 213590 BLAKE2B c788bf52587b13f16248b617c27a5be70fae526bc4dffa7106cf02e98317f820b424f598bd77953f928d6648a2fabc342ee5a5db3f7434e4dbb0eeec53b3689e SHA512 0d151740b27eae0e971d201650e518785826bf29410a6a1e4c3b893d460887d052850e19d62d6c0ddffb60f01a86fa27060441b33af541d2303cde1f1367b22a
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-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.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.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
-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.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.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
+DIST linux-5.10.52.tar.sign 991 BLAKE2B e438edeb31098c0f4ad455ff8814c4a6d4904c786652c6c404e39201c3e78cb6d4a26fe88296980ab40ca3cb769d5f0f08cce67587fae28377db3b4a7f357eb3 SHA512 6d7345a0a959d6101cf12afa6807fb35378d9455a8a09d769090fb9a6d899a1063714c4d72536d9519c37892d13a7fa9f1316518eb1afa633201ee5420da7e64
+DIST linux-5.10.52.tar.xz 116386612 BLAKE2B 60fb5dac282f68a2d8c969616ea391549fffd677a4d96da594fae82d747d2a0d4fe942754cc82c21ead0a2909081c194d33983c2d9f63eb86a9879ad6415862d SHA512 37262e3793ed433ee619e7b08c0ab64d34bbc66e29229025ada498edf45ab2c870569c0a3b17f026379c67153f277e90e1b301c95711638645bde025230201ef
+DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
+DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
+DIST linux-5.13.4.tar.sign 989 BLAKE2B 06c680880006ddca64c4b22e8d853e1b72727a3ca245667ba43d47058089954091a2d49c4b5e02506e34d72a1c3802201291701562dcf91b389c95c70c0a9408 SHA512 e19fb694f7749ad28a401c8f134866028e5b851b95325e81d3f1e4ef15a256b5aead1557f37644118dbb9528d401ca216ae2e2bfdfb4eeda3d46c826e7cbadfc
+DIST linux-5.13.4.tar.xz 119332428 BLAKE2B 325a64af66d0e4390e32c83e60b279745c66cff6f0bf1b0287b1456d7cf5e85444b7f90d19fd08924e3ea652f8743582d21377fa24a794b4b5cd099b68b76ce7 SHA512 dcd44f0da2420093f6ed8e44df4ed81fb8123fbc25d2dcdddd633feb3fc455ec74ef7a683a9c249e7089981393fcbed10c41aad10d4b0108c964cbd485e359e5
+DIST linux-5.4.134.tar.sign 991 BLAKE2B d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7 SHA512 cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
+DIST linux-5.4.134.tar.xz 109136880 BLAKE2B c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659 SHA512 7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
+EBUILD vanilla-kernel-5.10.52.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.12.19.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
+EBUILD vanilla-kernel-5.13.4.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
+EBUILD vanilla-kernel-5.4.134.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.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.48.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.48.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.49.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.49.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.49.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.50.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.50.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.50.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.47.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.52.ebuild
index 12c958a4bb2d..12c958a4bb2d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.47.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.52.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.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.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.17.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.17.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.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.19.ebuild
index 32d99a8f85d0..32d99a8f85d0 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.15.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.19.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.4.ebuild
new file mode 100644
index 000000000000..7feaac0c449a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.130.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.130.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.130.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.131.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.131.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.131.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.132.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.132.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.132.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.129.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
index dc33930084ad..dc33930084ad 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.129.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 5e4b4ba3dc9d..243efd5bfa42 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,20 +6,20 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.239.xz 4328180 BLAKE2B 75c1b4410196289ce504da4422d92c27210031ae7026bba08f5c6042cdd437e97044589f89105fb27aade20271bd22e0a22189d2c5a7a3fedfb861926fd20f8b SHA512 69e01fe11b21c98c4022c22ff692d266f100e720fbf30fccf492a04903139e5f2f5aef12aa234be29b7fb094f91339d37202476f6547f76809a8d2a19989cca4
-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.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.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
+DIST patch-4.14.240.xz 4374120 BLAKE2B 309c9cc710b9047711d39021a98c98d545428815924f9b01920d251f6522393846a260ef2e84a0cd8ac1bcfc6463a070869e35ee0a36616a4115df34fd80f9c7 SHA512 438ab29402daa79f1a948933e11c83b1a97f9406ae3480df3d355d26929110af5d92620a21910084c1e50d7d1e6de821fb58045afebf8e51b2f8191777b07e2c
+DIST patch-4.19.198.xz 4143156 BLAKE2B 2269d346a0dc0ae58623477de6980886e27206ac873f7c67c3757047f15544ecc039fc70cb67d145ceea60ca90b0c8f0e2984c3c7d2b81e49e53891aaed0a570 SHA512 eb9824bf10832a824bd807ff1aa181d9c425d2418bd872ed2a0681af91853855e2a43a56663a35ee172851a88e8d9fcacf70159a543890fe4a6e61aa17822f2c
+DIST patch-4.4.276.xz 3607296 BLAKE2B f1650bc85cbb90cfb7b20b4caa80b9d4c95190502e62e9e6df768be7b5865d08be4fd4951d3391eea1857b6f7185740e23f52612faf478db1c9697753aa577e1 SHA512 50c671910fba6c6b26e06e670fbcef4a9cfe48ba6d72c9daf6b9839b531827e38c2841b82079ccf05c76b12b11632d1ebd66bba7fb4f17615c4f41564cd50144
+DIST patch-4.9.276.xz 4041728 BLAKE2B d616a727c2ab3a5a5941c6293b93a2aca46d3f95963224d8e957fc95e13b86d291fb242cf88161f9094c6ce2e18c2191670dd784e7c94172366f16d95831de1c SHA512 34a5fbc84cbedc56688aa3fbc74323ce0abedd07bc77334860d1d9548d22607ea6d0890c9dc1cf876d249950b828cab47a0f01029a2f831872d0cee9d70c3c0e
+DIST patch-5.10.52.xz 1798892 BLAKE2B 2a3719564969688ae7c7705781e471afc963cf34205d5d3c188ec5f141c98d8ca9a9cc241bc4125d9b707cffe1577fa7b222d2002d32bfba8bbdbb7609bce6a3 SHA512 3ef78f4138aa8de9791c39521ed2d295b5c64b4a920698ee7d32aeea932fbc3b13e339e08bcaf0fefc2441441dd28028018cf1262e0f6daf789e793f3bd95515
+DIST patch-5.12.18.xz 954280 BLAKE2B 45c1485e24a3dcf246694e531a5d259efa6446df5337ceee59271c04ca76a3ba016dcf3e7e9c0b9373728c465d295537da3d5dc4b912231ee228a34207b53426 SHA512 725897d478b61ac6e7fbf9d2de33b89578adb637367c4a70da92996a4a82643a8d314533e7cd9a3c3b992fce967336662175ea87b32ac16b95ebba8d8cec8a60
+DIST patch-5.13.4.xz 441380 BLAKE2B c9307596f3d514eb6b3030174d423e54168400a2c3cfdbd093170075bfa669452dc87b281befbc441d599cb10b5cbfe19973f862d135d3ce02dcb55808b26a56 SHA512 ea5af857d7e5a26ab85c3e98ddac9ac0d537420e1328cd5fc631b49dbd024443ae8a7bd65e94857f2667550e57b705053cec82f93c5c756811d298a5ba2b0e92
+DIST patch-5.4.134.xz 3180632 BLAKE2B c0df9efc20413691609460018532afade8b82a4043ad2f6242d482c8e65e044a41a2c73fee2fbd04de2912c55d8b05a99a31ca9a34ff7c31b54ad3ec01a3d2a4 SHA512 b3132f2e1aa714a895382ecfe0760b81f0149a4bb2f35b238eeb4df4cf928386e1af3b27c555f0b50b678dcdd46c22c932b59af5af3b9447862b705851331c67
+EBUILD vanilla-sources-4.14.240.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.19.198.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.4.276.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.9.276.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.10.52.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.12.18.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.13.4.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.4.134.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 MISC metadata.xml 516 BLAKE2B ec4d6b5a7084baa9ed012e2108690e78422b269c88926baa66e8d0705dd5a7cc82fd76edcaeaf9a481c8b5099f65fe612388a826541a6e9a9c5256ab8aabdd92 SHA512 138d42372bcd976186c5c51f1e62b498df6b35662beeba737a46350e9e9f87b3d8bd97aeb57db43c99fc219ebb992aa2612c3ac8473cf4cc68e7d084c0fd8b93
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.239.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.240.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.239.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.240.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.197.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.198.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.197.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.198.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.275.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.276.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.275.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.276.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.275.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.276.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.275.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.276.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.50.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.52.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.50.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.52.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.12.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.12.18.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.12.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.12.18.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.13.4.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.2.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.13.4.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.132.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.134.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.132.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.134.ebuild
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 08ce04c5e33d..c72a6dfa6ede 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,6 +1,6 @@
-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 linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST v5.12.15-zen1.patch.xz 982480 BLAKE2B 468e406a3c2dadf318df9cf222c2306c4c12fd4a912ebf9492fe52bdbd0ecf2b202a5f373893006ba97472dbe96d6452f0318a88caa554f26e10c96eed9ca947 SHA512 04ba95bcdc16344270ec2b90d6032ec34d019fec75ae22b76cf4524f0163a75119982ebaf4640f6dceff7ac11c92448429624b1c07d63568fbd360ac139e670d
-EBUILD zen-sources-5.12.15.ebuild 1122 BLAKE2B e799f9a9eac948044e0bc8f7639bb7ed59897a6ca667ff7a032f736badf9316713cd35237b9c96d65d3635427c602ff2d10e701a2357879d9f71afa8f8b276c1 SHA512 18b1cf797ae7426eff22028cf50e5d9f709d5aae20d47d96ba17074a78d58964340e55cd88660ae718be5ae8048cc3d19936bd15d1de8a0127f330b572e619c8
+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.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
+DIST v5.13.4-zen1.patch.xz 537020 BLAKE2B 06a90ab8444c773b2d55d0d7de2b05d8f927b04cc27bd454ff5b3c8c64a5e09f861c269b239cb9e68ebad7865ad5d12bb2541363dec607cd96009be6ce7610d8 SHA512 640a0012b002fa5558d7ccee487e265114e692e61e731eb735521845319797e6c358bba72270f3a264009ff37bf08061e4207fc45c308e60521c5b1b743b8b4d
+EBUILD zen-sources-5.13.4.ebuild 1122 BLAKE2B e799f9a9eac948044e0bc8f7639bb7ed59897a6ca667ff7a032f736badf9316713cd35237b9c96d65d3635427c602ff2d10e701a2357879d9f71afa8f8b276c1 SHA512 18b1cf797ae7426eff22028cf50e5d9f709d5aae20d47d96ba17074a78d58964340e55cd88660ae718be5ae8048cc3d19936bd15d1de8a0127f330b572e619c8
 MISC metadata.xml 403 BLAKE2B b007ba7583bf43c622ac26808e1511274e1586c18b7d35e97f7e32d2c7b224e5eb89fe0dfacd6d71cf8367b4ce2c5967d0158abb706b1633218a95996fc70f34 SHA512 9655d79b7a09271fa0ba35435a727bec7dfd46b01d97a3e0a4d9fdd87ebf4ce66ca7093ee8cbb0812ba5ff0a64fe750db353824127e7d8aa731a1a95efdfd8f4
diff --git a/sys-kernel/zen-sources/zen-sources-5.12.15.ebuild b/sys-kernel/zen-sources/zen-sources-5.13.4.ebuild
index ef149d6a6a93..ef149d6a6a93 100644
--- a/sys-kernel/zen-sources/zen-sources-5.12.15.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.13.4.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 7b439f064e6d..3cc151226aba 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 40b43c9c81a9..fb7df0bad802 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -5,7 +5,10 @@ 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
+DIST binutils-2.37-patches-1.tar.xz 11960 BLAKE2B ea60d0db3b61d350a00626ab3ec76e919f15afcc52411c70cab4c5fda80bc0d250ef098847893724365b6c3e789f3f76fd84eda9d31d60295719da622533127f SHA512 608a600d977b9558054ed2278901f50d9d23c5786c271d7849ff884b4e268e1821db26b7c6f5e6cf0f57a7e44e88e4ce0f2441975f7d8401ada0d5451bdefc5f
+DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 EBUILD binutils-libs-2.34-r2.ebuild 3680 BLAKE2B 96fbeb96af93c6db271250870c4df85773db022aa7dd070ccfa33ed2dae57ecb0d543d93cb2ff0666e1b403f325e035a1f9988a05a16f53c167d168e3d6bec4a SHA512 9d540bd681a08451091742e9dba7044ab77a9d8c7920b8f078146fa7eacaa31b872f20c30477a33ec5bec3070408e1b2ac51e145af86d56fae794ace5f2972a2
 EBUILD binutils-libs-2.35.2.ebuild 4102 BLAKE2B e988ab2daeb4f77f469f76af9a56d5509100d6dda39cbebfd41e554d944ef2f4aba2f4c320477947b2979ede808dc4b9a06747e10f878d885e8339e58e7e4f24 SHA512 384c2b9e3819516b9191e65793e32c54b492f31fefbe17c6cb61357452ffb5e6916f9b1dc6bb90ae8c9603f805e3c601aca12b7bd66ebafb2b3106f436185a03
 EBUILD binutils-libs-2.36.1-r1.ebuild 4062 BLAKE2B 0e41ac1f70816696b908c79376acb43c313d6337e39420a1b6f03a961e3e599c9b75ff1e18dd7c1998375b0b15b49f00812bfb50d114f2c3d87c93d2070a0410 SHA512 5c62e3511ed4d6eaa21671a2c1332b8b1857863f0adaefffe23f23f0d0455e916665a6c5a047b8bfa85484a52be1ddfc3a03a1ca4317b52926220fe8c7edda61
+EBUILD binutils-libs-2.37.ebuild 4063 BLAKE2B 247bcd43981203750ba6bd1644779c32cf25cafb291deaa3df9c821e15fd09258a4c9c9986002a7bfcd5f58ea62903f9696f98cfeec1406c40be76d5f5870536 SHA512 52d76ad95e468fa503540355d079f61642785eb5346a8ee7809da9d6f8ab1bb019e932e2db12698c0a5f2daf0fcaa0ec8134130f037927d85fb8230d5e0631b3
 MISC metadata.xml 611 BLAKE2B 6093d3768ff4bc40fa0f8d1ebb3d9a5454f5e492030892d4791e7aafeef0ab4bd2902b818602725bf54e9045be762c1f495eeaf3742ec3ec4c4beda127e2c8d6 SHA512 21b771eb04b2e6f642e3ac48f13c2db19b728c8ed13821c39bfae696b8726f6f68ee65bb89ec0e90adfcee0e7f07a3109ab35e0699fd555ce0b84ad23ef81d1b
diff --git a/sys-libs/binutils-libs/binutils-libs-2.37.ebuild b/sys-libs/binutils-libs/binutils-libs-2.37.ebuild
new file mode 100644
index 000000000000..06298b7680e5
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.37.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof}
+		# 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
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	default
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3828852b7f2c..8649913e812f 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -24,7 +24,9 @@ DIST glibc-2.32-patches-8.tar.xz 65532 BLAKE2B 00c572cff396e52313d0324f7bc28192a
 DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b
 DIST glibc-2.33-patches-3.tar.xz 37076 BLAKE2B 718ab706df85c966145958fb6137b5499c1989ff27a62c22beaabd530d641e4937e6d6ab0cf00052b649dc99c3acc319997640eef95669235dab864f5e0afc9f SHA512 6d460976610a1c3bd3dabee9250008b5b3024ba486d598f85bc81cbd0b88188d125714b93a8b253f9b59b292e998f35118562e2a3ca90c418ff14fa53af2a7c3
 DIST glibc-2.33-patches-4.tar.xz 60124 BLAKE2B a7a99f39c16df241745772c31b10946dc44c51e6c09f8a447b905e7dd6ba529aee08f66a581431453c6665485ac1848861559aa3f0aaba8c2061c1f1eb77d9be SHA512 05c33dc465a98097f836783bb5037dfa14b3a2c0c140014f642ea72954222ae919fe2db9573ee70ca9c1881b3b59dd4b815a8f39f331494fa12951c9012797ef
+DIST glibc-2.33-patches-5.tar.xz 63032 BLAKE2B e7f5952b2d84dc264e960d8bd3d9af4ca43089ca269735168933e80a0a74d7be1cadc90935b429cfdf5f0052d3ce3482a8f073b15378e7f9c05034535d9eae4d SHA512 00c2f8f104e7899b76398a6a39f054cd109a71f5fcc4020304b7d7e15ae0c53df1c3acbafd56898427b3849452f9fb9e5064ff584d6c86c4d18c8a9201c89d29
 DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
+DIST glibc-systemd-20210724.tar.gz 1475 BLAKE2B 065bb4f364162ed168f9e777178ff2559f85db43c3585a45e63fda00dde34071674522cc2133d446c703737a36b1ba3148823ed53de8a4bc22b130a711a41dd0 SHA512 42ede5ef4b872e50cf3b02a3d305fd25675172a4e4461a8072cace688c4935c77267106a53164420e9181437501bc241dd3413806fd1f65eb87ee5ca877455ed
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 EBUILD glibc-2.19-r2.ebuild 38454 BLAKE2B 6019c17c3cd333132abd3d88afd019367d451e6727a7528524ad8835a62d1a741068041dce840c0350a1acdfd8eddb840ac38a9cf6d25dcf46b07c98a31137b3 SHA512 e14489e34e3db70740b31e7b1250884a57a597021f913cd86cd4d946a4b8ceef2ed3fbc409b0c0b13526e128306276c96d48e5f437620835b5d1cf245d778262
@@ -33,8 +35,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-r3.ebuild 45675 BLAKE2B 886a348dcb1af52e29481d8d1d54089306cde01f9c25f421e499280668879bc04ebb3e982d8ad1b509538e8bbb5af1a50ee4de8ff49d159c516382e80724fd30 SHA512 80a0f651e3694da4e291b0a1afd87eb77f7b662a9e7a58c11b4ca40fe6b39dfeabdfde167cfd9631479e722eec02071d7de807b460ef4c0628fe7894f3d414f4
+EBUILD glibc-2.33-r4.ebuild 46053 BLAKE2B 6053e2bb56ea88d94b82ab26ae71d613c7258763efd2b54966f7bb1a78c72464d1600ccd12858d731ee90906ad4aa56bbacb3fdf2e50012385e7d1aa7d0bd095 SHA512 2cb47f7178c4b4f7d7a2d927c383f175eaaf8d511deff63934f10dfcb74f6cc7adf8e42838433c55a25064828db80626698d66cd6960b7dbc9855cd671bce1be
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-9999.ebuild 45687 BLAKE2B 8235f45d86c52e6d4b670d56664049f6b60d8e2800c77f35ca05bda1a0aed93f7c075e03d249bae77967fcd2f659c027c6a449da3f8cb0982f0f8ad76bb585b1 SHA512 46a7c9c4b896378f72ce4c637026484decd921e4c3eba571e15f2dce5d4987d386b677b92b62cb59e3625ac3de199645159043756fb74b285ed155ca6d9a7531
+EBUILD glibc-9999.ebuild 46320 BLAKE2B 16ebf65995f94f024ac6135afae42cea1209ae445f2659054b2995685f1299b4f774bf21473101804fa9a0b1bcd1151c917e5b9303bc20ba279eb6edb8ab0c7a SHA512 c3338ad890f1758cbb912121d5bf5deb4ec8095da90e7778fc50b7a7e3a4536080b85190048f8207254636a466472645dfc9fef0a9e502aa7e36100ce79fb5e4
 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
deleted file mode 100644
index 5e971e697fef..000000000000
--- a/sys-libs/glibc/glibc-2.33-r2.ebuild
+++ /dev/null
@@ -1,1520 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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
index 73e8908484d0..e424358c1e97 100644
--- a/sys-libs/glibc/glibc-2.33-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r3.ebuild
@@ -23,7 +23,7 @@ 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"
+	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
diff --git a/sys-libs/glibc/glibc-2.33-r4.ebuild b/sys-libs/glibc/glibc-2.33-r4.ebuild
new file mode 100644
index 000000000000..a9e53d7039d1
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.33-r4.ebuild
@@ -0,0 +1,1544 @@
+# 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=5
+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
+
+GLIBC_SYSTEMD_VER=20210724
+
+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 )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+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 systemd 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
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_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
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# 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
+
+		use systemd && 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 b3fc7c71c7b2..8904487a6b0e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -35,10 +35,13 @@ GCC_BOOTSTRAP_VER=20201208
 
 LOCALE_GEN_VER=2.10
 
+GLIBC_SYSTEMD_VER=20210724
+
 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 )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
 
-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"
+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 systemd systemtap test vanilla"
 
 # Minimum kernel version that glibc requires
 MIN_KERN_VER="3.2.0"
@@ -95,7 +98,7 @@ fi
 
 BDEPEND="
 	${PYTHON_DEPS}
-	>=app-misc/pax-utils-0.1.10
+	>=app-misc/pax-utils-1.3.3
 	sys-devel/bison
 	doc? ( sys-apps/texinfo )
 	!compile-locales? (
@@ -113,7 +116,6 @@ COMMON_DEPEND="
 	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? (
@@ -128,6 +130,8 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/grep
 	virtual/awk
 	sys-apps/gentoo-functions
+	!<app-misc/pax-utils-1.3.3
+	!<net-misc/openssh-8.1_p1-r2
 "
 
 RESTRICT="!test? ( test )"
@@ -755,6 +759,7 @@ src_unpack() {
 
 	cd "${WORKDIR}" || die
 	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 }
 
 src_prepare() {
@@ -1362,7 +1367,13 @@ glibc_do_src_install() {
 
 	# Install misc network config files
 	insinto /etc
-	doins posix/gai.conf nss/nsswitch.conf
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
 
 	# Gentoo-specific
 	newins "${FILESDIR}"/host.conf-1 host.conf
@@ -1378,7 +1389,7 @@ glibc_do_src_install() {
 
 		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
 
-		systemd_dounit nscd/nscd.service
+		use systemd && systemd_dounit nscd/nscd.service
 		newtmpfiles nscd/nscd.tmpfiles nscd.conf
 	fi
 
@@ -1448,6 +1459,12 @@ glibc_sanity_check() {
 	# (e.g. /var/tmp/portage:${HOSTNAME})
 	pushd "${ED}"/$(get_libdir) >/dev/null
 
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -name 'ld-linux*.so.2' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
 	local x striptest
 	for x in cal date env free ls true uname uptime ; do
 		x=$(type -p ${x})
@@ -1460,7 +1477,7 @@ glibc_sanity_check() {
 		# 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 \
+		${newldso} --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
 	done
 
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 1f4f2e863810..765cd203af7c 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -3,7 +3,7 @@ AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d25
 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
+EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164
+EBUILD ldb-2.3.0-r1.ebuild 2946 BLAKE2B 121652fa19655d666497945c4a2b13ec4b2374c166ea3603f634e6a0b9d841deae65eaeb63426f6486131782e5e8360ef5b7a4574c096870c54df2a5c67a7f2d SHA512 1dc5a2b1e787309897b091754c9caf8cd076e3f03970e0b1d5bbe2574832c7e2ea516d5b9b2b5141c70c3fb5b04916d19031b37845408740dad7ae2d929e52ee
+EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.2.1-r1.ebuild b/sys-libs/ldb/ldb-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..197d720205bb
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.2.1-r1.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.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${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/ldb/ldb-2.2.1.ebuild b/sys-libs/ldb/ldb-2.2.1.ebuild
deleted file mode 100644
index 2ec72bff2115..000000000000
--- a/sys-libs/ldb/ldb-2.2.1.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
-
-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.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${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/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..83741f724f5b
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.3.0-r1.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 ~riscv ~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.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${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/ldb/ldb-2.3.0.ebuild b/sys-libs/ldb/ldb-2.3.0.ebuild
deleted file mode 100644
index c36e5d65316e..000000000000
--- a/sys-libs/ldb/ldb-2.3.0.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
-
-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.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${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/ldb/ldb-2.4.0-r1.ebuild b/sys-libs/ldb/ldb-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..e27020898909
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.4.0-r1.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 ~riscv ~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/ldb/ldb-2.4.0.ebuild b/sys-libs/ldb/ldb-2.4.0.ebuild
deleted file mode 100644
index 6886630a2b9c..000000000000
--- a/sys-libs/ldb/ldb-2.4.0.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
-
-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/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 2a0ade17f1e4..b8bf3b5e5e9b 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,6 +1,6 @@
 AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2
 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af
-EBUILD libseccomp-2.5.1-r1.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca
-EBUILD libseccomp-2.5.1.ebuild 2015 BLAKE2B 42a902f6c0abe87bead4723428f287bdf730d0718265a2cd98aa0b9af3f8cf9094831a9743f9e8b43de811eb5a7cca89657cd529c90abaae018cb0017c51777a SHA512 9f46b611420ae1adbe84a0aa2b1e8b1aff83d8d93a34172b6909bee845089a5eb8d0a871cdc576839fcd02837e701a8b30fa8273df1592945b7efa963dad9c26
-EBUILD libseccomp-9999.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca
+EBUILD libseccomp-2.5.1-r1.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b
+EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B af2f16371d2053acc196f25e655e9ffc839114de5f3283128db57c36a04c528085502970b01cadf9434537c9e6a7d7dd869ef879cff321e352b0caea59b5962b SHA512 9b256b7f42bb28697edbd44613718c152d0f6bb4a6072748ecf873ce7ed4f44def744a465efbcdd6dd29f599a57ec3f13fe68b09357d92ac82525c798dbe4a74
+EBUILD libseccomp-9999.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b
 MISC metadata.xml 468 BLAKE2B f09a751736d4f5f5b5d1cacfbbce2280f2c07f2a435882e833ecd0db3f363ae9e4e7aafaea23d21946279fef27a55d93af9549d75a5f929d6a965dc82f53cfb6 SHA512 3fb402831ab2522948f9514cf0dfad2ed1b035c773eeadb78d958766b92b480b1fb55a274e0990f1913b5be5e4c7de734f8f691f4b3c111949f68f604fb3edc9
diff --git a/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
index c445290913e2..eea16fa2bbf5 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
diff --git a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
index 169a677b6cf6..bf83271b3fde 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
index c445290913e2..eea16fa2bbf5 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 67b88f490def..089cc1aeb23f 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -2,6 +2,6 @@ AUX liburing-0.7-ucontext_h-detection.patch 1920 BLAKE2B 0a360811328eb19f0b0a377
 DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328
 DIST liburing-2.0.tar.bz2 109066 BLAKE2B e2be57f66d2a40650c74502bef55e646986443450b2cdf4d2b5247a3fa099178ae19e61a20e4452dc723351053b613a96743f1268004939da9fddd8f38df3fa5 SHA512 a0da3472eb876c9cfbe56abe14b4d926e4d1c362ee9c4f38eec4c4ab01edab6d76651ffe2afe5cac8589caadc02517950974332eb7990f8bcc9f4f4800b66e33
 EBUILD liburing-0.7-r1.ebuild 1284 BLAKE2B 70202e46fdeced14f4f6b2f931191af8108225fb74e771630b633cfc0f8e90efadc6013e4ff16cce9e4e1211ff2bfca7ab6228c88bf0c9bc4ff49b61a39c7fad SHA512 c09d8936d6a0955d541e3b02e7d6f0b5a76e54db4c175a549e8b5863df79a27a299d1b0badf3a45b8fe936343f20f921c52ba72464228372c0599f2db915a16d
-EBUILD liburing-2.0.ebuild 1226 BLAKE2B d68e0aa6bddb1a0516c1f4cb69519b6a4592fab313d4be9d5c57fd0712dcd9c701d25c3722365e29f0cb6736ef789474dd2e00eead5ccd26617a8a2f0a74125e SHA512 1fd12842da2e9cb17a7e4fb88b16ee00a97d763df56728a574c102eb228c0cfbc5c703a9fc5c22941241356cd5731728bd0d30635a1ce19d0c99f4917581dad0
+EBUILD liburing-2.0.ebuild 1233 BLAKE2B fbcbca5c908925238a5e3b01bccb3ba6177d83aca266fbfdbd45b44bdf8d6f4c90915f5bf8cdd427e1c5ccf893eb6579a388d298dcc3fd38b3fd14e862b56a6e SHA512 d93e26bad547841fe58d580c634a7bd9bf31b35ccc8598f19e6ff7696880ec72f477f6b6733cec16d05914fae4c16d656f9866c7a8b7b85d8af961570b116b0a
 EBUILD liburing-9999.ebuild 1226 BLAKE2B d68e0aa6bddb1a0516c1f4cb69519b6a4592fab313d4be9d5c57fd0712dcd9c701d25c3722365e29f0cb6736ef789474dd2e00eead5ccd26617a8a2f0a74125e SHA512 1fd12842da2e9cb17a7e4fb88b16ee00a97d763df56728a574c102eb228c0cfbc5c703a9fc5c22941241356cd5731728bd0d30635a1ce19d0c99f4917581dad0
 MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
diff --git a/sys-libs/liburing/liburing-2.0.ebuild b/sys-libs/liburing/liburing-2.0.ebuild
index 5730a362b7e1..827024e45bc6 100644
--- a/sys-libs/liburing/liburing-2.0.ebuild
+++ b/sys-libs/liburing/liburing-2.0.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="MIT"
 SLOT="0/2.0.0" # liburing.so version
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 5981cdecce20..6083800a38b1 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -3,8 +3,7 @@ AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 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
+EBUILD libxcrypt-4.4.20.ebuild 5781 BLAKE2B 20aa5b04a02fff77c110a2a6f40e9b5b64f6aefae68c72531ce24a757825707283bbd367c663fe882e45d07f11892aa99ab919ae4b2945bebadb1aad0594e36f SHA512 1520d594c33482de9e0a78009d76898daacf3c66e38e6395d6a7eaa899e45e5a18c05ce5336b8356d89f171a5e85960598ec4eebe164c58e5b76a2d94eca0add
+EBUILD libxcrypt-4.4.23-r2.ebuild 5853 BLAKE2B 24f2114d84458f84b3b4dc06b50e14b05de046964c0c58f9743528cb9541eaaf6bbafc1db05b7c8577f7b4b736cfe3f2465c97551a961a14d11be3a7a9afc9bb SHA512 e79e6c6133444a97d5b40e7331b507bf8b44b1b0eef0eb858dd0b418a5e3a3c6294d938477c0c05f20b4057d1d5d88222934baad465aced6608ef3e227c573d0
+EBUILD libxcrypt-4.4.23.ebuild 5790 BLAKE2B a4f109d6f546d88b2acebde3826503446494da40ad94d73dffe47bfc72f67c1a1a2f6ed13f7c93e75cd4a752f46b2c28922432849bae727a36f0e8405aff981e SHA512 6c254e624b5292faee45bd19fcf0b54ec5d11f309c99d96ed16cd9810c1bed652d9175a85df33e50df90c7b012885f161df7acc8d1e3dc0fc13f7effbb97bcd8
 MISC metadata.xml 830 BLAKE2B 21022e8e6a34737874590a560010f2a8fd1fb11275b4f675d195b66af70ebf8f28a2d881bab0a6653b0b1fbc09c14b99339f43d6f07fd8ffe282f951c64a4f96 SHA512 03dafb661b2273d25c7e282bb91ba01a371734446e12d140d5c5c469172e62f768de6d2a0f5bcdcdae7275f4ba0ad46de69c546b381c1f0bf338cdb487267773
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index 21e04f396784..01358ced2620 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -54,8 +54,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
deleted file mode 100644
index 59a192d732e9..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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
index 9a542cc2117c..6ca63517d947 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"
@@ -58,8 +58,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
index d03062b4d64a..39cbf0e019ee 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
@@ -54,8 +54,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index e2163e032660..16fecd7242d7 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -7,8 +7,10 @@ AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02
 AUX ncurses-6.2-no_user_ldflags_in_libs.patch 1254 BLAKE2B ccc2cd660bf102b61118f0ca170d079454b47a2eee41f9fb1e2b82dc241233adeb1481221fc25ce15b8c101cab200e5eefffde4ff0fbf102d8acf16fe222c40c SHA512 17e365302c683b7fc59b4ed870738b8ab487b9cc1e074d9629e1963120b6ea69b4c3b47b42c80524630d56e1b27519c6f8451397ae892ad759d1d0f019057418
 AUX ncurses-6.2_p20210123-cppflags-cross.patch 1246 BLAKE2B f2e6d5b3f106639435f1901f0a43aaf9ab1cfcc2c295f13cd51120f13bb09ee4e6863aee3e6036b175479235ba8804622ad1ad4e4f181e9ca7ac67ae98ff13f1 SHA512 89a1471bc1dec666a593819b15d778d061fb370fc9786251b0546535cebf46b7ff61579937e64bf35cd15e4b8493e49c74625fb9686bb003935eef017cf449da
 AUX ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch 1262 BLAKE2B 06de969e051fc167729318162500b529a0da243501e33c9cd915f5a853c78445147a6cee22b06e9577fd5821ec0820c05a908933fc9de64b672fdcaf60a74e08 SHA512 09f340e8359ea361e639af7d62f747e59e55b8a186724f6c833dd4a3067046d5b82400069900b7a3b8ca51bdee976e4eb550ad246cd843f85331d331db18e2f0
+DIST ncurses-6.2-20210619-patch.sh.bz2 836967 BLAKE2B f210bf25c33f11d67e54a6f416aae75f0a976880ea543408780fd3a8dc992ee8d9999bf15c925c79504be0f30ade4bbfaed763abedd2b2d6b35de65b353a6314 SHA512 b8392bf6c0b7570766ae31a043df311660201265dfe3e2e49425b1e2aa08c72030b5f5b6c7871532897596262c88a7192e3ff2adfdc618f1b9c13c22c373eeb3
 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
 DIST ncurses-6.2_p20210123.patch.xz 519076 BLAKE2B 790ca80f0b7cdba2e75e3ace91e7f40a740594bdcb19930f64a5aaad8ba041f9ee6057e0a856050e5ef54f79ffe21f23897477dd186790fce9f8192d6149e8fc SHA512 f0d4ef317157472400f183e9ba65102e342e996c4f1d99924ece72305064c3d8616668bb2c81c6113b4bd145b1589844f8c948e6424d4372939752364bed6141
 EBUILD ncurses-6.2-r1.ebuild 10019 BLAKE2B 1dab9c2dfb96a3ee7af19c3e72c5cfaac44abbabf2193dcc9e5db801d76185b770938fe3ba01033e9b14ccecc139fc20a51c6528eafc13983f1bbe09f73f51ec SHA512 50c87e06dccda4d4837373e726839526f9500c6a406e3d985699c5c90500c47dbdbf60358affd6e491116d235ebf214c71f741046ae938c884e42144ca224b83
 EBUILD ncurses-6.2_p20210123.ebuild 10132 BLAKE2B 51a9717dcd8e5436fad19c7f1d0101a256a8a456829ab6b7fc50b8716fa23295d0d575677db0b1a389a46546bd878a6b13794a21f00477a40773574411189e8a SHA512 8f602f257a36ef8926397b31d6f73b89a7c9c599cce55f3b598f05cbfcd8457a320cc63d6d9648d1d6d26d2fa3c24d9e0df59a9494a0c232fed521d6d492b047
+EBUILD ncurses-6.2_p20210619.ebuild 9914 BLAKE2B 62941b88a59b253d98ae26d432f8ad6b0c25cb76f0f55eff77e973deab3ac8fa9af4253edd8061b34882cca59c56895dc84d9a86177143d15e666adf94bdc8c5 SHA512 f2c1d42242bc348c1eb461a37cfdb98253c64657aaf732b1af3b59e40c2290d59c1b1695557620696019cfa79b4621cb0ba253a7c831b5d9f965d27c382ef2a0
 MISC metadata.xml 784 BLAKE2B d195c69ac7dd1ac9b3e9d547e677f0c54ebb7f17ae2d480349bee487753f407091b94228d11ef44b901fc6a5f18cd27e4bf0cf55d16d405db9307d3199ce54a1 SHA512 83e7b30880f244e3756b357628b726832a5e02bce6225255ebe5710014e52914b2b9c87542ff5f3a6f93b547c1d029053ebda8cee5322a2e2ef6fbaa34eb11e1
diff --git a/sys-libs/ncurses/ncurses-6.2_p20210619.ebuild b/sys-libs/ncurses/ncurses-6.2_p20210619.ebuild
new file mode 100644
index 000000000000..d49df4d8ee35
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.2_p20210619.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+	SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
+		https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
+	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/dist/${P}.patch.xz"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test tinfo trace"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	if [[ "${PV}" == *_p* ]] ; then
+		eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+		#eapply "${WORKDIR}/${P}.patch"
+	fi
+	default
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		ncursesw
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	#CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE="${S}" \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		# We could possibly merge these two branches but opting to be
+		# conservative when merging some of the Prefix changes.
+
+		if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then
+			# We make 'tic$(x)' here, for Cygwin having x=".exe".
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs all PROGS='tic$(x)'
+		else
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs tic
+		fi
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(usex tinfo 'tinfow tinfo' '')
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	# don't delete '*.dll.a', needed for linking #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (#689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc for embedded/recovery. #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local terms=(
+			# Dumb/simple values that show up when using the in-kernel VT.
+			ansi console dumb linux
+			vt{52,100,102,200,220}
+			# [u]rxvt users used to be pretty common.  Probably should drop this
+			# since upstream is dead and people are moving away from it.
+			rxvt{,-unicode}{,-256color}
+			# xterm users are common, as is terminals re-using/spoofing it.
+			xterm xterm-{,256}color
+			# screen is common (and reused by tmux).
+			screen{,-256color}
+			screen.xterm-256color
+		)
+		local x
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 36c00aac1794..a43ae4536e83 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,4 +1,7 @@
 DIST Linux-PAM-1.5.1-docs.tar.xz 441632 BLAKE2B 1b3ad1b5167936b8c38977b5328ee11c7d280eb905a0f444e555d24f9d5332583f7e0ce0a758242292ff1244bc082b73d661935647e583e2ebcd8d5058df413e SHA512 95f0b0225e96386f06f5f869203163a201af3ac5c1a4fa8bd30779b9f55290e1a5b63fa49e2efafa1a51476bad1acf258b1f37f56a4bdc3935f9fe5928cbc1f7
 DIST Linux-PAM-1.5.1.tar.xz 972964 BLAKE2B a1714569587a383fa8211b23765c66b08b18dc2808c1521a904171dc2886cced56e9afa27408e8a9d5eec6226b31390dc8f14434071370f4e1147c77ce8b36ac SHA512 1db091fc43b934dde220f1b85f35937fbaa0a3feec699b2e597e2cdf0c3ce11c17d36d2286d479c9eed24e8ca3ca6233214e4dff256db47249e358c01d424837
+DIST pam-1.5.1_p20210622.tar.gz 783068 BLAKE2B c8f13c2ccef73ad367d4fac9a7d1d0d3f3d0e4f1c8eea877d2ab467411cf17cc32c6c9c89e98d94090481d7d7746723175031ba8713a8fb0c3e1976e2854e58b SHA512 5b7a84b9de2d0b0c39cb33e9b8d24aeedca670b998536d74dc497eb7af31cb1f3157f196a01712c4ae273634b51ddad2062f207534b35b1d1a1e790816c8dc1b
+DIST pam-doc-1.5.1_p20210610.tar.xz 62308 BLAKE2B b3311e704ddc840b7fd28ea7764e8a0d3fdf508e2e37405acbfa26462a188c480859b3b21bd4a4b4acea70928e68650c216e8fb2d2b6f11ba33f54c6692cf3a2 SHA512 89b88f8ebf0c46f6b25dc0c5f39383ecbef0b12d6ffab388d92026066ee986f9068819cdbf38baaa1e341cd6cc84b1e8d3ad02db121aaf0ddad27e4e6efe26e7
 EBUILD pam-1.5.1.ebuild 3638 BLAKE2B b07f0bdc0d8a046da5e01a6df342a22e74aa41a1de87ac3f3cb2e8f75f28da52d474476389b30de34c9029fc0a463bc824f1f93966216654eef4825a0291c04a SHA512 ec971174aba7f5d9aaf9a2e41aed0aa4567c1a5560f621e462f2c493c1207261665afecb148b757d3f7de2978f91ce93c3c3bc487c2117b14eedea2f53e45133
+EBUILD pam-1.5.1_p20210622.ebuild 3517 BLAKE2B c46b1858230ea9aa350ad4182cbb2d0fdbc96329e00a41f2166ee2ed90af5726d0d76863e6fefc3a26f1bbd0f8a0da7c5f2058cd3a42db1433c0d1fb5b13f8c5 SHA512 acbd5b94fa6625726354ace23435c563e08849e4b499d59c5a075ea6efaf871b0b8a64ccc78582c70acc024296c4354a95fff782ec8ec2834d733cf4cbaa4282
 MISC metadata.xml 753 BLAKE2B 67c57ffe354542e68522d2f6bd2bd870d696cef99ac2c09f0999f09efba94d32f99d656b39c928c72ec5967571ed04e6501d43a6bd8c1272736f83a368721830 SHA512 f060d149e8d70bdd788e2d6bf6f466e66ba1786afb80640642e7c3871de30b019d8154b192c6a3b886cb75a6828b6fb587de7cb8a57462cbb5f8a312cc7344a4
diff --git a/sys-libs/pam/pam-1.5.1_p20210622.ebuild b/sys-libs/pam/pam-1.5.1_p20210622.ebuild
new file mode 100644
index 000000000000..91cc67372ce4
--- /dev/null
+++ b/sys-libs/pam/pam-1.5.1_p20210622.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
+
+GIT_COMMIT="fe1307512fb8892b5ceb3d884c793af8dbd4c16a"
+DOC_SNAPSHOT="20210610"
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+
+SRC_URI="https://github.com/linux-pam/linux-pam/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${PN}-doc-${PV%_p*}_p${DOC_SNAPSHOT}.tar.xz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="audit berkdb debug nis selinux"
+
+BDEPEND="
+	dev-libs/libxslt
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+DEPEND="
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? ( net-libs/libnsl[${MULTILIB_USEDEP}]
+	>=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND=">=sys-auth/pambase-20200616"
+
+S="${WORKDIR}/linux-${PN}-${GIT_COMMIT}"
+
+src_prepare() {
+	default
+	touch ChangeLog || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up. #549684
+	unset BROWSER
+
+	local myconf=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--with-xml-catalog=/etc/xml/catalog
+		--enable-securedir=/$(get_libdir)/security
+		--includedir=/usr/include/security
+		--libdir=/usr/$(get_libdir)
+		--enable-pie
+		--enable-unix
+		--disable-prelude
+		--disable-doc
+		--disable-regenerate-docu
+		--disable-static
+		--disable-Werror
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable selinux)
+		--enable-isadir='.' #464016
+		)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# tmpfiles.eclass is impossible to use because
+	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
+
+	dodir /usr/lib/tmpfiles.d
+
+	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
+		d /run/faillock 0755 root root
+	_EOF_
+	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
+		d /run/sepermit 0755 root root
+	_EOF_
+
+	local page
+
+	for page in "${WORKDIR}"/man/*.{3,5,8} ; do
+		doman ${page}
+	done
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 9706bba99f35..7754be5bdfd6 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -6,5 +6,5 @@ AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb
 AUX readline-8.1-windows-signals.patch 569 BLAKE2B af1ad52b09a1a49e6045bd640d57f3932f2b8db450b2eb7e0787a4326f6c61445ad83395620caf489da14107e8a51aed5d5fdf8e3268fab83d8ff04d393b1a59 SHA512 37aa778a21e360708d371aaf3f08274f75b15d8b2c42b030bda8d65dda81b1713c748644e45b6662c608da14ad413d6d83e43800ea58309fa60256a18317f5ae
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
-EBUILD readline-8.1_p1.ebuild 5422 BLAKE2B c17aa7255d9d239842ac27eadd8cd650ac9d148bfb7328d66e06b60791c091f5fca340185aea7716e3977a8163346655b0dc9f37d60b62376144abb037d30365 SHA512 214117975ae18878842a6a160f9c87dc9bb6d7ef7e491098a31707eaedf4497dd3d388e063430d11693e1617631253534358d9b51871f80f14578e71cf609ea7
+EBUILD readline-8.1_p1-r1.ebuild 5421 BLAKE2B ec22b0ae9545f37be7038473a593d9bac054a236b043a7610f4b155b3b103f37bcd52b6cef7ed39e0d2b86b3cff1550fc8974fecdbb7a0ea78092c78c370e4ea SHA512 ce5f0758bd36cc7bace051197b405b0fe4dbbf01bddf2a36f66483e1117f3ea27d8d74be597b47abc0f9a7d11a5b206d4a0598a66efa8bea703577f79d5ee259
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-8.1_p1-r1.ebuild b/sys-libs/readline/readline-8.1_p1-r1.ebuild
new file mode 100644
index 000000000000..6d42ede604a6
--- /dev/null
+++ b/sys-libs/readline/readline-8.1_p1-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	;;
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+	"${FILESDIR}"/${PN}-8.1-windows-signals.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	default
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
diff --git a/sys-libs/readline/readline-8.1_p1.ebuild b/sys-libs/readline/readline-8.1_p1.ebuild
deleted file mode 100644
index 5cd7a3bdc211..000000000000
--- a/sys-libs/readline/readline-8.1_p1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-	"${FILESDIR}"/${PN}-8.1-windows-signals.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 999aaea3d990..9e2441872825 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,5 +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
+EBUILD tdb-1.4.4.ebuild 1405 BLAKE2B 8290e5e8a488deeb14238ed5be795b8a763922339448fd62b21f8a6627dce6a58535acee7a0b0e1137477cb8d53fcd530e63b718526227db91438c75893243fc SHA512 b00e032edab9c0392d782e6c3ffcea779fe01363531b7573e664437a5f56054726a645f510669b35f2fc51d09ec744a1e15436d15415546bacf65ee0eb3a5515
 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
index c91a2b724ca3..187196ce6f7e 100644
--- a/sys-libs/tdb/tdb-1.4.4.ebuild
+++ b/sys-libs/tdb/tdb-1.4.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 5c99c53b7ef4..b67b43b7c356 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index aa94afb9f1b2..53cb23c78634 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch 3100 BLAKE2B e432205a6145f4f7efbe3dac7626b97b73bd4c9db6f639fb401494a38540025dcde40fe53464ed15057a5c67e4da5786a4a57b24e549a739c8a758d88654ab50 SHA512 79ca53f0c4ba9d37dd0a6b6bbfcac39651f658b0288aa33b941ae5bfc15cbf520ec197a6fe4230417385fc726723ef79f99a0728bda83eab96907391ebaaea32
 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
 DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
-EBUILD powertop-2.13-r1.ebuild 3788 BLAKE2B 4e985b40055bb591c25cb86deb59e5fe53db94c6486857f118000752b6a8764fda314f4c5d4b75e1b3e3877f5e3dac931cf0a9f06fcff44f6afb989cf5fdb29f SHA512 5d1ccd173b788818f5a9f2473cbaa91af89771d206e4726e8873717611240cbf4e2a6ce5c187ba46db0da0edb73c9d9fbca494841abbaceb8e419af6e788a9a0
-EBUILD powertop-9999.ebuild 3602 BLAKE2B b52644b5010edb0cbad9a339a75edaca4ec98188da83ab5c4c16cd85e3cec5ef8613a5fe5622cfc1d0c43654b9073372e6a63fce14d54bfd1c22792181ae9ea3 SHA512 3e918cf6c3012fba1ba5acc486c5bd8c0791f8ff1dc6c4d139c1acb0b7a9cd319a7b50c9b1808ddfafafcf591ac9a0c9d81ee58c115a99b4be5045a553437338
+EBUILD powertop-2.13-r2.ebuild 3791 BLAKE2B 04356f510be06dd202dbfe437351caf9f27ffcfc7937dd15c7f9a2e12db276f9e426f68d9d1758a913a40c676d0bfaf0114846bb8a9e657dd301b51cd77ef00f SHA512 68b22c7bf3d2e78f0a6a81815d42527e2901f639da84424561e0f26c48992f58fa5e4401a8450761a3cad1098bc1cec16325a5d4ac2ce9ec507c244869b1f3dc
+EBUILD powertop-9999.ebuild 3605 BLAKE2B e5ad4d84557b7a9cfa04478e44bed49552b06ee9a7454f425e35003678c637bcb1de09a942be26fa9365a424491e44e32a5fa7249624cdd5173090282ed067a9 SHA512 df83e70b1457855857e0d2e81120fedbd103e097a115b453f871bdadc9f013b7ab417d527dc46dac58ad9c382a1702b79cdfb37c30af64bf7e542361bfa4c45a
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.13-r1.ebuild b/sys-power/powertop/powertop-2.13-r1.ebuild
deleted file mode 100644
index ef1f63925d7c..000000000000
--- a/sys-power/powertop/powertop-2.13-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.20.2
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
-	echo "\"${PV}\"" > version-short
-	echo "${PV}" > version-long
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.13-r2.ebuild b/sys-power/powertop/powertop-2.13-r2.ebuild
new file mode 100644
index 000000000000..41279e9daac9
--- /dev/null
+++ b/sys-power/powertop/powertop-2.13-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools ${GIT_ECLASS} linux-info
+
+DESCRIPTION="tool to diagnose issues with power consumption and power management"
+HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls unicode X"
+
+DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses:=[unicode(+)?]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
+"
+RDEPEND="
+	${DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ_IDLE
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TRACING
+	"
+	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
+	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				check_extra_config
+			fi
+		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 3 19; then
+			CONFIG_CHECK="~PM_RUNTIME"
+			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
+			check_extra_config
+		else
+			CONFIG_CHECK="~PM"
+			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug 599114
+	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
+
+	echo "\"${PV}\"" > version-short
+	echo "${PV}" > version-long
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	econf $(use_enable nls)
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 04d3fef7a87a..92a8b30bd07a 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-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
@@ -25,7 +25,7 @@ IUSE="nls unicode X"
 DEPEND="
 	dev-libs/libnl:3
 	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 "
 
 BDEPEND="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 5c7a362cd933..2ff550ac49ae 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/anacron/Manifest b/sys-process/anacron/Manifest
index 432865167e79..c5e07d0d0ef6 100644
--- a/sys-process/anacron/Manifest
+++ b/sys-process/anacron/Manifest
@@ -3,5 +3,5 @@ AUX anacron-2.3-headers.patch 895 BLAKE2B dbc3880c572b988570a2b53ccb50cdc4be3854
 AUX anacron.rc6 249 BLAKE2B f5bcbd2ef69c776d2eb79095cdac4c2bd3a8890c8812a6e2d85b1a9f066504d09c927aea3c8fffbc243448ae5510e34ac9157d5329b2581587862bc2f2ac337c SHA512 b8c095e2fc9c8bd9b3f926f5d2d780576bcbc4e4824a9a06d649c8468024201936f798edd7567bb6fd76cc73f9fec4c7793e01c7311827bed29e5314227bc136
 AUX anacrontab 468 BLAKE2B 4f77a6759934e0e2693f3abeb9fe208de059d019906dc6c09160ac8b12e0c311d5f3414092c1cb6e62c947d950bf5fdf7990a6c351f4218f366ab2aaa4280c08 SHA512 f04850d22b459fe95bf5ccf594143f6fb02a1d29fc9cf36d2965a8b846920bc36b0d2d5665c5d6ac9828b904a4f30da49f62f6bedd51c75f548b981e056f097e
 DIST anacron-2.3.tar.gz 24140 BLAKE2B 70fa2c716172a538b6810b65a4b80d8d8b70e8de7569856236f6386e30a3a77acc6b7aa11dfc3ce06aa432bc74009aa6dd44fd8d3b70f8585b979d0c5c596b98 SHA512 27bbbfad5bc35ddc68e4345c3a3acefd0a6f794aaba890f7c75ec42b2e4c4200fbb1667e75b2e344afb7722bdc9ba3dc5a7db66d3369808bc9f483ea3509849c
-EBUILD anacron-2.3-r4.ebuild 1437 BLAKE2B b72e4b22a63088e1f008f5237463a70bbaafe5ce824989f3195de11235702058c276b1ffbb3967c70a9f388039899a281ed17cb9ac37cbf988655b3fc8dad411 SHA512 9972688c76279e81938320e9da7be2ee45077aaf41563c9d74e993faaafb7164d7f06fc3233865042b658f8d1e1c0180deeae7b64222a11fa9454d843194f249
+EBUILD anacron-2.3-r4.ebuild 1444 BLAKE2B 86e245a72f4d2e031087f12a4e378dca70a5ebe31ad1ad34cc4bbd5ed38121fa629ed452a6aca42ad0d48dc5c4086dbac1688837b4c379b8e6995a135b3101b9 SHA512 8b74d79ee9787e71e839382951e06ff5b25a23163fe84705a9296ce8a3e07212e956ab9fe463d2234653a6833533c50543439458b3a885dc36cad37bc5f1c466
 MISC metadata.xml 244 BLAKE2B a650691e7c7b4c902aa2797645acba4fff4434a8b098b140e0eb711d81078e24df71625176cf489397639b117be475d38ede9697e60dd809ace97aafb2387c66 SHA512 991ccea1a22791aabec3cdf5cc996892d6c595263fd92b07a4b2b52a1ff32d96198aae09947b95b08e62542958225218890b08367ade7a07dc04ac332c5e4cfd
diff --git a/sys-process/anacron/anacron-2.3-r4.ebuild b/sys-process/anacron/anacron-2.3-r4.ebuild
index b0c1a39922dc..0f206cd67fdc 100644
--- a/sys-process/anacron/anacron-2.3-r4.ebuild
+++ b/sys-process/anacron/anacron-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ppc ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-process/bcron/Manifest b/sys-process/bcron/Manifest
index 7e7ee049fa63..8033b64b67c4 100644
--- a/sys-process/bcron/Manifest
+++ b/sys-process/bcron/Manifest
@@ -1,5 +1,5 @@
 AUX bcron-0.09-fix-socket-permissions.patch 307 BLAKE2B 4b1f28579f75af2ab6547e2601ed5e0013b70ef8ac5e112ada22e79ed51cf70b10715816f5e856b6d83a7e3959bca5d9d15db66106ff1909a2ed0d416255de95 SHA512 71437e686615b6962a25121dc96f785af020c1b8db2e3a73416455e494a863dafc22ac744779885b64d296342b0d08f3fb3f03a398ebc66cde9cec721dd3d9f6
 AUX crontab 485 BLAKE2B ef44f29195b3d50ea360cdd76d2f7854961161c2ac4579dc7526fe02f4b86e8d1c5f28f90d54a36ca32a24ad347b7f2770ee35326ea21929c4dc68e5ec7af769 SHA512 0a67b137f67b4910cddc8e40da01d78df46a6404a683839eb04a8a4883d03e2cfc3f61b4ac40f5cdbd963ba0ea9a070e13eff1b85623b1a6b50b5f379bde3957
 DIST bcron-0.11.tar.gz 69950 BLAKE2B 9aaf9e7d8e468a184da97324ccaa6ea557c2d8c3c3557bb90ba9b43b98ac1ddf9bc7d879300394b73c3e5921f9fd7ad8859393076a77a99b9ec3a909e6493a17 SHA512 730e0f4d6fe717ddf89e787d570449f1f7b4b5c44beb2e11b6c88a92177ea02480063f16992f32a13877327b895ca085617dda65de90effd8fb465e578444f05
-EBUILD bcron-0.11.ebuild 2867 BLAKE2B 575e4e677f27310565c35f46ba0236e95198d2297b7e9bac26c346cde4a8ded6f306d747ccf6b7805177a62c32e5a13ff0e8a3caa6c59d57ec5d1242380857b1 SHA512 fa22d96492e46c4b484cfe2c679049a44811a9a9dd049eca4c4983b15bbab1f6d8616d8de6ba26245b698f742f587883dd09a8593bb99391d5f6ff76522b278a
+EBUILD bcron-0.11.ebuild 2874 BLAKE2B dde5155f5025e62b46e68ae45a9c54ac9d9d7be18effd8ce2032b342206193d30109fba8688bce00064ff97591243fda3992be702d2f95adfbb4f573224e419d SHA512 b32f9893e00fe241717a5b52d761ff25ae2e871f0b4dedd0c39ae958aa4f138c1d1d37b159d28107133e7f4578948319cf1d2efa71456969dcad7b8102a8cf6c
 MISC metadata.xml 566 BLAKE2B f8a972c8a51fd2768ef8a02b68a26c03b69950961e47e176c98073968dd0361c98eec302369b5ddc7453692bf16820ce249625b676af39e9fb2d3dc4ca5168f1 SHA512 95d7ef6f7548ee75046a45715c6976a1e2acf74b57dd68b225ed111f1e28ccfb8ec8263d3b8708798f9f5e6de1995f9ad7185ec8806978fa8b757c88eeda4dc1
diff --git a/sys-process/bcron/bcron-0.11.ebuild b/sys-process/bcron/bcron-0.11.ebuild
index bb21685215f5..e222025a0624 100644
--- a/sys-process/bcron/bcron-0.11.ebuild
+++ b/sys-process/bcron/bcron-0.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
@@ -13,7 +13,7 @@ SRC_URI="https://untroubled.org/bcron/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-libs/bglibs-2.04
 	sys-apps/ucspi-unix
diff --git a/sys-process/below/Manifest b/sys-process/below/Manifest
index aa3a3c00b960..224443537768 100644
--- a/sys-process/below/Manifest
+++ b/sys-process/below/Manifest
@@ -202,5 +202,5 @@ DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c4
 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
+EBUILD below-0.2.0-r1.ebuild 4344 BLAKE2B 4a4ef52caa6b944c730d1a95ae1134ff385b291084926b1862c24106fd300f4fc4f5912e3cfd38cb98afc9a8ecde38ef91e1f60db3a255bd5a64ae6a6d68083c SHA512 e933d86cadfb44a2aaa2bb04674e5d0f708d6e4d08b651c26dd95f306494a40750818b1ffe29628812481793d72001fefadcd18b2f53c367da7be4d6b19aac71
 MISC metadata.xml 1093 BLAKE2B 130366867f7fd554d1abff758801a67900f992a594e3a5e30515ead93fa9668826a2dd509e46a9279c9d6912d3fb9a6dba6a8d5a4150137a771b50660eb2a959 SHA512 4124eb9b7ccfbc1ebb46967cf8fb36722a61ac420e801df61b3e5fa00d75518a8e712e7aedf972c55ed1673f06f5fd4b6d2d9bb6c2163fd87494c06bcb03fbd9
diff --git a/sys-process/below/below-0.2.0-r1.ebuild b/sys-process/below/below-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..d46b1451918b
--- /dev/null
+++ b/sys-process/below/below-0.2.0-r1.ebuild
@@ -0,0 +1,248 @@
+# 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]
+	)
+	sys-devel/clang
+	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/below-0.2.0.ebuild b/sys-process/below/below-0.2.0.ebuild
deleted file mode 100644
index 35d3c669a729..000000000000
--- a/sys-process/below/below-0.2.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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/criu/Manifest b/sys-process/criu/Manifest
index 39ecd40c3a87..de5f47dd200c 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -5,5 +5,5 @@ AUX criu-3.15-pkg-config.patch 5131 BLAKE2B 3b4cc0a2ae3dac24eb5f76a20478844e10b6
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6
 DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
 EBUILD criu-3.14-r2.ebuild 3202 BLAKE2B f95ff85b90cb00cf6bb2a7a6d17dc1c1a3614d202da7283cb6a862d1184acce02c7799abfdee11a67d1eed4938f0424da408b4ae7788a2311fb5e0b20ca2256a SHA512 d1f8f721abf6211cdb75fbda7b009aa96f8a0cca5a6e99d0633c4d8dd6398bff357fbfc679ba0b2836f20feb16470fc55c2abc937f5951bfd68d134d80c7494a
-EBUILD criu-3.15.ebuild 3245 BLAKE2B f89e2db4b20f2f5215992b505ef1bb49349243da85e30b04632abe1eb61830eabd18b1a944d2c55f7e9b5ca3a398330014a4daa8211d12d4b7ab7802e4d658a0 SHA512 0bb8ccdbdb00acc01149810dd05599dc19d126c734ab39cafd8acf08bb4438cf98ac4df8c81da43c1a4168af9cc448483828af78218824580b57d33ed7a6c120
+EBUILD criu-3.15.ebuild 3244 BLAKE2B a5380405a97be75d8f2ecc3bdd1833a69b21777f1bb592b083cbbf170636af25fdba4861efee8163ddd9916df5b39bf6e8c468d4e8a3619dcd6f3b3d6d2eb581 SHA512 1804c5d17009108569d01288df509bf3c9d26ed084509afacedae3a4ee5242259edee2c6cf3f4808e66346feccb67bb6cb7f5a0ef4e8c8b2bf8ff826897c4958
 MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4
diff --git a/sys-process/criu/criu-3.15.ebuild b/sys-process/criu/criu-3.15.ebuild
index 065124a7e5d1..204e5a4facc3 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-process/cronbase/Manifest b/sys-process/cronbase/Manifest
index 8c3c6f662e35..c9a4a45e2faa 100644
--- a/sys-process/cronbase/Manifest
+++ b/sys-process/cronbase/Manifest
@@ -1,3 +1,3 @@
-AUX run-crons-0.3.7 4942 BLAKE2B 41be25ff5b647179dda723d44fc1441293ab8287427de9febedf49596cd816cbfad0fb98d1bb60602bd198bcef72eb8d5c9cfe01c66e09270bf653c2c6a6f650 SHA512 eb4f298fb67d7ff3e82d19e6a27f3f1df4b1abab86bd78f3ea85aecaead42a6c194773c21d63d081b62b0eb45cf2bdeb78b43b58906500e6bb52613f7e6bf164
-EBUILD cronbase-0.3.7-r6.ebuild 663 BLAKE2B 28f92096e74f005ce6d32f3c6cfa8210998174b375df729ec99bef5112ef465308bd805987e5b648843f86110e33f6f8f9132541716ec6092cabce536a6ad6fb SHA512 e1ec5a7b5a33831b5c92e12a9bc209b3b72b8f373b10651c9c90902295a63f50a0512aabd8f8f3f57c594a6ef7ff00400316dc04e55b6f9d0e6e97148688639d
+AUX run-crons-0.3.7 4939 BLAKE2B 3ccfa317d63e7cc4381ebd590e75f94cf482123377095f1fb6376e2cce0213161a1867db8b684cf3791bcda5540899074bd852677dc4e93bf04fb53c71159867 SHA512 69284eccc7b510a039967d14b01a88419a2e6437fe5643474c82335ff1388c21b024e2dcfe232e00f4a9f6b3b92d4d2f445b0561de5872197c2369f24f30c931
+EBUILD cronbase-0.3.7-r8.ebuild 627 BLAKE2B b66f40beeea925765de0713c705fa79e8d170f6264a1aa7ffe8dcf96473678c5cab94086aae62cbd1089d860dc330c5f168b8e738d9660ce6ec4d5a490558710 SHA512 cf43bf57ea7924edb5b62a9d8c441a798bffdfcf4c9c04f7dfe9cbd6770c13c682e4d18a69808ba320a4e2bd062775d1141934e6eb6935ee775570db9303fee6
 MISC metadata.xml 253 BLAKE2B 1d5af623950024db87f3016a93014ce876894828c8bac85ae8b157f8e2851ca96384c8e195c9693e09e7a76f4fb7033ee466057b930198a6416135eebbb6a8c1 SHA512 66f53c08df7430d7052861b4c483e36d54db4d937be2fd4e3a6135d36992e041aa88d60205b47c3749b54c36925ca4c45c88fa7b44fee283de48ab8aa75b738b
diff --git a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
deleted file mode 100644
index ff274f0d977a..000000000000
--- a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit user
-
-DESCRIPTION="base for all cron ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup cron 16
-	enewuser cron 16 -1 /var/spool/cron cron
-}
-
-src_install() {
-	newsbin "${FILESDIR}"/run-crons-${PV} run-crons
-
-	diropts -m0750
-	keepdir /etc/cron.{hourly,daily,weekly,monthly}
-
-	keepdir /var/spool/cron/lastrun
-	diropts -m0750 -o root -g cron
-	keepdir /var/spool/cron
-}
diff --git a/sys-process/cronbase/cronbase-0.3.7-r8.ebuild b/sys-process/cronbase/cronbase-0.3.7-r8.ebuild
new file mode 100644
index 000000000000..ec0f921d2255
--- /dev/null
+++ b/sys-process/cronbase/cronbase-0.3.7-r8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Base for all cron ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+DEPEND="acct-group/cron"
+RDEPEND="
+	${DEPEND}
+	acct-user/cron
+"
+
+src_install() {
+	newsbin "${FILESDIR}"/run-crons-${PV} run-crons
+
+	diropts -m0750
+	keepdir /etc/cron.{hourly,daily,weekly,monthly}
+
+	keepdir /var/spool/cron/lastrun
+	diropts -m0750 -o root -g cron
+	keepdir /var/spool/cron
+}
diff --git a/sys-process/cronbase/files/run-crons-0.3.7 b/sys-process/cronbase/files/run-crons-0.3.7
index 42c88100df1c..d979a42690b6 100755..100644
--- a/sys-process/cronbase/files/run-crons-0.3.7
+++ b/sys-process/cronbase/files/run-crons-0.3.7
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # this script looks into /etc/cron.[hourly|daily|weekly|monthly]
diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index 02584c0e8371..768114d868ef 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 1368 BLAKE2B 6a95002ca807ba1fffa69aa4a5846f4073e69a69257e9ab768dff797c16e2c833b94bfe74446ccf421801a7be3eeebc656d2f0e43e3ec4710e7bafc9847e2dda SHA512 12fc78050f193f5a6358008cab807cbcc0cc213ccb9e3e027e332cb59555c29a4f37cc73bcd4681152169b8658718c41d454a45a08759ca5560f51a495e6c350
+EBUILD daemontools-0.76-r8.ebuild 1375 BLAKE2B cdaccbb1636b548df41b0fc8523894e00cc5b43a951c479b3cd9229bece9a5c89871b2949a88fbfd364685de619f19d687fd89b2641e532d61f1c7746854760d SHA512 49943e4f8921319c6347b537d471dee90dbcdc7cc152e122ab5a06e23daf9d96c31398547d8b67fc95e5ed24e940b6471c1c97c4520fbc07701d8d82f738d16b
 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 d3d7d7abe836..be5da9bbc09c 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 ~riscv ~s390 sparc x86"
 IUSE="selinux static"
 
 DEPEND=""
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 7d04489d967e..0349971a8474 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -5,5 +5,5 @@ AUX dcron.confd 131 BLAKE2B 97b9d62f5a5f8798a5f85517a69807e137e552ecb2d287d02a41
 AUX dcron.init 446 BLAKE2B 1b7646859045b5b9b3db558c40960029fbbe2e9442aa0788cb3920f71aaf7137b86b074f98dcd094bc6ff110c0d56c44baa7f42058f357bb3f28f80cf80320d1 SHA512 9a6d625713a96490dea7c05717f5bae0271a297a28bd3f08c45d913d09b2b8bda259e7f6f772666f2312b4a2fa60477139efba389c8940bf55f6dcae73ebd588
 AUX dcron.service 151 BLAKE2B b8e3fa583592f6a3719356ed4d7b7429ba0cfaec2a6398af398df3a3b959b74659b6b89b7899c1bfb1c9ce048c00be6790aae650a88b5cfb5cc7ea51020e9fce SHA512 7249396786f5fc3b52981d0344c52bd56151d8ead161111a90a5b30c2985a39486aea3e263a6ddbefcb53d88a67277038bd88cc6480ce3d788093bac16835d1c
 DIST dcron-4.5.tar.gz 44978 BLAKE2B c77cea026b074eed11200bb335cc2f58f7346410f88ae50685db137583beddab14e50394233b8e0f27ae7e3bf30c7875b539db84c32236f78f52bf91862b3272 SHA512 08521391d16ba5adf80278ec2a734319c26c48841fd94b119c0b27d744c2cfb3562b1a3630135a03d1c43b1668d49262713abb20ff5f7ecd397a2a19a2f6105a
-EBUILD dcron-4.5-r2.ebuild 1157 BLAKE2B 2dba7773fb3a4a1c3136058a27a2abacd49160301e23de26b327c10c672b8842de45570ffdfaf7c115563bc115ebf67d234e77102c00872ae6a4d190b903a110 SHA512 31b6f98d9360e97f63b0b36b81bcff87fb4ee99433fbc7225bff8f4b8c00af3e17d500b7eb58dc76112754d3cb089c9f073cfb36adc751a5235d32e774f964c2
+EBUILD dcron-4.5-r2.ebuild 1164 BLAKE2B 415e8a1240979196580d441496ecacb18fbc6cadb52147c68b6a3656b51f713c994df047fcc3f5cf522c9696726c46aa964e5a204b9346d5f39a9528c0870813 SHA512 9648db301cdc4f9a81ffae4464e7aa8962019ad871a051a0a98585e8182f1270d1750fe3b5184071d0e7d14111d2cdfb85d52292e510149a78e728bda48a6114
 MISC metadata.xml 646 BLAKE2B 5f14f2604db704722425788bfffc6416afd2abd34b019cc8596dcbcb575e3e4d0aac99ed0310a7fc8bf384db80116f8fd80d8177c0f6b79b9ab96394548bb473 SHA512 4a4fdf29b18fba800638c08f29bfec7afe0976a2c0e9c554c55c2f713e12e5aff509d0472387b782b7444fa951985d1af9a44779bab3cffb66645a3877deb44e
diff --git a/sys-process/dcron/dcron-4.5-r2.ebuild b/sys-process/dcron/dcron-4.5-r2.ebuild
index bc17faba17b9..202cc31e6049 100644
--- a/sys-process/dcron/dcron-4.5-r2.ebuild
+++ b/sys-process/dcron/dcron-4.5-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A cute little cron from Matt Dillon"
 HOMEPAGE="http://www.jimpryor.net/linux/dcron.html http://apollo.backplane.com/FreeSrc/"
 SRC_URI="http://www.jimpryor.net/linux/releases/${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 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index ad65f15c7609..0573dc1e3713 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -9,6 +9,6 @@ AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec7685
 DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd
 DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6
 EBUILD fcron-3.2.1-r4.ebuild 6984 BLAKE2B a0ffbc0ff0c143eff057010923b90a0fe379c8d9d55e756d7fc9b13ee68390aaf4aed26894bda92ccf5cfe2276a1269db8f517a9adba0aace662dfecee796790 SHA512 a44daaee4c1d15644427faa1f345b7c141e5c3bb27406f2b4a4ccb9c2819cd951a6fd475d508be3f485cb7acc34aaba4581b9527442de3a0e2865258b0c56a52
-EBUILD fcron-3.2.1-r5.ebuild 7086 BLAKE2B 37ca577a208c063388b1a52b14af448d455d4f83840dfe034b31f59d92466ce25e95a6e7e3c19d2eab6d55e80c66647d599d27939e26f1f76e6fa994a14452fa SHA512 5b8ae2ac1f3ed81e7f271afdccbd0a3981adb50134b9492cea9a9a0ad4f56ece462f9958711135c6748740cb7fa22efe664250fb74a8e94f53f023c2d23da375
+EBUILD fcron-3.2.1-r5.ebuild 7093 BLAKE2B 7bcc217ad1f34b2991a3a35a629123667fb63c0c488df39ee94fc93538f4186f548faed125a717b0c0bce06fbad25289112593cf23f03a8cb5d25de49c222c79 SHA512 6d6815b015b5e20d8ebab26c3736aa8a503f42b5987e30c71ee3134bc1f6735e3aa8f442f16288f535c8febe16ee8d1dde878575ad5b6b07896175347116445c
 EBUILD fcron-3.3.0_beta-r2.ebuild 7114 BLAKE2B 7e302b974f42ad77be822ba97dd94556020b886b2b5e2abf188c4edd3c35bcecdf9a7db0bbc19e743a42284b8a563bb832be293602b47d73d73ff5e27983b98c SHA512 68f9f511885778d7a804012129cddd752859f6cfa23020efc499fc4234e3a1a51eda027042c3be0bdae71cfc4c140409b8c3b82d0ec97fd3f6c5764ab505095e
 MISC metadata.xml 1236 BLAKE2B cba4b98c8851e5c28d4bdfd06081cea35f8bed59e9f48d3ad094e43cfe72e12242ebd5a656b2a573dffe8e97158810370801b8395f3562eed0600540b60c9248 SHA512 6bc85c005fe5adefd42834bc3448bf97f2757b219ca9f28f03555cdf900044f8814f34386c468de30eb3ea482fc0bb839e59376734921e1cd7761e703858699f
diff --git a/sys-process/fcron/fcron-3.2.1-r5.ebuild b/sys-process/fcron/fcron-3.2.1-r5.ebuild
index fefe1afcd1b9..d6ec5a35ddce 100644
--- a/sys-process/fcron/fcron-3.2.1-r5.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://fcron.free.fr/"
 SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
 
 DEPEND="virtual/libcrypt:=
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index d8f14cd3bc13..ce39f07a9bfd 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -3,7 +3,7 @@ AUX htop-3.0.4-sort_column_header_highlight.patch 5294 BLAKE2B f046ca56c10151d53
 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
 DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c
 DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f
-EBUILD htop-3.0.2.ebuild 1510 BLAKE2B 926ec79b468e22f176afc14ef4aea85a1a1d7af11da8e43b8d9cf9588ebc0eefe21ec416480dc25bb724a62baa7dde678482edca5ea3bbf25e4456b5b389b7cf SHA512 1da5a321e8fb3eacdec89e87bff890d9a3649fb783f32a8a1ab9288fb9f267f06b768089cf94f2c54253a372d4b3564e925d5ad47df0956340c2ca049fcc28c9
-EBUILD htop-3.0.4-r1.ebuild 1695 BLAKE2B ad2853ea3dae63aeaa1ae29bb1c66fd5599d35d97db0bf8fcb15423455af8c3e6935e6ef120e7d853689f0fab7ea50e75a266353aa47a00774ba18a7df1664e7 SHA512 d0a89c6e8c9ca0131f14f8c7ef7b618ba37202c5e6f63e004aae53a2ea9b8beb112667917ffd65a604f3aee03dbcdc42f73e34d51a4810e62fac0fb764b1866a
-EBUILD htop-3.0.5.ebuild 1620 BLAKE2B 1f48e2a33762a52318d32a181f7328ac2fe9ed29e357cda62f2437399a3b0061a5497244e9d25749035159a5ceeba4308589af24f30eda199efb0c7dc57a8c99 SHA512 ff74727a77e0f4f40efa1fcf17e9a973a130317af121a314195e5fabb3f065c451c06eda8ea3f26537f292b175be741044a7859b7d2ea25bf4c2315c5ed2a259
+EBUILD htop-3.0.2-r1.ebuild 1512 BLAKE2B ed0a621d4f2474805dc12d63ddc8a898878b20b61f727e39c0544e0ee9bab6892209bf7448d621348354596163428b20f3ca517cab98a99b2f0919ce09047e18 SHA512 76a20d06f71e9a83508488563005a48468790d95abe27ecebe0ab617b6a23adcb8584b84e6bcaf328c79c5a6fe74b5e7c946dd0726aab823550f42c3b3723570
+EBUILD htop-3.0.4-r2.ebuild 1697 BLAKE2B e97e3a0217b473a8eccff90e45ce775434928a53aeda6c9593d4a4886181028a945a8ee1962f7b64b43c8f67f8f43168581f5a55cef02f3c09fdbd60c41bc258 SHA512 626f6547c897cbb1212692828b1067ed6ea6993b057a811968639ff22b7883ee26fc9b3d26e736653c09964c1d969a835c751ddaffac1a6308343e2cd438f250
+EBUILD htop-3.0.5-r1.ebuild 1622 BLAKE2B e400b1a443d342a70f7a537eaaf271155777ce916eeda8b3cd984c86c7db56898eb91a08fd9e9f59b03d22c40292d75d345b121c2443afcfac9537c4830513ef SHA512 3bae06c2e5f59b9ebd4af08459e82f69fc930370e74bf1ccc89b22cff62c7c36db8c7b3920aeb8c756addc0dfebf165bb31e54cc2e4dbe9fae51793bced4dea0
 MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece
diff --git a/sys-process/htop/htop-3.0.2-r1.ebuild b/sys-process/htop/htop-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..183f2f04fbcf
--- /dev/null
+++ b/sys-process/htop/htop-3.0.2-r1.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,8} )
+
+inherit autotools linux-info python-any-r1
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
+SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840
+)
+
+pkg_setup() {
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop (what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=(
+		# fails to build against recent hwloc versions
+		--disable-hwloc
+		--enable-taskstats
+		$(use_enable kernel_linux cgroup)
+		$(use_enable kernel_linux linux-affinity)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+	)
+	econf ${myeconfargs[@]}
+}
diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild
deleted file mode 100644
index 0abdd1482917..000000000000
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-3.0.4-r1.ebuild b/sys-process/htop/htop-3.0.4-r1.ebuild
deleted file mode 100644
index 6c51dac36511..000000000000
--- a/sys-process/htop/htop-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	hwloc? ( sys-apps/hwloc )
-	lm-sensors? ( sys-apps/lm-sensors )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-S="${WORKDIR}/${P/_}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sort_column_header_highlight.patch"
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable hwloc)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-		$(use_with lm-sensors sensors)
-	)
-
-	if ! use hwloc && use kernel_linux ; then
-		myeconfargs+=( --enable-linux-affinity )
-	else
-		myeconfargs+=( --disable-linux-affinity )
-	fi
-
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-3.0.4-r2.ebuild b/sys-process/htop/htop-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..8ce3e79b56e9
--- /dev/null
+++ b/sys-process/htop/htop-3.0.4-r2.ebuild
@@ -0,0 +1,71 @@
+# 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 linux-info python-any-r1
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
+SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+	hwloc? ( sys-apps/hwloc )
+	lm-sensors? ( sys-apps/lm-sensors )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+S="${WORKDIR}/${P/_}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sort_column_header_highlight.patch"
+)
+
+pkg_setup() {
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop (what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable hwloc)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+		$(use_with lm-sensors sensors)
+	)
+
+	if ! use hwloc && use kernel_linux ; then
+		myeconfargs+=( --enable-linux-affinity )
+	else
+		myeconfargs+=( --disable-linux-affinity )
+	fi
+
+	econf ${myeconfargs[@]}
+}
diff --git a/sys-process/htop/htop-3.0.5-r1.ebuild b/sys-process/htop/htop-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..61702bf269c8
--- /dev/null
+++ b/sys-process/htop/htop-3.0.5-r1.ebuild
@@ -0,0 +1,67 @@
+# 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 linux-info python-any-r1
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
+SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+	hwloc? ( sys-apps/hwloc )
+	lm-sensors? ( sys-apps/lm-sensors )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+S="${WORKDIR}/${P/_}"
+
+pkg_setup() {
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop (what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable hwloc)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+		$(use_with lm-sensors sensors)
+	)
+
+	if ! use hwloc && use kernel_linux ; then
+		myeconfargs+=( --enable-linux-affinity )
+	else
+		myeconfargs+=( --disable-linux-affinity )
+	fi
+
+	econf ${myeconfargs[@]}
+}
diff --git a/sys-process/htop/htop-3.0.5.ebuild b/sys-process/htop/htop-3.0.5.ebuild
deleted file mode 100644
index 29f65efb9cbc..000000000000
--- a/sys-process/htop/htop-3.0.5.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} )
-
-inherit autotools linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-	hwloc? ( sys-apps/hwloc )
-	lm-sensors? ( sys-apps/lm-sensors )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-S="${WORKDIR}/${P/_}"
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable hwloc)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-		$(use_with lm-sensors sensors)
-	)
-
-	if ! use hwloc && use kernel_linux ; then
-		myeconfargs+=( --enable-linux-affinity )
-	else
-		myeconfargs+=( --disable-linux-affinity )
-	fi
-
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 7c53dad42ace..49048ce9c263 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -4,7 +4,10 @@ DIST parallel-20210522.tar.bz2 2246330 BLAKE2B cf3dc65526522cedb22b85fabd364dc89
 DIST parallel-20210522.tar.bz2.sig 2080 BLAKE2B 8053520c93ee1dae0d158adb6d6867efda6496b2874578e70b640673dba5813898ba4fad2156f3f00a7f87ef551c41ecc8d4d61e0573752abe505d4eea6c2a86 SHA512 536309731b87ac6a523dda91d23b88b60aca7f4516a5dbba9efe08085f9a7590c7e797bd3a39afd52fdccfe1f3a776f1df66751817943f06adc17695bf14f1e2
 DIST parallel-20210622.tar.bz2 2251075 BLAKE2B 4855ee0e581bf1d3ebb7dd16e4126873f0bf4294ebfc8260ec75901b3a80126a2a7c4d11c1a997557cf37e8077be24b9f1a1e97e92629347f1a55e23e8fbd9df SHA512 084537fb2b86f284f8b09dd506a79e07856612a1bb03914deec6baefd08df4c9878ad0247a527b4bc5a6d42e1a9a11d13a4a6e304ea1c3c8083b5faaf7530937
 DIST parallel-20210622.tar.bz2.sig 2080 BLAKE2B f21c6dc3b90757e56547b88ea429e33cb04b7853cc3493a19bd3352a9e2c14f8d293ee1180cacd1449a37047e3084fa4d12dccc5767a28e2daf40d086c9f5404 SHA512 50fa1de3b40f8447c9adf5e52c23e8cf932dca0565ac663bab128f44db5e8159a399208d1a23ed6d5eff78b9cb0d6eb4ada92d642279e41d40b0c429ef4c825e
+DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b3436f4d8be89c92bf4607243ba18c6530364cd7b3b4b99cba8f7a55c8a0235819edd1dbe431de1b37716fe104cd9f72 SHA512 2b5bec76ca6db090bc93f57bd09771d264a761677adbd6f4b93256776cf65a62a5a3a4641c450b68044cb7e86c5e7202d9455d2f9b0ad0cb8ad64d6da6955f89
+DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
 EBUILD parallel-20210422-r1.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
 EBUILD parallel-20210522.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
 EBUILD parallel-20210622.ebuild 892 BLAKE2B 74cc5985f1f9cf5288a7c6874622e8b7d96997a6b7126e8f00f854f341a2cabedaa97e5bd1ff49015fde7d4c5bd10e250bde04f5126636a206d5a1c10a410e85 SHA512 410d4b983df2d2b7bc0c7631d8cd46283ec470650835d9020e9ed5e94601c943bb0c348ba0cc8dd3314d4700a03d4084bc535c52128b1475a9fb697445774808
+EBUILD parallel-20210722.ebuild 892 BLAKE2B 74cc5985f1f9cf5288a7c6874622e8b7d96997a6b7126e8f00f854f341a2cabedaa97e5bd1ff49015fde7d4c5bd10e250bde04f5126636a206d5a1c10a410e85 SHA512 410d4b983df2d2b7bc0c7631d8cd46283ec470650835d9020e9ed5e94601c943bb0c348ba0cc8dd3314d4700a03d4084bc535c52128b1475a9fb697445774808
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20210722.ebuild b/sys-process/parallel/parallel-20210722.ebuild
new file mode 100644
index 000000000000..df4e4dc4a9df
--- /dev/null
+++ b/sys-process/parallel/parallel-20210722.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc
+inherit verify-sig
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	dev-perl/Text-CSV
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( >=app-crypt/openpgp-keys-oletange-20210423 )"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index a9c2620d6a59..7da274107a9f 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,5 +1,5 @@
 AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313
 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
-EBUILD procps-3.3.17.ebuild 2262 BLAKE2B 9efedab0b9e9fa20556bac302eceda8ac1d23f508eb331e365dd5abf955f0ea1b111869be92580ca493b032a102bc82e3e26bfe76e25805277d075d5a6ed9818 SHA512 bd90336f235b242a4d19c05028102de06dc69c28ea0b458700d3f97d82068fbdae70754f300728e3ada2039c8540e084cd5c5d64224cd1e5ceb3e0bb850d3331
+EBUILD procps-3.3.17-r1.ebuild 2265 BLAKE2B cc8434921eac0274927fba6182113c980ac44e60760a11adf68dc6e9a598f20c4357568a2d08db10efda96964f307b6305929575e56167eec3c3c9c177e3e254 SHA512 1b39c4eb70e7e687b21e17933f446bc62b299c611e61b11691b1a9608277e5dcd87a97c5285015d1fe75122fdade7c378ddd7abfae3ca83c788155a9e4d103ba
 MISC metadata.xml 717 BLAKE2B caae5760de6bc3dbb19fef321255f8951a8ca70139511121dc6d497c8eac4a19ea1d08032e0b6538c74bb34242c8b394360e1fcbf65bd15ef3554e318fa2d4e3 SHA512 3a6a2fcf2dad8784e270bde8e6bc8b183e3dec14abe8c51a17316debac0b599a4f95dabd5e3e05344f500e8eb60b901062d17d644201bf4596e4580ba4d9494b
diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild
new file mode 100644
index 000000000000..77bbf988516b
--- /dev/null
+++ b/sys-process/procps/procps-3.3.17-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal usr-ldscript
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/8" # libprocps.so
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+RDEPEND="${DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<app-i18n/man-pages-l10n-4.2.0-r1
+	!<app-i18n/man-pages-de-2.12-r1
+	!<app-i18n/man-pages-pl-0.7-r1
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+)
+
+multilib_src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	append-lfs-flags #471102
+	local myeconfargs=(
+		$(multilib_native_use_with elogind) # No elogind multilib support
+		$(multilib_native_use_enable kill)
+		$(multilib_native_use_enable modern-top)
+		$(multilib_native_use_with ncurses)
+		$(use_enable nls)
+		$(use_enable selinux libselinux)
+		$(use_enable static-libs static)
+		$(use_with systemd)
+		$(use_enable unicode watch8bit)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake check </dev/null #461302
+}
+
+multilib_src_install() {
+	default
+	dodoc "${S}"/sysctl.conf
+
+	if multilib_is_native_abi ; then
+		dodir /bin
+		mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
+		if use kill ; then
+			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
+		fi
+
+		gen_usr_ldscript -a procps
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-process/procps/procps-3.3.17.ebuild b/sys-process/procps/procps-3.3.17.ebuild
deleted file mode 100644
index d33c80d215e4..000000000000
--- a/sys-process/procps/procps-3.3.17.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal usr-ldscript
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	elogind? ( virtual/pkgconfig )
-	ncurses? ( virtual/pkgconfig )
-	systemd? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-RDEPEND="${DEPEND}
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-apps/util-linux[kill]
-	)
-	!<app-i18n/man-pages-l10n-4.2.0-r1
-	!<app-i18n/man-pages-de-2.12-r1
-	!<app-i18n/man-pages-pl-0.7-r1
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
-	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-)
-
-multilib_src_configure() {
-	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
-	append-lfs-flags #471102
-	local myeconfargs=(
-		$(multilib_native_use_with elogind) # No elogind multilib support
-		$(multilib_native_use_enable kill)
-		$(multilib_native_use_enable modern-top)
-		$(multilib_native_use_with ncurses)
-		$(use_enable nls)
-		$(use_enable selinux libselinux)
-		$(use_enable static-libs static)
-		$(use_with systemd)
-		$(use_enable unicode watch8bit)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	emake check </dev/null #461302
-}
-
-multilib_src_install() {
-	default
-	dodoc "${S}"/sysctl.conf
-
-	if multilib_is_native_abi ; then
-		dodir /bin
-		mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
-		if use kill ; then
-			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
-		fi
-
-		gen_usr_ldscript -a procps
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index 8cd6939103ad..f283dc13df88 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -1,3 +1,3 @@
 DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
-EBUILD time-1.9.ebuild 451 BLAKE2B f6a34d41e7fc47d1167509201aab125d2e82f3244fcfa77ae65c0080b793263b0628e5222b527d54133d0cd2e018ead8c0732ed391505fe2863a7e30d13f6047 SHA512 ed73d4cd1314a1f1c0acec5c72070acf93d1dd0384b8aabf44a8fc7c8d513575c9c6fd5d01bd9458cc5e08c2a14efb8c2d4b7e19aa6c35177300bf77fcdd0a94
+EBUILD time-1.9.ebuild 458 BLAKE2B c4ea455224683718e27b4ad2bb213836140a66f4fc23ba556b54fdc88399468a7f928bf7e9a4c95831fbb8afe97e050836089603f17ff07812c92aae2a5bb685 SHA512 bfddc882fc577a51f0e6691e179d33625e880fd6ca431a0124d7bcd104df300701627b123fe5e87388d26673c669946094c30d819255c615ed1f95061b49c166
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
index 5b8705786825..31f680682aca 100644
--- a/sys-process/time/time-1.9.ebuild
+++ b/sys-process/time/time-1.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=6
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 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=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ff1c16a87bcc..6dcdfc39ed13 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/daemontools/Manifest b/virtual/daemontools/Manifest
index 703dfcea0bb1..276d9ba60f74 100644
--- a/virtual/daemontools/Manifest
+++ b/virtual/daemontools/Manifest
@@ -1,2 +1,2 @@
-EBUILD daemontools-0.ebuild 321 BLAKE2B 4c72f5139ec8447e8d42baf5cb7576d842a3a32e0d8991747d59a3e8318251c5acf3a185981f8155f65ca969fbe7dbd979a7dec5cd2c8443de03b1d11ff9e042 SHA512 7ffa05aa85aeecefbdd644e6d23c8c86f2464902277ddd10157879774ef72859c86f1d9ee52ecbf948ec7fdb4958440327c25e673ece906a3ab9a874e7041b47
+EBUILD daemontools-0.ebuild 328 BLAKE2B 997b5fddf5d27601825cab6e55e65a8db49a9016889c752b4a1632660d6bc2d3e11a1258eaeb81433b3679e203c4f9bec53d444d55636b32a3144e34a074f3ed SHA512 80df6d747df775b436f6746f0a54807af3e43d6a79c93708e7de6e751f7807d9db7d24ef09c11f9d83213e055bf06bdffa719797b3dc61813f4b8466f61a9882
 MISC metadata.xml 281 BLAKE2B 2aae5ea5778d806017d2b9a5ec265d4f50db5cab57712dc18e1441cd7a1a91d595d478926fc465437e1e729ef541d8fbcc8a9a9c09765270f093d4e16ac0072c SHA512 e9c907d7513327937e8a9f400bd097524d23001932d4416f533d43a94b07ba4eaf3f95d28df4193a2a7c8c1a8ce7b512c66a86386cc1bb82325b6bfeea9bc65e
diff --git a/virtual/daemontools/daemontools-0.ebuild b/virtual/daemontools/daemontools-0.ebuild
index e7e12efabb96..c85bdc345be9 100644
--- a/virtual/daemontools/daemontools-0.ebuild
+++ b/virtual/daemontools/daemontools-0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for daemontools"
 
 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"
 
 RDEPEND="|| (
 	sys-process/daemontools
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 3e26d7f873b6..e6e1770d885c 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,13 +1,5 @@
-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.15.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.16.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-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
+EBUILD dist-kernel-5.10.52.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
+EBUILD dist-kernel-5.12.19.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.13.4.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.4.134.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.50.ebuild b/virtual/dist-kernel/dist-kernel-5.10.50.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.50.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.52.ebuild
index 340ca7eb117e..340ca7eb117e 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.52.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.11.22.ebuild b/virtual/dist-kernel/dist-kernel-5.11.22.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.22.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.15.ebuild b/virtual/dist-kernel/dist-kernel-5.12.15.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.15.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.16.ebuild b/virtual/dist-kernel/dist-kernel-5.12.16.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.16.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.17.ebuild b/virtual/dist-kernel/dist-kernel-5.12.17.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.17.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.48.ebuild b/virtual/dist-kernel/dist-kernel-5.12.19.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.48.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.12.19.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.10.49.ebuild b/virtual/dist-kernel/dist-kernel-5.13.4.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.49.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.13.4.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.130.ebuild b/virtual/dist-kernel/dist-kernel-5.4.130.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.130.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.131.ebuild b/virtual/dist-kernel/dist-kernel-5.4.131.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.131.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.132.ebuild b/virtual/dist-kernel/dist-kernel-5.4.132.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.132.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.134.ebuild
index 98a5bc7d0b98..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.134.ebuild
diff --git a/virtual/fortran/Manifest b/virtual/fortran/Manifest
index 7d6164be9724..238290138538 100644
--- a/virtual/fortran/Manifest
+++ b/virtual/fortran/Manifest
@@ -1,2 +1,2 @@
-EBUILD fortran-0.ebuild 425 BLAKE2B fccd9412f0c08b0e55e620f594a10d55ae8743ee99de4803ff272a55508869378cba7cd4056391d72183b19bbd1bfb71b38c3d0234f460581e22e1dda2930ae6 SHA512 7dcb4a4bfefdd3749a7159afa5846a3310f7e7501083332a3cdbfd5b147f1bb2f28f33c6c5bc016d62214c108a40501be5cd7b043246e8864fad016e271be2de
+EBUILD fortran-0.ebuild 425 BLAKE2B 87e15b2fa9b3372e01a820992e04017242484c76ae4b07c091c3b0c74dc9e1d86753259341fc9f0e798468b52879f35a9a945deda10398291669ab94c1245c9a SHA512 922947c9541d6d003baf4257f1858c0fb7d10b9b30a08919341655be120fea89950179c2ac3694463fcc5534833194d2abd4cbc12e47ae78d33ddbc3c5211884
 MISC metadata.xml 277 BLAKE2B f7ddd373063940f565a3c424a8cc9a3e092d44389a56930db8a875b880d5a6b2ecf644d4605342199f3dde5332caf903bf094daa554bd9abac6919230e371e21 SHA512 970154fcadc29300b663def3d2b5c46b1cb934694850e67ebb72cd9a5d838b602690379db0eac0cb013f618d977e2141df4dee89d0c5fefeb2b672a7dc86ab17
diff --git a/virtual/fortran/fortran-0.ebuild b/virtual/fortran/fortran-0.ebuild
index c0ba0173346d..26e08f8f3d22 100644
--- a/virtual/fortran/fortran-0.ebuild
+++ b/virtual/fortran/fortran-0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Virtual for Fortran Compiler"
 
diff --git a/virtual/libudev/Manifest b/virtual/libudev/Manifest
index 5efb9306714f..f7ca489aa5cd 100644
--- a/virtual/libudev/Manifest
+++ b/virtual/libudev/Manifest
@@ -2,4 +2,5 @@ EBUILD libudev-215-r1.ebuild 575 BLAKE2B 14069a897168d44a8a3b99816e539d808866e65
 EBUILD libudev-232-r1.ebuild 422 BLAKE2B c31b0728045dece3fdbe82a75faf4040499be6fa538184493047d4da1e9e026a142e6b3567163f759ef4d3116d68f3d8e174a89fe821dfc918b00240be3f4c36 SHA512 7418b72c19ad876b3fbef1146a63748280e910ffe29b76f0bff7dd014c757b6851a64ff14b896bc74971588889dc09e1b970d01538447dbfb8abb3e2a3ed2a81
 EBUILD libudev-232-r2.ebuild 498 BLAKE2B eb0a9485b674ff13399982989f5c75caa7bd03ee673136242cab51a98881ebed9edc438d58d6171278e7e292dd4e58bb1cf98737067f9bf2284f03cad2ee0520 SHA512 ddfef5ee17f0b76991b641d4f7fd3ba6cdb7be093eed2ceeed3b144a16a0264b318e58b0bbadb5c3332968a24c943298601b2619e66dd2e4c432ccba29286c88
 EBUILD libudev-232-r3.ebuild 546 BLAKE2B 8b389c3402e5d48d39b50bca0ee9484f6bc63516a33b2f43678257ac1e9e98c733a397ab9f0493057b2ec8508defce2854180c6301253dfce9343d37d0aaac03 SHA512 a664095a2e14d90239e61e12d27d8a749f5ae28cca35ff9146a233bba9f1b45f7850cb02dffc3f0d2561c9a8a0c1a85fcce23a13ba0597c7bcbff759214ef219
+EBUILD libudev-249.ebuild 554 BLAKE2B 3f6aa950cb6d1ba14239d4d18dab61f47b016e2a42c2cddb0efd73033a869688a1e209188b742ca451946356e1c020bc3cf49b0e75da80d1f4fcc0d049389d22 SHA512 4330635857041155138d145a37cdd1d463d09d65349286243ae14ccb08377cd8fedbf5f7c0892ffe1a35f44f7686bd69e01ffcf4c2bcb3391c3e914f86073d66
 MISC metadata.xml 403 BLAKE2B 9e6e6b570e39221408ab7ef350a629ba46d9f7664a348cbaf0f18c6c4a53b36ab4851845c24aa3c6e94d60ceb21272400574fa2d813ab399d09664ba2aee5236 SHA512 aef2da40947fe78c11b68047a7941152bc36d5c6dde89f7fa173026d8905a4be712f4cd15189b072c3b5adc538753ca14d74cdd6cff4fada356c0233dbc27874
diff --git a/virtual/libudev/libudev-249.ebuild b/virtual/libudev/libudev-249.ebuild
new file mode 100644
index 000000000000..09ed219eae00
--- /dev/null
+++ b/virtual/libudev/libudev-249.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libudev providers"
+
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs systemd"
+
+RDEPEND="
+	!systemd? ( || (
+		>=sys-fs/udev-249:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+	) )
+	systemd? ( >=sys-apps/systemd-249:0/2[${MULTILIB_USEDEP},static-libs(-)?] )
+"
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index ae77010da367..e2ba71071811 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,2 +1,2 @@
-EBUILD mailx-3.ebuild 374 BLAKE2B 6010147435c46dc2b19d0421ec5ad4f6b69f8a701065a86cd6a0b8edc348be900aa6017d43bd99826443554c55597feb9fc9ef6a594df528660637b9c2babeb7 SHA512 1f6c73a27991e4c1599f6cb3589aba378947ae95d9ee42c8d3dbf4d23938019e53584da8e9b2fb38e4887f352eeaafccaa98b87df3956a86a029356371434c5b
+EBUILD mailx-3.ebuild 381 BLAKE2B c7505f3cb55fd42d03156680f5f32b6429bf94f20232b54e26f976d1e460c179df63982a6fee49adc4a7be667962a5b9ce99408fa6f0f19961b7aa0d9407619a SHA512 8a220a1a77e202597fc9507faa9d4270e51eb83acb9a7359253dc22aeec27e612fafb700b49bf8d86a6f404a91abc0aca53ec6323adf922b00691cca65003318
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
index 1e3f0da43b6a..ebef9b4f032d 100644
--- a/virtual/mailx/mailx-3.ebuild
+++ b/virtual/mailx/mailx-3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for mail implementations"
 SLOT="0"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| (	net-mail/mailutils
 				mail-client/mailx
diff --git a/virtual/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 09f51c2359cc..13d367dcd880 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Archive-Tar-2.320.0.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-Archive-Tar-2.360.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Archive-Tar-2.380.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Archive-Tar-2.380.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index baa93c6f7e2b..bdc31db84ceb 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-CPAN-2.220.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-CPAN-2.270.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
-EBUILD perl-CPAN-2.280.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-CPAN-2.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-CPAN/perl-CPAN-2.280.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.280.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.280.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.280.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index d1b501e6bc06..e0f7598667f3 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Carp-1.500.0-r3.ebuild 542 BLAKE2B d4bc36b090ea97b75164d15999a61a0ec94fc4081d44dbe124fc3b2a3ebeb90f13595afb32034b29929672af1de2e7b2f16813f169ade02c27f4091d254a7dbd SHA512 8d98f143b08fb32eea87a98eac02873806c29d41b5b1bd43bdf1f2b2776b85f3c560286b6d09c9f4fbc1d71e226de889c280f5ecafd98895596456c385f4e4ec
-EBUILD perl-Carp-1.520.0-r1.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Carp-1.520.0-r1.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Carp/perl-Carp-1.520.0-r1.ebuild b/virtual/perl-Carp/perl-Carp-1.520.0-r1.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Carp/perl-Carp-1.520.0-r1.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.520.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index 66b2ccf3dd22..eef43415580a 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-Compress-Raw-Bzip2-2.101.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Compress-Raw-Bzip2-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 EBUILD perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild 546 BLAKE2B 884bb9799b4caefa35c485ff1f2bff7a9df78795fa012f82280e97b5b47578d6e21512b738c1e74fe5d0e292054d9ff17fc946861bcb09afd7861f6d8e5d7f72 SHA512 4b5684036c5f8cecc8d5eca044ee76d6566103380c3d213fe12e999fcf3a6059b57ef4556b80fa0dd699e8bcb032586e4d72be98f24e6aa62a2ec3bf4ad0a1d2
 EBUILD perl-Compress-Raw-Bzip2-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index b9b974b0b9c3..7163983cebec 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-Compress-Raw-Zlib-2.101.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Compress-Raw-Zlib-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Compress-Raw-Zlib-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/Manifest b/virtual/perl-DB_File/Manifest
index 926e12fbf7a2..b51962627212 100644
--- a/virtual/perl-DB_File/Manifest
+++ b/virtual/perl-DB_File/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-DB_File-1.843.0.ebuild 529 BLAKE2B 53df5834d5fa106d7cd672f876a594f292fef796bc573b2890429fa9f9d87588fedded2b9ceec84b7dad524ff0c504fe44fcf35319dfd7f46e798a5354905e91 SHA512 5cf14fabd83852437a3d168c2eca8068040afbb40508fe55be206ad7f4f64ea31bb5c4ef548cb81b76ad4dbdf999ca2bc7a9192a35ad574090413e8f6d240892
 EBUILD perl-DB_File-1.853.0.ebuild 529 BLAKE2B 4f3467467239114b3ebf508a146bda1dda0f0330c8cd1b9e2c3cc4508d93d6fa64e50c0019591b98517abe41a35017051e45fd0605c4900b7d35fead63e1edd2 SHA512 c60f1634d3913c57ed4e8b857794f1319a71e16b61df5119a8c4488f6847e8f835cb6825427d8b7701a2653c2df953435d83838c9c3e80f051143665af3b548c
-EBUILD perl-DB_File-1.855.0.ebuild 537 BLAKE2B 1f5d4fb36b73ca50cd4b90234a7f39e705ac0b8e034c2d39c63d7027c6442d95a75ff74327d71c6e817273aceb9d32894819d3cde53f159156ead1c180a79d2f SHA512 ac51170e49d5b5076fddde965c9a2a0ce42ff7a24d34b8d01b2cfc7076eca261c1c3bb85ce8a851b90c6ad5db4d5d3e5cf190ada3ab1d45c7313364c379ba3b8
+EBUILD perl-DB_File-1.855.0.ebuild 529 BLAKE2B 49833a2cc9de956edf7a67ce07f682f392aa9bb1f576752c8a432024b03df2611bd4e396c6e397c20a467459b699200dd91fa80c1d7f26af8716e8e13526e717 SHA512 4ef748e4a7f87d315586287e565ac0d1fede26338f93214e5a90d75f68bd100584a8d8a4864d4e7d9cc7c32ba6cd73d0b5f1cdb909a3d547c60bb6f9dd29c2f6
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-DB_File/perl-DB_File-1.855.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.855.0.ebuild
index d0d242fafc05..0373fd345215 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.855.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.855.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index 84520700ed52..a3e53c15105b 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Data-Dumper-2.174.0-r2.ebuild 544 BLAKE2B eb674a8d24e71fed6d3e679563223cffc9e44ea33a701b7e02cb4d67adf93f9b7e826bc14e2f3836307e59e29ec3b2e12c0de603c3d52ea6d892eefc89cbd4cc SHA512 d36e5424652690b45e5232d8f85aaebfd255aafd950b1bc9107323dd9aea2d907cae342b8be5acff1a3b19e71b0d7c1d54392981d5f7bdfb8ccc5714e9aceef6
 EBUILD perl-Data-Dumper-2.174.10_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
-EBUILD perl-Data-Dumper-2.179.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Data-Dumper-2.179.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.179.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.179.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.179.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.179.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 2e481cc4551f..4455133607f3 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Devel-PPPort-3.520.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Devel-PPPort-3.570.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
-EBUILD perl-Devel-PPPort-3.620.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Devel-PPPort-3.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.620.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.620.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.620.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.620.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-MD5/Manifest b/virtual/perl-Digest-MD5/Manifest
index 72768b58fec6..93954d919b0b 100644
--- a/virtual/perl-Digest-MD5/Manifest
+++ b/virtual/perl-Digest-MD5/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Digest-MD5-2.550.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Digest-MD5-2.550.100_rc.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
-EBUILD perl-Digest-MD5-2.580.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Digest-MD5-2.580.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.0.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.0.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest/Manifest b/virtual/perl-Digest/Manifest
index acfef4dbacc0..e377be11a1eb 100644
--- a/virtual/perl-Digest/Manifest
+++ b/virtual/perl-Digest/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Digest-1.170.100_rc-r10.ebuild 542 BLAKE2B d4bc36b090ea97b75164d15999a61a0ec94fc4081d44dbe124fc3b2a3ebeb90f13595afb32034b29929672af1de2e7b2f16813f169ade02c27f4091d254a7dbd SHA512 8d98f143b08fb32eea87a98eac02873806c29d41b5b1bd43bdf1f2b2776b85f3c560286b6d09c9f4fbc1d71e226de889c280f5ecafd98895596456c385f4e4ec
-EBUILD perl-Digest-1.190.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Digest-1.190.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Digest/perl-Digest-1.190.0.ebuild b/virtual/perl-Digest/perl-Digest-1.190.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Digest/perl-Digest-1.190.0.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.190.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index 68e18df05c69..801c444f0898 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Encode-3.10.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Encode-3.60.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Encode-3.80.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Encode-3.80.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Encode/perl-Encode-3.80.0.ebuild b/virtual/perl-Encode/perl-Encode-3.80.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Encode/perl-Encode-3.80.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.80.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 74c54708143c..3676642dd9a6 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Exporter-5.730.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Exporter-5.740.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Exporter-5.760.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Exporter-5.760.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index fc59b8df825e..6d79a597bee3 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-CBuilder-0.280.231.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-ExtUtils-CBuilder-0.280.234.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-ExtUtils-CBuilder-0.280.236.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-ExtUtils-CBuilder-0.280.236.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.236.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.236.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.236.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.236.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Install/Manifest b/virtual/perl-ExtUtils-Install/Manifest
index 8277b6fb1a39..44eca0ea0ff7 100644
--- a/virtual/perl-ExtUtils-Install/Manifest
+++ b/virtual/perl-ExtUtils-Install/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-ExtUtils-Install-2.140.0-r3.ebuild 547 BLAKE2B 9c064b40ec4108ca4c5483ee2fa690d0ded4de4b2a5818f1f7cfbd5579c1e02035f0aa810952d3a396e0c2ccb4d842b12cc9c53a8dcfaaeb7f498a04625dbec9 SHA512 ecfca2790240fb697afd95b28e1a65c70280395313535467d03c6e08d1c8ac0be1690837f2a2809372bdc6319baeb63c8430e1424cb28926c8a25a0b9915d0a0
-EBUILD perl-ExtUtils-Install-2.200.0.ebuild 534 BLAKE2B 746ae0a91a3c57839035ca26071110e2395f5d2eb43a03dda25b5a282d1f514493f6db4f53d16f4fd9d584391876ad79259325b4367b44ac2c6c1c93445b730c SHA512 ce9ebadef2f64ec733d9407d68248679e3b3da1c60a11149d5c9a32f2e24e8210c0aea445323e259e28249f13f560ea942c51ea0908d215542fe1887b9d1ce8d
+EBUILD perl-ExtUtils-Install-2.200.0.ebuild 526 BLAKE2B 28813084bd6fd7f0d7a7258d7276fe0666d773f5694f1d8685e36dc2bc54e6f49e2f16d80c3186137e7817c90a8eb348f936c4633676df3a3d41fa1eec00928f SHA512 79db742a3e2db284175cb7a06dda3f237cbb529351aa94d743847abebe526322b1d93f3d4258701458775383d8fd3566c03bc4c6b0f6fd3746869c4758e307a6
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.200.0.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.200.0.ebuild
index d89665ad4998..ce4b1a403ec4 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.200.0.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.200.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ExtUtils-Install"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 685f8fabb6e4..0992143c570a 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-ExtUtils-MakeMaker-7.440.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-ExtUtils-MakeMaker-7.620.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-ExtUtils-MakeMaker-7.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Manifest/Manifest b/virtual/perl-ExtUtils-Manifest/Manifest
index 29b78caeb75c..265894a74b23 100644
--- a/virtual/perl-ExtUtils-Manifest/Manifest
+++ b/virtual/perl-ExtUtils-Manifest/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-ExtUtils-Manifest-1.720.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-ExtUtils-Manifest-1.730.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-ExtUtils-Manifest-1.730.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.730.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.730.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.730.0.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.730.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index 95712fbb79a4..5e3a2b30a037 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-ExtUtils-ParseXS-3.400.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-ExtUtils-ParseXS-3.430.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-ExtUtils-ParseXS-3.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.430.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.430.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.430.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.430.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index e5ee348c6817..e444679b876c 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-File-Path-2.160.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-File-Path-2.180.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-File-Path-2.180.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-File-Path/perl-File-Path-2.180.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.180.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.180.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.180.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 96720bbef89e..b2dacdd1f210 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-File-Spec-3.780.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-File-Spec-3.800.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-File-Spec-3.800.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Temp/Manifest b/virtual/perl-File-Temp/Manifest
index f8edc3dd2f72..c3e0e60a7e2a 100644
--- a/virtual/perl-File-Temp/Manifest
+++ b/virtual/perl-File-Temp/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-File-Temp-0.230.900.ebuild 522 BLAKE2B 09b2a3f4872d24bb36e4eb2a5f8b23d5b028cca525061bc6e7504a05c19fdcfdb4a1951361c85823fc8b61034671ac1cce15413525363aa127951f7716ad551a SHA512 9a84462c014b0b56f3a147b6999d8536a5abf84476a3121a678f0ae39444a06c83ab0f9a9066cff7596120f88c33eaa63ae377c8dbe5d9f5b7dc501f9ec25d6d
-EBUILD perl-File-Temp-0.231.100.ebuild 507 BLAKE2B 56761f3914ae0fbaf060a4e5389ed986da03c8c3f6f385f448d5cd1c349445b4ef6738517e1dc8f7206560b11a743755cac94c618a0e5436b8953689edfa668a SHA512 fc663c01f8ebca0d95e0e9df0d9b6b009917e22e095ea73072bb052aacd1735a630434a39edb3e346ebc3a7ef6a6aaf2847447f7989d1b602730559533e8087f
+EBUILD perl-File-Temp-0.231.100.ebuild 499 BLAKE2B 6df6c4e77a729558b260dd0231c467842cd8f941e561ce3d853881aabfa949915036a63877bda25938ad3fe9b173fbce7c7956efd317188bd6392b3add2f9b98 SHA512 e9ac3b823f591dc3cf8123b5f7b8bb94fe0d082e8cdc0f9253eb7e1377f69f79ff2738adb0cacc13044079f8f22036932089abc66be2ace04eb0c9863a1c8650
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild
index c484911d943d..4c5e4275492d 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index bc4981958ed9..9d22e29e16fe 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Getopt-Long-2.500.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Getopt-Long-2.510.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
-EBUILD perl-Getopt-Long-2.520.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Getopt-Long-2.520.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index d77fa33906a3..453e21402ab8 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-I18N-LangTags-0.430.0-r2.ebuild 529 BLAKE2B 612291003aa2e7801876903baf968eca29f4da91198f130be44caaba6e31c5fe7fe3eec5745f6447305792de94b7e00de94f4307574d49946165b292d096e0b5 SHA512 83fc7d1344d0faf9180ae9b9a6307fcbcc9fee9795a9c680ad182a508370b8653c4e7e650e7beb8ea9eb931983bf774a47d8f68171e47b259b300d1714453d26
 EBUILD perl-I18N-LangTags-0.440.0.ebuild 529 BLAKE2B 8c54723ec2ff280d5df2c8e1ef61d966ebdf6a0c2a23fbb9bb2b97cf27ae01579a24a7c8f723ad61bbd2a1a4f5fdcb23bc223ff9fa01317351aec6533dab55b3 SHA512 3b8948f3c5b097b9130c328b66914679857462d828dd22b3c550513bb25dec5452d59a60eaad37aefebfa4c141196f2e6b6380847ba01c8b1995b62def8fb9b1
-EBUILD perl-I18N-LangTags-0.450.0.ebuild 537 BLAKE2B 74eb9abeb48d349e79e2bdcb7f560d0d1e5cb5b0ecb4c66c52114c6ef8b3106745b41d788debc151befe692d55839a44315a08071a4d957c696d3c833cc504c9 SHA512 ab6ea1bada1ad7fef83427f785e39b803e8e480becc5aa7e2b83f43ef619e78221d5278701594eb26ff6ae925d2990ee16bd74c5ce9df7a7e91386aed7529192
+EBUILD perl-I18N-LangTags-0.450.0.ebuild 529 BLAKE2B 8cab532c66b2d8164ca506ca12ae9dcaf33ba5d8aa1f961c6865e0760e4a3954d96e3960ce8614426204eb895789023c7fa8267ae375aa54ef5653c570e46908 SHA512 74034f8c2147a9f39a6030f3669d2fed62f50d2f1ad1784fbfeb5fce4bdaf53ecc4c5c795693563e343039a2b6e3613639b6f5470c5e4abfec442ba82412f3df
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0.ebuild
index 17a989ea7cf1..328f4c831458 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for I18N-LangTags"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/I18N-LangTags-${PV} )
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index abae47ad6ad4..f119e0a41c8d 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-IO-Compress-2.102.0.ebuild 716 BLAKE2B 17b1a139489fb7b86275bf8c36cf91365bac9c4400fddedb036df7e65a39bcf17e3708855224260d03311f5e6dd59bf780801f0fda6fb07d8f5d142cfe89724a SHA512 6ff9be12f747a2283d133b3ad69322bb175f5d39fbdd36177e30e5af63a0b6cb7921a384420feb5b9372309ffdbd412c44f1edf292950c713cf7ac02b9e68495
+EBUILD perl-IO-Compress-2.102.0.ebuild 708 BLAKE2B c02b5f359db69c330489271cb17a7e21070b717e311f862f40f89e8383884de3c566fed79013f983ec2a2b93f112e08bf5fdbfaa4d0d28dcf8c7e951562051d7 SHA512 23b728a08e800c214cfac5fadefefffe83933f22b612fa36f18003b3d4ac92970178d54697e479f1abb44f727274a33c7cb19eb719f4d29870f4e0a3e3cc0716
 EBUILD perl-IO-Compress-2.84.0.ebuild 704 BLAKE2B d063415c6647c6e55886f8867efec12bdac3e59b676ab8ea0fba8c86d20c05660da3b3d96c8ad1a6f3163a4ab8749a61398cd5d89c47efd005a95bc3febe7695 SHA512 e44915eedf92037d0cf750c237d1452c0cc387067ebb796c5393ef9e606ce5d41e86c39c05fce3cd320f6eb3822fb79bf7cf48644bb69c39f38397059bbb5262
 EBUILD perl-IO-Compress-2.93.0.ebuild 704 BLAKE2B 7662907ccf152886e72630215a0003b64258cd1f1bbc7cb4809a1c88644a203bd6897a3726eb2bc12276d7a33bd3c1d072a5d989d6a6c515fe106fd50c8dbfe9 SHA512 83a59823c76c1c653cba972273df2dfb36240f86998ac2d9c70d698014a09f70c1fb299ba9311b31dcc0849cda396f25998f39fe415e30ed925d7a1c6633aa6a
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0.ebuild
index 17ec0d318d63..5201bee40a20 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.102.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/Manifest b/virtual/perl-IO-Socket-IP/Manifest
index 7e3265e1327d..0a516c44b820 100644
--- a/virtual/perl-IO-Socket-IP/Manifest
+++ b/virtual/perl-IO-Socket-IP/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-IO-Socket-IP-0.390.0-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-IO-Socket-IP-0.410.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-IO-Socket-IP-0.410.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Zlib/Manifest b/virtual/perl-IO-Zlib/Manifest
index 84c7326db86e..acd2c2bbb545 100644
--- a/virtual/perl-IO-Zlib/Manifest
+++ b/virtual/perl-IO-Zlib/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-IO-Zlib-1.100.0-r14.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-IO-Zlib-1.110.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-IO-Zlib-1.110.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 17d6541db6eb..8c6f9b95f79b 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-1.400.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-IO-1.430.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-IO-1.460.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-IO-1.460.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO/perl-IO-1.460.0.ebuild b/virtual/perl-IO/perl-IO-1.460.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-IO/perl-IO-1.460.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.460.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index ba6b45a6e131..3b446a8b1aec 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-JSON-PP-4.20.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-JSON-PP-4.40.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-JSON-PP-4.60.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-JSON-PP-4.60.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-4.60.0.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-4.60.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-4.60.0.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-4.60.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-MIME-Base64/Manifest b/virtual/perl-MIME-Base64/Manifest
index e72b928941d0..addde60a3120 100644
--- a/virtual/perl-MIME-Base64/Manifest
+++ b/virtual/perl-MIME-Base64/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-MIME-Base64-3.150.0-r7.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-MIME-Base64-3.160.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-MIME-Base64-3.160.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.0.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.0.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/Manifest b/virtual/perl-Math-Complex/Manifest
index 749bd8ad5a0e..bed274b83e49 100644
--- a/virtual/perl-Math-Complex/Manifest
+++ b/virtual/perl-Math-Complex/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Math-Complex-1.590.100-r4.ebuild 536 BLAKE2B 2feab1b5ea634b6849b49af94c5fd40a269c440d808e773e02592b6c05f8933c0ed9219f0bd489dc693a791fddfbc0b468dd9008448353a8ab01eb4bf671074e SHA512 f0a012512795bb506ba61c324a1f126bd589d281b7dff34aa992aeb8351948807b49c59fb8e04a0071cf6cf2f76365abe2f5a31a6715fbc934e05d3cd75e16ec
-EBUILD perl-Math-Complex-1.590.200.ebuild 522 BLAKE2B ebfbc68658d15abd5981ac7f048bd9c07ff2094d171b1916bfbfdba8ed2c35ede4ad1c3620452f21f762d6dcdf12f86120dbae608aeddf7be11e2100cdc5e26c SHA512 2e4eb1b694c0c660fe0266c3e34a73ccb5496467207ed883db3a2958f9f7c6994c09c97df9980c39c073c2a5067b19a3c08280e0f841ca300a55c7faab7a3966
+EBUILD perl-Math-Complex-1.590.200.ebuild 515 BLAKE2B a39d3e3cb86e7c2137117238ad6f6440a60be7c25e6fe237ad7d1460ea94e7977c403be7bc529e7d0f49c121c3219544ba6cd667e66de6a0b6120cc9f7eae550 SHA512 4b89c63e36e5254781edef269424e34c364855ba9250af07f194d292c2e450ab14bf16707e0bdc5a31f7a12cecd357a5e74f31a59f89a42974f57220ca7ec3fa
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.200.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.200.ebuild
index c48d1be422fd..937cdb6d8027 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.200.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.200.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index e08bd440a181..aeca461891db 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Module-CoreList-5.202.101.230.ebuild 644 BLAKE2B ee7a8a0992416a1b59c5961d8041b259c86d1fe650f6bc2fcc7b65df35ea57d79b43723105729a2516a41af7dabf010a6eff2f7740b2235b919c761917ac2f15 SHA512 4977d9f201bfcfcd2fee8914b423846cd063af6155915f248249416b3dd7d1488b0203a90351a791b4c53a716d1e0281a0550f1abf35a60a0e814ae074d22b11
-EBUILD perl-Module-CoreList-5.202.105.200.ebuild 651 BLAKE2B 42fa2e1d1f23c4251ac6df52b8cfad010a2c06216c4223c79eb5fe2d82021e8dfb6f2bbe33512e45050f0a79446964aa2abbe819cc86fc669810d3b95cb024de SHA512 c1e93aa9be5847022ce4a59fae8be2a326dd8d006aad3221141c09a4eb983090fe1e75a082129d7c3e6e67115fddfd245c3b402c371524ab01e4d3451426e461
+EBUILD perl-Module-CoreList-5.202.105.200.ebuild 644 BLAKE2B 7892122cf84cc47e8629a710e2179942b1d1adbe53e38743410c81672069964126b14bb7c9e51c686d2e97b8484e58945ec97920c752da9f1d3c920b0ab5eb22 SHA512 828d796d90a6f7d33d5cee88e86f8b8f3ead5ae7576aebfb8d8ae85976fbf40993f9b9a1c5eb169ad1626208e9d3272778d068dfd3f32a6542803472e5ab8cfd
 EBUILD perl-Module-CoreList-5.202.6.13.0_rc.ebuild 644 BLAKE2B ddcd4e7107870d0ada899d55a401550b3c1ed4269f3e911a4138d6a42d1f3eec252b65b5ac8b51e1b188d42ed5c6ff963b41273aea87a3bd7b296b54040a3681 SHA512 b757b8cb5ce0e8d84868358d033593303ed70b2d57ba05b9a3f66d1ab9f4ec21279d9df2fb8c2ec2fff92bbeeb34bb0d74f37d7f04807a8f70a2cb5e24f0d519
 EBUILD perl-Module-CoreList-5.202.6.200.ebuild 651 BLAKE2B 005936306be56577bd8700cf6d6c0566d2da6a06f065abb2c7db924376185d6f586ebdfc7e04a0b5492decbb3ec4c2b7fd9d9204b4f0ff06995e88d42533904f SHA512 aecf255d576a49abc13602aeead8c6985edcee4def25a8be97d3cf35ca0ef6252922ab48014941e5a1559e2f35dce23c5d7bf09d0320d49c4ae9cca35a496999
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
index c9a7ed416737..366f41732ace 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-Load-Conditional/Manifest b/virtual/perl-Module-Load-Conditional/Manifest
index 4f950d5c8dc6..e9599737fe51 100644
--- a/virtual/perl-Module-Load-Conditional/Manifest
+++ b/virtual/perl-Module-Load-Conditional/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Module-Load-Conditional-0.680.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Module-Load-Conditional-0.700.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Module-Load-Conditional-0.740.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Module-Load-Conditional-0.740.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0.ebuild
+++ b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Load/Manifest b/virtual/perl-Module-Load/Manifest
index 0caf8c01b530..ba2e1daf2296 100644
--- a/virtual/perl-Module-Load/Manifest
+++ b/virtual/perl-Module-Load/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Module-Load-0.340.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-Module-Load-0.360.0-r1.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Module-Load-0.360.0-r1.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r1.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r1.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r1.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index 26b3a4d038b4..8ce499c14184 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Net-Ping-2.710.0.ebuild 515 BLAKE2B 8b62469dd63b6ed9d0e355bbe568028caa3db0156edd63714ee40640671359ed407f0282e6b0221b33db8765bee16fead8092c6d8b6f91303400c54bceb0c0b2 SHA512 03e036e948456c62b282ccdcc88e75bac791907c6e001ccb6f0cfd0ffb159b245b378ccd035a5a1bd74b59d2f1d6bf60a1313d01035894c545f15e5b101d790b
 EBUILD perl-Net-Ping-2.720.0.ebuild 515 BLAKE2B ae500da3f4d0515bda1fb5c1eaa8b9b1cb9aeab03c62b5f05174de502befb537fd3522c393f8465d2b17d29b46a8d951c2928b4a6b716f1e59f5ea2f9baf5071 SHA512 cd7e5030412530e80a573c2782c924743e890edaf8307e05a7bcdcfbf86f1be5c51f5ff8a583f07f5eb48dd03895ee70d076ee008ab64dc51c89992209d6aaf5
-EBUILD perl-Net-Ping-2.740.0.ebuild 523 BLAKE2B 5abdc807034b671c55574cb28551a61513f7ea2ff6da757af39f7703b4767454d0e5b048bcda8eefa5bc9eb06c63812547417a86f89e95e6daaa416633b3b364 SHA512 2af9fcbdc26711ec494228432564659a180648c2bfab9e7249e0b19647db7c9f85e4c493baec9f09248e9f7cc8439b32a81912df324455b35a62d8075a462d19
+EBUILD perl-Net-Ping-2.740.0.ebuild 515 BLAKE2B 515e40a94072748f6b234f9c1bed5d86c411b0289a255836a4ced1a3fcd18e73e3ff5a2c0f60bf521c98a6b6c6f54ed5c76bfdbbcf29331f39d9235618b2fe36 SHA512 648ad1732c7ac8015623896fa8875b78b2b3c0c81fe8203057c9a9a709375f15fd9fd87077219ec1ba577eae547f0196791947079f632a344ded66726830027a
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.740.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.740.0.ebuild
index d086f58ca4bd..a237cb83f85f 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.740.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.740.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Simple/Manifest b/virtual/perl-Pod-Simple/Manifest
index 5be15d6493e1..b4672a76956e 100644
--- a/virtual/perl-Pod-Simple/Manifest
+++ b/virtual/perl-Pod-Simple/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Pod-Simple-3.350.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Pod-Simple-3.400.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Pod-Simple-3.420.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Pod-Simple-3.420.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.420.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.420.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.420.0.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.420.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Safe/Manifest b/virtual/perl-Safe/Manifest
index b1ee82184038..0e1347e675ed 100644
--- a/virtual/perl-Safe/Manifest
+++ b/virtual/perl-Safe/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Safe-2.400.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Safe-2.410.0-r1.ebuild 531 BLAKE2B 43f354de3c120bbfcd3f18fc694c0825d558a6f77cf2138a40933e5ac7da58015f6490278e57967a8596c07953624c105a6067098bfaf7026eb7f0e3b684d315 SHA512 7028f8cec809b77f13afac087bff309c9854a1390f4da7f9020acd9517b56e53c275edeb61520608620a077bc3419929c1657105d311f873339eefed9183ff3e
 EBUILD perl-Safe-2.410.100_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
-EBUILD perl-Safe-2.430.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Safe-2.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Safe/perl-Safe-2.430.0.ebuild b/virtual/perl-Safe/perl-Safe-2.430.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Safe/perl-Safe-2.430.0.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.430.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
index 403a7935136d..f16be46b4128 100644
--- a/virtual/perl-Socket/Manifest
+++ b/virtual/perl-Socket/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Socket-2.27.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Socket-2.29.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Socket-2.31.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Socket-2.31.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Socket/perl-Socket-2.31.0.ebuild b/virtual/perl-Socket/perl-Socket-2.31.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Socket/perl-Socket-2.31.0.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.31.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index 21d6e3682647..cbffbc07d8fb 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Storable-3.150.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Storable-3.210.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Storable-3.230.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Storable-3.230.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Storable/perl-Storable-3.230.0.ebuild b/virtual/perl-Storable/perl-Storable-3.230.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Storable/perl-Storable-3.230.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.230.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index 32d6439ac52d..4406a496feb6 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Test-Harness-3.420.0-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-Test-Harness-3.430.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Test-Harness-3.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.430.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.430.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.430.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.430.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index 8e3451742f2a..6624ef286d84 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-Simple-1.302.162.ebuild 518 BLAKE2B 5ee16a64618c9fbb918e5b5378d4956e9e2fd5ab6b254efebaed4d5f01f0cd64747a67c147fd61be5f522884234f7ca725d08225572ac6b7462e1fbb48e71645 SHA512 b7848f3c4ce538ba4545d58b91a994f0a0494b122adeaf9eefdaf40d432cdf61fd12389dd0a343b20a28ff56791b0400fb4388f5b0f6f6e796a06a7d246bdc43
 EBUILD perl-Test-Simple-1.302.175.ebuild 518 BLAKE2B f1ab978361478badd6228960272075e4ce1dca09cb1ff01f2c564fadec6bc45e690eb31eca8f0858ecef36f7241e6969f830e4f1396d6cbad1553b5ee822fb92 SHA512 4a07f2795aac3d33783ec06e0c6fa34166a0c320819f673824607c59c399bc06d6b5ec8a9b058590f291a37878ed3adb7580208a35e246453a4e6a092d2ed6f8
-EBUILD perl-Test-Simple-1.302.183.ebuild 526 BLAKE2B 2ef3baa5c06d1eb759268c069b0512937a4174a9d6214c446d42be5c4bfae6d9ac66effbb1889f6085a9b866c1d366e133d91b24e99941e0d434f3d8730b7de8 SHA512 14f65d9fd9fe6276ef77bd99b5de162e8e241bef3de9f898d1a90332e96409ce8a646372d7c4abbc84f5d9c6f9abfa3be6bca24d83929fb7bd1f6b861e82d4ca
+EBUILD perl-Test-Simple-1.302.183.ebuild 518 BLAKE2B cff4692a1918d403a86c82d7e0a79f0e2987beea2f7e9ff5bbfa6d70dec501ed9ce7f0e40d99373c50ffb5375456d3e5e878bb889ca70b855547a246fbbbb6c2 SHA512 a50230a7995f31ff4dfa6cb1e1bd1b9b9a4aeaf36c7c04e40421e8be57df22ab2ddd854eedcc7319082463a917cec840e9cdf36b39a4f19b63322cee4c81a4bf
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.183.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.183.ebuild
index 44bcdd5f7b26..3114bb7fb348 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.183.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.183.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/Manifest b/virtual/perl-Text-Balanced/Manifest
index e832b179a3ac..752c08d1c6e6 100644
--- a/virtual/perl-Text-Balanced/Manifest
+++ b/virtual/perl-Text-Balanced/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Text-Balanced-2.30.0-r7.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-Text-Balanced-2.40.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Text-Balanced-2.40.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.40.0.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.40.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.40.0.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.40.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Tie-RefHash/Manifest b/virtual/perl-Tie-RefHash/Manifest
index 845a9bb1001c..fa0463ec9d45 100644
--- a/virtual/perl-Tie-RefHash/Manifest
+++ b/virtual/perl-Tie-RefHash/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Tie-RefHash-1.390.0-r12.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-Tie-RefHash-1.400.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Tie-RefHash-1.400.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.400.0.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.400.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.400.0.ebuild
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index 354da14f361a..b70130931c0a 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Time-HiRes-1.976.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Time-HiRes-1.976.400.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Time-HiRes-1.976.700.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Time-HiRes-1.976.700.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.700.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.700.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.700.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.700.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/Manifest b/virtual/perl-Time-Local/Manifest
index 7d67eb3510ac..55231d98ec46 100644
--- a/virtual/perl-Time-Local/Manifest
+++ b/virtual/perl-Time-Local/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Time-Local-1.280.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-Time-Local-1.300.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Time-Local-1.300.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.300.0.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.300.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.300.0.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.300.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Normalize/Manifest b/virtual/perl-Unicode-Normalize/Manifest
index 92c8df49a7af..c9dd11e3f856 100644
--- a/virtual/perl-Unicode-Normalize/Manifest
+++ b/virtual/perl-Unicode-Normalize/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Unicode-Normalize-1.260.0-r2.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-Unicode-Normalize-1.270.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-Unicode-Normalize-1.280.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-Unicode-Normalize-1.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.280.0.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.280.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.280.0.ebuild
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.280.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-autodie/Manifest b/virtual/perl-autodie/Manifest
index 595e74d73408..c1e5ef7ce54a 100644
--- a/virtual/perl-autodie/Manifest
+++ b/virtual/perl-autodie/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-autodie-2.290.0-r5.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-autodie-2.320.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-autodie-2.340.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-autodie-2.340.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-autodie/perl-autodie-2.340.0.ebuild b/virtual/perl-autodie/perl-autodie-2.340.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-autodie/perl-autodie-2.340.0.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.340.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/Manifest b/virtual/perl-if/Manifest
index 9339de621cc2..de32c9984546 100644
--- a/virtual/perl-if/Manifest
+++ b/virtual/perl-if/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-if-0.60.800-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-if-0.60.900.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-if-0.60.900.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-if/perl-if-0.60.900.ebuild b/virtual/perl-if/perl-if-0.60.900.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-if/perl-if-0.60.900.ebuild
+++ b/virtual/perl-if/perl-if-0.60.900.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index ce57775dfe1f..3fe13e169214 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-libnet-3.110.0-r4.ebuild 644 BLAKE2B f794b181b22cb5a9f27b2bc02a24cbf87ba616ea6a7f28a8b57bea0bbf81d1e0b9a3714214918255e56a2c5a652fac7d15d675a0abe10150943dae99aa838f6d SHA512 8338bd568a854efdc9ec47316abc780b5cd3a192ba0560bc6f42a8c961bb5277600bc633e5d4134904305eb67073b44e72426d8d1e3610a1a8c5d8dd078ed8dd
-EBUILD perl-libnet-3.130.0.ebuild 631 BLAKE2B d977d087ef9e20344ce32edc203f2c69b33dc485951a947b1733d727548a836f4e0bfdb9902b864aed4096de2ba6b8d5286c2878af159244fc98525542cc5c49 SHA512 9c7466ffc0ad7a77a6219f278413fdcb9e658034a710411bdd1e63ef78f9edc886af2e9040fe561fbb1a18819d00e429c992def27288e054fd8a75b2d6c48fbe
+EBUILD perl-libnet-3.130.0.ebuild 623 BLAKE2B c68aae68f77b636cfb488b5a4c5dd8aa4d152499948f1f0b6356d5a3563b0dabaff02d9f782ad4f44dc2f979846496f184775f91b8116cff911f76e12b03f507 SHA512 4386f08383d8fa667d11b52cf4f16ddd92e139102a851d7446388ae647684fef437188ce37f9cbd9b768f2bad8fda8f72729e7e02d0949aeecf433ff79556b10
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-libnet/perl-libnet-3.130.0.ebuild b/virtual/perl-libnet/perl-libnet-3.130.0.ebuild
index 7cec65b93e63..9da3221ac6d3 100644
--- a/virtual/perl-libnet/perl-libnet-3.130.0.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.130.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+ssl"
 
 RDEPEND="
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index 4ff1b3fad475..f2e7cc2fba3a 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-threads-shared-1.600.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-threads-shared-1.610.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
-EBUILD perl-threads-shared-1.620.0.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-threads-shared-1.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.620.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.620.0.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.620.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.620.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index 6326cb6aa9f4..cee527d3566b 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-threads-2.220.0-r2.ebuild 531 BLAKE2B 11717e9b5952eae918455cb3977a84e5fd67f6f022e727ef100aefc3bfb3e84c0900749ce91ca15b3c7685a463a08dc6d27460656198ee9e198ae38a3ee47a36 SHA512 59f8aed415d16915fde243c0ac693860058dd4e94ed1a199e0149f0e5401a4d5fa29a9ad3f4334b1fb4873142b4b1e9335f632e16f94bf47f7d9a52d4e260f4c
 EBUILD perl-threads-2.250.0.ebuild 531 BLAKE2B 791770c997990c5577f10960eb410950a70061a943d9a2c53f91317211861775fcae59a33aea218a52f7ff2b33dfd479878f0739aa1cbeed138d9798cde6dd50 SHA512 1a56831614e0ba3d55ff12e64371cb878653f8adef40eacffea7f7de8d5225e9372f6cea7b33856afb5e88fc87ebc17ac075d64360c12064f4af7755f0d699a2
-EBUILD perl-threads-2.260.0.ebuild 539 BLAKE2B 040408d6e74a9dabb0fa26c76d50c1915ca50aa97ab1e1d92750f9680c84bd17341825686021776f9721095635e21fcfdd67d13957f510230320ef814f97dafb SHA512 433feb128460bf574dfbc04e143336494db7465506161f24dd1648850515d7959f6eab3f112bf181d1b3d04cb80e5006e290cea64de83a3d1008d0246d21f4e1
+EBUILD perl-threads-2.260.0.ebuild 531 BLAKE2B 8c58d9aaaa4becf80ccbd21c9f09b782f9004edd029564fb14ccf01c65250b0d59786b98c9dbbde5ec8ff6090e3a82fb5968b286b2e2441512f8feb5530ccf01 SHA512 e4e0a4a167cfc10691e285f052fc7714d831583b35d7f0f76fbfa56ef1cc9b46ad5c2bb8e9f31dcbd796f4fa90f4b489272ba19f26180278265bab839ca4ae49
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-threads/perl-threads-2.260.0.ebuild b/virtual/perl-threads/perl-threads-2.260.0.ebuild
index 3ee0cf006a3a..0f9abbe86506 100644
--- a/virtual/perl-threads/perl-threads-2.260.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.260.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index 2ba5a491ead2..950118e8c983 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-version-0.992.400-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
-EBUILD perl-version-0.992.800.ebuild 529 BLAKE2B a61df59b0d6ee8b2dafd48d490bf2d6189eeb051e3e5c22cd3ddaa56fb4be7ad7a2522765f59f6d6e2663b351399709627006141dad0cfb972e065fb7928f55e SHA512 7908234c7d779f27f5f2ffcbbfd241c50e1bfe32620c8a62bdd17640824a78d197c843757046c4ec12bfab22c4d2295d4b90654533439c186e6de2ba18be660b
+EBUILD perl-version-0.992.800.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-version/perl-version-0.992.800.ebuild b/virtual/perl-version/perl-version-0.992.800.ebuild
index 9f4f948183fb..32755beb5f6e 100644
--- a/virtual/perl-version/perl-version-0.992.800.ebuild
+++ b/virtual/perl-version/perl-version-0.992.800.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/ruby-ssl/Manifest b/virtual/ruby-ssl/Manifest
index e4ae8162453e..a9e586cea18c 100644
--- a/virtual/ruby-ssl/Manifest
+++ b/virtual/ruby-ssl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ruby-ssl-11.ebuild 777 BLAKE2B 264c225ec7037760a6216ad3b1ce7d501589a74510bcc5b4b0dffd60c380d3c5ea0fc814e1f1adb3527ac1cad34c06c36fc547c27a2cee9b2a2a74bd24a521d5 SHA512 6b62adaf724e7ef36a4ae841d09c5d0db65fde2f6cb46a3a3f72df2cd567dc3b4ad584a9f1bc9e84db390af6851ac4eb0891d3bfcd1b424cb706fa62dfe7f4bd
+EBUILD ruby-ssl-11.ebuild 784 BLAKE2B 51ddd5ff44a8dd1af3d31da954c9576cc89509e69f67d9c96687e67306be0aa638d106c1de574e4864c9982efb951c446b62d52da070f93f7434884a37847024 SHA512 610dcd6532fcbcc1261b233494690d9d07eed27ae89a307a91360f6626c059c3ce9bdd148aeafdc735a599dc76be528bb7d7506a832c2820545f6ac621b3f4d8
 MISC metadata.xml 275 BLAKE2B abbe4c793cff9f65abae6b3349a997ae59b62b2e51c0ee302387240d118c5b9aac75a4aa0d1cda9f221723c2cb83a6d25269d41907da8dbf82138c70cdd711aa SHA512 11d85df40df311789634d773775e962e634a342420e3e055a15025cede7fc16f7fa1d3f7a616a036a10f2a461b36ddb163cdbf05c9a04d5391d363e68a267d8d
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index 07dc70675b19..7cb57d342a95 100644
--- a/virtual/ruby-ssl/ruby-ssl-11.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] )
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index 96ae0c703747..5ee2b7521e77 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,3 +1,3 @@
 EBUILD rubygems-15.ebuild 695 BLAKE2B 867f94a7bb8d25e720ccfd841c4017896d91839f44c6fbf91870e2682f8226148619242eae812ac7c6387915e42473aaa2c9f67b881efc8c1722a3b3540d61fd SHA512 caa8aa9259648c8a05a80990d6dcca82c8179dfa59b97e02de4d484d1bd02af053f342947bfe16a9a9c1905ca76a0b25d8c000a0090a1f6d3d3570af8285867d
-EBUILD rubygems-16.ebuild 864 BLAKE2B 9413a37492bb1d2bc5b9e9b4a0f12d55d565ecd384f9e1ac0b047ccf577a69056fd1ed5f6243acdcdf657a708ad085cc93739b637499b39f4b4e3e3309c7f34e SHA512 95307375fab49bafac33ca072a7d17f79b1206a5dc3d52631b6e9f8a02d4719afb4588a18286d65136eab427e0e891934e2ab6b3373697d037a39e7f336409f5
+EBUILD rubygems-16.ebuild 871 BLAKE2B 9dd749ec937e51ebf576ba5d417ce2144c5387a999ce0a8551f9d3e4057cf1acd1f396d6247624f7676502b9fffa74d5d5f8d9d6cea86abcd98ac9bcdcc0588b SHA512 3883f8a4eb94b3d325a76a0ce1c0c9ede4ea3ef2e81fd11b09332356ddf6baeecc4ec0b7a0b9c2f107b10e126df8217d34380ae333e4fb3613c1e5a6a6ad2613
 MISC metadata.xml 275 BLAKE2B abbe4c793cff9f65abae6b3349a997ae59b62b2e51c0ee302387240d118c5b9aac75a4aa0d1cda9f221723c2cb83a6d25269d41907da8dbf82138c70cdd711aa SHA512 11d85df40df311789634d773775e962e634a342420e3e055a15025cede7fc16f7fa1d3f7a616a036a10f2a461b36ddb163cdbf05c9a04d5391d363e68a267d8d
diff --git a/virtual/rubygems/rubygems-16.ebuild b/virtual/rubygems/rubygems-16.ebuild
index 99691d4b5ad8..cd0a878cf35c 100644
--- a/virtual/rubygems/rubygems-16.ebuild
+++ b/virtual/rubygems/rubygems-16.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] )
diff --git a/virtual/udev/Manifest b/virtual/udev/Manifest
index 88be6dadc4a3..3ca6d70fcbfc 100644
--- a/virtual/udev/Manifest
+++ b/virtual/udev/Manifest
@@ -1,2 +1,3 @@
 EBUILD udev-217-r2.ebuild 374 BLAKE2B bf332683a81ddcf54c0b7c2ac9d1843b4345cec0c398f1a131721aebcd6946047d02b38cab91f684e197d6e8f3cefea6f2fcdffdac1d7467b52937757e61922e SHA512 b019f359e0c28c83e9571fc324fc2ff49f59f44f2f9da875ea6bd0862e2da2c06978d390130befe2b49d01e3dafec81f82ef36d371e29969f02edfc3ca7b5bad
+EBUILD udev-249.ebuild 382 BLAKE2B a1e1cf1f50206aa0a714b9759686d4cd44034adb84423bd4193b6513599f127aa26ca893a07127756347a410629084158ff1883cd1b16d2dd42bb9ab3d33af7a SHA512 26c052b56f69608cb8949350fcaed55d060e8ef36f2ff333818a3a84fe2a37316e9919844185890ffdc2c98b10008611659f75963694b3e81fc9426a4c735b27
 MISC metadata.xml 403 BLAKE2B 9e6e6b570e39221408ab7ef350a629ba46d9f7664a348cbaf0f18c6c4a53b36ab4851845c24aa3c6e94d60ceb21272400574fa2d813ab399d09664ba2aee5236 SHA512 aef2da40947fe78c11b68047a7941152bc36d5c6dde89f7fa173026d8905a4be712f4cd15189b072c3b5adc538753ca14d74cdd6cff4fada356c0233dbc27874
diff --git a/virtual/udev/udev-249.ebuild b/virtual/udev/udev-249.ebuild
new file mode 100644
index 000000000000..f328c36934e1
--- /dev/null
+++ b/virtual/udev/udev-249.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 to select between different udev daemon providers"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		>=sys-fs/udev-249
+		>=sys-fs/eudev-2.1.1
+		>=sys-apps/systemd-249
+	)
+"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index ef50a92b1cb8..2f3f3c595ecd 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 601ec2dd3fe0..af8cb919442f 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -6,6 +6,7 @@ DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f473
 DIST mod_h2-1.15.20.tar.gz 707590 BLAKE2B 245b21d55c5659ed4ada3bfa5ec369ca3154e629820980caa1badefeca05399a31fb4f94594068607af20a6936e8ac2439b23e31ddcb9db8d4bb2c907400a152 SHA512 3492b24fdcb6371a5734b85253d800baa6f1650ae3c6b4d08539ec5436cbaaee2ed41fa9515fa36a94c281048f08970b20ccb6373077251a475f6831aaae8524
 DIST mod_h2-1.15.21.tar.gz 720305 BLAKE2B 9abe84867a383b9dd9e0841403544abc94c95ddc9a735bdcfb420d5a14ddb7e6ff5832455659b62ed5e9c865f9c467970d1863510a4fa63c655242cdc83a54b6 SHA512 bf0ab88e07c59c38189f7c670512ff01abdf6110d05a344182c557724028734edf68eea5227ac9b5c400810621ae1d30efac2394a369fbf6ef9558e2b3bcd17c
 DIST mod_h2-1.15.22.tar.gz 721713 BLAKE2B 59449f23b84cb3c0bb3a211af6c57bb6e5e77767466657addaa6cafd6cad96d7030f43785e98123af15c18fdf6ce3ec416d6e885661998d46962be5abf059159 SHA512 cc201edea4152ac8d82232a5e50f1ed6d4e358f04338d43dbdeb7cdd4f338dd8734b6f8b8febe0c9a8f2b67288d2db4bf12915f60c28935885b30b767a9043a1
+DIST mod_h2-1.15.23.tar.gz 721889 BLAKE2B 79f68d7d2bfb08886eb6cef22ce7b20961f2ff4c6045766c0abd296f389a85e0deafbbbae8465cedcc156e97a6f495cf50b2edb1170976509f72f3d2aff02036 SHA512 5358efd2de03efa89719b0714d674bf143f8331e52c78c10fd1a2a9c282a7932f9b8366a63006fce7d35e3d66a83d7083b8af577ab5bbeacfc240f703552071f
 EBUILD mod_h2-1.15.16.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 EBUILD mod_h2-1.15.17.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
 EBUILD mod_h2-1.15.18.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
@@ -13,5 +14,6 @@ EBUILD mod_h2-1.15.19.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615
 EBUILD mod_h2-1.15.20.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 EBUILD mod_h2-1.15.21.ebuild 1024 BLAKE2B 4ae8408022edd8f0cea2abfdd3c7b7e7833f915c6165d34cf61ee979252deb78249cf270c370e968236d3a1e9ac01d39366da8f61524e9f280fc021141257e7d SHA512 dc7ac717d8367c51b4d02afc16490ec98779a81dbb1cacd1f4974c857fd6b27e4a218c49854fad626ee4d99eb4464e6f61b674c7de09b8f6dffcb094d0d91736
 EBUILD mod_h2-1.15.22.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
+EBUILD mod_h2-1.15.23.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 EBUILD mod_h2-9999.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.23.ebuild b/www-apache/mod_h2/mod_h2-1.15.23.ebuild
new file mode 100644
index 000000000000..9d7e1b600b10
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.23.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 62f59d054015..16e94378fec1 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,6 +4,7 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 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.10-r1.ebuild 3927 BLAKE2B d90e5ed563016960f6d234ef95be2b02b435c8d584de8b6cfdd4abd1b2cc85f8113ab9c6c4f18249126b110c3d1d4f4d07ed5897868bce245225f73975edfdaf SHA512 e915cd09d488a3f52f23503d1754c5ef9a0811847a892125da2120bf06136526bfa50aa004b584b0523b667e8a101eea2dc4931f748ea349bf7f81f304eb6a1e
 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
diff --git a/www-apache/passenger/passenger-6.0.10-r1.ebuild b/www-apache/passenger/passenger-6.0.10-r1.ebuild
new file mode 100644
index 000000000000..ace4e92b8d8c
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.10-r1.ebuild
@@ -0,0 +1,126 @@
+# 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."
+
+	# 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 doc/*.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_DOCDIR="/usr/share/doc/${P}" \
+	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 096375a97a47..12bcb1c2174a 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 21d84fe4d0df..9cfb40edfda5 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-91.0.4472.101.linux64.zip 5964960 BLAKE2B 56d597797c257ed6520b44cfaacb4ec2b1f1c71308c94257a2762f13c772ebbfd5db7458e65192900098a61b513984bb9db3502a6d5c1e5bf5e438f3ed77fb15 SHA512 145fdc825a6ccd41583af4c54b9c384b0e21e68f19d20e9125b06cfc893577bfc0b4b331abf68882cad9f7948cd5339c2dc443345c9dceddb9328cf08811ab62
-EBUILD chromedriver-bin-91.0.4472.101.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
+DIST chromedriver-bin-92.0.4515.43.linux64.zip 6023109 BLAKE2B ab424750e2c7df89b2d524c5c15d63daef927f5d18b7d3971b3230b982f97ca2dbe32622a07b38ea5c4ead65de409d04140fd19147a770c4a2a8da714b6fbab7 SHA512 49d9d7480138da0b1cdd1358e0cbc904a997a4a34b03485546198c7c59ebca2988cbbc41dacdfca233f203b2610fc720523b5fe0a00d068b4e61a995dc8c0831
+EBUILD chromedriver-bin-92.0.4515.43.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.101.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-92.0.4515.43.ebuild
index 7c2aac12ffeb..7c2aac12ffeb 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.101.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-92.0.4515.43.ebuild
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
new file mode 100644
index 000000000000..12e1c372c12c
--- /dev/null
+++ b/www-apps/element/Manifest
@@ -0,0 +1,3 @@
+DIST element-v1.7.33.tar.gz 15425526 BLAKE2B 0cb13c5aa94a16e532f9ff4a8558b08c01afe1d5c8c4070bc9c26684571a316b2ce1265cd763ee4fe6c54b255313d489adc41e8dfc18f619ae3c2016b593087f SHA512 8b23d2e63cd69ec51cd053826d73f72be50a9662f2adcb7d8b86b0d2b32175038e77c3d00c2e37b39147565fc9fc1cb9c61be1f7a59d1f23e3c4d6316512912d
+EBUILD element-1.7.33.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
+MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/www-apps/element/element-1.7.33.ebuild b/www-apps/element/element-1.7.33.ebuild
new file mode 100644
index 000000000000..0d6f2e6d2cb4
--- /dev/null
+++ b/www-apps/element/element-1.7.33.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/element/metadata.xml b/www-apps/element/metadata.xml
new file mode 100644
index 000000000000..7d273a80ff68
--- /dev/null
+++ b/www-apps/element/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>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 0a85a6717570..c21be6be1c32 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -940,11 +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 hugo-0.84.4.tar.gz 38962300 BLAKE2B 68c9b220c1796fea8285a79a237744f8a668954e78fa7538830b0333863991b7e05e727102ef6c89f11caacf98fde40207421f95e74e26ed0fa6a783cf3d015d SHA512 f78ceb7514d87591703ac0f0ff2dfdd6a09d738d319a28f2d9ec13b44ab45d6d9ff02e7378c3764349827fd08d735ebc28b625085130db165232689655dff1e2
 DIST hugo-0.85.0.tar.gz 38968286 BLAKE2B 37f80c7ecea465b8fc7ee9b8a8467c90b22e3f88636ef6e10b09210c13c39c8d75983bedca4cbe6f0e0fae156129642669cc6e0e361712b23449520fb2aa419a SHA512 213ff0d1d87cca7ff87731216d0d0a80c2e5abbcca39a4222615a5a43f7f13f5456609ef47ab7d493a30af8ec65fb8dcfb21bcaacb43fc2d550178f5fe448966
+DIST hugo-0.86.0.tar.gz 39142083 BLAKE2B d260c908be3464f98bf49a61469c11eb0c76ef4aef1be4be171683796ae8d0b1eaae3785d1a542dab366395a1676baaae8c458c53213236d1787c92b15ec5954 SHA512 b6073ea67890b165e63fca48653f0ead03fe72cbdd557ecb98555ebbb22eb9133e36156d376ee9b2c9b739756efcc97c4f626a3a5c47cf520cfc02159f7949f2
 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
-EBUILD hugo-0.84.4.ebuild 51562 BLAKE2B 4469984f2afd7ac212b3e1be733639ac4cfacd4caa0c56e091904069b1986cfc6d82b2d7f0e8e2b6757aec8412ded84adbf2ca7939162da9f791a051f292e0c7 SHA512 bc9f6332e4c061f456dd84c43720e2f1e0dc1b42256d9435f9c535e390fb642f50864228c327b0f28444d634eb66b043aff38e650a6ba97b216ca4cc2163ba83
 EBUILD hugo-0.85.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
+EBUILD hugo-0.86.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
 MISC metadata.xml 726 BLAKE2B dedf419edaeb32c30b19c00dc42027ee4621ee836b44df94a6a35d63396074f379088d48c5f8a99a68a23166d4e595e3cc81f03b281fe9118693931e22d7ea63 SHA512 d7d396fc8f553322e50809f42977da39e82a7b51c56e47b4b23c1ef99bb2e5b2928232a518cecf3059d48fbd2f8a83bbc54f3a23c7f614802f38db413924349c
diff --git a/www-apps/hugo/hugo-0.84.4.ebuild b/www-apps/hugo/hugo-0.84.4.ebuild
deleted file mode 100644
index e073d11f1352..000000000000
--- a/www-apps/hugo/hugo-0.84.4.ebuild
+++ /dev/null
@@ -1,993 +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/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-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/hugo/hugo-0.86.0.ebuild b/www-apps/hugo/hugo-0.86.0.ebuild
new file mode 100644
index 000000000000..6fd2f589ad8e
--- /dev/null
+++ b/www-apps/hugo/hugo-0.86.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/moodle/Manifest b/www-apps/moodle/Manifest
index 473c9ef4bbc2..db87e2bd9169 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,10 +2,10 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.10.4.tgz 57525833 BLAKE2B c95ec10571d6841059f59f311e7d003b7b5d1b54f08c76bb90edc4efa9abda96b826064e80d5ec86bbdb9299148d8b261bd6183b49d47e69a586165e759da962 SHA512 c524f1940f9b0631f3cd53d1a8f1c43ac05e98e9293ffac649603b9665f3ac78db96152d23b3f8350ebd9ab6264bd544fbf69c164f93d9374a2f0f81af075660
-DIST moodle-3.11.tgz 59365522 BLAKE2B f9a2f77dd851efd740b924e51de6b882955101834ca4201bf2fd243ddd8dbe403d1054dcebb5c3022e941fe9f7d119b285d6e955cdb871288cb3b0e40eb9de07 SHA512 69509d57990bf9cca7a262b78f6beb0d90d89e5d93018fd306f662d32303dd39cc0a14b2eee0d58e8f420766cf0acbeeaf6e1f7d43de6b99d0999747b438ee5a
-DIST moodle-3.9.7.tgz 57157463 BLAKE2B 359d93fdfe62e1470fd7036d2c1d778ce7643c90e70e48a70033bf341833616b8909e6b36d54ddd8f63d38239bfffb709b6fdb50800440c9fc86329132e54f6f SHA512 71caf4408237ae59a5c70be7cbcc245580ed8eb382f03fb4d5284d946f1190fc48aa6562486fa9538c374b760fd05a0bdb95cac5ae182e7787d2e379e51caad6
-EBUILD moodle-3.10.4.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
-EBUILD moodle-3.11-r1.ebuild 2812 BLAKE2B 5626350ca51dfca177261d5f89f59c6eb59e736f0992851f1adda51abe91b40b067106402586aeaf128035299a33792d8cda0b77980c17293804ee1edcecec70 SHA512 79c8aeb215fec8dbdd2e7fd0747b8c48a277713532a38f671596590799d3d8100ac4b502670798168b3bd8d9bcf0c20f4cedeb430fa8cd3cc9108004afca021a
-EBUILD moodle-3.9.7.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+DIST moodle-3.10.5.tgz 57567486 BLAKE2B 677370969ef906ce49a16751a67dc6ba5464a6cd29c609517c235288a5a145177ae357e4fce633e59cba9dcfb243e83115d1705fef65f2c7c3b080771c6925ac SHA512 b46f238f4216e3cf0fc332b7e1605641425f6a6d26534c481a2613f4315b319b7403adc3575f68a78d218a6f6ebe4cdf8d89408f29fbfa7e841fca11929ca036
+DIST moodle-3.11.1.tgz 59388965 BLAKE2B 8298debbf0cec61d45f232a7aee038b8abd6f0e191b29d2be45db7beeac97f536729fdeae409cb1079e0ed4d42f966ace4a5fdabcf3490ff2c57a5c541f72d96 SHA512 92cc1cbd40951647fa93c557b7bc944ab7574c8a010cc87bbdb027bce201d2553496926013d28e28a1ef6f0fa580dc60b67c11a9cc1662edc19211ae566ad0ac
+DIST moodle-3.9.8.tgz 57152387 BLAKE2B 410b4e6e540bb7f3147e8da73a4b737b5d0d92e4c48fa0653cb56374521177d2d3407c0310b808e49a7c686e6f6c64402f4fd9f780b40478008f0453c321cb61 SHA512 f0adad79f2bf96db1f103d2662545c8d136fda4c49ab56b8204a34d71102b0bf07b064b1ba49fbdeac021a43c8a29a78c3fbcf70be3757a48385cc13c092c2f5
+EBUILD moodle-3.10.5.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+EBUILD moodle-3.11.1.ebuild 2812 BLAKE2B 5626350ca51dfca177261d5f89f59c6eb59e736f0992851f1adda51abe91b40b067106402586aeaf128035299a33792d8cda0b77980c17293804ee1edcecec70 SHA512 79c8aeb215fec8dbdd2e7fd0747b8c48a277713532a38f671596590799d3d8100ac4b502670798168b3bd8d9bcf0c20f4cedeb430fa8cd3cc9108004afca021a
+EBUILD moodle-3.9.8.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
 MISC metadata.xml 387 BLAKE2B c94976408768e98849655b8679935062d448bd3c9a2b65f165c005556d0a7230717c23577216e61d1d529e2172ad4c19d51223aaf7db07731cf2e1e92b858efe SHA512 bc5bc14f985ea4eba911fb4e411c5caafca175a1859f2535abe5b8fa3ebe45e05ecb9085ffa4dc33bd9f88bc220fbf42f7b1615553f352b742ffb524c482e49a
diff --git a/www-apps/moodle/moodle-3.10.4.ebuild b/www-apps/moodle/moodle-3.10.5.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.10.4.ebuild
+++ b/www-apps/moodle/moodle-3.10.5.ebuild
diff --git a/www-apps/moodle/moodle-3.11-r1.ebuild b/www-apps/moodle/moodle-3.11.1.ebuild
index ec940d7eb7b7..ec940d7eb7b7 100644
--- a/www-apps/moodle/moodle-3.11-r1.ebuild
+++ b/www-apps/moodle/moodle-3.11.1.ebuild
diff --git a/www-apps/moodle/moodle-3.9.7.ebuild b/www-apps/moodle/moodle-3.9.8.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.9.7.ebuild
+++ b/www-apps/moodle/moodle-3.9.8.ebuild
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index e7734767cd91..fee0754515a2 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,12 +1,8 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-20.0.10.tar.bz2 123375030 BLAKE2B 881777f0ee0489e14ae67eef5d7eaa37b8b7b6e047eb3953467470e7e39268c7680b0ccd43f10426de1668cde3f4ad82ec57148e93a84142d1cfbee7c1ee354f SHA512 a65a4c19894d61ac7d168f03a7aae489e39eb53f42cd02301800fe511483df056afab15a9d8708effa0109af6c451c9cb13ab3502ccea7447ec3cdb10367fcf1
 DIST nextcloud-20.0.11.tar.bz2 123339332 BLAKE2B f89dd1c81a9fcac46bb270a646df89d43064bac73e96209e379a5a60b204bdc44ade6b265c870138bc35a0a3aa2a52f4797166c03c1d156ac49336e48c1372d7 SHA512 4863a7819a564655db0a7b49a7ca9be642ab5383cdeada5c3ce6fc4529fda522a4427eb4b3ba5e00e4719232fed6c1f9e606e11f38c35f8838f82247359f335b
-DIST nextcloud-21.0.2.tar.bz2 129247099 BLAKE2B 282f79e9f764f1444dfe339e73fb955a7c77ad9335304ce0d9f8f7353769f3d11ee455ab01aea03ea04f5f8a029b3e97e49845fe6490d5db4d07324460626917 SHA512 a222c55c7ff515b96b7c826da13ff1770f82bebda2e73df6bb31df635338155dff611a560b665b0e9b17f2d8f33132abf75ffa80e84f5a115ee5d8a4737b6795
 DIST nextcloud-21.0.3.tar.bz2 129433656 BLAKE2B 75df0e3363e606fb4406aca7e37ab0a373d390f50966405c59e620b683979855c05f16548bb14e9ac7b4ffa756562679e5d6f1a8e4cd1d46aeda0756f235facd SHA512 e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7
 DIST nextcloud-22.0.0.tar.bz2 144386509 BLAKE2B 5d41337a7577d33f4be2ce5900b97df5582542bf4b51a4de4eff2f62726bcf014d99456ebc775feb16fd625582760e31ee434a23874451a1072822dcd21d5cd6 SHA512 ced81296d1080cb224ac96df501721c1a16a8a83f9784ab281d97202ec6611173d60a6a87279e7f36b735a92dd010ed81b0c7561fc7dadde00df10f9b7711cec
-EBUILD nextcloud-20.0.10.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
 EBUILD nextcloud-20.0.11.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-21.0.2.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
-EBUILD nextcloud-21.0.3.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-21.0.3.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
 EBUILD nextcloud-22.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/nextcloud-20.0.10.ebuild b/www-apps/nextcloud/nextcloud-20.0.10.ebuild
deleted file mode 100644
index db622aa5e6ab..000000000000
--- a/www-apps/nextcloud/nextcloud-20.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-21.0.2.ebuild b/www-apps/nextcloud/nextcloud-21.0.2.ebuild
deleted file mode 100644
index ab3ba8e01bc4..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-21.0.3.ebuild b/www-apps/nextcloud/nextcloud-21.0.3.ebuild
index ab3ba8e01bc4..facb26136365 100644
--- a/www-apps/nextcloud/nextcloud-21.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 962c39fd9b7b..5d196ddc3559 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,5 @@
 DIST phpsysinfo-3.3.2.tar.gz 891158 BLAKE2B 40428647a502f9861f89a490a10e95bef0fdf306d2ee27507b4f396ee7371ca3d75b7259db53b8501b127fb525dce283cb8c73e50172b5b2a78fc490fc7f658a SHA512 33f76436d6ba1aa76a4c7e7dba84f5d4bf458b505df47d65ff9f1ffecc4db48a853c9cdb8583019e70c4d0b54c184ae6d48968f3ed820a711804095a5fc31b07
+DIST phpsysinfo-3.3.4.tar.gz 946436 BLAKE2B bdfb731ac8e60e436f915b0ac72f3c327b08dfccee0d1cedc4ddc89700c4dc76bdd73d9e37ab82fad25e096a62a9a4d31442939558ab593ba5b97520d428a6c1 SHA512 6bcbf78edfa3af441ee6768cce559635f7aed6ce0e357379a7ad1158dab21b860c82845d746f66074c84cdc92e4a21fb4710f61b69ee8cfa1e457d098d642bf2
 EBUILD phpsysinfo-3.3.2.ebuild 1680 BLAKE2B 0b6d1d90d01ceb50736042ee13cf800f577a958ff1326f4918ace512cf8179d158c29e5fe3332f8a3aaf76002f2b27d3ada183648004c48803af6c8ac82e3814 SHA512 e93f3f6affef0bcb7f6eabebd15156b4e5558eec86abbdaff6319a6eda2d03d4be60c9bff5ed495d9d31cee65f8e34972a7519bd2451ee5649231ecb14ea6b0a
+EBUILD phpsysinfo-3.3.4.ebuild 1684 BLAKE2B 0f0feb31ef87d879ad4777013d1c6f1837227119be362ac5d324c11e8ce49cdab8531db4662fe56fb17c97aa3aba35070f2b0e29fbd027eceaa92b976aa78ea9 SHA512 159b7cfd4d61a0bece701f7a527bb1834cd804201bffff3b0713f409fb7e79d72035615f0994fa68b83fd6ddc48d68475b3e7a6abc28237f0d5832a51b9263d0
 MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild
new file mode 100644
index 000000000000..98bf2ace46fa
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+RDEPEND="
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	mv phpsysinfo.ini{.new,} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	optfeature "showing disk temperatures." app-admin/hddtemp
+	optfeature "showing system uptime." app-misc/uptimed
+	optfeature "showing snmp statistics." net-analyzer/net-snmp
+	optfeature "showing iptables rules." net-firewall/iptables
+	optfeature "showing ipmi sensors." sys-apps/ipmitool
+	optfeature "showing ipmi sensors." sys-apps/ipmiutil
+	optfeature "showing system sensors." sys-apps/lm-sensors
+	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
+	optfeature "showing lsi raid controller health." sys-block/megactl
+	optfeature "showing fake raid statistics." sys-fs/dmraid
+	optfeature "showing software raid statistics." sys-fs/mdadm
+	optfeature "showing quota information." sys-fs/quota
+	optfeature "showing ipmi sensors." sys-libs/freeipmi
+	optfeature "showing apc ups statistics." sys-power/apcupsd
+	optfeature "showing ups statistics." sys-power/nut
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 3fbf24ddc342..b4fde187b0fa 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.3.9.tar.gz 1866167 BLAKE2B 28546631dce340d3c1128b525de1c33e9e3aa23cd557e6c8f7e9b26f97aedba67f2e5f3ea351e0db2d79e068e16cfa1672cbe3e6abbffd19e5009e2a9df84523 SHA512 791b05df34a4f2eec01fe6f6b9038a6630cd60c42e1f2e725fe3d033a692b77d2d688858b947c53d1ce48258c7c87a2e3fb31356e553632b88149d5a29bfa70e
-EBUILD postfixadmin-3.3.9.ebuild 2978 BLAKE2B 3339b2f17788c81245e9c6315fc99e70e39fc4a55412af0ed1ae7ecf52a81a1e012e79d65c7a2f35c613ccfd050066275dd0e1ebee6b0fcf2f9a6623fb6b955a SHA512 edfef8358f540a0293fe3a6b10f7c420dbd934673e2afa4007a32544ccf173fb7843942518e3760a4a848638aa372ccf4fa5a832f91caa6bbed49076130e7576
+EBUILD postfixadmin-3.3.9-r1.ebuild 2932 BLAKE2B 267b42789f8946de5111ee783c18a6f3a291152c5bdcdd2203e7daa21ba4ce4b8026f458bc170858425cf115c131e9d473eb7742ff1199384b862d46e32cb694 SHA512 0c7cb2e541c93050b64a691120fd7dd87a990ce03c2e91acea114efb62472e4ae5b976de81b3ed0baa3e472851d2f9c8ab1fb1808d914f80dcf6593c11d6470a
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild
new file mode 100644
index 000000000000..fb3485975968
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		acct-group/vacation
+		acct-user/vacation
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	docinto /usr/share/doc/${PF}/
+	dodoc -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "Please note that if upgrading from version prior to 3.3.0,"
+	einfo "existing setup_password will no longer work and you will"
+	einfo "need to generate new one. See instructions in setup.php."
+
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.9.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.9.ebuild
deleted file mode 100644
index 20b1f26da4e5..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.3.9.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
-
-inherit user webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres +vacation"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	dev-lang/php:*[unicode,imap,postgres?]
-	vacation? (
-		dev-perl/DBI
-		dev-perl/Email-Sender
-		dev-perl/Email-Valid
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		dev-perl/MIME-EncWords
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-	)
-"
-RDEPEND="${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
-	fi
-
-	docinto /usr/share/doc/${PF}/
-	dodoc -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "Please note that if upgrading from version prior to 3.3.0,"
-	einfo "existing setup_password will no longer work and you will"
-	einfo "need to generate new one. See instructions in setup.php."
-
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	local shopt_save=$(shopt -p nullglob)
-	shopt -s nullglob
-	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
-	${shopt_save}
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
-		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index ef36ca5d567c..960df6f2f64d 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -5,4 +5,4 @@ DIST radicale-2.1.12.tar.gz 123828 BLAKE2B 38ffb264b1f8e185642e0236821bd1a7714c3
 DIST radicale-3.0.6.tar.gz 123817 BLAKE2B fa4b70c9920d518df6c939395eca857c237a75218b90ada45564f2d84266d65df12898e4efbb52905829948061e10e72b5442943fd5061a28447330ae8d491e8 SHA512 e9741547395fae8886ad84b6807422ebb196f5293d484f5f6136498058576cff697e28c117216f151d56494af83593347ceee40a6efa21272b803d0f301a396d
 EBUILD radicale-2.1.12.ebuild 1722 BLAKE2B 3aa793d57898fd60726422114c247265f2566134587f1bf04a0cd94d0525baa4935ffb53bdf77996b3f12f5faa6c3f9845a78a8d9ae0bfb9de725a7033e0e866 SHA512 32b0893d0778ac3f6b8ae40387a8e7817e77a165d572b311f21565fb37c5e97ddf527e2adafde4784de10e3fa3a6466ac5922b5d778562d6894d1e2f1408d8cb
 EBUILD radicale-3.0.6-r3.ebuild 1917 BLAKE2B 48306d0aa313277ab4e19bb76d102a767ab913313901686202340a77588a4f2a35f68f3e4a6b849e81b155cf7257df4ab509d0ad704c70c780da3dc4603e32e0 SHA512 a6a6fa838dca885f21e2694d43cb645abe1b87168d34e15d940af9ab4be90f06cde55baf25f81ce8d170befd1b0f76c03d8f9354dabfc76c24d72a1940155300
-MISC metadata.xml 556 BLAKE2B b07d7f83f54dd115fc7fc0e775b97bc30653389d301fa39e0cf8a8ee9a94bc3b3cf6b8bfcbd8c53c2b0502b73011707d7ffa267b9882be935b3f3a489e127957 SHA512 9b5981e5efb581f950a766bda19a405edb78773fbeec2a19fe9bca75d6c208c3f9628954d3ce346d5a90701e0f2e8eb182fbfcf4ca458abafb10d683156ea6fd
+MISC metadata.xml 328 BLAKE2B cd2656a4396e244717be8fcbfc6e2a218db5ae8650e8921e5f4a805d7f65e88c8f9a12d104b391fd724fbf018fda8d5b5bfa5a43570878c404d36f8b50af711d SHA512 17a4556a779d7c7536abd85100ddf4748858d3fe6b4e369e5ded4a65214a6a16aff6a1b3c1dc072e6f9a3421de9a6fc6f24ab9c492bba3307a94afc2701bf2a9
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
index 4912a745a440..6e22f12a2814 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Kozea/Radicale</remote-id>
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index b4f911cd141e..c6c926de72b7 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.7.2.tar.gz 15750424 BLAKE2B 1f17b4e92af221d569c4d21f702cb8ab17d8165b021c12a0b914b96142a521158b5f7c0e1de1f6c2a0b8e9c74aa72123a942269887652f2b88759c52ab9456d6 SHA512 84d41dddba5c4c59a0ceb3ef2e04760c27ae811e9db5cb43484f91973dd9c5acfb66affd8f76db06dfefd77e1bd90acad1eba7ba176a5f43b28ec806f3861edb
-EBUILD wordpress-5.7.2.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
+DIST wordpress-5.8.tar.gz 15073609 BLAKE2B ecf7f4b40becc66099948943810e9ddebc3e6fa1584259c7ffc3d0e9077f2b9cdc1d5488749650c77ee9df8a16c51b3c62cf21e5c48287a1b26fb83ba26ca854 SHA512 6f3c2f2e2d3d3ac57798533d062f12d1d751dc8c2fd30fb6448d60d50d74b416ecc32f1b3c54efd6a3edfcc227f29b14706e8ffadaf7d9710ab345ee47b88629
+EBUILD wordpress-5.8.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
 MISC metadata.xml 428 BLAKE2B 0995af6d73ebb2fb3d42dcd56376b05e62f4f5a716ba21d19cfca37acb284ef350312c5d0d21d8797bf7255494cd5077656c38be502bbfd40bdc10d1cc74987d SHA512 cc1dcdc59abafcb9cceb0423f3be99ba3abfed728420c0def6de048a011c9345daba0b3ebc0ef0220e3755a64f8be8d667472535c637512ca8e80ab372faca77
diff --git a/www-apps/wordpress/wordpress-5.7.2.ebuild b/www-apps/wordpress/wordpress-5.8.ebuild
index 230beac91636..230beac91636 100644
--- a/www-apps/wordpress/wordpress-5.7.2.ebuild
+++ b/www-apps/wordpress/wordpress-5.8.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 38a312474738..b09c025e19ce 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7f7c9e9f823d..d8f3c10f5fa8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,7 +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-91.0.4472.164.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
 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
index cd69cc5880ad..ba08b840323b 100644
--- a/www-client/chromium/chromium-91.0.4472.164.ebuild
+++ b/www-client/chromium/chromium-91.0.4472.164.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+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 )
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index e9a92adf1b4a..25577b0a7fe9 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -6,101 +6,6 @@ AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd
 AUX firefox-bin.sh 2930 BLAKE2B cb10a59067ab05342c344c72a6692e44439c6943d91d22f0c6007a27b56d5b163dd54dc9c9858bdf2c0385e367b1811fe966b1613f22bbb48256aa5102016f1d SHA512 6eb5f9ec2a3135b68d41bb7421a074a04146e431f4aed94043d41c493dfa0063bb2cb77884036473be69de97862271aaa5c5ce7556af0e5cf15929777e803a52
 AUX firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
-DIST firefox-78.11.0esr-ach.xpi 460297 BLAKE2B f3624758638b746b25d36910d8ea77acaa171d63db225948598f58efcb8a0314fa123805f15046c0bc1c27d6d80083051b9abb398053e36ab9f4dfc95b255756 SHA512 105c7f21e336de446692f39c770d8fdf828e5f99550e4c1adc2672f9759e123524852c1c5e9cfddac0fc49032bb31d90bc6b169978316e381401e52cfeb7fecd
-DIST firefox-78.11.0esr-af.xpi 428363 BLAKE2B e05c471b6206c22a63b214c6aa68161e012e15e37374420abfb14b42e5b8af8ae32b64c712aaf5d49fd5f256c11ee35536a999f13187f53fc5b924c05904367b SHA512 0cee97d8d5584e57f763a57f4c6b4eca7096b112ec086a8171f9ec66c1b5229727be34886b797285431d05aa69c7e29ea8f706a2c579c4ac3486dd392998336f
-DIST firefox-78.11.0esr-an.xpi 508380 BLAKE2B 0e6fcf7b196f6db6df865e78c79d6f3b69d44b957813baa18b85b68a24833ae62887f46a933a7e3e933a52ab0092c42d93ef5a42877dc856a02c879a259c8042 SHA512 be4ff7d680db153b382d9d46dc199097ff85eafd8d8bc3867ce2ac761f353aa29346069d2f8ce96f3d9ec60229bd97537e64821ae998356e34f64281b136240c
-DIST firefox-78.11.0esr-ar.xpi 560961 BLAKE2B 565e5a1942e3bae9307a0c3291b4c9673789cb151db11535f80e4cf5e6ed02491b21406c32deb2c7c290fac3388f21289d6703df0140f8a92104cba1d06e8a18 SHA512 dde149a7efcd5dc9edecc3305005a9ce229200ffe5e99fd235343a85a71c28fb38c577c75eb5297ce22a54ef3e15dadb8472981bfe5bf2c6afdd5ad05c4203e8
-DIST firefox-78.11.0esr-ast.xpi 456390 BLAKE2B 09abe88317464f103ca602e72c00b4157c4d55187c64ec898eb742adfa9fec00af509be3a333e8d421173257185466054936ca891c7fc4a09950788248ca1a68 SHA512 5fd2db0c59f92a27887cf7636b768fdb245b9d61d50f437566cc77dcc7aa5e59c4dd4c4df82cc82e330dfc7731623d063c4ef3f601b9e7d4b15b083660b28757
-DIST firefox-78.11.0esr-az.xpi 497446 BLAKE2B 1cafe6d385fc9503b2eee215c87c17bb3cc6603bd56c021cacf2961b4b2c7ebc5716e2812d5919c54d3ad71fb7960db9db3e6cbb891d3391aeaf4b6a327e5dcf SHA512 f1b9727de0d6f1d46f8fe241843947dd5fbdb9160605e7ee1b6ec2e1d60e87762dbbde3c531d60c2230cee69be99cdfd7e605e8f903f2405eca4c9f3c21ede3e
-DIST firefox-78.11.0esr-be.xpi 608660 BLAKE2B 21989b272ad242c8977aad75d2febe424e4e1d6d0514178d4d2688350a96a99765426224410eca7c69fb5d7cdd247d51089fae8734711686105821cd7d88c9cb SHA512 b7b4931349f8e259b79008792b7e41d9a73dc481492cb30826d01b4b2443909a22421f27953412425ffe8eecd01bde5f33f9a610f1967d92708a3947451689ef
-DIST firefox-78.11.0esr-bg.xpi 553983 BLAKE2B a061eed00d5e6461944477796e00cbeaa6c94ca1de1d67f1aaabe6f85dc485659de4485b21f42a1cbead90f9cd6cd4e26e6301472df10c12deecd7d6b1dad050 SHA512 fd3f8724deacc830800d6a68a679f98b7f2b8195dbc9ccc267a5793d0ba8cde710f341d41c7affd3c66140f58acfb9deba5c43a1020db7e06bfec812ca265896
-DIST firefox-78.11.0esr-bn.xpi 572621 BLAKE2B e6153181264b8e631c0763cd836627492c36a7805bc82459282ba0c8ec3673858a56ac9e03ac4e7119d1821832c000753e06d29cd0a5265e62561098f614986d SHA512 9e13f533805f74ada58c31901a13acf4ddc925b604c68784ef0d629930a7e3463de805509058516415e4900010917a6e3df7c46e7eaa3db9209ca7de3c5d2054
-DIST firefox-78.11.0esr-br.xpi 507131 BLAKE2B d8c8d132f105113d5c6086ddf865ae3c694742e9620e903b0d2228d15de3183e16eea39ab724eca2adadc500b103b09b28c21dd8f9d2ea4fc4b82d5320d018d4 SHA512 5e18adadb34c8d84a159d996f35d2a8adcac852445909e9821fb437a5351f191e488e3b4529643154379c167f45e18a1b31ff54ea194d60fe7882b052a916b10
-DIST firefox-78.11.0esr-bs.xpi 463809 BLAKE2B cffa7ec714f4eb2b64ce3708ee734d0a2dfc8716c950088315da999c91744449c9789138b7bb351c6da0b894fd21fc1d599fb830dbb989e4eb28d76c34b23b30 SHA512 0a55bf9964a63289a7aab3167f0761ff70a9ec037c131f13589f1552b081dbf0f31e56a752ea09d4129bcb4da4fe5af16a548a9009f98b54774e5cf246cf5026
-DIST firefox-78.11.0esr-ca-valencia.xpi 517179 BLAKE2B bf227d0257df231420b001310ba8c2d97345fcd1e5279cf469c99c22692cabb346aec026ff77615592d66bfd2a28cfcb9a086236efe9d73f9051b2f27e50b22f SHA512 59912a7451dea39d847cf775e6257d4542d0f87614c044c66399641542758a35c186304aac1d4847cb130727d5da2cd82929d8f32346e5fbb40a840911be8750
-DIST firefox-78.11.0esr-ca.xpi 514179 BLAKE2B c687a831195ca51a3a1f41730912a00552a89aed20f0e0cef9330840905ac6a8d301a1a6e4c3166d2057ee4c28597942e621bc698a118ca28ae31f3924155fd4 SHA512 0b81e11fc94d2c289398a61e70025dcf485ee50aa1ddd76a40ddafb427fc684099879aeabbe084a6bff74a1a8592d833777fdf10d8f0f1bd926344c464d4df0a
-DIST firefox-78.11.0esr-cak.xpi 551546 BLAKE2B bca2f27344579829c90410874948074c79099bb6ba11323fe96e65aa4a6cf69d09bacac63809836782f8d9e1cee8730c55c811b137815414cb622e30d05f3787 SHA512 49197b480aed66cad0d2ffcd1a3396c34c2060ddebbecc79e89c784e6a96b49378a15b18f82799df0b84a0491f93a1f2ffc13c7097a739e592d5d5c85fbe4a70
-DIST firefox-78.11.0esr-cs.xpi 540327 BLAKE2B 331535a13c927532b7bd342ef67c7aa6d1c81ef6b98f6656ed31386d602dad2db512e6cef7e176d9844821ff15a15afca229b540de43aeaf7606696d114e072e SHA512 e7b4f3c0c4765dafe373a62b3c230189592ce0d137a11d816ba453bf4c61fc461abfb17186b81902fd34db7ee5a631699675793c949e31d740ea3624b55e2ba1
-DIST firefox-78.11.0esr-cy.xpi 530692 BLAKE2B 6c0029019c3ff6b50d1ac06d754ee2e043992b8bca78f3de762340b5af400628eb79fe8421618b4aa5462765660c0a76c64d1da8d4ffb03a6ed205fe7b2d951e SHA512 85f11501a6b86e52482627bac4a8f18de684e1404af1f1eb5ee431701cac8028e1f6d762e14804d79dc4dc0d9f584dfa021fa8aa51ad664bb308323e4786f937
-DIST firefox-78.11.0esr-da.xpi 520275 BLAKE2B 81b8d297efbec1580e85e3627798d426d36f1e885dbe2f80e6824c7f4f7a7f0cde48a6a2d9391f69e419e1aff5e31894c59aaeec2c273f1637d6cfd1ae0956f5 SHA512 fffdf640d14aa22496a1bb492cc4fc15a70bd0c2d4d2ca0ac3959867bf0fe55f1f1e8c283af4ef7733ab8656d2fb8a5c6ab2a124178fd09ef372bacdc31f1731
-DIST firefox-78.11.0esr-de.xpi 542857 BLAKE2B f8b4c3d963ee0a79ea06d9ca262b3c7d350fa52e0600e9d4ec08a1ecdd8c8950013d8147fd95893f5c268f513097d9a7fe1ad4d5e690e2eadd08e0f1838c1d06 SHA512 8aa31a7cc65d875582a0bfaba03353ff45826b97245eca0f1e0e7e639cc2454ceab5c13ddb27d30a6b0b62089c47beeb671d65ece5285e1fcea5f89cb3cb372e
-DIST firefox-78.11.0esr-dsb.xpi 554280 BLAKE2B 3dc5ed7e8049ff54e06a5f891b3bd73d0fa64206c42612f21ba39923fbbd4797aa09bcbaff4859e82ce29e6ae4ec8b76749fc75eca3d1413769fe9f50608df66 SHA512 f47b3a0bca7b59649d2df91a88de27d93b6d05437676d46bff6d49bc44de2cfcd9c13ae971a2e8db4884aaff6d9a7869764c7633dc94042bee72199f5f9e440d
-DIST firefox-78.11.0esr-el.xpi 626556 BLAKE2B 7b4556f29f077a52115538448c75b70da276f8c174b2603c9edcf5b25ab60a02cb19f7771085d92bc295c0ea740b292f099bb2616b032c631a5db373c95b5a3e SHA512 cc5a3d269247b4dcc73f0f3c13443511680d1acbb0c10e24990f40d6ba3772a06d7278c70072320086358329e44c29f48653405e6579e0e7c9925e76d77cf5b7
-DIST firefox-78.11.0esr-en-CA.xpi 497732 BLAKE2B 37a47f333e9d8c39a8dffafd19bdc949355aa527335b45cdee6be9c767e3688d02f51bbe9b566b978296ee953c35a60ea2dc718de41b64a4557c2335f4d477a8 SHA512 fd5ce7cf7c87b719b2831dc16f604aa110fad2385fafcacfb03ce523b275c944e3dad530a17a5f0b3b637590adab0fa5a1d65dba45f69ceb05934d5240cb6502
-DIST firefox-78.11.0esr-en-GB.xpi 497595 BLAKE2B b19cb4806211a294cfec0fbdb9d3454ac664e7483cc2838c1f3d25e0185bd1fbde1dc3a94fb5e986e731631696c1a3e629d07093a47a0697e6ed07c27142a6d0 SHA512 d04d7f39ab0b74a4201a17ed427670ce97c5e707fac64243d106b00e46bc8f9ef7b0c04877d32d71cf5818758fdd54eb288db8307c517393b809b6176124b91b
-DIST firefox-78.11.0esr-eo.xpi 525746 BLAKE2B 7914bd53ff96d486bf554f067461498bd9a4116aaaacf4e80136271bd8fefa92f1315ada188a1f44bbc0c24d6d5779d6c76ad5c1fd1bf927066ad3596ed358de SHA512 bde81dac8e17fa65057f0e16b166ae093225e1a578fa898e2e3ac645f1e9e65a78591d72a5c00648df6790306daa8a62d27164fcd97327839536af75c40a9809
-DIST firefox-78.11.0esr-es-AR.xpi 535812 BLAKE2B 918ef527737125079833ab198ef7fe4beae69d27788c491bdc8b88f134777522daf6c75a255f13aba00e8bd78b92a00ac71e6d4d401482d7e4b29717488250d0 SHA512 ee8cb0ca5830bdfe50c3cc0cec19a0e9541f10aacd5bfb507331c89d7a7b6411941effb0ae707adb7dcbb35034f00f00a5106886be2038ad3c040b04a3743c70
-DIST firefox-78.11.0esr-es-CL.xpi 535368 BLAKE2B 56717ddd355c2ae91a1f09d86cdd40d69e9d2e4d4e6cc4b5b61f3e38c8fb2af97519149f45abc958dd5805a3bb9083c8bef40bc6652c89a26cc7350941fefe21 SHA512 356135ac19efa2dc103f68fa87ad7cbea8cdb9d2744c70156f2af3e758f00091590a86f93a534f54f5f268a5473b5a4bd1741f58d30cb0692d7a6c59ee4f52b9
-DIST firefox-78.11.0esr-es-ES.xpi 522714 BLAKE2B e916acdfba81377958b6c92f218f431e385f1b36de24b080e94c929f38c1e3c3dec5bc3da478bf1d90164a644bde0e1299832a4fdd333b5fafef2525453c3cc5 SHA512 e22e942cac32c7f0936d6e53bb9b81c0098d9597089abf1cf9d4de0cd898e3d88269974efd6d4017834839e6a5a21c286ecb73579a15410002086979c172fad0
-DIST firefox-78.11.0esr-es-MX.xpi 532294 BLAKE2B 3b1e2ea95186f874a895b6fd2e7b53f124ff63319c7a45d7674159df614772b13cf21557035da8443474690e0988adeadab068ead17068732e1556d7c24974ea SHA512 caabe1f4c4203450d2428073826970259a382b4697574e883910a0911984459284c8459ec286bdb61a66209ef96c608ec5bf047dcf21a8ca1d203714b6713e2d
-DIST firefox-78.11.0esr-et.xpi 485234 BLAKE2B 35f5da2d84b34edb280157c07ff0790ab1077ff8887ddfc75ddfccf6c6ad40b4d4de7544e3bf0991da6dca6a2936e3a8697e8e9a85584f11bb444d7b6e03c9f0 SHA512 3c06680fd1f477f16a8cad514287016adb9261198acdbcc8532904abf78bc0a88ff35539ade1da5cd386a570633776d2397c6b642dc96f179ee2a00a230d8f69
-DIST firefox-78.11.0esr-eu.xpi 505882 BLAKE2B 1dda7f01adb79347ccd7a7000d18220b673f063fc78e53f6eb2b7be1120eb3cfa73f99c59b5d98e2ee40f5bfa87fa5ce4525af4c3db4e22cb28d5a977247003d SHA512 93703e656ca5b33117f2831778b7b35a8577e61531bcab55c92c7c26774f0f8a8a53080724ab8732424ea470e914ce8096b9b55fd1d2f4409e7df5fd797b286f
-DIST firefox-78.11.0esr-fa.xpi 538916 BLAKE2B 054c162d70c192eb34656c6d9f25da88ae2289f9d45f782c2f0bcae3420db9e61511f39fbfa3cfd865d238aa152f102c68cc89eb679e80fa57b4c8f38c7df128 SHA512 fcd0802e5b085c2186fb7fee4e9bc9cdc173a51a759340fde70c123f58e1cefdc5237609c50148f975038d7af2ba726c6ab034e07c884593435a355c91e19370
-DIST firefox-78.11.0esr-ff.xpi 481611 BLAKE2B 85374030298f6bc31b654e8854eed08da24b17439215a435ccdf6ff3983a7ce5edbd92601a04eb1b7de9c62e9dca7fd9519d55f63d3335c47f9afa2c1ee465f7 SHA512 b2e400fe7c82fab165f26624a3e509da1bf9ddb21305a9c6be283503bdddaa67348a4c69641607f82e3569c77c2aa16b067346b8e84be96d57c386d01f6d890e
-DIST firefox-78.11.0esr-fi.xpi 517919 BLAKE2B 1d2dd74944266752a32ffd5a47d0ddb3a990691e8f6fd5d1b294ab64407a73873943298540fdd55a1e121328a8d56e1b822214075129350a4da3e701af89fc8c SHA512 add238b483dbddc64983b1cb808cfdcc8e2d834ea9422355281887106a44df242f26ef2ef33aa8e2d1b454d419ada18206d2f8736b9dce7e8d4360a1f97631b4
-DIST firefox-78.11.0esr-fr.xpi 545880 BLAKE2B 81d51c519d6cbe145ae90398dac83b084e53cbfea7aecef3766aba10b206fdaa2270bcaec7decb0ae7c0a1b110ef4ef5d99bff5abb04c25cc22b0cf6d162a61b SHA512 1750ebe31ab6c3bb554646c9cf90c514327b95879021de47b0956b9b334a6f506ac6107de086dea6dd089082b79bfa7638385117d1a35ff212b6f21f7c44f415
-DIST firefox-78.11.0esr-fy-NL.xpi 532475 BLAKE2B 92adba15f29be7ea1eb51c2120d4c1c89d77a819b6f685034e1205d8aa17c439e8f0dc415310bafefb85d454fde7647409bb8c531714333742f3f0d4d5eb1ad1 SHA512 5812f2c1ec09288335b0cd876fdf38c8b3c8ffa12fb2eed99c164467ad92b126e38b4a20e37c5b477bd95de74d69b4ffddd6d048f3e30736877b844f0da947c0
-DIST firefox-78.11.0esr-ga-IE.xpi 466898 BLAKE2B 725df8bb5ea0ae76bb79d22e3c2062e10c034c833080fd2d02b434b0aedcd4ee27d2f3cf21c7ea09bb93a3d3ca224677d3ebf12b5471eaa2c1110d7fbf0fd173 SHA512 b0a1d1255fa05df7566473806d4bd84f4640e4f624502e6630168ec062dd0c55ec75ff66a6ff323d8ea50e72428f28065a16a983bb5d806d830d86ce8d659199
-DIST firefox-78.11.0esr-gd.xpi 491875 BLAKE2B 962a20eedd0dc3c9a881dc941cf83c57fff70309f009c44d53856f45961985723c5dc1d0e3e7845887d5e07ca44185137271be12ec58c266d9402942ace334f3 SHA512 f8ab82bb398594482caa4c29b6127d07bdeb69ad7eb5d389f0c3575d75647ea19de93f80793aece94a9fc3bb233fd8c4a8a5acb8c31ff676f499776b47ed4440
-DIST firefox-78.11.0esr-gl.xpi 528415 BLAKE2B 4633cdfd83d83d0b9b7d54d87bfb4e76d49fa8af07f71fad5f304747755386e6374b7f6477963fb5c6ad3e514d57847fbb19fb8c4f404c120314830351d16b29 SHA512 bf9d88b5755af5d4f87266d9a824cf48e54530805898987dbff18e5a443a07b23c0e62942c404b4b39d8aeff7615cbea0104826a2c6f38d738bf97f6d61baad6
-DIST firefox-78.11.0esr-gn.xpi 546473 BLAKE2B 899aaed6b43bb7728f71be2050a55c0d942b75d9d0341ad0dc31d0d98e79d8337f7d8a0700d780325d8697dc56f5bb416ecb82b61e59e4ebbecb36962cb7b5d8 SHA512 162244124aa73427402158a98ac0d7af2c2804923c12538597ef7214398e325ce681d42724c2d7c5d90f673a98d5cd42a90e5e2890a036a637ab8324fcf372d4
-DIST firefox-78.11.0esr-gu-IN.xpi 541427 BLAKE2B 1a615af95f7d1f275d0856840ae6dd81bc654f892f51f3fa3b7105b5fdd63bfeae207abf44e99f1d72eef2a7ae38c7ef55610b672b3c33a4254656465e8353d4 SHA512 1262c9918f7aa0a288ccc1d64fa0a810545cca9db9cf094d7c8dea51870a8b33fd984d38ca1935ae897fd25488fe6923ef15b027c2cd5baa36b8d9bad5ffdc29
-DIST firefox-78.11.0esr-he.xpi 545591 BLAKE2B b8d4999ef5387e02f591c22dabfd7bd6621c1b6ee6b08c1dfd3ce4cd1e525eab64bb2f6323dce0ab0e56c8877e9338ececd9d510a1700e7ec40348b05414196f SHA512 1bf5c0b2086a0aea35962bf5d642f21dc326d95c36bfdefc7bf90262aad7fe4b797ad44f825e46d02d6dbae4875456c34c816e6317b2025e5ffab3ed2e772b96
-DIST firefox-78.11.0esr-hi-IN.xpi 567857 BLAKE2B 111ef1fd451081e13c0c46c4a2fd1dcbdb4c6e04cc5ede16ffbd5137660fffaaeca670f2b60929d7478d188881f3d03114c8429fdd6f94bf78d1336ca804aafc SHA512 d0999ce7489b9fa31501e2b4ac17e6989d220b85cdff0b5904f79502fbb7b0cefa9ab2128157f9e1a24947b75c152f4e74704350ecca82e7a3423465e8f3c581
-DIST firefox-78.11.0esr-hr.xpi 522694 BLAKE2B 3236b7c789626020baa67786db081ca5720151d876d776d2a08ad0680b39e510fa66854f1b8d952b04f7f1345b16c94fcc8a67b2d6b6c384f753c752dd58af93 SHA512 4b1b533900d5b22f8500f8d2b8faed88d3e0f505f26a574e39ecad308e4d301e356df43a460fe950283c9d821728c27247087c3edee8450bf6c2b40bb7246a44
-DIST firefox-78.11.0esr-hsb.xpi 550670 BLAKE2B 2e1546766636b5d22858599ae87180ab5854d822c966ab454517e545ba2228d50229c5c4e08d85509505495191789d0141be37e9782eb8d3dbd754b60cbd972b SHA512 25eeb1b03a05de8a0f8227f9c851de306767f747846ff58af48ccb30d80acee01c2c3ab2a4a4584a52a3fc50644d41edddf3e8dd91961be32bb4fa358f367e8a
-DIST firefox-78.11.0esr-hu.xpi 554888 BLAKE2B 9027cf3d182ef39c0580c89a9771382ae15c86c0db0d0b78ab3a6b11a9c7bb070d3482712a0a1982199389e8a82a3875fe7f4154fceb629d902179eee1e278b0 SHA512 4d53acc3d1b83ee015a992aa0f035c37ed9c1ef37dc5d92bab31a8216f377600b1f5bc942e32cbac1635cc9ad066f19a6829e73a49253bdd73730b52c23166a6
-DIST firefox-78.11.0esr-hy-AM.xpi 588982 BLAKE2B 8adbc413015b61bc015c5b3a7c30266fd4e50e1900cbc4ccb8844bfaf9a7bf665e1ea5765e80f1c6f8d13edca0cb7f72d9ad007cc13a74ab29db7f666fd71ae8 SHA512 eff9f9d314b67c2e6bc6fbbcc1c21d2a27c18c55e5671868c8a52ab9ec404d4ad0d00db5f050d24ccf473763725eb08ac1b9929ec028559e399efc35a0800243
-DIST firefox-78.11.0esr-ia.xpi 518824 BLAKE2B c94a1756232b7f9d9f3b76551095ec198e4bd0db0d746135f5283a45681fc0755dd92b3a330a863c1fd0640e409a5056de854d2bb6c836178a9a3eab8bfb552d SHA512 44a1ec8802193ad7aecee76d9a3ba98dfb24c33cb28d30686ef3cc88cd3b66da66acc95bfadc05528c563337124c74b27b689269b7ab61776a3741e367fec179
-DIST firefox-78.11.0esr-id.xpi 509573 BLAKE2B 5e36350030d11afa16fae0711efaf27ad23dea0ab7fd41578a19605d58a7fa4805e75c41cd2b13300b99e79b121f617be3514d990f92dd046a279c4b00149b65 SHA512 5479fa47f4b86fea14d42edddb175aec79ed50161b467205e21cb24274d1053aabd7014f9e826e053f14ab6aac8adf6142df135d8113c3e36aa23480eff78692
-DIST firefox-78.11.0esr-is.xpi 477026 BLAKE2B 81a36f4bb784edbe2675df18f7e0846b6dfe1ac61040fa340f4c683e524166ab633dcafd5df68c33ddef9d5db59ddb75742137bc160129b40d1ebace36b90354 SHA512 9219ab7984c05216d1e999ffc045fabbf513f067f02b5c82c9765f67ba533cf279e84dc080fdb65e252e92c0fc641dc7dcbcb806a36de35719fb2dd50ee088de
-DIST firefox-78.11.0esr-it.xpi 449813 BLAKE2B 3d552331e4e5230cbdb5703ea0944ee3feac6b41aaa7a337f07464d37be6e511ce74214883ae74ae53febacd95744c1a2f6005f05ca12745ed013c49f118c959 SHA512 f60cadc36d5c16b1df5782795a3378cc94f464d955ebc0678d3181dd30b22bedcd0a3559e0253a305d64209b0c3c94f858d5bd7cd717e1c6011e02c441d7ac6b
-DIST firefox-78.11.0esr-ja.xpi 578206 BLAKE2B dbf66b4607632ffee7abea2936dd8f833aa15bff24bcb36a173017c8bdac08727ffd6986a818ff0b7dd493ae2e86b56a723f3bbbd2fa8861fa3a398247a2dd09 SHA512 423eeca73184c5398de16f15668e61f1400961986bec6e4981a0825fd031880cf32dec3616330b223d1b0da6838116b1b3ea70869e426abdf03b3e16a62b0726
-DIST firefox-78.11.0esr-ka.xpi 579092 BLAKE2B a76e3cedc38a2a94132e3171cbc7d7a5430ca1878b4e04ec51d2c47ee9905c53031afef06c90990aa86dd89dcf52789b08180fd4fe5a9f7ea0a294b82d8228df SHA512 de8fb5f09df796da96c7335ad7a4371ce876503940e4efb99fb74d15deba326a2d562bbc959bee1e2b28e34ff5ca2216d10c60854174d03b73f54d7c8cd3e426
-DIST firefox-78.11.0esr-kab.xpi 539730 BLAKE2B 7a063a666226b78b86875e30c6e3931868ef8d0361cd2055fdb1aa2be60106c18f31cd9d8c646a5f965683c9f6d24453c69d91cbe2eb902474753630fc12aa0e SHA512 f652b9d05fe9c0112152c2017ba43fe759046e4bca5d744d69100e31946c4e9f5946e28f15aa22f4ac38d52e4cf505ad8865246def27fda1cecf1bf86bfcccee
-DIST firefox-78.11.0esr-kk.xpi 593259 BLAKE2B bf60d1f9aa68948410dac824bbc7c8c77bbace804743a8259bf10ea3cd633ac622c5ab606bda02debe945011b89041402140d40a0306f598e95dbc91b3a05ddd SHA512 c8abc09acb97221d45e7cbb2ecfba8a9dbd34078ba001f26645f648a2288a81e7b179d7d8ffb6421192c2c9afaeef17138e73913f31844105449aa77c4ca145e
-DIST firefox-78.11.0esr-km.xpi 527377 BLAKE2B 83e81ad460ff16f4e53b2cfaf362615ef4e0244198ecad18be66e8d4ffd15792f5bf680768d68d3d002c1cd0fa5fe738214f010620f9d6815e8331ee77881f9e SHA512 3ba0936f0b4fa2bc8657d078227a61b05f68b19648e315cfff49d25517d9c86854a38791bdca54e58efdddf863df0e5f6441fe81ad6cf78bf1b3535f4839e983
-DIST firefox-78.11.0esr-kn.xpi 506744 BLAKE2B 3386093c535be3f82e1d3fd5e605c411039c4e2bca8489f043ee6125100fd60585ae0184470d6513d28e40c026ce5250c3f43e79b1c6d3a06a436d297df73c7b SHA512 cc4fca5f34d9f2e3608eece687250befc21c8269a812d440e181848a3a9075e16172b651c80217fbd34798d264e5cbe5235e73ec9c55e40a2b46ece529f8fe78
-DIST firefox-78.11.0esr-ko.xpi 567516 BLAKE2B 7615fe5f84e1fc4de98b1c187aab92de20c9f827b3b18c26af1e76fa1201f810ac28c29dc2a60d15b97c90439b2a95e183ec2c00af9425609c32af381f7dd143 SHA512 47f5e98275f2feed4e4e87546707869113046592afc4cab3ab590bcc0b81464d0db6080fa9b6e7a29bcc400d7dc822d08e62370e064336b029731875b87a50ee
-DIST firefox-78.11.0esr-lij.xpi 475237 BLAKE2B 6805d43557b613415bb1d33bf7830b55c701010d662f68210f762c2e30d4a103393911c756226b71b2dd4191dbbdfbafdbb4e5474befed3fbb1059193afa9979 SHA512 acd25c5dd8dc5822d76d7b1bc73fdbf27d7970aeaf4485aad76e38ac56f69053ef8aea72ca02346ca2e18e054a93115d89d09685c1e4fffad31626833dc0cb96
-DIST firefox-78.11.0esr-lt.xpi 540691 BLAKE2B f20a307b0417394b544dc5ab22d32aef51044a62535929e0aa4d7b550bd3a59c9933cbb4f5d601d0f5784cfdfe24ae10a680a979bf69f260c4ab4eeb185d19ef SHA512 361def4b4c09be1d2a3c79f44dc86da0ffba9200df7d246f895636aaed83ace8f2914206f1b93fccc81a7b6470ba13285ec7fabf2bcb449477a95509d758b824
-DIST firefox-78.11.0esr-lv.xpi 467473 BLAKE2B 429fadab080ce70fc35df9d830c638225594c3f1fba7e052472579dbe190db9138000bdbe2959bda61a508a750fb5f363a969f074a73b4fbacf3365b2a1fbbd5 SHA512 38f9420b44a8d1e3c9a5ee8be2740eb2d622738757ed355b7af149e17cb0d3268273255b47c75150af79cf76446b0716e9af19c90d0e3bf3e59461764587961c
-DIST firefox-78.11.0esr-mk.xpi 460018 BLAKE2B 192d34d0a283203d489abb62320cc39a681bba8711f9c05b796aa3f1a32d86e6312ecc3c5bf204700062775844263b995474b245a4e2e52b320bc2793fa454c3 SHA512 9f95cf39cb57b7d44d929ab4f9e97aeacafe23f34dc7ba348b8306f2fa64bb18af47d505822064ddefdd28ed2b36eb8da3d4dc43c2ce3b40399b7d827ec3c5c3
-DIST firefox-78.11.0esr-mr.xpi 541577 BLAKE2B c4d3e712c29367dd25ef26aafff054f6206fd1895ca2163bcb03189c4e5ebc4a846924ac4ec28fe936a6182150543e317edb833a6d63724836c2a93887d31662 SHA512 2d9618b81cee472689e5e452a7ddefd9e5f11f30eff1cc52b9d81ab554f0b2c927b8dd3aa387f82dbfb10cb723a83c102134df344848ae0a2e2a37f534329981
-DIST firefox-78.11.0esr-ms.xpi 453066 BLAKE2B c73088ccda660183023c687ee32b9e6368663e06298b3c6f7bde16771bb8640d5c980c382fc34df29e8ac08447e936411569fc403e16b51ee9d983cc584ae322 SHA512 536b3739a5648da54ce1485320292ab49fecb82d309a60d50aa949b6636771d7247783f03b1cec77defe30306e78347900712c33c76156538f460a6e1e63aa9c
-DIST firefox-78.11.0esr-my.xpi 526332 BLAKE2B 3e293489503022cd39a8f8b298a0103244041f1b89dd4ed3e2851192b138f7718b49813456e355ed352b316d71d74e8c6f3e3a31dfab09af6ed49f57377515fd SHA512 ab17d08f10eeba1dfbc5bba1972fb72b3af892695f03780521627837ea1a2b76b718b8eaf4839b90dcf722e1f607daf97057ea28e6d5ce6bafa814450c21a9b1
-DIST firefox-78.11.0esr-nb-NO.xpi 518531 BLAKE2B 4771a47af1c9d571c3b4b64a363072bea71dc0fd01ff64ef5b8e987ec976e74f923107deb2bfa4d37c78977d7d623458f2bff56adf6e6c14ff24f707b0d0864a SHA512 c1c7f80e04292c596d6c527a70e13685dc650e487161e455ec5685cfd46011d099bb90e49c55adb7a18f9f4fde0d07fcb9383ebaa6535a2b4818a37944b7d42e
-DIST firefox-78.11.0esr-ne-NP.xpi 483412 BLAKE2B 26dca10c6b452561a5a6c43160a62e3cc98346032bde346c7d34a3810509f508dfa33914016db95def0117b283fdce7990168f78726b1a3f645fec5d555e07c3 SHA512 e6c59b96247922fc19d9c5c83e425fd0321855078d233e1e0c659d1e35f742f03f0942f11d045356d94c1cf4c291ba2042d29da434d62fcc862be2e2e49c2348
-DIST firefox-78.11.0esr-nl.xpi 526205 BLAKE2B 371c26004ed153afa9fc347a43228854a97dc64acb42541c43d954b2871d8e26aa083b2c09040ad66cb90ee42560d9f40fbcc69195405f1d8d6f1063bc8742d4 SHA512 13d38d71c6b3ba5adc75ea74181bec1028132d74f38efeac868f262304bb042397ffe29221b7a3f960e99cf4b742a4f7e7f6c60b48401267e8a49885e83b1961
-DIST firefox-78.11.0esr-nn-NO.xpi 520145 BLAKE2B 85577e4f9bcb1cb1458acadad234dd98509339b481ce66a8e1731f33c14538510a8be352f5ca557d7f5ece7f3ac1f96c3d07031250fc88cd2c0cacbd1a8ba500 SHA512 488d3e3b05654309893ca02cd47e924ac8bc9bd8540fba4148c111c7b2bed459f4271e777829733802980318b2bc5fc5f3e56ee2d559bd820b7857e4c4f13f54
-DIST firefox-78.11.0esr-oc.xpi 542146 BLAKE2B e69f3e37bfc8112f74f316258a9e466f21fd807f8e261630038d00b565ef0197254461a738c8fcaface40a5fe966e9ac3ebb14d2120866515c6fd50f459661de SHA512 a53f385c15a64544b8eb2a25a54e6773e8490f2be24e11235e6d11cd39943a60b661cd34fe7d548aafa7f5647d33af960206329581a2aa5c847246941ea0cd66
-DIST firefox-78.11.0esr-pa-IN.xpi 580369 BLAKE2B 843061ff3fa36733dfbcd387091b894fb9a97a062c09aa50e1ed128cf426f216351a6f8124631bbd4b33a17392ee6d93d4eb4bf2f5bbc4848a608c6d414f0d41 SHA512 123018ebb7b17af2343cbbe793fbaacc70abfadcac51841045939c0dbbee8824163f437b0642cd29ae67a2d43e4085b3f4d93790c62034f444d97ea5552c4c3a
-DIST firefox-78.11.0esr-pl.xpi 545618 BLAKE2B 34d80786c9cd9efd7c098c497768a57318879fd74f9e421e770c2dc5e07f40c3e60b4b9b5788c176288ead5e60d349d567023825301c19d0150017ec9ccbbad1 SHA512 758dd62d0ab41c0581271af6fd5d53dd485581ae7d7b0a5171a1b86371f1ec5c5e839e8a7c3eaf1d798e8471fe3a73128d55b626c7e4f04b12bbc1d9f7f5c22b
-DIST firefox-78.11.0esr-pt-BR.xpi 527580 BLAKE2B 000e64f8cfa7631d02432ef8ab7e0966959c27b31b60c9ee7b8c835f04a938bf217192f6acceeba8276751fdd509d01563eb806060ff66ab42311ffce714e682 SHA512 ac9262ed0cb860c50133985a3a61e5bc250cf32f382ec6edcb1a3a07fece2c32be83ba7c65e9252fdaa7a31e355b92d071f9b70cb975a3f7b2bdb4a99b7c92ce
-DIST firefox-78.11.0esr-pt-PT.xpi 532041 BLAKE2B 962c4fde5d32a65b553f2a680c0b7194cb147f26884b94a62f4782f5353edf22d8948a480f92ad03e040d28137382cc9f0eae8d1c64173655228d0fd4eee7f38 SHA512 1019f38b43d4f927e7517423b7a80aa35c4f3a68ffde302edfe4246e66d7b36d8a58172215087cd23691708c4889f964a0e8963c97ec8b0b402f624b13ce66ff
-DIST firefox-78.11.0esr-rm.xpi 526727 BLAKE2B c68b159baec0daf35a7e9c55917baf41eb76e11ea80d61e862b3406b6ca8f7eb814386663e6b6904b0b0e7078db888c9e5a5d00d9610e96c34a0cc80504617cd SHA512 034308373ea6cc8dec37144fb4ffb3c219a6da8473e7378f6688af914b89cbe0a50f82cd583b1097fd9f936bc58766c9758614b311702455db091eac97c33f7a
-DIST firefox-78.11.0esr-ro.xpi 535581 BLAKE2B 9621cb86dae765ce36fdf79f38628c411ac52529de74bc4b45eda1f9139bc5808a46d251f5477a033871c8463c16b78e6b518524d64234b394131406ec16c3ff SHA512 5663db1b61229041b3e5578058b860be93f92d0a8e32f8dfd09ac67d9b37433c37000b87b7ef548a6472e628abe08ce2aa03fbd6e7d3830a55b8983525f7051d
-DIST firefox-78.11.0esr-ru.xpi 614598 BLAKE2B 95c043e5aa94f925b34039a1edfbf56a32c16563a9e8adc3e00f6766483324a0ea64311684af7c46b30a3cc1f36991ecabbcf9c24f41f72fa3db8ec05455f5cf SHA512 e39d18ef5e2446df7a8ba65593cba5a98d20a65fbc653647ce6895447afcd9066bb9b78bc67c38a9033fc9fd92dc0f7b50d21f386bc25b28bf01ba55299eb183
-DIST firefox-78.11.0esr-si.xpi 492528 BLAKE2B d58bcd748fb539ae8c1acceee767d425d74b539687e355e02957adac7ada8914b682de4d6d4804a9c72ef969781d2a0759a1d9c15056bdd82052a7d51a0937fb SHA512 045eb8af4ac605af448da78e4881dbb6212b73956edf3390b959eb32b0f48a968f81ad98bce5429fb56df83b2c8d0747ea776dcdca87de86a38b1a687492940c
-DIST firefox-78.11.0esr-sk.xpi 534235 BLAKE2B d2256665a9bbbf293a990a43ceb84825aeea26a44d19d26dad97abab2b33f0ceac5022835adcc9a3b7084fede17fce74f54b5b2a91e73f26e2a230933083bd64 SHA512 2bf021e6dac9c8fc6c916707eb66d36e633ece6df505f40d31191cc64d58dcf124bf764bb2234277ade7551991ca8e5a66bf798f9d2daeb1b443d96a2faba54c
-DIST firefox-78.11.0esr-sl.xpi 520931 BLAKE2B 41e396986b5b5c2eeef9ffd4d3d41e8146e449872e123f16830618edcca1f8e1de6ea8bae7e844fe98d5868dcec6697a8e462785f109752110da9bd155e9c173 SHA512 c119dfebbc9462523b42cfe12330eb24cb24b6b15ea3c106498c2c11f788f82346eca08e38fb86984509a45b38984d791b464051eddde4db2de60646342e65c9
-DIST firefox-78.11.0esr-son.xpi 424592 BLAKE2B 23c7db38b6b120c85968b249c1941b6809399f2bb93013c3e19beab308ab377ff893a8417701fedd1bc6b6565a2a71c01fa9eb5af4d16c7299c9a3b48b41ca29 SHA512 60fe6345d2433314ecfcfb57eeb010c77ef3b3d91c2aa73bc735f2c8be32ceb126af69574dcdc0b1871b1f38c8be4a179fc3a8493c38d6383c8c4733da68a1d4
-DIST firefox-78.11.0esr-sq.xpi 544904 BLAKE2B 0c1193abfa9fe4107e0cb84184377dc237b5c49458a0dfc3a169f56ed6bb3a91b64d5ebd8a45a1f6723115642f558c82efcb77ac8f44b2d3b02d3f3f60359980 SHA512 67edca77eb401854d651e5c926e1906aa5ff1f542360fa333bec134eb216f1b25975778e6d2cddcf9295ae3a458681ab7ce86c64980edbe2a8ddc7c82f635482
-DIST firefox-78.11.0esr-sr.xpi 561399 BLAKE2B b9d35c16abd775c9cdc7dbb178d6b31241e6d5e4c04026b642ddb619a905c743089285f5a2b22b4730464d44f67ddcd57c5ed01e7c101536bba14abd0407e2a3 SHA512 fae0c9d4a23e75b2c42debd23c6dd75afa4c716d615d9a0339b6e5e7e5c58b2df33053280ab470181f952e3b0fc8822daf56cd32a9af89267c48bc88b4ae1d79
-DIST firefox-78.11.0esr-sv-SE.xpi 529701 BLAKE2B 8d96ecbc1cdc13c376a4c9ebc257fbd01fe267b4b4963197b0f9111b5a0f0e2e89619198a973bad54e5d7c96ccb18aab20bf07e2fe805861a7a1b377caefcd22 SHA512 ea4d4894b3ad4677ef4a2aaaca8acd28db6871556c6551657176e436ca9bd866d5e9b07bd9946772ec37a45ebdd0eba39416530042b484c038fdff5b088f38db
-DIST firefox-78.11.0esr-ta.xpi 521547 BLAKE2B 773132e40dde1f581120e1c97b214c33e4890f8dc2154c1baf02b9d7818ff8be2bbab5546ad8fa6d9c7d1b9c9091ce96fd47ed2b7a57a899e32370b8a50e1b26 SHA512 d6c14daeffb64007a989ecf915294daeb6892e501cc4501dabaaa76f9b117e23bc10da23ab5f41e3be3f1ebbf7c8193e0cdfa08c6cfeaf16ecc7463585b9c998
-DIST firefox-78.11.0esr-te.xpi 558415 BLAKE2B fdc9c213549e8449ab0dea28338d592aeabac7e445cbe0f2ac57a48e312beae38bbab22ba3f2994fd89e29dc6087ce3c3d5af18b70eacba787260770cce7a0df SHA512 d253b4c840a03663f03d77f6dcafddfdd251be5af393d74753b2e95e17f591ce71361e77fb37fe4599d0cb1de18e9edd2fd6d06d2f5534ac763970c58faa3915
-DIST firefox-78.11.0esr-th.xpi 592239 BLAKE2B c37a0fa43c8040cffa385d1cb4f23146ef2fe57df6463354c3b533cd856b44b80531579da53e0918ce38062581aa89948cb6fc9b4f9ecd4668cd5e3659b95c1c SHA512 19bde374533a290dbca33a57dba655f8b019f409f99f04f932d16c47288ca27cfab3293382efba4b4420a84d39599b128929ef63826966205c5cb16ceb926721
-DIST firefox-78.11.0esr-tl.xpi 521123 BLAKE2B 240cfcad7697e7ff58115ac584320d23a7122c3e2ddb02aab50b4d4cd8cbdf63bd3206cb90fb757ee6a3b06beaca0b62bdc2df47726aecb288dd1ea0c2adc8c1 SHA512 f98cc31e55851901773b52a31d26411364f9fd2536823b2b21465ce486b34e798bb4e49135662c811b30d2b136d6e6df4a4c9a25f44d4c9c766a675cbdbf474a
-DIST firefox-78.11.0esr-tr.xpi 539883 BLAKE2B 90b3f6f043f1cae99fbb4fdacdf90f4bf76fe332f90abea0b992149620cdd6e8e0508b87bd0637de9777b700edeff4707eec2d78681e3cdadc5578e1a6792965 SHA512 829526b0ebc7b02b786b54c3dca05ff6f506bdf7326f79d68e71eb57fef0915174607945cdc4f5c3fa480a0e2ab262d8ff732c5e8a4c4af123a1c71bee2b2e66
-DIST firefox-78.11.0esr-trs.xpi 501226 BLAKE2B c3cee10b4987d6bf8a50b65f58a70f50b040784787facd9082fb8ea7b08c4de849e107c32d45088bda756632b8d53798452d8c3fb731faca10dd72924935a440 SHA512 7af715facefe60adfa6f3b83e0deea92ab2a71b525986125c5053aba8209b11a0ca1ba3f5a9a2fbfd69202e27e0691b03547cc62418f247d20ff878603d53063
-DIST firefox-78.11.0esr-uk.xpi 608591 BLAKE2B ec73fd8afd7a139caf91315950ff0c9bfe35d695336eaa807b80ddd477365a6d2a67285f568c2984eeb91d5f625d4e462aed2d81485e54737bbebf362dbc7c72 SHA512 0a32fdb5a0975f79de8a4d8d93da80ffaf7d31bb8ece301e6df88acc2f16c2de46dd1c16f658afe2ff5901f0cb2b73ee638053c16f181df6291b0617e672c64c
-DIST firefox-78.11.0esr-ur.xpi 557954 BLAKE2B 9f1bc9b4ce94eefe33d70d01db4b46b3fe75e7b5b28affa866e87c2bebcbb595d10fd343821515b824ac8c682d8646eb806f5453ac29fbc4bdab3c0fe81cea6f SHA512 a6599d7da6ade73b09bb1f89abf47937d4772d6c060d3b3f3b049b5c66129c17c01e30148787721c255e89b8c2a141463dad7dee2486d031471f847398b79133
-DIST firefox-78.11.0esr-uz.xpi 477559 BLAKE2B a1981f6aeded9be08a2502ab88dac552585de7fa16a6b022fe592130285905599f06b1725c4f5e10535f82160f7b9070a785f619b5f2aca9b8327205cbf65846 SHA512 6811de4a950ca4d72b3567e4dd574651ea7138a23d9b927fb2ee7414a3c4ca40a4142967aa99b6ab69ecca6cf1250ba7a17c2b405b8095afa2633390ab45c97d
-DIST firefox-78.11.0esr-vi.xpi 562862 BLAKE2B 1563fc0ce49d784985f4de6015dd52f6c30f70ce245bca8b98c43ed2500881c30f3606c6290c889ff33ee962b5467eb6eec80632cf60b8105872c32a9f57964a SHA512 ae9b647b80ea1c1d4cd96385f972798d4d40da395c7cc63f5db1ef0d48397eda6bd75e1e9aa8f70d72fdd3bee4c4a2fc99147749ca05c3207d23f047ca1978e8
-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
@@ -196,402 +101,203 @@ DIST firefox-78.12.0esr-vi.xpi 562863 BLAKE2B b0c80866ab862e0d9d43306e897c8b3a06
 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
-DIST firefox-89.0-ar.xpi 580093 BLAKE2B dc4542f4269bc55a849e5a50b3faf240c4299a5cf053cb31975d9136a6a622c753f3d76b697e839cc013fca7ca443aa6b79a66669ed83606dbf812420538c45d SHA512 60d8e158de33ad00d0180bb0d11f19934551f0b54970fac998e56d47f8da02177ad7be59eacd004a2e36e0c438f0c7e1fc369c48e33a96435e7169d105061f53
-DIST firefox-89.0-ast.xpi 506057 BLAKE2B 6b40a25304c24c1fab9d6fb92d5912c993bf2b1749efc4f8a69ad677aaeb97d710f427e37f43dac62f05059645915f1ad7d8672cd1541701720b1e49ed870294 SHA512 d9f9d783e0a62748923bed45a597346c19d849969accab27e2b231ccea00de7433a2cae6fc5d6ff889386e52961e544892e62b79a065f2a2adb09785a9586fa5
-DIST firefox-89.0-az.xpi 503312 BLAKE2B 31f602cba632617ccc09eba7530135a2323d27758bb28367f678ca66fe354b48957e7b7c33bee468e681baff126222950e8a1678a5d2dd89cd4106359e64492c SHA512 23be6e07afc040eecb277cfc1c7472e8d87eec3308569265378a98fb64db857c61d2370af3171e2fd27dbe130b9519f98f9fbad134570a102d8d653106313e88
-DIST firefox-89.0-be.xpi 631192 BLAKE2B 23761f04e55195f50a9c1a47634c1e0b089b739fea768af98f8873ddfc324f68c5bf762a3c929b3a7a6b9cf08554546f0f1b74467416484876da0236fceb6df9 SHA512 c9f7060a7e02dab1e653faecdb417ea362cda8e16811a180dba861ce6a435f913028f7e15e4864490513ae606da97a4a306fa6a2cbf0a731cd7b6fe9768c2bb5
-DIST firefox-89.0-bg.xpi 576970 BLAKE2B aad84ac50e3a5eca260befeba09ef099a8ae4a175b4160a8c9efcb80c00de656c9ac0ac88e4e5305de5342604447adb66c73bdb82554392ed272700c1280e909 SHA512 ecf27f9757c60cb35575cf9c85014cbb50a5254bff50cb6a67d2d7ee9f8316145e4c1ad0a128a21dca7f801d7252723e8bb776075af70722e47a1f02f9443e75
-DIST firefox-89.0-bn.xpi 579296 BLAKE2B 007183f8214ef8a398e7a8bbaf177cd6443054a2236bb59999b20c9c851d7727126b1acf75d6f13683f480895c74b022691d9cce55ef39148baf72b54b808bb7 SHA512 e1416e626f5e2257b5b42e417ab568874e0a8f0df88e8e14b8d0fc379da2ec615b1f7d83281e89b4d302a75b85229e85a7dcd6c0be82294db4e76ff64f8f71a8
-DIST firefox-89.0-br.xpi 527037 BLAKE2B f75b59552a833d0b527c0a0cd7a96132e31de3ef957aed056d43ad1c3f2d6534ea1dc12b5929d54ef3c1f3925166609ed691467efe186d334cd0e962b1f156ba SHA512 5c64221b0f54e61625425715d1d969782ee8b2e8d20f84c4332910aff29c92a84d9450e62ab290df131e66c5b9972c19ada9cd706e00f2fcaae16f06c8659416
-DIST firefox-89.0-bs.xpi 472172 BLAKE2B 8c04c8fc80a3073d140165d186771efbe71cfa09d6332865f1389ae49461420848a749a3d15403a90792b7fb8bf6b99802c8460e2170afef54d03b6722dc326e SHA512 88dc9783914253edfe7ab1891e633de2124b21ae977183a158970163e808ee2ad511cdf690f05852950b221feac0dbcb5bc2045fa72caef8431bbfd0b5b754dd
-DIST firefox-89.0-ca-valencia.xpi 548358 BLAKE2B 4893c67291abb0b5f0ea995860ffdff5e87146af6fd7d78e5c00c46092902ce5bb15939d2147c595e331421b55a0353a30cbc65e7b6c7358544999a1e388700b SHA512 86a44a82faa05b56e5d06e35853c38be3d22311f3753e7384ad0d25972f82dc6ecd78af963d9157cc6069f8b1b039960d16ab42b40b06b67f5ef31d0a2d7f44e
-DIST firefox-89.0-ca.xpi 540877 BLAKE2B 38886de1ed71f4673e040909ce3594a20dc187d26a1e1a4efa280944a7e12600039d17cf13d47b7be0ea4e190e245fe99cb3ba227e40c499ab53ad49a681b70b SHA512 6134a2c547b13a9d9d1d36bf4b9958d0301a99383ed45efd0719bfb49407c8d6739d3df453eca1fc82c7fef85f0bf30d93a1161e630ebc1f9a91b753a032d904
-DIST firefox-89.0-cak.xpi 572312 BLAKE2B d5cf23c2ecd65ae92def715b0f1678ab61cb6d36cfef3b2fd286b673c9bd9f3ea3b20f989b7b7eb78e53ee097bbf3343efd1b641c39e0d861a61450af6cf43d0 SHA512 856811d0199374bb4a01e839d83f19143079007e0da1409a91b94571a817bc38f5a5f0a1a91dfe7210f6a0cdb65c52c440e307197a02b28fc4f949e54b55e77f
-DIST firefox-89.0-cs.xpi 572805 BLAKE2B 06076a677b6aa7b238a9dccb269324682ba2ac42bb099456b6697a8abf9a92fa418d7ea39191fc350d60549babc5b0fbcc6b31bbdef4301460d9a2824b77829f SHA512 f63932b8f0eac207c24f3d7cbfb94a7fdb882767897903ce9e65adb5edeb4af875ace61ea933afb88d9977cd8aafcc1ba3eb50c61d2a7c2d785e1e6aa7d64d84
-DIST firefox-89.0-cy.xpi 551348 BLAKE2B 5aa137e9b64c34b578a85f855fbd4617789e78a10c281ef2dcb8a82a12d884d85b2f5500ba0b938a610a38ba014ebd786e163378e6f78bec461a497e58664c1f SHA512 e17f524f0540f34353c59b802c4aa1458e89f75c92e4625d668b5923b2fd09f166660746a4d7c5fcfd1bb2ab002384a07a2d07d05edd133acf51483f5ed955f0
-DIST firefox-89.0-da.xpi 543288 BLAKE2B 98d6e15a624211ac65e0209c35c7306aa41f142e7fb8472afdfda5f60b92a8f19c2e9d14982e48c60d57c24f2c56a4f7a7137491fc300cad04d4c351690a6c70 SHA512 cd72e36f9747ce3ccdc29459c312abf8bbe67bd5e1ee0368f5c7a428c4a6b3dfa073cfbc892e38d225755898d259d0069bfa4ce882ccb5a9aea1dd6574c2e716
-DIST firefox-89.0-de.xpi 563045 BLAKE2B 3df897a9abfa893d5432576ed260bf04df212878c38f8a9f954b8f1e62694f964127345a514764f18669714921b3276b3f18860dc8d9473a4d7485644d61986f SHA512 e204d0ebb7058801249b5889945f67df60013fd3f56cf57e9d23bac37238aa4fad1b9eaaea863004dbcaabb890e0c30a80e55f69315d75bc569c2ea60ccd6bbd
-DIST firefox-89.0-dsb.xpi 575725 BLAKE2B dbd465778d01e8702f0f78b1be2b446b03dab8f604c18defaaca1b2883dbabc87bef4d0bf690fea1b14b045464dcea43f04fb64a090c0320cbb028e6f5fc41f7 SHA512 ad6d681a51a153788a86dd72455e7e1148c6887cf56975f664f9da3c32514491c8f8b4f848e05210377c5cdba4bc327fe42071956bbf9d8571f433f8fdf695ac
-DIST firefox-89.0-el.xpi 649167 BLAKE2B 755817f5bd3d5d2e92c0d2587f850f16ec6126af21b0810e0851a0f83820d8342dac97cff1c9a5b04a60cde53495fcc25556eba329a4ddb0d5100ec13a69dd8a SHA512 906592944bc2a2fdc060d125030b0ee0d0976995c7e3685a7cd50559a5d03dc2dde2ceadfda041a1631a688da105ae24708b8b7e196c494fa7309a3a91366a14
-DIST firefox-89.0-en-CA.xpi 517781 BLAKE2B 210f4b1ac73e4909f862e7f6c86938a07648e52474a0a146f7702b8a15eed4818a1aa0019ca115d7b8dc7465a72ca813cb58f4b1292df44a848cd0c99ffdfdf9 SHA512 72d130ad92ded6527280bc4b28041ca9deb8da18f04843853bf463d7b9bcb01dd0e76dfd5cb0a67cb356743264bdf921c5961d2891bb751247fb31b7816efbc2
-DIST firefox-89.0-en-GB.xpi 518774 BLAKE2B 2b8e0d0ab7f0c76299fbf5092b07f6a10ba89332361847cc7f3f526ae7cb12ea503d7f0793c4081066d1c56aa56c1e92431ecd21e819344e2e3289dc6949b29f SHA512 922cf46a7d9409a9ba3c7844f8617ace13383279dee1a6a6a78e7254e44edacb9958d486a6b597bb6dc9fa765a22e5fd3d20cb391ea94bde0e744efab72bb2cb
-DIST firefox-89.0-eo.xpi 543566 BLAKE2B 5e67e2055d277bd7b97f252ff05d223442349a4ad62d1a005cce1ef268e8a06c7c775948874938d8c134da2a7101ca288130c431d3fbd3d0af6d94c867c305b5 SHA512 a985a486e1f06da900deea570227159736f4af6df0262c5e4ff989641ccbd616e3f4d29b45ffdac39770ecc33556564e6833857a529a6706acc76372f0074c36
-DIST firefox-89.0-es-AR.xpi 556496 BLAKE2B d8b19b5c37ec4a268a946e0866eda4a2c59c30384bcdee6bc326012d42d68472cfcd242ff75a8fec11adb963a308a4a8c3cc7296c82fefc6d6c50ad8fdf0b828 SHA512 27f02c43e047a1e29eef36f3c34c2663b18842528d9a842e3c38f0a3c390f3cf40f8d7e3e1d686293795a9e4b61adf86ba9fff550ff4ec9b65f7fc2262bca759
-DIST firefox-89.0-es-CL.xpi 554620 BLAKE2B 2c839e0927d6e7b9f9a05cf72cdd592f083e8ece009b0fb8f94bcd02992a96a317ff8a437b0f5785b44055e0b17485cc1d16ba083c61d3f6510c11791bc921e7 SHA512 117efeea143c49c6fc0991aec1b1f3b015a8fcb146b1644c082f39c8c06d427e57a7fbb3642f6f5309ffe7c651810e71f53d0000d07ee9dea70f31387c6b76cd
-DIST firefox-89.0-es-ES.xpi 545105 BLAKE2B b9efd0008e8f54587ab5ecb30cf5bacb2440618b8cc7da9daf2d9f4c6070b9bd8aadb1408cf2f933f1716aa403ab49daa9304aff060b36c0e294639265948379 SHA512 59d231f33eba50b9d3031ced9949929b06a6af929471c4e06ecdd933c9726fa5fdb84ac333438ebfe421ee718fee4908f355600031c736dff0818843f21b144a
-DIST firefox-89.0-es-MX.xpi 548396 BLAKE2B 0808ea1a2f2ee5a51966d6f3f36c73a8d9d4f4e92604902f608d256cc48e41d9e984bac919266066a8c6cbfcf83136acfb29356c3668a08843e03a4c917d128d SHA512 39074ae46cdaed70682de46ef59a2c60e4cb6670436d3f3dcc76df825c392fbe17c67a1b00b9cf75ea740aa95c13856c07a63f1ba3532c19d354bfb94088e2e9
-DIST firefox-89.0-et.xpi 496460 BLAKE2B 6b50823eeec0e44e0a0eafaf90b4663e0e17096195260497653547ea635eac67701eb256ae9e3f6a3ae6c3bde4b814c286b852930e98457cf35f603bce3d1762 SHA512 bfdd02e2d41b00000e84f92977958f87abac95375abc54866861ade98c78ca35749d3b9edd32c1384a5c4da33b0939ed89464214b160c277956d87bd6f98c7b7
-DIST firefox-89.0-eu.xpi 544153 BLAKE2B abdab27c63fe941d36ab271fee480d2b17567e2ddfe0b8cdebbf83692a68715a1c52917e55d4ac14f711e764c8dcda2e12fcfed49623cbca3e0f117b3b7db2c4 SHA512 3b466fc839801a6ea0403799c83b14b143cd5c06bd9a0fce7a9a6831624580f7de91ff306283449c53d6a195108ba2fea501f5a9394adaaeec4375b111e7f7ac
-DIST firefox-89.0-fa.xpi 561129 BLAKE2B d9b44f6c29a0a4a3a6cafda47716de9d0bff86f4e3c139f0e86b02e0db6f0519b289770872de6eaca3ab8b9564768bd0526c95b187c511553505f326380b1c83 SHA512 542f1ff846ff47dcbabc19479cbbf347d674580e5d081f21e0108c964ee00455cd1214fa45f847906c4084c24584c69e8e824655a8441198996390bacbfebd58
-DIST firefox-89.0-ff.xpi 487850 BLAKE2B 488c6d93dfe2422576d96f8454a0982108227511bff1977e7eab17a0303d4f631f4e3992dc732b3112094fc9e19b84592fb41654f5ae82d33e1c1c5a809387a0 SHA512 980aaa3ed22acfe77f12b31762f101c41a46ee0e59dc41cd9d7a7873d19f42843db5ee151a3a9f73d8c11b6584ce1dd932ecad3c15d991c4b55bdf8d13d45522
-DIST firefox-89.0-fi.xpi 542136 BLAKE2B 37a07892111d05ed46fe567010aff69c23f437137c8269a743dd1138dc7658bdcabf96fa17bb5efa043bca753d517728627b43276c49aa874c911f5a4c88f118 SHA512 5ff3e8394a032f4fc35507a823be3121cf9504a5c8ce968c6580c594f1789adc5ddaec1abd2683dea1f4e09d90e7ea2de989b8dd60e372fbcbd838e0060a750b
-DIST firefox-89.0-fr.xpi 566466 BLAKE2B 69394e105115e98e0ac64bd7b9aea3c5f8c22cd8d19187ed9a3f5e763afc2b7c468d1070280a16c1507f343cebf5e05e723251a041702c6dc3c84fedec89f584 SHA512 fcb19c37ebff5d0d8124dcc7b05a5f8c9ca0e39ab6ade05b6a8879461d42f050227dc974e259606dd1d8ee4789e6081f6d647dca3ae58a326cd980fa01daedb6
-DIST firefox-89.0-fy-NL.xpi 552202 BLAKE2B bb3a9833acdc53f2442349d3bccec48dda81c642be9b21c4e0c901c53a6b74bb77d7676a07e9d91516c72b91f436cd59d2c528ad126490b8c9bee72c0f1cdc51 SHA512 eeefe846a98e844dff152d34fc609b98d10c8a0fa9b4d936ee80f4904191ed66e1d7e752dbee6ee5e8ddb94aaf74db82eec73582a8fa56a16b2798c38b14ec34
-DIST firefox-89.0-ga-IE.xpi 472857 BLAKE2B e3a2392fbe81bd61a19ad2a922137c51981e450b85d72a9507ad7ed1a53d1c0986f12cfdc02b8af9d5d1618527bcb358b5afd4500b0efe6486a06ea5706803bc SHA512 d9df4c6a41c25f51a88bede7e2d771ca54a31d56692b6843b78aff55bfc866ad46f39545e1beea6d46d65381bfc25fad56510b2dc4e7e8b9659262caa6f30ce7
-DIST firefox-89.0-gd.xpi 502210 BLAKE2B 6b46c88f465047cc111733276c56ae06ba83dda907bd93f7ebc0b9478ecc09ff5885147e3d63a9f830e9f189ca1ea65f832d8c504d08fcb8e90d21e2cd8b3048 SHA512 26ae967973031bf0aa9f9dc90d3d568af23d9e8fefbf4100980c8583f9c9ce54505df042b8c23c6de41b37ee865f39b7139e2ce19f661ba6602d7848566c8e9e
-DIST firefox-89.0-gl.xpi 551076 BLAKE2B db921351b3edf459a3ea92b94b25f74dc94f4b905db617e76a4ffcbb634f74427e33720ea549b0cbd40c89b34efba26685c7c91c502d4cd8d916320f95b68e30 SHA512 951344d72c127f6f2c38659b459e14e3ddbb392e6e6893871e186b9cf319675261d65c7aae7603da6dcbdd7caacf4303f2cc6c8ac3fb62cb93d21574e405dd98
-DIST firefox-89.0-gn.xpi 567486 BLAKE2B 1119215b99e6f8abf5d498ffee4ba48ff22dae13a3a2ceecccffa23bd5b075ad2ee4ced43f835f1ecdee2a1858c6c3cee6fd6ce2c0f7dd8621564c243a257ffc SHA512 b7a3a07ed1669a47bc8f1f449122b6c5c438c70d415aed6828853175769ccaae09b6aafc32d5979f378ee0b6ce5f058945b300cf8c67d7b395b6a63174afbd1c
-DIST firefox-89.0-gu-IN.xpi 547170 BLAKE2B 10ccf0a24d88c23ed60dcf32b166df7d7f81c56abe1863ed1ad5e17e360cf1bdd8fae4b2c063d798355cb67745f2b26820c070ab85e57b2296b47b1f1466112d SHA512 555c6e5f6bfc1bdf5f79c92aa2e81d682829b1955e8089fbfc6169358172d13372d38291cdc7e1931686ebb193c0396b0a5912a5e19c6dbaf47512c939dc7229
-DIST firefox-89.0-he.xpi 566472 BLAKE2B 103b71e94c9a115e920f4377ee9ce1827deb3b7ae851705a70a4cfa595c3d9a3e89f9879c541ffbc0255b18ba0f068964227ef66d460538a7872f4b6a7ae0d29 SHA512 e7b3bbdc3c36e0e8f1244dec3e33db95f0b35b46f0f9de9da5c6ad68afeac2cfba34861767e1565d50308260ccefdf2cd5a2b7f8109aed9893d594aa334ebfc1
-DIST firefox-89.0-hi-IN.xpi 579120 BLAKE2B 7da8b6ba3e20a26bd9619d955fe1b031962a327ceb6e15fef30d3a9c791d833e3695605a94f81cfbbcae2a20b2edbea804ac74c8c0074da36347ae5583fda078 SHA512 341a132fdc118004af5e9a5c4cf612d1e97d1f998bfb38504b0c9cfee665ad55b428c73e47f8949a15bb158ca30ce0cbcffe5cb72d89620e465a1c0d216c5e40
-DIST firefox-89.0-hr.xpi 547981 BLAKE2B bbfafe8af7161c138b598e4a098470a48dfd097daed74a92e98782585af400cfea905a594dc03e7183d15cd001d1a488ce9647e40b20dca491298c1461ca8622 SHA512 dc9b9eb6e865781a7b8844d59c5420bf2f077dca1a080d74d8020bc0365be38e172414e7d1688035a85822c724377653349ce17e64c2b1e4b0842ea2c1bb3de7
-DIST firefox-89.0-hsb.xpi 571862 BLAKE2B 8aae767f653f1a056d11cfe64135fc7dd1cc4f7b7a7cd0860ab36cb817461e87cedaa7404a14ef2eb04550468c4bc316d9292a922b772948b8c39bd905c68170 SHA512 710c1859cb15fb3c370dc5d063d63508fb16bdfdd274e995e00491ec5d64ff16ff73b91466dc4ef694b9b9170c66fa50125e348c130dd8ecf5b9fcb34ff927d7
-DIST firefox-89.0-hu.xpi 575477 BLAKE2B b67aca1edd96a9a927013aa4c6f6adcbef092d777573e79a07b438a7499a078643f17f933a5675d9091a5a78659d5dbcc7581d51b004e12ed035f28766df726e SHA512 37613893d6ea3162a4ec55b680099051a98125ac5d877268cce6f834e28045eeb09cdaa01d5eb6e208d312ae09b45989c7ccb67e7faf29c498f0f7e94261f069
-DIST firefox-89.0-hy-AM.xpi 599171 BLAKE2B 496177baa604245c5f251777eae2c4246dedcdbdc5fd7e171e65e484543d9eeb3255535ef1892873983c344c54d241fb24007ee348bbc1d7fa1647eb2c3b7c0e SHA512 3e03f45b55cc8dee73c9708a98c72be287dcdde76ecc83439f243a55ae20f9ceffb265dcf9ae6e3cb86fb75cb6300dce2b1624b3be41124999e0e9008dbdc9a9
-DIST firefox-89.0-ia.xpi 541186 BLAKE2B 8c3e84bca2e916eafc9ef4d03d81fcaa8a812f11f02a5b463c3148de91549b44137a0f6af5b988ddff5815b99615cc9dd5260e8527d8e559e3db9e73bb82b472 SHA512 081fedcb3911021d79fa52ad1573bd939f83696de5624930d52944926cb26aa77142349a09baf74f1509d1ebab583572d56dda34e78081d41801086414c39520
-DIST firefox-89.0-id.xpi 537723 BLAKE2B 2b3b3816ed799a1f3aecd29ac2bacf147326fe54a556ea17f7d9e69e7aec2899da27cb83ab2a636e2371ca0d1d64934e26c118ab57ba4f6c8ead1a4283d23c9b SHA512 54979f34425a3ae55407d099fca30e6293a29a82ade6f3ef7b3ca7187f9414c96e1e339861ac5d6224dd8a379a53a4c1ea845356e42d0d22e99d6b0ebd139a03
-DIST firefox-89.0-is.xpi 483449 BLAKE2B a75afd2c51ac04da1d0d6628975b5744c1ddab6a94d32356304945dfab506f5f351f27551bd4171c6a2eabd3f50cc973641efa4e99f4e0176bfe8700547bf857 SHA512 b42de1855aceca779bef460b355d4413ec5677f54e5f037229dfe14c5de56deafd36288a83ec8710ba5247da81aa4bba3ba97c579dc6f83e7d25ef5dd53fec4c
-DIST firefox-89.0-it.xpi 469422 BLAKE2B 54638dad88408d0abcabd6b50ecf5a38fd85ed4f916af9d94a5f8e668cd53c4814dcbaba633f850021157856a44395ced3b06a2eee0af9c8d60480dcd83a9c21 SHA512 226edd1bad94e895488a479cd0226909bdb37e73c2de2f78a634ef463fe455f91de39f7332d4a68af9a9a0598e53ded553afa841e4973ba18c26eb2af9468dfa
-DIST firefox-89.0-ja.xpi 601275 BLAKE2B 563424d6a28553ed6082b6016a73682ad2691e27f85aa0881fe61b5b03ed6b21e74ba8ffa62825ec66e312a5c1aa1d34a63020aae4f5e253cd764374fec0a5c2 SHA512 fdee8a09d425af6f2c08323cadc51d7d73cc40d49cca075317cec96da46884dba45359192e1a219ff16399196e838a7e0b4bb0739f886c7f9ee7f74cd12c9c27
-DIST firefox-89.0-ka.xpi 603273 BLAKE2B 3c97405156d4bcd1612c2a8fbffa6a26ae6869c57b140a3523ee4c987f28144ae0c0d87fdc7c1731ece65072a2098b82bc6840b9a27b2b69ab030326cc95668b SHA512 dc408827d387bee04f0b49501cbbe54646dd7a9bee4da6034d22370987f384e9bb774a0bc8b5d38e3fe8daf290ee76165d9957daaf363068db21c2e034d48c02
-DIST firefox-89.0-kab.xpi 559616 BLAKE2B 37f1d4dc09a709261bbbe9076f070ecd67441df8f0470b3a907320826d708c1fec33ec7be38d2d33fa4add74123bf06cd4e17a9577afa4a3b2fc6dd20b9e47d5 SHA512 21065337584695324e0658e9ab536dce4f874ba95f7fdf23344045df522cf1d4044f403ddc2e77a482e14a62e87ea8254d1abff83cf125263c27c9ae584406db
-DIST firefox-89.0-kk.xpi 618863 BLAKE2B b58201ab0ad7998ca7dd8e0c6133f97b473239c94c47f44216b274fabae7d78994d9701d6a13a22409af26bbcc8f105a28dbb7e7a4197497f5a9a38a8b81d940 SHA512 babfd593996fed02efd165a80d92c61da773d882bb76fe0e0b901784f9900b472812fff47bb2830de2058869c432e6932704ea4197f374de92aabe0f98e4c16f
-DIST firefox-89.0-km.xpi 543106 BLAKE2B d6b22c64a503a5b9910d419092234bb0664ed316b2bca79a724683f68956fa9468463758e52a14d9dbe8fcfff32111386927669dbea2f259359cbf629448763e SHA512 568c78ce62b893306c1ed3681612821048c89aa562402e4eea874db11086ffda2ebf5a872b8bb6c753c2a61a5d11769a0b29b66f5420b3e4d53b46bde49a4379
-DIST firefox-89.0-kn.xpi 510229 BLAKE2B 83482843a00dc563e759a1b8769e53471859fa843f69e82a5e43a824c3378535d82d9510dfbd5bdd996a5e40e8f8dc6289891dc614ff2bac400a39dab00a9722 SHA512 43464538a8495a2f3654751b12bd1f5eaab7ffc365f0f61f54315451cd85d3413c4f5497dc0bb65329cc90fa774ef83c45adef195a07020d5e511934cb008cc6
-DIST firefox-89.0-ko.xpi 587144 BLAKE2B a70434b3bf11877c71fabbcf47708c05c38844190b473964c9cf8011cbab8dbc657afb59b5c6807aa2a537dd3748a0d1007ca6b0fdc39efb2eff61c9d01549b5 SHA512 ea401b49588bd7e4b42ba9211d2d2d05adba5b027c559d50426caf72336a96d9cf14f8e3eae01c6322d5696c7cd82c90c237053aba1660710c3bfc4d73b06228
-DIST firefox-89.0-lij.xpi 481899 BLAKE2B a82537d943bd5996884da7205c23e9af89f72bf848810bcc82fb23a18d8fe00f26ffc3baa73320d85350d0a42b49955b307ff0a1f5cb03dabe732dc854118326 SHA512 647c051f6faa92a83e37c480c9939ed94667cbb34e9db7964bf043f8742fdf0cb4e6f4110341da4bb7df0c1355bb32b09cb7dfa97955cfbe30ea1622030c5760
-DIST firefox-89.0-lt.xpi 568939 BLAKE2B 0ecc128f2635249b18f53607b401312e3a9383052f75352599c1ae2de58985bfafd2d56906775e0c079a47c24ed2bbf9efafa4069267214cb47ebdf5b904d55b SHA512 4b627f4e6240821174b990bec50eb3b2286543cc36f6be3202240a60f59eaee44e2b44f0979994de67715070a7c135bbed123cab75beccdd4b43fee0a8dc8cc4
-DIST firefox-89.0-lv.xpi 475440 BLAKE2B c3de085bf316aad37a1b2c9dd22ad49a8a8b32817002b9c9c29838c947d3775985e35a045476a0cc47500927b869f9158f13d716980e7086d8e61563bc4a91a8 SHA512 9459adfe10f203699ef773b2640a92c2510fe0edf348ba2feace9c892c57dbfe747925a9eb4732b00c802ba70e5635590ba15e49ab82eb6ec7973e49b8099b2e
-DIST firefox-89.0-mk.xpi 471211 BLAKE2B 7dd9ce39d3a9a211eb614dba6276a8cf091ace29e3823a70a8512a9b196e98f99f1edd246c9a0eb176c64a142a3e9b7a4b96a16107869e1de6862cb14cbb6b86 SHA512 c5b78492baaadc0f64dbe4a1b78a4636c866fa1c5c0b36634f80544c9fbcf2f83198a2dd7fbdf1100cc997ceeb59bf62ce8a88de20c07b96eb95b743157c0120
-DIST firefox-89.0-mr.xpi 547355 BLAKE2B 1d7df95907362ab7e0f3c82d47cf9a474de931cba80dad62a4d6dd555ec38f09e2e6c0ad53156774dc7cce914dbf96ba37654d0581d25e6ae49747915072358e SHA512 525699485c51c85ae92c81e539aba6dc7425687ddbfc53d442c7f43c2dfa214c89ce2e80c9a1ba35b56c5aed49718bce3a687d40b382b29569316a92f441c2a8
-DIST firefox-89.0-ms.xpi 459067 BLAKE2B 0e7f57f65f7f5885cccd38f33de852d00232a3731330a3914802644418460a31bdade5b6c564e9aee153e351e2bad67638784a7733a813fac819352392a88a2c SHA512 101628191ca8cb59025b610210f589656a0f54be54b381fb4b8207a862899522ab6d251cf2f21fdfbf93acb89efd57b3b017df420d1135d431faff74774aeb7d
-DIST firefox-89.0-my.xpi 530823 BLAKE2B 2aab1ce79a8926b0faeaf18a3d1093c6fbbefd6796f25f4546b1f3049a59366fb080eb9a9d0f2b4c7a09771bb69bec8830419fa3baf87a57a0247ccb2037285d SHA512 3e9e4d32c62471f084b76bc73fc6b0f6b4bf0373b2009eea6d0a5f6eed0402ba8f890328a9fbba1df25d04321c4e37b1cfc35aab68f2c5fdc1002ba37a37244b
-DIST firefox-89.0-nb-NO.xpi 537947 BLAKE2B b881032a2e687de6c909301e078afa776b5fc9e36f5af9898bf70cb94fdc09063f80e110b908d390629df7bc567118d54b31872992a06393c5334e10eefa2e05 SHA512 3b811680d3d18c7ecf1818917938b7b21ee5934bd615bc3e97244e49ef4b176d4cb4a83c38e633c9e9e19acb2e3c1bd768bf6df26467c1bae148f9f3d055d3ae
-DIST firefox-89.0-ne-NP.xpi 487881 BLAKE2B f3244fce1c2a7f95f1521f67cee4fdb7501af89424560cc5abbe3bf0c40ffab908737f632a7d76edd5b17a938931ffd9846509429f75a79b9c93999f3ccab9ce SHA512 fa5097259aa30fe280324078fc78d51b5d3a75f8270fa2caaec70f6dfc69276586cc2d44ef2c9b3cd253b87f03e60eac6015ef54cff7e5e49bc5002ebe96f4e4
-DIST firefox-89.0-nl.xpi 546008 BLAKE2B d1d677590a822e8cd1d1c7ec451bb1290f152c0084830f1e645858baec438e86181bb386f7606dab197c997dd5566c8a8e22411cd7fadbd7539fb13d5b016118 SHA512 314789b591c35c4463c1559d98bdf1737527e153e4ffa8ccb968ebeb81aee7818f566c668e43f095f76667962ca346dbf412ec493c457f7fcfcc29b01508f2a1
-DIST firefox-89.0-nn-NO.xpi 540491 BLAKE2B 55e716e2baf59fe65d5812fd57c4ca2acf472a33c5fa2cfa81810ca55d92c2fffed3d08b902f23a77e6b39579efd920b5f57ab164b9dff8f7546d8811a873730 SHA512 7bbf8c48923d577598fa2b94f746f912a123b3ac8413687a34c1a1be7e5a931ebe49b67676dbcc465595a0ef616058f8dd26e21c98cead6390d223f324434d49
-DIST firefox-89.0-oc.xpi 562502 BLAKE2B 6732d9bcda5cfc957f1ac6789d560b45f5c1f93cc8dce6dc742321c101ef9392e4afc880da973d601a2eb6cd1445f5e936c8062c89c4a6a1138e7998e519a950 SHA512 d0226549199784ad1d2858f637cd748aef3286b1bc7cab6996d2dfb27e7f43410147e85f5008adf937168f55419a24802f5c2d84acfd893892993e3e2952f369
-DIST firefox-89.0-pa-IN.xpi 610372 BLAKE2B 1a51a6ae6f8059a2d801b1a3f2a9838f8c2b9c99bf07f2aedb6a0156cc32240eef601226355650c4d0528c070445f0c76577d452b376bcc068becfc0dc9fa68d SHA512 7a88768a7c04aa87d8feb909ef65ef278846647b6a014b2b66b3b333b19797a969804b3d023beacaae52d529856adf89a0ad7ca84823db607019560995128dac
-DIST firefox-89.0-pl.xpi 565556 BLAKE2B 9f534e793f252c0b8c4bf4245e0e27512e6cee90af40bb2c73d839b892f131d33f8cecdd32477eec0a8059c59c7e752e9657874aa239f996357488e4745c78d9 SHA512 d43bc7b2c60abe866003914011d8ac2e03e4fbfb332ac92ad6d8327ab69ec5e423accf0cc61d8f1052325929b4583e76a029d8b8cfcbcb8e012f26ad7c84639f
-DIST firefox-89.0-pt-BR.xpi 551777 BLAKE2B c110e7173cd8f08a6a80f0f2b7a7b9f62e5d5b7fb4c8ad865a84b552363a7441432ef76746ccbdb1cd09ce778cbb07880d199b47e12e45036d3f27b2956f5908 SHA512 4ffe40da04ecbbbb04541aec49c61de4e6063aed1e72679a40bc3a50dbbaef04c94cb9e97e400044c61c9feebdb1a067582ddaf212af3d207fc77bd443743072
-DIST firefox-89.0-pt-PT.xpi 554258 BLAKE2B 49f46537b3cfc45cd088b5cb84449130a991cbb31cff5af45f41c7cb9cc84dbf115f532a112e9b7ba03f421aea5eb2c6e00958abab50a8e89b9247f7d19ef0ea SHA512 b419a87a2c21e5f976bf3aa74ca7b8acac6aae135c6c2f577de531e45bf26be52e0671c54e6e2460ff17899abeb0d71a7a39037f634043e5824de39a24ccd24b
-DIST firefox-89.0-rm.xpi 546488 BLAKE2B 847251192b66885a35010384c03f4ccf63b90ea51292c9802d5b9e3d8fc452361cd57e8018ce62e0b20518d35c47afc47b7fe4cc0585bd90fac47a8fef52471c SHA512 2619e0079e10cab7a718725ed4b3b016f14f78d643b6dce84540ab9679065ea541ab3c2c23f66c9327dfbd355cd4e8c7a127ecfeee85f5bf962474920731d65f
-DIST firefox-89.0-ro.xpi 539729 BLAKE2B c3e4246a57b05ae23658d60e56e869dde6733bb1f0af73ceccfc953557d770aed5be01f9e3128c66863faa3aa883db9df9fd1c53060cfce7c5295b3ab93dc569 SHA512 a8a9e48ac09ef84bfdd7645724d01f6e63f022ddee9c0a29f665e09084bf045397ad1de8cf89353bb34f68c0bec92919d3c343892f0223e070640c2baef6f035
-DIST firefox-89.0-ru.xpi 638010 BLAKE2B 80c13a906d27ea5e4047d62acb44ecc10a48f9fd4c46e96a16d2f4510ae1130394a73847251e238cecac2a68d5f2f811a1a4a0ed10da4dead9c24402f293eb9e SHA512 3bad5ac71547379cd88be14e8544865b0ffd7fd2984587da1fd367c28cd354512442e7b5d21fa139b6f549772088e7a7b82bd4366c3722c862ec70f24d8791cc
-DIST firefox-89.0-si.xpi 496809 BLAKE2B e905c7eb52359b17c624a2aaa00468a01f2df4ecfcc2410657982d32f41dbd0e7c86f6ef4e6a0ea7982abcdf760c826d1431eb7f2e7e2a1fa6009017905ebf51 SHA512 97dc99fedb9d7d651c9e89ec1bec43728fc3c42271962f7091304d46d038f554b3b4997ca8b861064b1bd01bf62c95a4b75c28f2b0642e17b492214adcfd3135
-DIST firefox-89.0-sk.xpi 575285 BLAKE2B 25bc0b37265067ec4f38c4556b27f292f98273112737e019f9eb3d657f338196c618a0206db2ce05749ea81c14541058f1ac859352b29b77ec7647a8e7f71ab8 SHA512 56ceeabb43fcac2c6b888e0f6b1433ec508918127271cc52b68aec040be119f05ab603be449c1943bb40e47acf0878bcbc1b663a416ffe2e6469236a00efd940
-DIST firefox-89.0-sl.xpi 545282 BLAKE2B 88be79bf6d1bdbcfdccfb0d50ea1b9c3aa03d350ed43b833e02ba8710b76eead3deaad9b6cb822fa01c1a29cdaad97114cb5ddc0d2f466c8f021f1dadb1e3a4e SHA512 f5676e2024207237bdaff6b62469c389e22e09570d8dbbbb71e7afe8329600684d3a0dbd2d22823051784f62596517554463d78be70f61113049ffee45025c43
-DIST firefox-89.0-son.xpi 428542 BLAKE2B 33c6803c97bce89b2ef4ee9376bea7c0772b99393833ef82a7af57bb2b5d3c768ac4b1c40494a785cd138fc2b33c8db7046a4a877ad466a77fadb3c56db6166b SHA512 abbc213a378b680b41d7f7a935d095a7d28e09055fc9bf59c755e655f858173ebc151721f6af37870e282f1b0c7c742b7259663aa2badba30bebf437b044457a
-DIST firefox-89.0-sq.xpi 565304 BLAKE2B 67aa8064682e40c4e99fef3ee938b19de2995c87e1628c8d4d3a2dfb5e94208d8d0b4319d6035d028b87ae1fc6018e2888e1e1f730e88e2d18596b9fcfc7789d SHA512 05d275c69947fff92a3176b3e88f98466c8d5324755f570d7343c17a65f532abdb8014a54f6d065b98b620dae4bedcb4bfd5d3e49f6b9f0b5b2ccd590164e482
-DIST firefox-89.0-sr.xpi 597862 BLAKE2B d96bd51525d754f17221a3aa94e7da9430fb20829c72037b1f5d122a4a00202a91f5a82f49963abbeae94b56f88f7fe78b9cd696086f9a3fe94cc8df593e2647 SHA512 57e7d3448fc2959a557679f551f57b6512727934518e0d54682a8dbec6b6b74a24246bfc91a67d2e498a8122abf5cbabbc0f666e8c4a4c6aaf17277ea8769ccb
-DIST firefox-89.0-sv-SE.xpi 549181 BLAKE2B 96153e3d253401d1f6c8ef39c941a1cf43e183fd0417cf0b37b44eb7e7e6aecd400f9cb0344ef2c7a2ae8d4d8d87740317348f787b498bf56ba5c6891ab4274d SHA512 1cd09e531388618bfa9fe93b85eec4cbd798226901b4c3e43f1c21fd3f7539f8a9c4d1909fff8d950ffda11ed4104eeb6700f8fadfb8a42a768a43f64d28ae50
-DIST firefox-89.0-ta.xpi 526049 BLAKE2B e9eab0d2709e7fbef61ff9c124a603c10a1dfa79e297be84a8cde409f5933d6024bd87295f8ad596949de2804eddf09908533dc25f9b83e001dd41cdd093b1a2 SHA512 6e05c53571f83819947943863eb4dbd6d1f32699888e64394dd3ee7bf8d26045a88812e7dace8c41f4e27576dbd211acaffe41d92c277ade6788a27ec7574ad1
-DIST firefox-89.0-te.xpi 568332 BLAKE2B 4d013e3f6513b741bc7304516b04ea1b9e3df4b48a2c16fec6c43843f6d9f2da34dc70f3d950dd45aa5d22bec6192d8bc11a9e4df2d24b3bc5b6de10b00113e7 SHA512 0437c18f25399c9ba58b6d9defebb4bc3807576cba49959a758c82e228bfcccd94939553480cfaeb468f3d37955600356dd8cc1dd34a2fa10df9a36adbf772e5
-DIST firefox-89.0-th.xpi 616899 BLAKE2B f5c19a77fb6c9ef34f441ee25cecd09e3bad498feebde34ba25684b04b9a7f038ea31e6705cfb25264db6a3f849e2cb06f4979903149444d90eb1f5364950ab0 SHA512 d7aae1798c50ed9e7e6ec562a156dd5203c2d432d32025bb32e0f96372b29e556bf49c9522990923568d3a15c87d1b651e26d156d6037c383c70d1504208ed24
-DIST firefox-89.0-tl.xpi 527819 BLAKE2B 5eec252b959e390cc80456c7bd60a440978d262b59eeda89f5cda8c464896a72e74ff0024b36fbc67ade5f035d1af5af74da8989f4c636bf9edc471beb85d6c1 SHA512 14aedc8a4060986d2463804082077c6377e59d443b431dc92ad151289ac20582a53b9b823544f8c0efa26aade34d8c18ca61db862e1bbae202703f8e085da00c
-DIST firefox-89.0-tr.xpi 561422 BLAKE2B cb630d02e498e02bb226dffc7a6a7e34a7bf72791554b631e3c4dce25b4c03d4e84c47763e0eee6c82204d41c3ffdc5ee0c23b7975b3ea47d08a241876901222 SHA512 dfb1a0b2038dfd503e06b35638aa016ead6d488130367cd28000a5071bf405087f4bb8a39d3d0350137caa1854259eb416c3ce8f97e759845e09bb6fe4bd9aa7
-DIST firefox-89.0-trs.xpi 506426 BLAKE2B 8df9462ab766e41debe92911d0294c2123d14c36a174c497540c54387075b57a207c394288cf2c3d08891ce73c6659b36d148c5803541ee01044fd432c8ef978 SHA512 bc096c30117afa919d44b30db6b312437cc6cf1417ecbffed760153ba2341d3efa6c3a11e26ba88052a4d960e4a8cebef8b276bf31dc6683704c9dad07bb63b1
-DIST firefox-89.0-uk.xpi 631757 BLAKE2B bf77e6433fb141adf4a1bdd91070257c2c816b25efdbabf2536f3b53e284011813ba5089310000df6c0db01a5e98c6ea3d7cb3fb0c483a602492e770a45e1097 SHA512 adf417c6dbf8d125ee55df0eddf2fe2ff719be96ce53b18e3b1928bb0f223a6d86756347a0d8a33fd4592a2c419fb52b8410ee5e396001b70b2edbb945a606d0
-DIST firefox-89.0-ur.xpi 568635 BLAKE2B 3a2cd526fcb97aa36c5ac37df7ce6ff7e3d11e47e04da60ad968370e053b2597474b957cb8043a674a61d949c8bf9c51aab86ba3e094e7bef18204500f405247 SHA512 3d9948bfceed9e1551d3ea45068cd13318a7ff3de9383a040df5d7d062540a7fdb0b3e336a9f5aa454b18ea23454e25d97e80f42471485a2662dba11496a2a4c
-DIST firefox-89.0-uz.xpi 482812 BLAKE2B 80fdfa568013e9e036e3215f1c8ed1079f53ff9d98882cce41eab27b2f2e282e943a217df4bb0a4b697aa74866eaf9190da57fb51c5a3db822c68eea0178cab8 SHA512 2656f1bda76a75e4bf54a45dd2f55672e6497666254593f7a9fe07ffb1e24d3a62872a718affa04fa9ecf62dfcda6d93c401b428123373a5e35ecd3dc8a532b8
-DIST firefox-89.0-vi.xpi 583128 BLAKE2B b92515dc39697d3d3519de3767f60ac955334c10ecc4a56e88be8664ef5d0bbd59f22f5dfe6acd906c389b217b9645f5f70e1cde4ca06e1612e95d57fcd23092 SHA512 d0f59864e9c12d88e084c40ea508314c86aa850b823dceac4de694b92f399ea076ff7edcb01ae5e8641f0ed527b2ca435317b73acc4d2e78f9bb692dac2ec4d0
-DIST firefox-89.0-xh.xpi 430715 BLAKE2B 9fa6c688b9f4eaff2b128b58910cede20b4a83476d283d27326be66eeb137d2c571a3ac02472de7d54075a6886c064017ab95615e706b770cc9ba320912c4846 SHA512 77a58649b7bde95fc52472ff1e3a80bf127d18200231c68c992be2e2dde8dc093c1f5ff0d06044f55e6a62da68ff29bf14e74eea7bc79309a9b67db3c9d8b1f3
-DIST firefox-89.0-zh-CN.xpi 584729 BLAKE2B 14b90888a13e25810bfc47374941fc1ada1b39e75e98e00e71d505c91e2e41b463f5b83eee73d69fcd782a7c258215daa56977717eb0d0bb9bd93ef7baf426a1 SHA512 71b1c4ff073ed3f5417abd8793b764368817b9415966fcbd85b1c43be9e242fe03472a59e7f5a2a8631840d806932e272326bba79f4a54c1e69c4d582ab6295c
-DIST firefox-89.0-zh-TW.xpi 585191 BLAKE2B 61325e7e8d70b5c8337084e4a950275566703909e3712bd53dd50345f1ad956563aa84db7aab0430211d070bdfffb781d9218ae59c8c9ace96b51ff1b6eedc04 SHA512 b38831845954791b1f60421a97356e31f7479f1d803e50946fcc86c925c1c25ad09db557a3936de1b94c736a0753b3b78227e6044fb7574c7ee7f0184e1fb512
-DIST firefox-89.0.1-ach.xpi 468846 BLAKE2B e51d1edeb3a0fbfb678ff6192627cd676d2154a3d53f9a7223d7190443774ea2d32ac3459e210cb54fd0b358c9cd608b944841604df089659ce33ddc7fda44f6 SHA512 35cb64ae3bab45107c4b584b38aae39c4993e2f4ad70bec57cf75530da63004ff965a79083b8b83743e063df70296405167bc14a39f916168af0250fd3f6515b
-DIST firefox-89.0.1-af.xpi 432009 BLAKE2B da8e61b4292a12e8d72152b92b21d70be0bff3c08b42caea036fb3f7ae724e509052f1b8c4d33777c981ace0bbd51d8ce2fc199abaff07298ae73fca0190175b SHA512 1bef8b4421119ef1ebf221dfa6c05a17c8f639fac1fc86965ce1e4b1027a95de636afff3b8a1752b229a27fd8dda31371737fd0c3950d296965a0864f2df69f8
-DIST firefox-89.0.1-an.xpi 516751 BLAKE2B 68fe7ecc22d8a44bae709e9f1aa37ce98c5da495606cf747cebadda98bbb1efec86b90a6f4f0147d80bb5b4591891794b907402281fd17a3d1f0982865e8f6de SHA512 8b67070f63a34d92437e2d64335ca736646261b4cb900158c7f21f65b0c1b63fc64cf8cef7796ba05612b1236a2ac55a6a3fbc43da2ca94d341587b29887530e
-DIST firefox-89.0.1-ar.xpi 581595 BLAKE2B c93262513b5a38c0e497f6f447d58a2d488a5bb4b7c11795ecd8b11a82dd2388e638652187e6a8697baeec23979a5c1203fd428cf19fd55ad6d56afb24fa18e9 SHA512 cc553f83b5883439d892e1a2a6de15f65d4a6ac4980ea26c84fe61a50ba140956cdabe319c8336c9be8ba6042ea5f5dc3fac8cea01b337791bbfc4dd1dc7bf81
-DIST firefox-89.0.1-ast.xpi 508458 BLAKE2B 34ee495c32e3ee790c1d39006441b9cb92f89cca716ac1cd53cb2e59a671a97c06db0056a1b1afb0e7515447b937b92dd5c3d2fd58db0cd2651ecc4561a0386b SHA512 d671deef87cce05c0ea1a27bae15f1db478a89e939e4fb2a57265f129a405f90aa74d9f77a1252707d313965abdd0aaee51e5cdef7362558a81669e0100ddba6
-DIST firefox-89.0.1-az.xpi 504821 BLAKE2B 99b81ba18e9eead457e5b54631f8d674d30fec5085571bb75921352d6dde30eafee5caa7db2e0633a3276e9a198e271c335ff4f343e6f66f04bf05f672fd9fee SHA512 22073a66cc3cab0120c6dd43a101c489059bb99ef8c95e13e6dd9f350cd4571855d26e28b87724dad21f3deef8c46d465f86028ac4b548988e972f2a84142dc7
-DIST firefox-89.0.1-be.xpi 634595 BLAKE2B 3ccd0189a7e34a24383fe07b0add77a7310065a0d263a498b3ca1854aa9272b6fef536ec3cf5c6e97a6ecc87b9e8ebc9ab7a9aab32d4c7ed0b4f67b184a00579 SHA512 09ce5978dfaecf9a2bd5679578ba3607e98908bc7fcdb49e931b734c8b50f31ab374b003f46ceb8fc14a5a582cf8fb280c44d489d9e7daf2fb0715a31de5ef2e
-DIST firefox-89.0.1-bg.xpi 578538 BLAKE2B c112cae36ef74ecc17bce3f3438b01e51c8e3cdbb553daa5d8366bf720380304f68ee0b2db785b9825f54f233141474fcc9fa16cdb311fb6cf88a4c8f25fbc55 SHA512 959d5533e1d4f12e8cdfa9460875a1eadb1bda4af71ab80f5f9d98950729bce55f92d21cc782dc6cac4c8c4c8ca262b265c81d8d59b1f40bb5540159a016eb21
-DIST firefox-89.0.1-bn.xpi 581034 BLAKE2B 416b40e423bdb277797e26f959ad9ab12fd40b24d021710cd270443835e098b65c39869763954b18f9a0ad030cf487729fcc632044a4cdb98cde9d73b11bd40f SHA512 dd4f96d81145c8028b2423ef25b0a0ac6eba1cc871d0e300ec8e3f9e728b44ba90b37e7356fa10a51c800a025ceda1fe941c5260705294dc0e63eb5c9aeeea31
-DIST firefox-89.0.1-br.xpi 534207 BLAKE2B 3ca475a42409b201414f2161258ac93b0dfae3f0cf4883578875abee31c4fee9ea2c188d12e89e99b6d581876991669c09424c1d0f275b8cafe508d0b45cc233 SHA512 c53808810acfc304a40f7375a9a508d2b54f82dc7b381f64b5a5963661a42670d5f0f35d4d4f3a5b06514c85b229e4bc77f5d9ff68e3a86ca420f288f27186fe
-DIST firefox-89.0.1-bs.xpi 473653 BLAKE2B 10569965de1842007f8c18e28797efdb552943f8f52c29bd3f56a6416c63509f24a492f55c5d92194222435d8a401438f77d6ef5b79d4aa6d770d256474dcb91 SHA512 579c57c210f3cef9b86836c8736767c4e8651f770d583e6800fce85362c14daa2aa1aa6fbf5e8133fd2a39511ed5c3ad9a82a1166b531a92c08888e227933080
-DIST firefox-89.0.1-ca-valencia.xpi 549784 BLAKE2B 1835bacd538fc489acd2a38bfa8dd3fbbd9054a3c48d8213a0b62f3567e22d9b1d24b316835afd454b2f43259657b05c26ac7ea773a4f60017c3ed792c03fa2f SHA512 6587f849532500a7efb6fc4e80643d3297defc30d501c721781d985d23604dff352df2b0762935e380a73e637b0d8d13dd08fc962c70328dbb0ee4057820cc0e
-DIST firefox-89.0.1-ca.xpi 547294 BLAKE2B e7fe9e5db343d357858c32a24f1ee045f84a07c3f94f4002d696acf5c1ee68a3a3b2be63a4ad6f38dc931dc1528ae6d5a3000738f0dc0573955f0c8cbaeed478 SHA512 4864a16d3cc7ec31dd9c5870a9d17fa8f2d1b738e9b401d4fe330d36baa3c598f9eab8f5761f99942e5668e4b4030e61296f6f4303e7e44f4212027a1cd7d9e2
-DIST firefox-89.0.1-cak.xpi 574177 BLAKE2B f187dca6521fed545089be06b31a8cdfba1d4036b20d979ba7d29aa296ef0b2184757ee7b97631a0599ace3431feac8cf95cd1d567f35d2752a9bfa28d4ca599 SHA512 a806d4463b93c41941c9cd2b8b24e52547895b7f7f4fd9f91e64b5a19fec417df88d0c87c455d24bac07b0f978d1f44a571b1def049bc196ad9053eae1107fbe
-DIST firefox-89.0.1-cs.xpi 576777 BLAKE2B 4acb2a4618c5397a6151d4ca6ef027493ca49a09fcac1529860118000fdf55c6e48ae50543e104175a49328f09af2073c6291f7788bcf23dcf5b65d5aa0c25b4 SHA512 752f96127d68292f8ce611c39dbd179691fa7e14267ff214453280881d4875113584ee9f79dbd4fe4b47849aca1e0866066823e9320d9f028f4bd74d85e65374
-DIST firefox-89.0.1-cy.xpi 555421 BLAKE2B c0c821c344b9f744dcdc0e56e15ddd74988bb828fd1a550fb66a6bada74bf8672eb84d4f7a0d8190c20f1add4a09518e6d9fe58b13516c5b0b287d1b553e0c5d SHA512 ec4c8fb890e780d6f53a1978755d9fd951f7cdcb4c4ff854039e23dcbcbd484dac91387d4ceb962810fe1861d70541f12c4104297eb75fc9cd2a0d5e9f6cbd03
-DIST firefox-89.0.1-da.xpi 545133 BLAKE2B 2f9be4fb8330103405ee27d971f8b86543990ce14ce6a2c8f1843e3c7f78197cd2c22d165a9743d962bd49d3bc1ae43b02fafe8422e5ce5d8a6baedae7aa751b SHA512 5ef06a3b5959f6b97a2b0dfcbde1df2c314f24cb232e1792c9468cab257d6f3d00999b649d513ab055816f314e6c2a9092cc91e4946d34e77a166d4a733c9a3c
-DIST firefox-89.0.1-de.xpi 567248 BLAKE2B 028485f22c0a06211afca8f8f9d4e5e98d41ce40b9d201a1138920f8d71577947f66aff490c97cd2acb90e6ac6bd2c6ae44912acd10738b9c2ace098db3f8b71 SHA512 6b25c6691047faea4cd63c27bf11385c7105a64bcd05b72aca6b68b93b76d0b2f0d8571b74516737372ef4ab9040f0516abee59b3093642bd748226d9d80f580
-DIST firefox-89.0.1-dsb.xpi 580247 BLAKE2B 2c0d40e5d3745703e741f36e3c7a326031a35a7ce19c98b15d712f383f97f9767164e656ec55abb3c05dc7c0844d9bd7af71e1888969b15baaf773473f709458 SHA512 ac79d8be607eef80d476bebe0cea2f253a083a544d06a49158916099a75f2e20faa8ab5c56b7dc281bab1c42539bb0c32673f81e453d49965b7f625b97012d18
-DIST firefox-89.0.1-el.xpi 654974 BLAKE2B d9cb5e6b978a6a315ee23072d703897a5b82f5ecd452f8372e92abb18f654d0371770702e12e18ea9550341928d6939d5f07953dcf88e9d8e5027da108893a74 SHA512 46f72ce5f5490fbd8667264a96a08d99ffba11450737d621553cc69f46277dafb3f535540e5d3f58073979cc3643f76e4876fcc0d69af14f5c26b2f01e6de85b
-DIST firefox-89.0.1-en-CA.xpi 521300 BLAKE2B e3490cd384354d31711b82db9b7a3fc95a0a21559a96ed6e67a997e071775502a274adbaca56bdccaaace4c5a6ae2651126eab01ab13eaeaa925dbe9fc986cde SHA512 5bd96158e336c7c05585957724498ab28759a638542c010fa62bf8ff26fcc78add08af7fcdef751eb25b0a0cabfc371dc5af7491cd182c4904222eaa7b6b91be
-DIST firefox-89.0.1-en-GB.xpi 522577 BLAKE2B f4703ba63f9a045519537563ddd594a6f7bb05d9ab1a52866c5ee18227ad8254e9ea3ea02b807baca5877bfdcec74b5c91fad90bd70ee85236c0551010e6504b SHA512 3ea2081c74dc57b9eddf0bfd93e8abd5cd1e2ce23d3588109c955468ad3557bc027ce83bc2cbac188fd34841f70bbf2e0805513802abe07a3a319498384c2a58
-DIST firefox-89.0.1-eo.xpi 547370 BLAKE2B 07b1bd7cb38e1e3e9b1560c4abee05f21b5cd052d42ac2e71887595de7b528aee30a6aba4fd3e04a032df6bf757cd41604dd3668260f99e2af5d3799d006dc2a SHA512 49b3b7ed0eaf2b64c09684a93d6b8491f2cbd4a35020c4a6ba5585e15bd76d222db1df6c7ae85a6b9e670891cbd753c4d9e2c69531a08adda7dbd72bacd8d328
-DIST firefox-89.0.1-es-AR.xpi 560254 BLAKE2B 43a437089a11625bab4b898d95386cbb590e52b568f93627213bf02e9cf7244444f4b939fa30b298e2f0baaf10ab2038600c45574b6aeb91d9f80c144228556d SHA512 7a39a9b7492e6d7f8d3bb88e5556b653f9fb6ce5bc9dea9035e4c15530dbe6c240f1638ad866ed759cac87083020e955c8f5b1b4dc43861f595092f53d816419
-DIST firefox-89.0.1-es-CL.xpi 559512 BLAKE2B d66951e1b4b7e1a823463652a8fb913f4988945345b35a22989d0bf14ce789705c91fd1a11c1bc0f8316ae633fec4188ddb15d83f1e49c965e539ab6838e5f5c SHA512 191e11e46a8001e598dfa524991e07af309b0129ddbf7507ba986d84d56ffef0e7e29ac969a653e2583fa9bfe655acda295486486350f56a703961a414aeb805
-DIST firefox-89.0.1-es-ES.xpi 550056 BLAKE2B 098f38330d0f84b6e33ad79fbe361ac05d9ccec1cbdb78b94f1dc3e9f49a14663a906f7a75a19f51f4cfa779161a547e8612de8cbb990bb72c2f30893b123185 SHA512 11f004a4548a80d4711008953eaa9a74111f8fc19a37aac3754e94273107d50d8e12909def9d25d66fbe78ac4d7e84b03940422a72dc3ad7a86d03bfe909074f
-DIST firefox-89.0.1-es-MX.xpi 563876 BLAKE2B 62f1ddec9621ae5281e86df91b7d68a39038ced624d24aff5d6d46461565280455f213c56faa3b385a86acb7c9e8cd22958e2d716a7c8074aa50e9cbe6571f82 SHA512 5a14096d880da6c529bf6e6939062e85a710365cb0bf0b82cb3bb9cfba15cbe5629935cd4dab8a98d2e759b86659039e6d816d9876d1e6de207b412db252a9be
-DIST firefox-89.0.1-et.xpi 497910 BLAKE2B e1d43edd4eb1f78d823ffea9a9b4ccfca669ab009649149c2535e93f78c9f7a2ce5b612ea3d7728de6430d5d8f573b10acdb898230ecc424fa952067bf1a5a6b SHA512 2bc66cb0d0ad05457f804c6bdc6bfa73f382f0d2d5f384f503fb1a6b11107669f657670ee21c35c078669775e4c02825d06f6f453bf59e57e4afacb256b1e73c
-DIST firefox-89.0.1-eu.xpi 545965 BLAKE2B cc924f1015f61dd95a355a5e26ade5be03d5a914bfa4ba80be2058dae338695c742d790d1a840ebe41dc5f9f69a8f1798f05fab35aea4fa2fee46a60f5e64ee0 SHA512 a4eda267ae5b456ce259c77b6eaf3d39b9e1e03789526044dd17ad905c0455960d56b33fbcd772b0026b9c952fb1b5bc2ccb842d1d3f56cfbcf52cae36ef4f10
-DIST firefox-89.0.1-fa.xpi 563531 BLAKE2B e5de13a773f29c65476458ad3700736084b2e30f136cd6848e6fc43e0e107f3806225f921f90fcc38dd82a2ff425425b867292a40f2bbca6bb7dfaa548c20a77 SHA512 8bc0754685f70b0f3b36364f597c5cb92ef6d872243aad31871cf36dab8a6bd05044ed4cfc0483b5f7d32e9649747179200d09efdd79251138c3d487e3def6e2
-DIST firefox-89.0.1-ff.xpi 489336 BLAKE2B 8e62b3415f5df7da76efc9047ed71ba768c9613bc63e2ee5c986fbc9bf577dd575a731086cb81735116e249690f58cd9233bae5e7714066183a01e83b070fd79 SHA512 9f78b69d9cbac33b3a80b652c4a21ddf695cbbc44967ae8b95326258998b57f0ff2473a1f1f50ab02397b3ecd8f33c498f05c875ad0d956e5c6318257c85c5c5
-DIST firefox-89.0.1-fi.xpi 545677 BLAKE2B 265971c9221c3abf7faad20c2d75c98448e7ceb9f497f1af14542a15e343031390134ad1d324ef7bf6fa76fd2b96d6f29708fb1ce7c36c0b93a274b21f86092b SHA512 1a0fb20bda6c36084ade67c8550cc2c8b72ccee13aef75472a8bb7e3dcf8aa4e511343258e01d658e7d2667842d65bcd1d2eee2c16107c391ee2d3ed97efa61b
-DIST firefox-89.0.1-fr.xpi 571569 BLAKE2B fab5cd8334ceecc13ab1b3c8d20dfdd2f9097df2fbe9a036b5417190177de33b22da4e30b636017a073aff3fdb5fbc4280d0257af04e3cd828c5cb6ea789b405 SHA512 2544f8819c49ec13804598974ea23160103a18cc380f2a9298f75ec900673a311cf52ec6638144e0df2636a2988f25941cd21cca713b7c44bc382f7499fe2ff2
-DIST firefox-89.0.1-fy-NL.xpi 556346 BLAKE2B 44b16bcba6abcadf2cd3a69be996fe14af89b14412e1f14b24298aa700d90135cba799d60d86069c4f6e662367fc8fbea534d9025f218f68bbec0408109c2af2 SHA512 e28ffaf34d4ff8a292ffb7f2f6ec84a923c5b2185d76f2cd3cf1b3f81b47431b3c74c80a3ac6643521379c1248cc4b160356c587a01c08ee4d4732d9f1c99eb2
-DIST firefox-89.0.1-ga-IE.xpi 474436 BLAKE2B 72bcc6b1ed8ee7564d3903d99d82b288dbc9b151811a6427d62d5249b53e112eb0a9ddff6e6c09449f6d7b863881b7033ce1d6a412f709899f920cc9c65b878a SHA512 a203cc3740cda2fb06f1c2b8cedc939893db57025d063fc321d702b624430d61723ed2a9be96ae023cb35bcecaca3b56be0c3a85c5c80c67d84fa0d23328fae7
-DIST firefox-89.0.1-gd.xpi 504541 BLAKE2B b693d208a2b47cbbad8b0bd0cdf909f13774fda66aa674c2ff0fc9f0cbafc099aae726e655c95796f9fc4d74115cccc9f79ea898bbfafa5ab931abdc1cfa2a68 SHA512 7fbb453bcf47b82098b27d9828f815e67d9d5992f2532ac4ce9fe8dadb8ec89009053f14f862da2d80e547a2c7b27d16f950a4d3882751f7f7fd95157c592437
-DIST firefox-89.0.1-gl.xpi 555897 BLAKE2B ed4f4f59f7d44265b02f4009020cd7f31eb641983550d850488edb7324aca51f44351009d5700b9a765ed6fbe88a7f8e1953ccc3dffb3eb4128ae93d6dc22193 SHA512 e4ab5047439127083ac4186f257b30d45b68d783650509ffb30b4cc88a2d64d921ce16a6d43427414d52f27ae48e7466a6804f3cd277ae071519020792cd04f6
-DIST firefox-89.0.1-gn.xpi 571595 BLAKE2B c649b935faf2c7a49a8e644454448036c22b60b682e75d357843b27c2d83dea6d9ac77eb83ada8161963dd969e6f78504aa3102922f18d5db3891cf004118ffc SHA512 6098e4fac9f3383f178bb82eff098fa53b93b6505543334f384284f5754e87438650454aeb3aaf37a85eb9e6f9ce600849ac78c5d87db95718e935a6efd4d93c
-DIST firefox-89.0.1-gu-IN.xpi 548870 BLAKE2B 85541ecc92ac35309dc033259a91fa47c13352888bfc98aceb0088c3cd32ffc1253da292c441930bd8fe7477eef74463f81e00c906357c77bdff394ba08c84f9 SHA512 b85fc8410666157600613fdd526854e16cb15d9b27da7f4eb791a5d77e4e653258ac625a82e5dc0d02edcba146b693a55ec12c4276254810467e2a11980764a5
-DIST firefox-89.0.1-he.xpi 570351 BLAKE2B 876490930273c222c7d2eb8ad4e947663b895e03584af4024defaf6df1141b5cbc90c722b4dce4af1df7041a4e91b5e199fdd520ec1db516b815e720b8f097f2 SHA512 a745c3284beb7f292bc3a4f008ad2e95999f9873dfae513d563e2c0597265b0e7b9fd389abd4dbd387832bc6eecd4eb6b959f2ca0cbfe68800db7dc85078f13c
-DIST firefox-89.0.1-hi-IN.xpi 580699 BLAKE2B 261d6546df6c7f21e24326c92d560377601641b3a77394c9829fce6a68ed27fe2db78c1f97f00003a861e2e4dabe50c3a1872267c6bf12edb4f882ccc4dc29b2 SHA512 09319d9e008d1544286a0d73035bf0107e747215c1eda31cc7fa993812576310016d7133472a9ba3d3c48c247b529e6e9412d27f3b13fe84bdad35f477934e9d
-DIST firefox-89.0.1-hr.xpi 550878 BLAKE2B 78ee8daa5a34331aa89634262fdf40823afb81cfe69903b108d7b66ffe445bcf5f3d1da5ea6934fa0dfeb48252fe78150edf5ecbff30a2173bf69bcf3ab83612 SHA512 40e86041bdbbdf8216a4165629f30f7ba4dfe70721e991730920e7a24b20b96c8c6d173cbebd6b25bdbc2de2c1855a1f7eb0c1b7626a8ebe8a184baf09217cc4
-DIST firefox-89.0.1-hsb.xpi 576376 BLAKE2B 74ee58952b3bb28832b109c16853d94901a497efe73cf92554a5e890bb039420823f06daa88c6745d93e9b7a8d0a66c583cd12fa59a3545a2b2df938599d3ebd SHA512 09c10d0f5141910bac86a20d0c635059a928f96f830734810a95e05f898dcac41a028001def623ff9d5b8b95666dc671b0cdb16764691dd63c95269298c0f22a
-DIST firefox-89.0.1-hu.xpi 579999 BLAKE2B 05c8d22d2d948dedea03616cd6dac965b5f552dba8fefa0ac84b730319a95c39e34db4fe9416cf70a88bb931c6707927093b2d4ce9abf238dd3ab0e98ede4140 SHA512 02f26debceb179d8d79d0ae63505c3b1fb1f1f863672722017684cb757436166dc3590b342e2ea425237412f8631358eedaf14b5e8b3071ed01c72bed03ba3f6
-DIST firefox-89.0.1-hy-AM.xpi 605693 BLAKE2B d8347ef6d018da414249a37afec1d23e68cf40d5323132a5c8a79627053686673f5cbbaba26108b82dab3946afd1e3b8e1ded719243d4954c7ef13394c2cdec3 SHA512 5e9259eaf8e8bc36bd1a4bb66c139bc09ee5930398a0f6d06a9049ebe89efb5555b741b35895cea52722db8a55a1a0dd9e08bae9e75aa9fd853b33623602ce9d
-DIST firefox-89.0.1-ia.xpi 545259 BLAKE2B cf64f83f312b4c5d2e9a999efd44d7a891cb008521ac11786abd476a7d361cc196d77454d3c10c180fc757e8b22a1d8a52a7fce660bb57ed20672635c720942b SHA512 61aef761deda61e4b5e8e7784f84952b6bd895b6519a67cc92cb77d393cba2326a64015f1057cd615e2301d6f93df66c70c0033d988a401ea2a79a031d62e9cf
-DIST firefox-89.0.1-id.xpi 540515 BLAKE2B f7053d31d16cca81dca578921ad32fca7fca1bdfcf8e1648afc6eb3002e6cc22a172d6ef35f2d52e174cca38de9f0d0a02d576840f0bf6ed924094cd22ec0dc2 SHA512 5c1fbb5e45e77420e79781ee683721bd55602d42651b5f51801ccfec30c50e22dafa7c50ae88e002ee9ffff4ad88b8f50828e5a2f9860e8ac1fa9c97b65c965f
-DIST firefox-89.0.1-is.xpi 484997 BLAKE2B f837718cce49647817656c4bcdbcfb3a5707bdb48c9d62c285fb55a86e8ca7324f56ac66a93d659aa1d5113c0be0aef04702688db50efe4227c2d3d405339df3 SHA512 b11ec9d002a3634aed1277974b584946e06430316dfcc7d7fbb4e6dab848b89d51b60195e8c7a3d95ca1198e0f25a08f4e695722d41571f0dcf96d3bf555559c
-DIST firefox-89.0.1-it.xpi 473387 BLAKE2B c6ef858eda8adba7950ef1881953d77521628bf023501531fec7099fa391b628586fcc67b1288eb77d2bda1ebdfe12f7c984adf8982a78bbff43e25345f8c600 SHA512 d14506757969a751620cdcfc36d3a4d67c4ddb856b9ea7bc767e8bbf74664907c3081b225a58c8e86ff495960597ae4cada4e80d55d3990e1d08e64da8afa252
-DIST firefox-89.0.1-ja.xpi 603224 BLAKE2B e9e503f30f86ed35c5fd8c194ba18a2e44f3c9092c6c5462b9f58b9b6c8d6e76543b08b9ef071d60a246254a43059409f58d7631776dde555e458dc07b838130 SHA512 5b5a7164e4affe6d9547aa7d2a99699af03f617c44e51c342b40751a9b8abafae74e378c522019f6b3805b16f863957c193502faedf1232f089eb40c635891f7
-DIST firefox-89.0.1-ka.xpi 608147 BLAKE2B bad377982007612c9e6ba00eb5fdca745fb4b07d1495dfa490bd998144c4b52ee459bb714e298863385d2efd314b79e97aef2f909e1a6ce478b1d56c3d5175bd SHA512 718b92ab559e3fcb253f9c9acb7191b4ae76013c787f960490ba08124f183721f515850586bcec1b42051d0d8b0a55255e7714b4c8eaa15f764d9ae0ed54607f
-DIST firefox-89.0.1-kab.xpi 563224 BLAKE2B e180b653ca282f5a6322aa7a835fbabcf5e742c042a62d0d3d0a07b62b7951421b4150d44b6e6311ee9eec95d2680ccc7bbd6a9d1979ba4fd606d3a4b6567e58 SHA512 05cc6dc6c7a4800e3bfa9c106d20dd7cc77751638807990d8aba232c64f9c33bdb8c0d2b0e4876ece50ee363dea8310656b52a871e32163ad2bacf0ad73ef32a
-DIST firefox-89.0.1-kk.xpi 622339 BLAKE2B c0a6089037bd2fe1650ad9617d879c00ec279ede7dc62306ba762b1a965139575f4eb4276e961bf5d4870a16e6263578c1862060e8fde0c8cf291af21aa8971b SHA512 47080cef7e4e25128fddf5d3a7a9d93789039575602a31b1da443a150246287d61d0b9b168eb1fcaa3a86823bc045eaa2fd6678de2d2c7d8b28e897e57ba97fd
-DIST firefox-89.0.1-km.xpi 547445 BLAKE2B b1fc1be528743439e3fc0e8709afb2116d9643ceb70d36bbdda9c4b600b3935f181623328fa438bd09c4de2e5dd9774e61cbc9491fe4ee172ac2135920053c2b SHA512 33f81de0d76476bcf7eaeccc343387dbbb410e9139d9f79498a6409f5fc3352f4f3dbd4a79d07cfc332fb95c4d7a933c5c1d73a6e5f749c16cccf95ff5536b28
-DIST firefox-89.0.1-kn.xpi 512022 BLAKE2B 82b603fcb93c8dd73bd9e6e58b2844e1f482ed423d6f5a3e0556686d60957191e3165cf45f1e2b4a346aa467829f2af0a45bdcb050d806e83c3643adc992e446 SHA512 d61be8283144c6f1af6b9e63dd957ba4c6734a354a495e2e228dc8c6458fce5ff29ae46bf0e53c305644bfce52aa1446b3e2d08e1b2d421f95d956b1e0881822
-DIST firefox-89.0.1-ko.xpi 591719 BLAKE2B 770ccc0d8d451a0f5cc8db92560b53f51755103e71b28662176f1e3d26057affadbf5696d1b93c05c1fbd65feacc7b7e977ab66898bab734a56c82da4199e346 SHA512 381a5eb54e275d1faf226c5a10fec9c8f9d3ea48454f078d1362ada99a28f2c0eef19a7e4ab4bcc880b153e3c9b7df308ebbca0ee007c83d4fe8c1b6fccd242d
-DIST firefox-89.0.1-lij.xpi 483436 BLAKE2B 2263b0b05be9c657bda3e257d9a81200d47ebd7dd427abd083c68c0abd9ba9237108a1b7879c53651c6b45a0ea9d004942d865dfcb8db9a2dc2ac9cae0ac6c76 SHA512 597c55a930e3e460118d81bb81e75444d6bff2c5256527d272eb242bbe13d0369770d5210ca0e9ed881fa913db6a82c9580a89370bb65c5a76997754033ea798
-DIST firefox-89.0.1-lt.xpi 571829 BLAKE2B aa247269adc3f2ae44f502b5d89ecf4364767581dc69bd89f8a6942f6ae235bdc68878583b403a0a310e26fe0476bb415aef02f510d732a9c5af8424fdb747f3 SHA512 547d0931f65e373696deb3c41d68f6c00372c8dbea7e1982a82d77424d8ff4c3f30a3f48faa7acd0c7a1d109a9fc905ebdcced1ff0e4b91cb9bb55c303e74238
-DIST firefox-89.0.1-lv.xpi 476946 BLAKE2B 9d441e8c5a9248f7910456cfd895673f3305c82b5d1ed5566a3f1f4e9d65d5d773a91602300e4199817113088699b0ef24ba5f54ece2505f5543368f152fe678 SHA512 341ee2fcac4bc1e2e68bfbb0fe8ec4f3f2b02a2904ab8d3e8a3feb89bfc058a4f2f3d9d7ef493d14fdaa1778361cc6ac9090afc3ce75ce12bb831cedae73c871
-DIST firefox-89.0.1-mk.xpi 473642 BLAKE2B 7528a23169d34bc9247f689155832c265438290f3b0319d238b172d33742179537d7423baa3609a62b141af7bec216f077c3937c5d8dcd0a4871a219c9b5cfef SHA512 819049dd9d3b487e4805dff32aabefac111ab811c69b0e7691532cc1fa025a7d542496575c5e13cf1deaed9b293154c2614214d34e7f99da08fe480d16f6382f
-DIST firefox-89.0.1-mr.xpi 549058 BLAKE2B 33b8deb757baf8e5a14849285e395ac7ca11d5d35f6828e44fc63d2f7ebf34c5e1ccdd80b4105d88c525d7013a394f87c89f62c7c1b30ca7c264a258ff009b26 SHA512 83fcedaa3861694fa1e014a51250eec3de1da33ca016b03dcb8cfdf875d778d64168602465a316e1a2491bd74dee7ecabd4ad2211ed5998cdc42d722f80b5e46
-DIST firefox-89.0.1-ms.xpi 460556 BLAKE2B e7b5f83b2dd559464bdd131934b51238fa849a15328540f9f2b84715cd93acc941b0cc053d958a41e115b2e94b7933b4be47a96ee96cc984f959bd94623717f8 SHA512 5e5c0786363eb171ee80d7f33962eeb7adcec3056868ca85dcd5231a041a29183a05dbc11f37e1f37a9ef82edfbebc04578ebaaded9e113de07f67d59668b66c
-DIST firefox-89.0.1-my.xpi 532598 BLAKE2B 99864a11a36fb2f1f06b91501d2aac94f38917a10155a1fa712bd0939fa415e8b668fa5cb8f793f521fb480cb1ea64c87ca3c30d3cc7f9d7a29826f0f5687da1 SHA512 c3a1019eee70904a6e7db0fe3fea8228f3aa72f4b179eec98c67e60531378a765655e48d4bf6882b2b491b015dd05cc0ade1177b597f46ca55dad19e77fa8f55
-DIST firefox-89.0.1-nb-NO.xpi 540801 BLAKE2B 2feab5fee3c12de6e38752e56e6b01ae963f0659c201955ec24ae1d826508be894476c60a52e085d60b62a4a326d4aa334c8f2e68286b27211b40a8577b63506 SHA512 ee2f8ccd507b674dd7c4e4635e299c033e9f009c09a24ec9b6cf3c819ed35b2c23ff9cafdaf5e6a586d103d52c2d20d8f36f93346b2916c6b1f4ea9b8aa24f22
-DIST firefox-89.0.1-ne-NP.xpi 489577 BLAKE2B 9d8a114e4b6149b7e1faf180e1e079d82c647a1032829b17b4b7e550021f773ba706e40edfd191cbab53c733932852fcdd0bc628ff195f103c949d7388780f32 SHA512 cc772e9600cc4a1b41379b627a7fa46b8466441d54d787762ac147a7b73081834594a75044e7c8920fd1678ed55c1f04e07a0edb12c804904dfa15b177ea200d
-DIST firefox-89.0.1-nl.xpi 550262 BLAKE2B 45ca890016e598d2544beee5108bb20e65affe9221abce19a69e19132549794ce9e0f2d78a836d4ba15e488b2e88dad5d8c7963a8e217fadf5f030712b4d2721 SHA512 d77fdb8266dedc8a92000f0ac766d771821adb17edb73f5ba2d09bd9fe45abc61d2e33140cd6a28fdd7255f66cfa42c6a2fa8d704a8e8a90c2d56fd4b1f2b3d1
-DIST firefox-89.0.1-nn-NO.xpi 543878 BLAKE2B 3f8df6bce5943073bd8360d2dec45d722cb3ea2c9a0cfccad2b7e8a3518ad9e0decc1afdbd66f3a1c698d2ce459b887a5aee34700d9c3cb4f623076452ef4599 SHA512 83bf4a1449aeeb5a2cdc6a2de3b5401566c79e7bdf326abf4c94d799f328b4127e64932c1cb6f46a8331683b7f663bfc61dea464845a555f3bf206b9f05e4c37
-DIST firefox-89.0.1-oc.xpi 565229 BLAKE2B c2900e050010e206f4b187941ef77f99ee8fa51658a6bcc67fcc9fb140b2f2c2a17addac974fab91619f2fe64ccc063afc0dc51baf5debc88221553fc49f5433 SHA512 2e210c48024e9ce3b9f11e82ddcb3d7b2cd0262b4174d311f00f30391bf944c254f2ee276ad350a929833c9946c033c925f812a4b0c14ade112c683f7068a23d
-DIST firefox-89.0.1-pa-IN.xpi 612312 BLAKE2B 86e6e40c24b317f375a59d72af69d8100b276444e64a3323111ee2b9b0c37e22c7c0c9e056145400b3e74e8fca0eb13e1b6714693d3449df2f8c089d9d0a076d SHA512 fba80f09a8675584f81fd614a3571e08b9d9e8361c729d27947731b863870c6d25a176a5f7f072612f70d3a666733aebf988522b2642de40cd5421efd4b28a5f
-DIST firefox-89.0.1-pl.xpi 567573 BLAKE2B 57fe736b4a16f18af5d0a132e6b0110fe731e383937a2af1faa588d5f4785f820af55df1cd7d8477b9e75210c5526642c5d6530d1db80fd83ed2270fa5c7df9a SHA512 91e2f18d6344bd75100fa0d2e0cf31c964f88e5a779d814bfc81a89d8f7262b3c88000e5d4acc6ee14bfd1b1a649e8e8ce74dad9abb021cb820a4638f33c67f5
-DIST firefox-89.0.1-pt-BR.xpi 555986 BLAKE2B 9d0751f8b6fd7bde77f79589a4027dea590c3212297019c7d03dae5e857214061e685b9bff312aab7374e8c5047df550deebc55113bbf7de22dc9a9db6a8ca32 SHA512 1bb31fcfb9d1ecf2ffea63a2e49af23848eafec5161e2a8026d91b6f200cf070f14845bd0145b43f17b801b71283e9eebd29b5120da613d4c04a394eacef71ac
-DIST firefox-89.0.1-pt-PT.xpi 559649 BLAKE2B 50f98232689c8386682e249c4aae3c37a73e07bf81c0b1667145e9fcfcb4c4537cb0e2bcbb8779e5960b902a19ee511add0e5a6bccf45be57b902ef4d77ddd0d SHA512 030fd3ff7c95b3d67a92c54c94ac72c9aa7af9402f159a29556d6bc3328f8e3a3e51d73541a5b4337fe4a145d688636f0ad3805f0da0ab755e315d54f0711603
-DIST firefox-89.0.1-rm.xpi 548894 BLAKE2B 9540033827e9900cc6da2b7ad37a2774ec1c97bcc6e329aa348541097890eb04caff3ef23d0aed6d223c3573ffdd9d7d46dce4c16beb109cda9095cbaa420d1d SHA512 71c00855604f40743dcb168a9bd6a3b0744461115b210f935be5c72ba5a67b9c05e4650cb9ec0bb126accece05c7d2a2b929d72fc269b6b6c76ea9d4e6644429
-DIST firefox-89.0.1-ro.xpi 543406 BLAKE2B 150237f22446c34126f2a70cdc19f3c691e3fae127fe0088f1352caf8286e387f875a2c7830b90c0397e978e14e5240da568271f3d4a8b1b10cfa73338014fd9 SHA512 1813005f0009481ef769023dd529b699cd9f31bdbdb654dca3be316b744648f3effe7258b90ec1180086c910e6202920d4bd3391c60b1b5150a6a4b7be784ab4
-DIST firefox-89.0.1-ru.xpi 643056 BLAKE2B e7b7c3fa17adeb9b6cdd467c9c49bde215e329b4dcbd5580d31eab3ebecf1081ab9dc2af7bd2eddceff4fccbdfeba406ed051131d8301ef2d81cb3de92382091 SHA512 56f88072f7526871b9bfbca0d70167c163369fd162d52ff253138ddf8bc61322e65320d1c5f10089c653d1242d05d59340c0d1ff12408b801b1cba79f28837df
-DIST firefox-89.0.1-si.xpi 498530 BLAKE2B 291be7803f1bc40580b253dc5452d158927b6cdb57976cbd4d79f365710e8ca528b9b9922fa98fa776bd60097bb3d10a08466968613f5c36e25b4f400279dcc5 SHA512 f4460a70e331fbaad57df903e1f3e4a068ed236076b47a88a9ffd4cc1d1b61a85d006af349d0f3f434ccf8ce159532b27d0c95342b57a76394ac8eb97498b840
-DIST firefox-89.0.1-sk.xpi 577634 BLAKE2B e9e25cf50f4950841b44d3cc459e6f66fce5ea020bc164d113bee09178488f449e625e3aead66b610c38bd85b81df38b175385e9eba65ac63780e3334baa7fc8 SHA512 acf883f5a4b10f1d0f86374c1ded041133d4def53981d6ad498413ef44ab5518244f4a5b493573b835313224016d9a91aa492179f985b1ce6482b05b78af3a68
-DIST firefox-89.0.1-sl.xpi 548730 BLAKE2B 877ccd5df831dcecd1b0dfbb2eb0eb3303b18be8a5ebbb58470cc93f3b83856d0f79847e5f6e2a8b7828f0afdb3ea6d02fe4c620766d18206c3b03dc97d0adca SHA512 74ffcf3730b37a840c547b331f6c0418dc36be154550d45716dc800687565decaa6a78b8102e5eb1cab3c2fdfe3527361e669bec979e813831236f9f2b12680c
-DIST firefox-89.0.1-son.xpi 429299 BLAKE2B 6d26fc8e5fc1d48846974dcb12e9a27d17251f0d977f6280675ebe899eebb6382e9b34272b6e6eaa194e3325a4539ad3cff93af27c7795cd366cc052d5e6c580 SHA512 aaeb30f5f5a3574b145f6ad41837d922edbd51b9998867bdb675eb4d5811f54ec0ffa027ebebb34d5824fb40aa2837fdf138f2f3c569feb530b433b97ff7479d
-DIST firefox-89.0.1-sq.xpi 567155 BLAKE2B 89024ac0d653118bb08fb7b24a92af49403ca8cc0137ccab94c4a76df3b1faa362b0510d9a5b37eea0cf07c0928910570ceb7883f4e02d034623aebd5ecdd98a SHA512 8459a29b9d87e9f741085c3a946bcfb0bdcad1ace061d0f4fce5a506bdfc7b4caa4978fa04f8e20093a75483748343cc016adad18233ca8fd0666fdcd7be2dac
-DIST firefox-89.0.1-sr.xpi 602622 BLAKE2B c277ca19a5d9726c5c76e10dc4e0e7fc899194b1fd60f69847da6d73733e606ad1836e39bcdd7d7d6c1b0b3a461a9b0e9f0a4d3484ba75ce873bd74c6dc951b2 SHA512 024465ae1b7a150d8472f2148e0bd8f1f53431c7d7f991cf5c68b411d3123d17963cc80c6ef41717e3eef7752b064c7dadad7ef9ed0931810f3b9fd65daf0865
-DIST firefox-89.0.1-sv-SE.xpi 553404 BLAKE2B 8730fe710616b39db8367df3ebce016c08130c56d02afcab4914473877fb8eb2dd9fca2e340d8dd97f4e1a96ee7bd1d87ce762f52c09cd90c341e112d85b2a64 SHA512 61584f9a9889fbf14465bba6c50f9148e7b2f56a0e6fb76061d41490aa3482b25fe0846474281f839bc3fbd53286848e6d2829184bd324b8de19cbca571806ae
-DIST firefox-89.0.1-ta.xpi 527580 BLAKE2B 30ae44c2a280cc423bb8a51057b027f5cc0103bc42fb7b331d42d491dced0cfaf303ed278e3bea79710e4a18f4d58a3993d5f19e1837fd36066d3a6cf378e6eb SHA512 d495b8a74fbdbfb840b322150ac067b7c0322fcf13807462c253bf0584bb05a60181a78012e2ca125ca2bb91e29d74f74b071601b089bb5042cc2ac2e228555c
-DIST firefox-89.0.1-te.xpi 570050 BLAKE2B 45b77fdd488db172fb357f76ee2b2b33948067ba3d5a9aa993d3933ebebee8c9164170350dc047703d7951a2ff157b9ab8328190ea56486e14c80688f8a6b114 SHA512 c47499e3a81eae3eb0cb5ad744edeb456c4c6345a703276e11b49747bead4ac40ca2cf210a15b7ee3a30898e1ea7e1022f6f20c9a3a1254ffc6204ee4f009c68
-DIST firefox-89.0.1-th.xpi 618967 BLAKE2B e6de6f582f2346372a74d66f46f924a2848f370c7913a4b61d1315d0bb7aeee202b44dfb36afaeba97d9d34b4221a88b79bae011cd25c38d641aedd2fd6020e8 SHA512 76bad8ce2ce47228ead7adfd8e86f533ce632d622dcc773575ab57afdcd277770294f7215b4a1b6d38fa453055fa185f542ce8a952ff344d410df08469437713
-DIST firefox-89.0.1-tl.xpi 529535 BLAKE2B 8dc033a18db7097f881661cb9a0d92107cb57874186b31c497fe82960cb4d58d2178ad478bac87d989c6fb05fc37751c10984dc86c0b976dd5c427408dfd84de SHA512 238abb9ab1b75b403f089dd053872b4e6f2856002541863f27a8d9bfe048575bd1e3f340aac921a534b4ae5c9864b0b3dd5b450fa3fea331215689094c3e5a0f
-DIST firefox-89.0.1-tr.xpi 565817 BLAKE2B 4c101ffd68da9d087c0b06377ea0d24df2f5de69b14700f0163e608a5907490e0a7fbba59e6ca93d0f8ab9cccfee1021bd1a5324d40bafb51860cc076c1d8355 SHA512 8d4027db743eabde462ac0bfbf7a650d5389dee0510f9cf0e32137bce75f9720cc0a7ba7b7b3c576ea526dcf320902cca94250fb000ce0765a737f67f1ddac33
-DIST firefox-89.0.1-trs.xpi 507971 BLAKE2B a7c2c243d88963288d1a7ca4cc409ec24d380fe7d3a4a529e35f55fe33470f0e2e190caee5cd2f3c3c65d3c78f4fa4a2956d3840d7a2f6812f0ec45950dc0429 SHA512 c4aee94e6a502c61216c6c05d0362a19c2fe9f10e8bcbcf046ac5b1ced4286c14db122f7302da27cb63409454ebf3ccb0556dd7307a6d9bc8e490944591fe8b7
-DIST firefox-89.0.1-uk.xpi 636752 BLAKE2B e62f427dfafdb4b6150383889136f88240878a8f85aa55fe90d3f507aa2faa4f5d5f4eec5f03450bac0f097ca8edbba9554c14f761bc3b8b4c36e683b9332a01 SHA512 7323da4b7b1cb2941ae06db24953c2e3f565032a93c353580d1c8a32ed58f801f3ce63870db05c1797b03cf867e7e697c61203c67582ccb209929ac8188baf0f
-DIST firefox-89.0.1-ur.xpi 570280 BLAKE2B d79f3178f5b4077a19efcf17a5f436819d6cfc4fa2f0d4b14582a4d3e69efe9e85b29b87a760d69cccc4d893e4dcdeda489e5e3ab496c9ed6fb8625896d60f9d SHA512 60954b3feaab774dd6104c27affc7f2877b3f196b55cdf443693cc61b943515ae60a9400d13eae1d8be2dc707dff7bf6acc4f24a8b632e004d72116c27d48433
-DIST firefox-89.0.1-uz.xpi 484314 BLAKE2B acb8bc76ad744cef6f9cac0d5bc8e920fbffdddfedbbe2f7ac64720f2b2481779c483bc27503de79457b5fd1f18e110fae3e1564ed0f5b596b3ab494f747d2e2 SHA512 263429e941ec23c4fdcd5227d91eca0dbf419fb1bef991752222f0f8378aecb4c74bec8aea8508b85fee9f83f1eccdee3e7d3183b30349cc404e21e9ae3e557d
-DIST firefox-89.0.1-vi.xpi 587760 BLAKE2B 6a003f922c7fb5b3c6cae614854edd705c43cd7ed0e3144bc4eb3a6f12d3ffbfe4354ad41ff612164b4a9a5ec43dbe707bad0ce3430b09aa34010c97b74b9c88 SHA512 4a7e7cf6344d982119ef469f4eb5617b9c6c633b427e91fc7c3ea6c5a48f44ed2cd167e264cbeb6c8ff8243c6fbde4a4a1819800489f339a57424bd4dbe043a2
-DIST firefox-89.0.1-xh.xpi 431450 BLAKE2B c079a0901ec10e706f4e10a93f86b92a448d8a96ffc451afcb7cdbd421c4d5966491713565dd88edafb38530c6d3382766924fe9c6bc87b6e3e1284aef00196a SHA512 56026db93063170a951eb8b5d509e1e6d404aa6e2a768d0d5fb013dc57a3fcb12533ef25bbf9c66769dd623e2b08eb4fd19436372c7d69784b6569f3d3155501
-DIST firefox-89.0.1-zh-CN.xpi 589253 BLAKE2B 4770a0c6ad71a9cfed8aba7d58c6d3326643b7e1918003d2fb5732a5142fc015c4924e84a26e075bae87acdf70f86833cfa78533e1cf2ac95c350f2896ca8509 SHA512 b6b9ae9d5e18dfe69bebd71f9bea2e8caea7934148193a7740da3072d013ad1de6ebe3533107e08165609b2ca8c4f1189bbebda12ac95602d60f616022f438d1
-DIST firefox-89.0.1-zh-TW.xpi 589742 BLAKE2B 5af45ce81d198fdb563105bc4d2e4c829613710c46abecd03ae3c0a0a4f2c2fb25b7ef0cb091a16f0a159521d46892d5fbe3b917cdb3db71ab963e8851208430 SHA512 dc5594c42c177fa35f2968c4bee39d9bc463cd953b37f326df6a2b14b6f40973bb699a1b44f792d991e5d89af1be324f9eadc6a6c6be1db679143e06a6c4f74f
-DIST firefox-89.0.2-ach.xpi 468850 BLAKE2B a37653b757b54ccaf2e10bf99450830327de17b3cb25e47ed17bd6b05b35b9921f8c75710697e2df71bee99326137c5944345165ca59111ae759b0b96cd1e2fa SHA512 6d1bacaf0e391d5d69488d0ba9c59f18e949af50bb69f89e635d09b9c6f4a63664ea321d0ad2903a162d93e2cca6584da3717b9d6531dd905ddac130054b35fd
-DIST firefox-89.0.2-af.xpi 432018 BLAKE2B 69b911c2065fac0bdb61f629c1d2601f8b145416f381d7ac3c4e5877b8529fac533a7f44d442170fecd4c7d6ea9b0c31b31320f943cb66f4836bb027f476c93b SHA512 972acfc2e7eed2ccbed427f6f427f0abda0a194a6423864f300a335a59761c53328b72848541fc5d8fd32922762b5fcc47017e70fe03a29975b047d7542d44ee
-DIST firefox-89.0.2-an.xpi 516762 BLAKE2B 256f884bee7df9c501668189e9bb929effafecf2f1f9d5d17b5a26015750db3d3c4ab1cd4275391d7261892213613503a6125268c8c62e6283aeb13b15f5e4af SHA512 9cafdd709cbf23e8a5a3e0ee7f198c2a516bf9a0817539fce0824378c79c18f2c3b5fa646c9d69ffff7b800ccd0936a7437efa843682e8056f30ea30a13a3c5b
-DIST firefox-89.0.2-ar.xpi 581597 BLAKE2B a6fc48027fb0cfed4768c33422fab5f0f90a59d71c53ca74f9a61af27096097563ab6a1b07abd45345c2dba25c9dcd2f35a8d90a07e11fe12911929cf55a02f4 SHA512 54a049a751ce07d150258854a9cb4dba107fe59b10d98e80d4b08ea26da58d0c372a6e68483f310347142cb38a7b95b61636d34b189d8c47a52911131408fdf8
-DIST firefox-89.0.2-ast.xpi 508451 BLAKE2B 1c17846c7b0c4061ce12a6758d201492a8136a31c0981e567613b19f13285c111558cc473729323015d5c1749b0990ce4fc34cf1b1ec6a81e35cdeac7d37a27b SHA512 091c79fe8acdb8455358108b7b55f87b0fac7dd4b9aebda69b73155f86230cf01679a7f71c9c00ac4ae5a3295f7b90d4b5b7ef0e5b34969e79b83d51a88cccd8
-DIST firefox-89.0.2-az.xpi 504818 BLAKE2B 861220904769ac91f43fc78406803292742df228fdd82ed0438ec1ad5de8fe2eb9b2ae1841c3fad57645ef820b4019231edb7d7614ff93633c6892234de588a7 SHA512 f43f1f0855355e0ecaa3eeb549386d70101e07ceab88677bbbf0ae189b3080f90d7b412ec192fe72d8f34f82e9feca1a58dbc4b208cc779bfed84f718007cce6
-DIST firefox-89.0.2-be.xpi 634599 BLAKE2B a058a1c859d9d437d74ab35ede0e40124a53d857aecf69409815f7773f7fbc1eeae0eafae0b2ca73f0771c626f2011058832b58c7fc4bcae8f55e5a8901d5593 SHA512 7841541df19cf749dc4905cf4b8526f9d85e21ed944593bc051cead3cbf73d927eb30fc32608875e8dfd9a6d8698387ef5e02c7a870a710b6e0f838a657c1d2e
-DIST firefox-89.0.2-bg.xpi 578545 BLAKE2B 106fd14de0313fad56d4e0cef94e3e703f93e1495db7dc3d95ee104a1cd9ce66209e65ed61cc3dcfe709b45ec782f913fbbfa71452298a9f8c47110efcc47027 SHA512 531cd666b107924a0fd0a088af9da66e756d03c23ba0d36332944be5533b9165ae62d067b980b0b415a04f6ffc5b234824de5d78237a02066a4dd18a245ed16a
-DIST firefox-89.0.2-bn.xpi 581038 BLAKE2B ec63b14a58c38ee0dc721b8349840e8696ee569acb1575c751a42f0a63285a42ddddf380cbe7f320759eb873771996cb8b158762e3fceedca13fb1e7e3a82251 SHA512 f1a55e54d3505ec2e8b594a481d182152488533535d9a97433345abace7a4d622c9e0a9bd30c34663135ad3c6c609419395430da45da31fbe365c5b8ecfc95ca
-DIST firefox-89.0.2-br.xpi 534210 BLAKE2B 9b0a6a810d3c0a19b9a74937895035054b6c539122399294c7936c5cbd2c40b5993ef2b0be317b26ef252518022e11d44398966c25b217dfff137c54f209dec7 SHA512 81728d81e985fe2e020686e78d209c890f33eaacafaa0c971df1fd1243eb3dc0c501340f281507270bde4fc0b3d4951326bc0d414c5f72382e39e5aa018cd1d3
-DIST firefox-89.0.2-bs.xpi 473656 BLAKE2B 963277f04be23d29251718885aeb5e4f5d8f691c34c8a68978abb021b9898c919d9f1e91ab010059618f179ebd87d687de72ce4b0af8a86b59729cc424e8be71 SHA512 60770dcf10795f40c35da279b7dc9d1863a0669f39070e18afcb8d7c008497fdbf9406acc59cc54c7ef5e91f92ce2b96467bd7127d6d306b10fa82e82186d002
-DIST firefox-89.0.2-ca-valencia.xpi 549775 BLAKE2B 412f218b85d48ac804f5a6ef25502cfaa26f94c364763fa2bcb820e7e9346048416b716433019c682470006de8ac9f53335f330382da15d6d4a258709ed81edb SHA512 f5af959f1dc3b6bc44c9ad8d2390d505779d38fd0367385504736d289c8c2fb0a6a08118b9631b53e1ef2c16b2a80703dc9abdbfcf94f68089439a4bea87dd44
-DIST firefox-89.0.2-ca.xpi 547305 BLAKE2B 9e400f67b565accef2105d06ba5955d58ebf1920027c0f21ff97f4596a67d975457436bc613610cc17a67e0683e4f8dc44b821f0adf243711665fdeaa665392c SHA512 3bf066f55c3a8fcd44446e1981d3c3b770e568be0d98371045c33d4ee501765b21b36951541fe1fab8d38b744b507c370ad4e51ce42f82c11cf67997b6f6e829
-DIST firefox-89.0.2-cak.xpi 574185 BLAKE2B 0e8af0f57e8857a0d0aeb06717347495e5160f45451f484fac3a45cfdc49b19dce517e39af7e6aa734a53e2c0093f9c744655414464ebbce36853dc792a55b51 SHA512 72dc9a0de6ba72f20f3d43c3e60191151af0ee34f8942ec84b28b71272d39b7568c0258bd000817e8b59427d11958448c128bf5c4f0275067200323199dafe60
-DIST firefox-89.0.2-cs.xpi 576778 BLAKE2B b2b5922763a816a29bf2c551faabe662f2545f8060f5cb9bd8154e68d24b25c4e067520c863a6b1382b9d7328e1f0211d7f3894c4c66dd7d009b617c3d80845b SHA512 fa0d53d77b4215ff3feb9e57cd349817146fbc6e7a0e501aa2b670e76a5e1b3bae706e90dedfe9f6dcfbb36c71fbc7ac41429c526a526a3185aaa677769bd459
-DIST firefox-89.0.2-cy.xpi 555437 BLAKE2B 366a386f2fcf047e78ab78f6aca7c9cc5dd10754efa31231ce171e4364c6f7cb2ace02bee1e9f9a2f28c8791b29980a054ad62ce28a9130007cd014cb029a368 SHA512 b94e38d02a5c80d3143587a34ef895d221c6fe01cd456a5b95fff460fdef6019579b6dc2ac9fc1dd8122d9c065d0acac45231215ed0da5f35ba0cf5ec81b5f62
-DIST firefox-89.0.2-da.xpi 545139 BLAKE2B 635a83a27c25a8d80b2c68871893aff96cc6b88cc2094ee139257d4bb16b5693ef39ba227640fe027b3d0cf0ccfc702b24be0d2f7405274b6442bd8efd210ae2 SHA512 07c3c94dc8d6e00cbd6224b23a7c66d717400bba80bf3d07d934d0752769c46c540585abbf72281db968828e002834b0b043d49649fe3bd3888082da589aed1e
-DIST firefox-89.0.2-de.xpi 567242 BLAKE2B 02ea00115f890a9b3975b0ae1ceca95dc1d063ab7e2958331bc7b09c3284d8e332c6e4713e3a7e8e5b900e2561ae690d36665271ae9d2d27be596eabd0251e2e SHA512 5c2d84f64fa64a98ef190932e4165b7324524206cc3268708f9f0aa1f32f42655842586de63ab7ea5dd7dc711993a13a2ac80b9fc327ba0e8ecd4d7cdc31b8e8
-DIST firefox-89.0.2-dsb.xpi 580240 BLAKE2B 06710445efae96b73e845f516221b13879840d26be4e8fd2c5167ef4485ae9ddfeaadab91d28d833eed6aa36821dfd50431144ee0d416a6fb2427e848e871ba4 SHA512 a6c4b2e0f0a0d229675417cf8922dfc7a0fe3ce4bbf9f840b1de387ee4458a6de4f5471211e6054af250155b667f2eccae5c8840cd47762e6a2a5f876a34c0e2
-DIST firefox-89.0.2-el.xpi 654967 BLAKE2B 8737dcc74434b5cf7bdb4611ed454a4c08a4d884522c367cc8a4924687b7d419c0d7400e8ee53fecddcf41ece0aa4ece14500f0e66485c7175d7facb7aac1077 SHA512 4e030b1d82b52918402c43e1788dc54044f71fa8535ba0750409c784fc5045d8303461d0bbb7a67f7c6bf9615a2582ee69eb0d1b801568f33daebb3d407ac1c5
-DIST firefox-89.0.2-en-CA.xpi 521309 BLAKE2B c217dbf3d08238dc3abebe8428d2246ec6a51bfa831ae85b98331ea26792c1588d692d896a22551dd12e0fefd797c22cd273f904126d22d5a2dfb116aac4b40f SHA512 9ff21e0661b7557dce8f6853fe5f1a0773cf94d761763a2c226112a751864e58ae811c7f91af1011fb26e7c27b054bc8541d8f9e1eb76845f62b1925fdc6b22d
-DIST firefox-89.0.2-en-GB.xpi 522583 BLAKE2B 592ef116433744a506dee6b12d72fca9d691bde3754105d6b1fb6275aa1fd57eefdc40f14370d8a7036543a2f95aec0f4dad3496a846a9107f4468af3089adcf SHA512 fbf62ab69914e5b11aae9ea8f54d4f169b82b778398268c2093f1385c4c999ff9dd0da65ae19341406e50529ee138e14911c360c1b08b2562e19e25f2674be5c
-DIST firefox-89.0.2-eo.xpi 547367 BLAKE2B ac99c396a5bd55a1ec0ef95c6a7efa9ebabfbeef323cfb832f2cfa20890c80b3d6b77673ab684b8201a0be7200a1d7173a2e5a57eeb7b5880ba4b0442d46df92 SHA512 d2eba8a0b8be3237a4a2423415e381267ea12e44287bf6089a489bb48307b21a2111a719227f92a0359a0e0553ce6dfa12a6eeec676558f39ffd3855792292e2
-DIST firefox-89.0.2-es-AR.xpi 560257 BLAKE2B d3f09a433b10b5b424f04e8d205f4cf697163e72305e234b473603c5dde3856c36b959480fc29dc585802ec68c31aad75619b53264913d57135f65958682026b SHA512 d519f02169d17a44bf1088c9fae169818442af283b4786e5d5d5f19b134126fd1538d735af634b155bbfb6223cb3a06a82ffd5a788745e85c8463f929799c536
-DIST firefox-89.0.2-es-CL.xpi 559508 BLAKE2B 52cfd5a642fb230ac5333d0888feaceff45c026f2ef251ae5a2e067b60f669687696d3dcf48a2011472089ecbc8f879b33594e89c433d21202ca66c2fb1df9fb SHA512 dcdaeace020bf3d299d19898a711a6d6fa38b3f0dbbd735b888b2aa68de589e66536f07aba82ae441ef33da8a0a19a827b72c3c5936de8073196fe6520372287
-DIST firefox-89.0.2-es-ES.xpi 550058 BLAKE2B cb3b97f61212d0660dbd4cd72e78605c5aeef54b954777aeb8244723430764090814a4e25adc4b1c5690244d27d270520f403e48b8f31288f376f0f3f0dd2867 SHA512 8afeb87c1200e91dafb6a9ea18d454c74e20591bf1bbe874be5c863f6734b384b49a94394c447f11a7f2a1bf69f95cb8de76b5139c5f21ef26e79b0a518aa4e2
-DIST firefox-89.0.2-es-MX.xpi 563876 BLAKE2B 4df825b57165ee08f7dee4cda15d0a49ddb9e6bfe2858b092a6418f5d4afcf46f956d9ade3945cb7e41dea3e16c5935b66a8b5196026b9bb936b1c6cea889b95 SHA512 2b42ff706b1b25b499bd7528830cbed572fc8e10f8c87f338c2cd4c2caaf3e9fa0745a5c718877d7d3b2c1ba845ed9a844ebb7925ac6c4eb5763b50ea03ad3ce
-DIST firefox-89.0.2-et.xpi 497915 BLAKE2B 4cd3add869cbec056afad8b95761f403cdf598f846e82ad1446fcb7513d2fa5c75bb21f14fe5d8773eb56b0f6253b475e153964a656f1ebde98ed1bfef58ecb0 SHA512 24ba7294db61d43cc3dbac685790b62c6b84fd44208f9e046fbdcf96a973482d5172e9a0aa68724b21474e2ada4c1ffc5f2a27d12024edacc6fc66f2b2e7daaa
-DIST firefox-89.0.2-eu.xpi 545962 BLAKE2B 180f34844a5e7dde51f0672177c6ad1c719e5ad8c79a5018476dd908b740b5647403337be20f52d49cb43686badd51f6133ac1bfb404448af7ae4e4f1dad0422 SHA512 f6a9919a4378013d0577deddc82fcc5738eda7c94e42d917797dee86d5484a53a272f812c79dca3b5ef36aec1bf055bc023a4b51d9baade21f26edcfb63ddb95
-DIST firefox-89.0.2-fa.xpi 563530 BLAKE2B 4fe4f48210721ce9732dae136ac888b087afc8772ac8b2fee9c9f9afc72bfc544b21d533746497abe659a2b751e9034ad4d141abb8b837e2ba8e64f2b885d525 SHA512 8e2cc18d61170f0fdaa6918f3e8685e25bbda5092b85a5e6391a801b0bbf5368ea64729b467dc10747a8afb017afb9e07738850fa05b66af1070658d95fd904c
-DIST firefox-89.0.2-ff.xpi 489338 BLAKE2B 616154d7cfe9446f9c5a6496c307589d2d5341e61088f21dd08806d535f6684f56645020afb363ffb239322d9d295b8ab453d53d688490012e55ea8fa3535229 SHA512 4a6c21799bfa16f58a8632bde4165d7cb615a7a6fb0af0efa2846c396c92c34f0addbd128f66b28be451b338cb1385d6c634b572f1465db9c417b17218503519
-DIST firefox-89.0.2-fi.xpi 545673 BLAKE2B 47d8d8ca3aef0584a874b8e9c3fe18f12847d8289a61b2f0264e13aa504d6d969dd0b0012e556887109cdd53011671dccad38efd53733e7f219262045869c283 SHA512 ca657db092a1fc72fd59e1e3fa8e3df131ecb9d8b1d4553ab092259518c46ce478c7b3d5d826e46d6a64c92f2970746027745d85f660a594df0eabe3c81aca6a
-DIST firefox-89.0.2-fr.xpi 571567 BLAKE2B ddeafad8dc6c038ccb971f7634cbc1b2ba206e7bc10e397d703cfef07c8e5b97c1312cb18c75fb799cb1c032b6a731d499d56a6144a91102613c167fb0ac900c SHA512 c606b41bb6e90b790a1a71abee2a359b692dfa953a10dd6f660d0f61244b5ec357c0bee292ef11f221a2f91ec0fe7c0cf32c4bc0d3548651dfd76677b2e483f9
-DIST firefox-89.0.2-fy-NL.xpi 556346 BLAKE2B 0eb40a57a5b8d9d8c5e189d9384950f8907680e0d53e57df04d6bed3082882c6e7e9cbbfaa9493a4e06494b0af17ed8713ce6c57324aa92afc8810b4dacbfa13 SHA512 534ace39c7ba10d6b45fb6321fee0dcddbf5c4917cda44128929ddc3da0b09baba981a1b625d5ce2ad41fb9d4421bb1d2cb6283ca20bc944f109a9bdd632ea88
-DIST firefox-89.0.2-ga-IE.xpi 474432 BLAKE2B 820c23b2222c51d996c84166db5639173490ca55d69e8c025bb10325feb4b73c436c9de718a9db1e3a06201d357960f138d152a31bdae3e528a60cba06b69717 SHA512 5eb7a6670b9e34c6e25f677f6136e00a7628222d6372f3a2c1546f15616d2b9e2d8f8b57ad30e54e12f620f70219c6c5ff1392c443f826723bd9bc121110bd2d
-DIST firefox-89.0.2-gd.xpi 504559 BLAKE2B 21476b9c67b5ab0c3e67b07f421682ff91381ca1a85c4f012f2f767b52cae72425d497b737c5c7c2df9d15bf3ac4ccae0d3c12b5e8fb85804a187913364d0816 SHA512 c8d5a39694965933e5acd8d67e7d207d48705333a7c5c9d84691c459550c9156d8b62ca52c18bad76551e9e234985ec33a4822e605465f4c6c08f0cd720ccad4
-DIST firefox-89.0.2-gl.xpi 555893 BLAKE2B e3cd65b9e5256493eaaf50db0663d08cf855d45b99694123019020636403836a31a5acc3fd3bdb8a123152d96c47401b7e27f0f3e82f8456adefed6c7003efc5 SHA512 65f2e9600274862146d101d93d1f4e222aa53c7a3c80884d6c688de0131aea66bda32d0f4df7847ffa8e9da4a94c5b6ae1729772977c90122b1d662a5a2f7366
-DIST firefox-89.0.2-gn.xpi 571591 BLAKE2B b14cffb526bdbca93bf96e7dac3fc9cf8fe713cb5b92660427d934830d6138a37ce7f3c91fcbfe44e3e14c5c33ac645d9b3ebae89bbdc97d2725a6a324a6eedc SHA512 79d1a8327bf0d526a7b9f0622ea3a23841f8c80c491bf622a367bf133158df16ce69195bdf726fd07924df7aa7167bdddea36d575c2218b75874383ef7b7ff07
-DIST firefox-89.0.2-gu-IN.xpi 548867 BLAKE2B a24b341362e78e764132646e260b7eb7647333f33b13578cfb4434467967b1a25821cf696702027916f0682219b1fd5a04911c35071820a62a43dab6ba698815 SHA512 51e1cc46464fc88a59583790d10b3b6786459e3776c96863f437662561c08ed3d2e55299a9ebbca0c968e747a1707749b22499b9f99b2c357d66303351693c04
-DIST firefox-89.0.2-he.xpi 570355 BLAKE2B b912aa996c2abcb7e3bc4ba5c832cec2e1d8f7ff148bb9b4103db3a31c4310ba44b7b2b24360024fdc71bf9d7ffb317aac4e089c1f3e63ca84d4cb35c4dc4610 SHA512 7f1fd902aa658d2b55cdad6ecdfb35dbec99ec3e9ef3bca1d3f847b6e8fe8c2ea241b3b15b57fbc9d7f29bc4f7b617bd1df61e60ffabd5009bfcc1c4cbfb4f36
-DIST firefox-89.0.2-hi-IN.xpi 580698 BLAKE2B 26ba7b4bb028f8ad869dbf7dd3eb1bb50a58ed7f6a83550d2e38b8c4f2855314a109d38e84021733b3361300e7b8078745d7484be7572afa4f85de3fdea51fba SHA512 c42423e043bd91386da10369ae410d597345305123fe2bcd951640cffd3fbc4ba210528baecdd9982231beeb83beb6614cd608d7e007ecdd48ba6ae76b2a5d66
-DIST firefox-89.0.2-hr.xpi 550879 BLAKE2B a61101a8a005b993da66a3e442e2c684e3bd55f2078a04acb1bee5f3e25e1e99512288f24010311186dec05d6c30ca9850470f7660dcf07c4c9ff18e3e7f86e5 SHA512 9a358f21c3bf6bcacf37ea8494f8b2d0780816eba64a93e0725dd7b36959e7833b52e491d5cf40e06ec1e9e5207286d26f0412ce4d767f83da68a5bec8622927
-DIST firefox-89.0.2-hsb.xpi 576371 BLAKE2B d450350d41b49d598376a4f0f5a28ec53149128bb973fbd1c5c0c6098d7f2b21cb39b6e0b70aa42b4086e6cd4ef0cae54a4387b78a73ea6593fa4bf65e7ff950 SHA512 a82299ff8bb95994f372eb19b115beed2fcc40e538be936fa89ad0ba1706bf41b23e33bb5bfae7996a486122cd6bd307c2822d4442d5056abfda45fdd6190574
-DIST firefox-89.0.2-hu.xpi 579989 BLAKE2B 5f0aa5fea423628fe2616a2da70745b341908589b6c8d4ee6f7c22e73c032d6077ac6d1f1c9be5fdb2248840bd1788146861b1aa699adea21707a84d47d6a24b SHA512 3f050ca554d0bdd9ef4b9e0978d2eb416d11240c867a963ea35c3d363a625eab81e8800ed917a57e35cf892c384f735cefd907f682e5b4d23e5b8b95d5649e00
-DIST firefox-89.0.2-hy-AM.xpi 605694 BLAKE2B 3fe7cdd44511bf77471653fdedb11381f298309d829ef035cf6ea9efc6a8e224cbcf9267f70963fc69d8625f11a782a7fd341ae0ee9dfeda6d6776cba88579fd SHA512 2055055989fbe5198c71ad485b255441a911ee0029e0901f9fa47703d9689eb6309e49558c0fda35948622e93cc6833eb63a644619a306ff2e4059a79758c527
-DIST firefox-89.0.2-ia.xpi 545257 BLAKE2B 212f4ff8a8d5c5c9f97a85b9c375a72f0fb8adca6953d3282dd3cca7e80de42fabba3126b7860376d8af03f64608dcd40a1f153b5fe1966acb69de44d419fde5 SHA512 668a2226b16ad3c75e0d947291135572d39ae33e93c85fac5b9c0565b6e81d4d4ce334f5144a65366f055c81e8790379b8b23c22c8aa27a7da67edcc83557365
-DIST firefox-89.0.2-id.xpi 540522 BLAKE2B 55ffa59456a83f416462b9b301ed0f0da728ba8faa9da01544abd75f52127880aaa7ac88fa7c5d00484f20e653ef4d01f2f8ff49bc4e82f6fc030f6b9c872cf2 SHA512 f15a244b595ccdb13d635968f7964ead5baf1aceaaa1e12d81e1c2f2587d6ebae9516516bd28f2a975a7ebbd0bbf690c5d3293e19d46977655ae70c0e274416b
-DIST firefox-89.0.2-is.xpi 484996 BLAKE2B 8f15185aa436efa6f80d3eb3a65583e0d9e8e98d2cc0c9264de2d3057a9d0e58ef1478648f51df56fb35e908aa672602a0a4a5f184e6278d7bdb72864f6c5089 SHA512 1b3a9f5c095742181ec58e411d712ee8d4c255a6dd447cd96add54406679ea25e4f0a67e3cbf32e183492fe56e3daf545962bd454e875ef6f98cb6be47e6a116
-DIST firefox-89.0.2-it.xpi 473392 BLAKE2B 724617f249914104faaeca90eb8a2f04814c8b512b52e94a416bc977e5500455fbcfde557e5b5024f77afb4e33ab6558e2baad32abd1347755bf5be016c3874a SHA512 266f5b572171a82e5d95317115b7dac820a80c867a167b218633209a599207d2aad1b15db84d32c148f82adb5b18c1a1b82f167a8a4b7c6bb0c04e49595dd8f6
-DIST firefox-89.0.2-ja.xpi 603225 BLAKE2B 13ad56c035e9156124938f5b938945b32169c8c577506da4bf59cff7b98508c93ab491ea578504e3590d54de9a1f1cc8b22890c1aa33525319fee40cd1716e8d SHA512 26f5a824e8328f99d32a1c36c455fbd65e2b4d021d7d5fc1de35a321328f35f43d16efe3b07849aff12346bde8b8bd1bcf3eb4ce056a818ab72b76b135e11d76
-DIST firefox-89.0.2-ka.xpi 608151 BLAKE2B e0ca0ebba810a16f1528eabfed4964cf24730edf5261c3c441974b7cff67174a82c428360d496bb5f0f89fadffdfc031a2f79c74c446c4a00ca5834e1f367376 SHA512 06cb4a1799241263ad072bba8b081b615fb63e9f123752af6d48927d0391d7a946e7bfc228252a58dea6ab6bf66367429f5fdef592b0d1f6254ced0d7fcfa3f0
-DIST firefox-89.0.2-kab.xpi 563244 BLAKE2B bdd595178ccf92e0dc5c8bf24009a6ef238df251f44904cb99a810a54dd5fb3efd771dabd309c5126b0734d74bd72893695797a95c2586f4b8f4a79c544719aa SHA512 4a14e0ea1dccba1768ffb63b92740eaed63b7059dfe439fe7220fac26a4a53775b4be2b39d962a72b8f626ec0361a0d9dd2a00c272edc98e59b96a42cd02b730
-DIST firefox-89.0.2-kk.xpi 622345 BLAKE2B f7e502754d2d0ec7d13de22ae2eaae2d637cf1dbe572d52879a91306be0fb7cda84cc33449051314067bdcd09a3bca37ec5efc368a0269f8f55ace34cfe38b2d SHA512 ff4b956aca657836b605f0504b05ca24527d3a68c9a917b35fa8d6bbf43fe211241a1e0880a4bbdabff27618fca15e27f28c925b23b462b54f77891092a67c25
-DIST firefox-89.0.2-km.xpi 547441 BLAKE2B d76376469e50618861457fb18acfd4127a7b94fb6dfa20c7d229f6a1b11dbb572d377cf6181487a1283939a944b5b39cc5d898802e51b151914acf0510443fb3 SHA512 9ef05e53f345cdf0dc79f458f669e5e7c462e6b28dd70d3ee99315bf6462affb4a9e535787e4c0a861090e7f3c110eab5b481f6d145732c29c815c3052265af3
-DIST firefox-89.0.2-kn.xpi 512031 BLAKE2B 8158b5f8373d54db9b1076f9a114ef295f67875edfd95ce8689f5f279150fe65d2171de18cf763614e63aa94cb22980e0c58495314ab1f685cdea3a5e109ebb9 SHA512 7262b3d7f8a8d7d2e25778bed200c3d87d5ebe26da37bcecb5006e0d249b684d1f094af2db994726d6e63a0d38cd456de08d57ac8dfa137802320996550d7d37
-DIST firefox-89.0.2-ko.xpi 591718 BLAKE2B ebf8443c009cfc37ea93edc84bb7d3295a1d7bfb00d0b92a30b06556ea12e50a0e1f31e41c1300b8a26cdb9ca19db730ca0ef526242a1a03f615ff1731a1e8f8 SHA512 1d7dc210fea56fed70283262efbe65ed3e41d48beda8dd508831a75eb7c8f8efb612d3a2bf7b6949bb76f6e1b9fd588c311e144ab77f828b53a93cc879e3d26b
-DIST firefox-89.0.2-lij.xpi 483438 BLAKE2B d55461cb5d8351cb5d04c9733fe9d11ff9e57437a581f5a9eaeb1e42f6db951f991943e9952e8ce3de678e4e61f57ce5262b89481ee9a966bbba5c84a33e10ec SHA512 5970552824bc51bb1bc8f6a7152dabeac7d23374b7f53fd0e5de8778202e9fa126750635975c107ad7eb9e61b628b9a428ed227abda87882f37b946c2120e06f
-DIST firefox-89.0.2-lt.xpi 571819 BLAKE2B d2bb3dc9e5e6665e358b84766ff2c2c8ffc087adeda4969f2f5117c9850adb82e5512d49af48361c3dc3a074cbfb2f7207be1e7ae593624cf5695f022c4946f4 SHA512 be17986d194bd1ae988416b3b08d96366944f187611ab022a31207262af2504a396d9e24f8b387b90686ee6156a314502698e949a76455f85c569194d2ad0c54
-DIST firefox-89.0.2-lv.xpi 476951 BLAKE2B a813e04ef2e0e26e2599a59af3e18fb52d86c6282b6d6aade6ec531ed1aba0c594bd9df70b0c919ef3b51a9515f70c27656b587628c143c146f1356934a6f375 SHA512 523371bd833ef831d4fbab91d9c49a4ad15cbf7f3e2307475f1ed8c59b0f2aa6be7aa72520361020f4efcb8f866b08a030e7dc36f2296b6e363b16aa2a6c9591
-DIST firefox-89.0.2-mk.xpi 473640 BLAKE2B 4797a6fe9d05c306cb0255df718c62aefa349cf8a0dfdd56948a436d0915a322c4c0c53a670f0cc9274f3df6b1654e7c5366cd03d78ad0e2f969d71fd2be0ca0 SHA512 10e3fbef9f70671c55d530dd61b3d670fe06118339948f35e5854213d819192b8c09bf3d78a5ed836de3a9b5caf73443e4608dd121c813851d27e74f91199966
-DIST firefox-89.0.2-mr.xpi 549046 BLAKE2B 98376f97c2ef77985bf1abd392c249245a5193afce780e55ca4e86c709e9cf141c48272ae8a31e780a6fbdad89c28dfa9462dbb7bdb74c3ce6ccdf077fd447da SHA512 da35ef1ddd137a9b3a2c3c084265d4120dac599fa2ab8ef236f5a9151d8d6a2d494b1b08fa9e7ce9e9e6b00238cfdab44d43f74302e8746a66dbac4bfb96e0f3
-DIST firefox-89.0.2-ms.xpi 460550 BLAKE2B 0d23b4d295cc32f8d9193ae23625f3e4d839e902ae0bfb38261395990c1ae98759611bb1f1b14dd8b804d3a61d60a1ea7ac9183e6752b5de1416f32097185dc4 SHA512 a6452dd903121bf2958515b976d5e1a659f79be93de22e7aabad40d13f13da8c862bb9f2c5f4232e0b449ba13af4a6ffce0ba1a2ce4ddd4ec5ef8549753273fb
-DIST firefox-89.0.2-my.xpi 532586 BLAKE2B 8cdcbcdb4d7b6f0300dd9d81238493bcb6171f8a50d4f2a27db1f005a847d9a3a4c2f397fd582d86c4e76a19c47c2f5c1493d6956bdcdc18983f9d3c93a549ed SHA512 498da0af4cf59ae5cc2fac33d5ef531c7aaf98876ac9679a159f527cff0e02d449aa0b07a33d32c145ae370e82bd6c85a953a1e13ca7808a16c371cfff8f9c9a
-DIST firefox-89.0.2-nb-NO.xpi 540799 BLAKE2B b0fd5878743b8efa3930ac395ecef42cdac880a7ad39d596f2dee6e69545b6d1aa7820142af4cbd2ead655565d01f57e7ed6f1d6e31bb1289bcb8b5479acbb2f SHA512 8e9ab743db0e57d4d709ea262311edd30abcb06c6fec9bdafe7fd351177279b044ac3c8f2506afd0ae5ec28c7d1d0184b0654b6c3739de8b8cd285b03e55c7eb
-DIST firefox-89.0.2-ne-NP.xpi 489570 BLAKE2B c0b0b59fb0036cfa89f5393bf27e8354d4f0fbc292881f9dd3bd34c9797387239196a8dbc01c1b1217e256c893634c0be41fe0d8c9dbc9f7edf24c16f6d9af43 SHA512 ca8902f1c9962f95379c3a923486b5c22e0a3cabccec98b0b83ca20119be1e29729ef58c394f1a1e87c5444dcbdf4e95b4898e514f9b9a4ba0c23e42559c413e
-DIST firefox-89.0.2-nl.xpi 550259 BLAKE2B acc1c4fca104bfa86494763febed18268248f4f1902d2706f62bad6b5b7d7361c4d59e7b916957be94fe65c9e93ad1f787dfc7dbe7f91352d8e401603aa28d59 SHA512 a08ef799e0f49e8d3e686af4b11fc9e93ddb88145c5ad9a311201ceb102b431aee9f5c3428e6c713b660bb4f5413b8ec0c45a1c1e581956f1858c150c1ff632d
-DIST firefox-89.0.2-nn-NO.xpi 543878 BLAKE2B 2bcbbeca88972dabdcca90446cbca20d6a9015febdc1f2edfab80b325a054d28c8c8f12dad2c0c6e3a16dba5dd8417cf1d1e62a47d7db52a04ddb1f0f358f05e SHA512 f0dccb61ead554a0cae6f45db8971e4fc915f65d68a8ac3f3cf08d4df5b38e7510bb06161c5608483c92fee23a9c77de166e810edd00888d163a64adfca79447
-DIST firefox-89.0.2-oc.xpi 565239 BLAKE2B cbd2fb22200e08e78084a501ec2317cba0c57c237399325adc3b544826b8d60b7cd9e169bafa9cd1e63588a3219ad53458f624bc4e8881232501f69bfa5b466b SHA512 59d1928ac4406e55f8fedfc7bb77f1b26ff41c79132266941b5b3b9db87a54651c9873474a6b2bf203407729ecd88705146f279fd3fd153750f173930ef0d621
-DIST firefox-89.0.2-pa-IN.xpi 612306 BLAKE2B 0f490404b8b1f3e150902d7593e5124d69610bd10659c503dbe59a1a51d71d35e48ccb208fa36d30c7d69001d315b81f9f6aea84bc550c60a5a8e2b8159478c0 SHA512 66d8a3374880a3746b80cba19171d7de81384739d84899309c0c138b243df207d31861108fd07d76a626f14aea1cb3d298858ad67d75e955ff728c66c98962b3
-DIST firefox-89.0.2-pl.xpi 567575 BLAKE2B 4d07d0fa7453ed794e7b3a979a68565223e0c6e4e0f49143472f80992812584995c740a91b8c0e223cd980efea033e1447a3075d72c43d26cc7dc6cdcd581c35 SHA512 abb2c8520af05947f58b9b60c49b440e91d38e9ade27c8806561b8230683638e67d49373af4036767749d59024703b9fb1c450280b82fd9ed18e8aa9e5b4019c
-DIST firefox-89.0.2-pt-BR.xpi 555983 BLAKE2B 49562cb68949c47070720ca22829f835533047bcc892ccad36553fa3db35a7720a4c8a4f6174b4a44d56af9db5a6d5db92a82994a173d31bd423449a22af2e26 SHA512 b7af0236a1d3ad537f843e7c57f2b2fdfee09d9442a183b782b99cbd6d53ba4a9079a8912bc03fb2225235b39673753ecbc5702074126d5904fe24335649947e
-DIST firefox-89.0.2-pt-PT.xpi 559650 BLAKE2B b3e9f06f20dcd945285705a4556a89e61b8325e33f77155c6f2e539b548d2072e414a12eaa20c59690f6496f4c36dfd3bd2da80757cf5a06eb54e6e717cf0790 SHA512 a4bfe3a1f4dbf3674af831215f441116feb610187a7b156363e294e2b4807d83fe93a3bfbb4f3e84b90b345e858fb2add4efe2815dc0218ea4dde314f37ed773
-DIST firefox-89.0.2-rm.xpi 548893 BLAKE2B 87748fc3dde2e7bae2f8416dbbf8eb9741598d5f94375c5a144988de97137da35a00a4d45fbbc8e45214c02212c413751dc91e78b9770d35cd818eaac7133664 SHA512 f5a3d751e45eed7749fa2aeae0f4e3cc7455d0b5fe72483feff0e72de78bcd518dd9e15d98d54c6b1d198b66cb30fd1b165f13561ab9fad794292da841b14970
-DIST firefox-89.0.2-ro.xpi 543409 BLAKE2B 28af45766d7bcf8867243e33e01d29f71beae4d3bf2ce23271e0047fcc4422f27dc3a8c9155c84dd67b135b6e53977a764b1a10841fa62519a57e968e732a1a1 SHA512 ffb9a28b9f1e36657082d10d466d0a4e83ecb3e89c39be30bc7d3b7fdec74d511bdadb572788e43d650b4b4f1ec5b3ab34a54336aef58b5e19ba538e6f122b61
-DIST firefox-89.0.2-ru.xpi 643056 BLAKE2B 4d14dfd40cf38e96069645ff98d456d2f4d9d5394ce77ed6d65f1d59a03cdb0d9380f8c12c2c31ba86db62c9b49d3ab08ce067f640ba86e9e678e3976358749d SHA512 4b17b2e637f0086020fe6c073ea14b57419822b296b38cb6fff7dff0b083829d5bd6e4ed5d597714da7d44b371a66a0a9ea220e0ba9282452e72cde36db1769c
-DIST firefox-89.0.2-si.xpi 498542 BLAKE2B f76a686ac0d326c8306c49e28d454845c5468ca5e88a75a7612555a00c2665dfce825f283037df3426025ff1ab4ef977e78dc117ef192c316aa1ff48a00baac0 SHA512 2c8cf93972be48853b81de7d5aa9e77e6cde9fc5b0a51c17d34cbda550542d2d4bb119acadeb108cbea0e8378bf4b7089ca1ae5669a4e9c5568eaff2ff4db581
-DIST firefox-89.0.2-sk.xpi 577643 BLAKE2B cb129330379bf9681fe940c5defc52b4f64c4635729635b1389859c58bab71ce479f3da9a8b8102ca90b082459e0f40170b9496d40e9c4aa6a56f3a373a66751 SHA512 70f53a2566c85e529fdb4884d88666a84c363f5249a4d48deaa1302d6886d6d563ccd069e3359dbf10b9244bf2b9d080b1dcc0ae4ab98842a5186c0bf9c6d539
-DIST firefox-89.0.2-sl.xpi 548741 BLAKE2B abfdd89c976e42df6a7dd8bfbf121bf93bbca8deae1ec49144468922f19eac960212e382f3eb34579e0e50837b47fc867dd4431c069782df74715196fb24c79b SHA512 8c539b050e82c36ab86672281fe3325bfae03323d2b96a88b12ce87319ef24641838cda5d81668abc4f3629b1aae0370cb4661f0d80a7b3bdbeac9fffa49a384
-DIST firefox-89.0.2-son.xpi 429309 BLAKE2B 65ab28fd243ac6ee5562f7490de74f1a01aebd161e356dac1fd91a4c4966a41c5fc11364eefb89296daadd5e4a710f47fcd873940b4b445f0016c9cc57e11889 SHA512 8380bb066a1eb1fdb69ca4afe0652b59983168a73c5ed96d9168786f959921dce1bd5efe578a26f2886e00874512a023c50aff942dfc1bc8356a64f060224dae
-DIST firefox-89.0.2-sq.xpi 567154 BLAKE2B 65e14ddc267d01d1f7ffd260c91439c207f433f5bbca3495f960cab343bcbbc152c6cb84bcf8ff2428674d4c479d0769bccdc030cd6b21837632498727548566 SHA512 844898aa7b832269bc2896c1efde843dae6b4f423c354dba788a3ec2eefb1cc054f7309784e143a4eefce3c65891861d90502f230abeda20d1b62de7be01c2a1
-DIST firefox-89.0.2-sr.xpi 602622 BLAKE2B 12de5ad2b99ccac85331435d81733fa69eee9dd13b3e873866413761dca5fb21225437710a0da4d616bc534cc1997c1da7abb27af3f9892f82594fa54dc97e15 SHA512 3e757955313f1109e5a8da9ba7bae0bac9b8ac69020b4a0ac1462a0dc71c94ed6c7f1a9c6aab21e112204191eecca59a39ced5ea141341b37f6ba88bcb72feb2
-DIST firefox-89.0.2-sv-SE.xpi 553406 BLAKE2B 9afc8ca2af729c15843538f3ebc697ba69c4f330713f23f287acf2df99ed8a049329845aa04447fb1a736c2a5ff6da50a4ef1a89bc788bd0d14c1c6e6bbe84ce SHA512 fe425bc9f4e62efc288fb5e236e077a671ff89e01bc92ff3cc04ea7e5aeb5d897069119a52e1ed94406ad597200dd5091f1c8da82cf04a368e9e61448aaecca1
-DIST firefox-89.0.2-ta.xpi 527592 BLAKE2B 004cd1653675f75e918f1c7037688efbbb8c1d713359f9f6c0798103807d291b90da969aa9e33f96a9e47cc20bf1ac44b047087bee2a48468a0959555489dd5a SHA512 535b2c12c54b09ae47edf11aae58eaf30355e75bc98024aee0eec7802b767654c48a94f409b8dd357b7792b82fa89e451c76558c48b16029b232eca3af03f34f
-DIST firefox-89.0.2-te.xpi 570054 BLAKE2B 66e8dc3a8cd9be514826ece6f9cdc4b0975a58ddd2997ca77dcf7135281498f295acbf72d94fc2f54f654ae87080095e149fe44be763ffe539c86999c1b39166 SHA512 e1480f699de3f7ba8b39a3b797a88443416b1540a20efd08557da3199f40d5d4f4571d122ace398fe8d43ede9540e2743e64d7c9ed7558f4e1c932249c018bfb
-DIST firefox-89.0.2-th.xpi 618977 BLAKE2B b348fcf13cfe998674f71aac6d5291dc625aef11b7521b252a57983a2a737e03abf1042a9ac3e4c21f45abdeb498f87fce3e1ae31e36478646d6c1ffc3dc1c75 SHA512 a9566f8cf4e888c5e73a7f0f902fd38530b6aac9932bcd5be9409368c325e925ba78c468bff8192f317a8ba8e432bc651e7acec07010d37facbfa5d2d36fbc91
-DIST firefox-89.0.2-tl.xpi 529533 BLAKE2B 9af410e45a39c1109a075f16b4574283365148fa452a236bbd0de4e84b684e65ba596b08bb9ddb688db845334c762b714e1437d01e4a128b9a0ebbb4d2a5d0e4 SHA512 6717ece59aaa6806cb1cb576e8bef3bdd53fbb8d89092ce8fcea5787ba65d2290f168196eedf9e17e880473fdd649ca040c80d413d93ef46c1325b9f4bfcdf34
-DIST firefox-89.0.2-tr.xpi 565810 BLAKE2B db49faf5777dc32e814aa408cfb83f730e54f45681d4d9738c192ddc250dae5936fbad4c9fe9782c1442152bb0e6b62afa5544b6ea6fd6172c8cbb7871aaf710 SHA512 c1ad899f9cecb19569e6bd4c551085ce82a6e99371ff2fd1b532aa63915dd121bba7615762c3300173e81fb13e578a5a3dd8c70039ad3dc7efde463ea53705e3
-DIST firefox-89.0.2-trs.xpi 507975 BLAKE2B da0fc99cdf37144c54bf8376824f9f18665d1801085a60704f729535441021c9153cb7ad05410d1633be2266b90a28d548ecb1f3f63b0301b3fe244cde41dba4 SHA512 5d9805265977f4c90fca72570eec2f980c4f940ca8348e343d024bdafd1d580ea581d0d59af1e554b485bc9219ceec889327f00fa988c6ddd01baf8658662139
-DIST firefox-89.0.2-uk.xpi 636754 BLAKE2B c237de3dd387abb8ae4fd93792bf4da48929a62d32bb2cecd38e70e807fe76ecf38f96314f05ca303b06a5acf8eb3c5d8b0e19f0bac740b6d8c21e46d7ef4d61 SHA512 09411bd33feb732713214ec09d0029baf4cc8810a1edc3c97cee197a09df263b411b811f780a92781b286334e610d64e16a028e9ae880044a15b75e0136a2617
-DIST firefox-89.0.2-ur.xpi 570276 BLAKE2B ea77e15baa79a631eb88dcbdc58d0dc264d8ae6822da104219c1a2f3e7e5fe12f2879aa24ea568b113016a983e4f7c3cb1e005da85225d77d9eef7ff58ef9609 SHA512 7f9836bdd83f1a688b54f0237748ec6f3dd6c42381ff63837bc15ef78b78ef98fcd878b6c9e4d1ffd3fd2795bc14ca611280998cd8d3221045f853233798ee00
-DIST firefox-89.0.2-uz.xpi 484317 BLAKE2B 83fbb36588ffe3ee9b5c7ae3bdd43c334de90d30c93e0466e95b4c684ec96f078d335cb80dc786a6904b5729f7f4a2c6aefc4ea5b74448cde9031d836f7ff9b2 SHA512 3751b335d71e06a85e3d72f8745915637e12b29780f20c7fb26935d85f81c6fecede2dbc0e1b56aab40c15d5217847fb412935cb5d586843d2cdadcb2483b516
-DIST firefox-89.0.2-vi.xpi 587754 BLAKE2B fef2b5a71876894290dea36db697a604992763dbba5a1ae320fe6758ec16e1dc1e77e6e18a03242bf6c1dfbbf94c24d8f4648db12fb742c2ed5bd4e039cb3bf2 SHA512 8cfe190006d17608af1ceccde25aede55a802b7a86ea5266f03aa1a0f4b145b895a39668a5c0721dcff651d136b976716373246d3ff15a855774a72f470cbe61
-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-90.0.1-ach.xpi 467563 BLAKE2B a30f7816f4d606c1465058d871fb492edfba413f515b076ca030b77fb79c8b183081791405ec5435845bb2569a227dba00c88350f39a5a177a1bf1b35131c09b SHA512 f49f245bda17b165cdae9e0d809051c669103db87bc48c93bec7086fb4d178d428619738a32dcd74c153ef3b09c34dda39ee061e379ea5e1e664fd161e1ad2f1
+DIST firefox-90.0.1-af.xpi 430695 BLAKE2B 2b354ec1bbebb37b35783113524594fe2b884bb9b269ee8b8d69d65f21844fb6c2099a5aa05ef6646c8d596bc71b30a2e85c807e23e039f5f07fc2dd52c5e07c SHA512 7e25f43572fc58462c94a83a5fe3be2bcb44f3745419b34bb224835bb7fe063a841b0598f85ee4284ad20365b0099bf2e01d04d068739adf68c152ab5612cf79
+DIST firefox-90.0.1-an.xpi 515449 BLAKE2B 5bbc0d9e7db02e96bb6587bd26608986cd3602aba35daaa468accb1f06e82995c2ce3509091f2c9c9b280c8eb40267b086acf2a343b0fb51d384ffd7d85cdbac SHA512 448222104996df23cb93cfb6fb89739bae2449f22c773cca9ef0e5442d0f825a58ec3ef7661d196495bb2c6ce7686a987ac55d6a80d6b838b838fdc8236f7305
+DIST firefox-90.0.1-ar.xpi 580200 BLAKE2B 6efc4c47593c8c259e637e2ab089dd2042bc1620e5d31af225ee6edaf7748cee28262a4680bfac6bbe85d77d8783428082f07ca1b113ab8d358e357412b3b434 SHA512 a80677952af00ec887e0726bf349c36371f5fce96ae395727942e0f0beed3e45bdfa2d53cf5964eb6251ce233b36229affe4ebee31a0c41eb6aa73215aca6dc2
+DIST firefox-90.0.1-ast.xpi 507903 BLAKE2B f0f1962483fa41eda3ba740c53bcde712d3db152379e15b502367f5b3b189c95be1ff17183ac24ac5d788f09aeb9897e0a0ef6170415ac42ec018d345aaab963 SHA512 98332f1a5f74e4358822c5d4e0e4139af2ec0cd7010ff8e4a7f6f8ee08e993c7e7c351fcc836a12fd0b7c1665268706c6941f26119292b5923d9dc66936fb9b8
+DIST firefox-90.0.1-az.xpi 503441 BLAKE2B d1c0fed64089657ffefe97a0c69f6bab42df2764db766551454ba5567522e2e5ef657f70587aae09d3b1d6a30be080f84ff5359d236768678c0e95b712505499 SHA512 91fa9eadfa0846a30beeff72acc5520903970b1fe756de0b19db93f3c540ccd88e9afa1d16e7ef5cd82f94524cf4a14408c568cdcdbb0a31f41be36c9d703204
+DIST firefox-90.0.1-be.xpi 636667 BLAKE2B 7a4f2dca65233c667b3b1ee21f55c62706ba929cdb598a492f3cba6bc0ded7b578201e81b0881807a933140b6e5f2173cec1e447aef7d5103eff958a821de53c SHA512 04dd0afd76166da9025fa9113cc20f309087860d9e86d2c2a3f7aeb027e20bdc1a1b87f65dba52039170a24b25315a2f3bce566e231e18f4299c1075bcd600c4
+DIST firefox-90.0.1-bg.xpi 590435 BLAKE2B d97d552caadf822476cf35f7c488bcdc2ed588450581eded137b57dc207fc1f4720352ccd4c6efe08f7bb36ba72cc3f3bcea5a8724fd74de584ff26e7e2b90d2 SHA512 0d1f5b229b32713b27d37102c361f5b1c7b9eb1b9e38b30391a9d32bc142c7c848a881dbd0c217fe69004a179566d247e77b31b22744c4ab4347d581a13fd3e5
+DIST firefox-90.0.1-bn.xpi 579582 BLAKE2B c577016265972d1d764dee0f5f23fa789ef9950e70998e803c896922ec59ff95b281e4c36b9304c50fc981808e598e94a0557397b0f7bcde0a1fd7e400d6c7b1 SHA512 17d897aa3269142fae4127da0134508970809e34a74de9878e2b9f1a3e5c62c3bdf2f067ea42068b18138a40458743aa830356357405dc8b678cbf1798537bb9
+DIST firefox-90.0.1-br.xpi 537487 BLAKE2B fc699ec4b602f6f51c7cbcd66ee9e97e34bd4fa0ab453eb45ee03d8c88e1f75a5dc0579a341bd28c95e50dcf4c49a5058cf74adc93a439d4b8548e7cfd64d60b SHA512 c588a26b6727f48c5812ad640101236dbbb95153c9ab38bc82fd7b6b2fc35e6a652f536082590c4f4b4a3122c2bd3a8d7203fa54722e7f233cda69e46b5d945a
+DIST firefox-90.0.1-bs.xpi 472335 BLAKE2B 96c1870305b7a690eed96bcb41066a08665f53409decade572bdc9e198b98a2d1be31faa331d109a0d107af70f90ff4341660bb3c08a2627fd6423d39473896c SHA512 c2ccb864d1b3c5b20ba574b94515948aa1c260048822a3e324664935aa452dfba022724f085efddb30762b7e1af481246f968205a4aa69758fc5c570b86cc08e
+DIST firefox-90.0.1-ca-valencia.xpi 548463 BLAKE2B e04fc7c21b2bbd7a9b71f23016a0d58a2d31469dbd39b14b78d8c43d9ec29c926f61c826ebc080a65e4531c42c3bc3aafdf095019da08711edd2615fbb4293bf SHA512 62bb4e239b797b1aea9a217c1478e220b9d4d2d4eae65d3ee99f9afb6231947982f04707953293ce8cebd10fb937e6f9fd44777edd5199953d361219e70382f5
+DIST firefox-90.0.1-ca.xpi 546577 BLAKE2B 867f7834d6463140d7d57c50c85ae9261c4fc73603fa8071a2a7ed10ff00b02b0e7982254309cf50af4dc3094121117f4494fa6d9b69b7bbfdadf5fd4457a95c SHA512 f8e8fa64da11cb0100a8a9c5f9ff9cf97616cdc24a308e50ed63d3bf4ed465d1546f5ed3c3bc1e06d1a71981ea1ba970c53654855a96ba094a3f74d90672ded7
+DIST firefox-90.0.1-cak.xpi 573755 BLAKE2B 7c7dda98de119ece958e1009e906a63ea1aa88f5f18f830b072ac8b365c73a9a572e29f6a47e0e0740441a9275fcdccec2e8c277f7f2b399256feb20de2521b7 SHA512 b741e9cbeba4214b188cfe0c638babfbfd12692e90e0e8593383f298f1e5d398cd2ea0ce4c49bb892446d6bc72493d06d16beeb1ff23d7cf08163cf9dd36e6c9
+DIST firefox-90.0.1-cs.xpi 577430 BLAKE2B ec80c26bc53f6acc5aab20e9a72f0d83ff089766c4e52a552c7022538bf6b768abce4f884a688a3ec064cffd3fb06eda33d5a074a8ab44d7c7e7b05d30c114f1 SHA512 1732ef51b6427ff0a3bfa37e84cd640ca9c4c856f136083efade14e98868680c42aaf1e21780acdb08b8ce7c15a32ba2ca6721d0eed1c1737e53f871a7f169f3
+DIST firefox-90.0.1-cy.xpi 554151 BLAKE2B 47c6de44dcb551663b99b2bcaab6e68a5ea1c073de37bca91444e06a55a926ed2398daff5c4b99f31e4c411de0a324cfe166cf739c2f60c67c935161e63ab4a4 SHA512 f516d5122465be7ff89cf5c90646f2b712f1c1868ec096c51603bf093f18c8d3d9572f0e3e8762faf5aee2ef6dc6100cc4f86b473aba5c7e4093cfc7f4df126b
+DIST firefox-90.0.1-da.xpi 543830 BLAKE2B 79f8d98bfe8015b51844ae44af19d6ba84aabb5d20ff825b0c9fa74fcab7e41e3464e6c1382343c5b72630d369e9418466077e15f1eb5473e5b3617a0746359c SHA512 c203a1b544c785a6d059a71e46e13329a4e6e97cf59fb2a83f45f2224888c442b8d821566b7e71120005fa9a28708824b9ae8a134efd5ede5f1fc4ef5b54a9db
+DIST firefox-90.0.1-de.xpi 565907 BLAKE2B b37ca7f0bb9c20d630ce07943343a744a67bf8902f7ee05c62bda49196933c6b8fd1875ccd0dc0215413b2d2ef8bb67914afe66fa700cc18b3fa025792bcd42e SHA512 2c6887b3ff9c11b44b7dce40883eb9f7b2b98c643d7bb3c3e418380f606965bf9bf286eab496d4e591b0595ea99f16461872f9607ea6d443cc16b13d448b4e4e
+DIST firefox-90.0.1-dsb.xpi 578732 BLAKE2B 994d2d7c9934afce2c76d3706fc35c112e98b64e5718618edfce8d2dfbad39b79fc245a8c33369c1f641b2e5ccadf489086b25d24618f0178d6319ed973bf912 SHA512 a096bdaaa5e2adb055b019d09ca2df27c414416944c0f0bdb27501ed98052c6daa5bb92dec5b9606da178e7d7b02ec4403319e5ddbc8bc54271d278774d903a0
+DIST firefox-90.0.1-el.xpi 653313 BLAKE2B 11e45840d7359d15a929872a3224e42ecc069a2b0051fe17ef59a6dab3a3f2bba11e57f3e49e256821010f514e5acf0a8080f76db69497fba3ec5a6e7605c79c SHA512 dc287455d86c89369163a4ccf56e3348d74210bffadcc9f1aa311d106ede11f0ea0048b4a45d4a398e9fe07a1f606ac7cb47a6ccf40fc8082fcc340ec90bb3a2
+DIST firefox-90.0.1-en-CA.xpi 520981 BLAKE2B 37f9d58a60b71c5c9f830fc3ed76ec4dc04166388eff87c75b0b3c5dc3f25138cd30c87edf963171fa4ad982216256c281537af5270d39dcaaea4738a765ebeb SHA512 db8f9c529e5ba055e56e7be5d906a2d63d0027ac9f9ccf17f3bfa0ab2084baf4dab490b24375f6bd2bdc2ce55fde9f31655d7de2b36288fe8e2160251d25ade4
+DIST firefox-90.0.1-en-GB.xpi 521294 BLAKE2B d70ceb560b0cba17b8c9a198e759012714b72b49b8bf103b340a68355d8a32d78eebfaa26fa0d5ac8330dc7d52937e14234d7a3d895a706d371444477581dd56 SHA512 f2a6cf86752c70dda3b4394e6bdb0c9f2f772ca91dfe4ff76dfd5409c48f44e6287c532c6777c19df8e633cb473a661a699021b81516a7e2caef8517342ec0e0
+DIST firefox-90.0.1-eo.xpi 546171 BLAKE2B 6ed24ad03698d384137248122edc8f4afcb1e1a3c4534114ba79614b2923bd7cf7a0c3852b9a6868722a877a12c8161e6a4d6c78ad0151e34f369b1dc16ba034 SHA512 15ff184598812a5cbaa8202c0728478b5a3ac10ed634554b1386c81892099e616faaee4cddc61cbb35d812e6ad641a78ba2cc2d66468f26e51766e332092498d
+DIST firefox-90.0.1-es-AR.xpi 559091 BLAKE2B a9164380b7908c6cd0a1d09e9bb74bad715be0bc6e953511dfa8e47cf6304f810f263c9fd05648de311fe3dbc785494ad1ab3e3937384be4427a956e2bad94ce SHA512 5bf406c19f61df5f16d8e35a027d3779e0f256ba1e9268611200c926b8b27619a41b63df68bbfb1519fd87469e7b6e7c0621697f8fd5ad32fed71327915ad4b7
+DIST firefox-90.0.1-es-CL.xpi 558226 BLAKE2B d6a3b3c4c86276e87737a7765e3671fc89f894ceeffed60665b91436d8fafe3e3a594182c8f72c7f9ff7126e797ff5bc2f038117af8219229f6f3aa178e78d03 SHA512 bbe0bcda78c434d0ed7e8b34f38f39a476b415e0d353722381655e3b753c81d221bc02e29469633ffed9620bb28ab339b49bcf5a13ae13c03a3ce608302fe481
+DIST firefox-90.0.1-es-ES.xpi 548979 BLAKE2B 63eb9b61c94a9000a754d6555fd468a04099ae198c27be4bd218ccce7bd93d226029f56b94ac0a4179a7173d82bd5510e9cb0fd822775f821ebf1acaf99cac93 SHA512 fed06130a8d868e86a57ea6b26dd1b5e5db7de6ce4a898bc039efbc17416a954d8eef96a1e10d66aba50c80e24d2b78a99ee0bd09ff8b9b09f5db7b380e064fe
+DIST firefox-90.0.1-es-MX.xpi 562420 BLAKE2B 57dfde811a33ed1ef52cb1e06045d52b7dd21b45054330bcff87d60440df5858d0288bfd9fb2835dc724559e5c4cc8154ca8f2444532bd33a86570518319f161 SHA512 c816b47239ed61ebca03f6766f4f665a37882311e2805566f5cd3da6a00797e2cdd4973cd3a4137b7309fdc02f45022adcc3446e906402c40fc727ca5d9c5587
+DIST firefox-90.0.1-et.xpi 496641 BLAKE2B c560f85ce62046723a7dff4fc7aa31cc4f25ba5301d5f93dd422a6e0559e7a041cf55476cb8399861cf132416cdac4990f0f3a6b10a1d22f535028662ad2826c SHA512 07cafeec25071e9d7c712ef5394cd49794d01c73a4acfb8dcc700aac3c3ac80b6e45606fbef2fb417123942bd8a9fdc50d64948fa8dd0f9845a1728eb48fcd35
+DIST firefox-90.0.1-eu.xpi 544759 BLAKE2B bed804c5daedb6d00f5beeb60da9b30e0a3252d2f09433deb0b1ba913961c6780edda3160552f7188f3db11fd35e62bf5a32e071ce981f42d8c58ea42e3dde72 SHA512 43da4484590334777b7acaec5e7962f5848bf17781f4085467125d6a1287d777d77f8143a637c3bf67c346e793ae2af18bc24915043377e6c65223421f90e7a0
+DIST firefox-90.0.1-fa.xpi 565130 BLAKE2B e94ffbcc42348bfb2b7b0448fb7ab0bfe86541250bf2f4673426cf74e4a9c553186b722291d00bda2dcb3f64bf5ebad0e5f044af736d623d21cce3b3ac6c1445 SHA512 4a5a26023ad95a61139c16dae1b1583b2ab0be31c64f0e32c92597b9d796f93a7b0cb15465f3d6e50ad06e7b78b4f916033ec60b51a8719dd473c3e69db54d45
+DIST firefox-90.0.1-ff.xpi 488041 BLAKE2B 52843f1d77a2e6bde4ce42e3eb7dbd1cb0ef01d0e1d46dc8418f182253b43c2706e326833ed733e4fbaf38fdc88fa83f0d0805f27fd40069fd4cdab0c7bd6d50 SHA512 2b9ea0f7225d0e5cc93d0fa942bd2785a12def41600a9afe2ebb69df6ce926b5aefa13237a7c9483dd2caf9121052ffbabdb04262ca8505ad8b65a523f160e6b
+DIST firefox-90.0.1-fi.xpi 545674 BLAKE2B 73bfc8d8f0cf4f6dab55e4ed804fb0a2a9a80b577e645ef6f2105fae5e285d404c3e0913b76ca3909ea49c846c9e2424a22d03c962bb9776a3d27cd1e51b44cf SHA512 6b66c1c7ceaeaef83adabac0c0988e9315da2e3e9ce42bbd845e642f2eaae4ab56968393690bef5d1369fff21dbdf566499316115149172189498576953cdfe9
+DIST firefox-90.0.1-fr.xpi 570206 BLAKE2B 4c8f2e9e4b0c762bc0498b08a76885adcb7c36164506c433b91dd5fd22e69a6ce91e93b966e64e762e9c96105e71252c12dd20783fb4065093f56db61904a5f6 SHA512 b142455937ba139f2385cc22f2da357e36a1d082a77731860d2115f9eaf8266a988bbd9cc1ec30dd899a5d1ed4831872a6f494e4d203151328006f782db04b51
+DIST firefox-90.0.1-fy-NL.xpi 555046 BLAKE2B 89d741eb945138cca6471ac0b3e3b09588c6b9fe5d2fac250d2f40cbf005f445c894cc152dc692855598e288c8d356ba1d0edfe5ddaf5d23c1526fb64cae3b70 SHA512 5df49977394f88e99c55f1f4e914d96614e70f30c5d611210b6e40283074968bc7906c44389164d5d9390248fada6aa8aa1940408982ef08c3a83a8039a2c171
+DIST firefox-90.0.1-ga-IE.xpi 473117 BLAKE2B b2da1ab90b7af89f970f4980a189640674e23a0cd88b5c0daaa88335ee48f36e531cff39ab80a2edfb60a2f6e1ded89101b04c5a45869886ccb3ba79fdc0ddaf SHA512 04bd5bc068fa2787d1af54d4ba780f1bb4bbc9f53c8826ad91e351c76742a2d4ac672bb8e8300dc89f2189d635ec00ee3e750ac0622296f85fb68e9fc6da3205
+DIST firefox-90.0.1-gd.xpi 550989 BLAKE2B 2e2bd993fd17743a892997c23671ddde4633acb77685de2949882921a53d11a9c7675da7eb292ea609d910a9ffb09a12356eaa73c331950249f4f5817a79a300 SHA512 640f27de1df4fff3b7da6bd01c69e16f9bc5b036e711d51bf7641cfd6a39aa0fd30b5b3f04c4c00ffe44397ae3079504b13c36577f8c9e772390b31009c24c4e
+DIST firefox-90.0.1-gl.xpi 554475 BLAKE2B 8052c752b431b96d9bfbc4c137f5c1f40d3377445631327cf79234774a324fd03c82701fd01884a945f02b3b8fbc96974a1665705f007d59c8b9e99d889e78fc SHA512 5fd8701e1d67c3bb065dc1f409cdd67089e883a0b76ed0ac9ee4d4f13be75aa9eebe4d22879529ac94ab4091b0a4ef981cee7abad1960acc755c2267b07bad36
+DIST firefox-90.0.1-gn.xpi 571174 BLAKE2B 5b71ff90d2128c9aae6fcd7ff87a9a8dffce9ce63fec18e7f0f336e17744dbf9365089d931025416da7bd1759f82a95b9556911b7ab2d253cbf649e162c7b4d1 SHA512 b359f7717a18cff6e4d3472215321d09f5077637c344ecf7da56639879b043ef6c5809913b011e125c985d022bb8e921328dcf4a96b90bd8d8231d462ed8f88a
+DIST firefox-90.0.1-gu-IN.xpi 547526 BLAKE2B a9586665e12001c1eb7327b8fc3b5edc2ba4ade85cdb11aeb8cafe1357771f1728b4b158ed3abfd2fc4d032b7f73019e536365a6e95aa17fc7ab1be7de5a7fb6 SHA512 f8459b05537ae768e3fef891a49202ca2351a7e2f3305d11a8c7b8b840d9f2f88efde014f0de078a9cf1f4eaa26db5a842d87cd140169827ce44d96975e21265
+DIST firefox-90.0.1-he.xpi 568991 BLAKE2B 57a4249c93f96fb7bc0d7a32ba41aa74b0661ca57cdcde2efbe695bb681835f8d3babb8b91ae8519a64b0e27ebfc0c6603fc85ebf09412a436e1fefc9b2bb29d SHA512 9bf1f56d47bca657848be539fc4aaf4cbe208deea22a9ecf912babc6e69587afefa8618f81b841d1634cfccc88d145d9cc0350a1b4527a16920459be57c2cc4d
+DIST firefox-90.0.1-hi-IN.xpi 579605 BLAKE2B e79e14b8f290f67003d3316506255944ff883d9d2600c7c95293eb4de96efcc53895ab22b2edb804e97b88a1fa9ebc9be7fe8210e21edeff1b4d7dfa3f710e21 SHA512 ca9517f8427dd756aa08cd6343cef09980530ec08d34b01075d274ccf898cf6885cc56f2f97d42dc6daae5f607b4f926834d4c40262e82512031ae28c35e425e
+DIST firefox-90.0.1-hr.xpi 549989 BLAKE2B 179e37c8303ce34809bc87274cd8bf4a82fb465efff9e4806540adbdbf15771e147bfd4285afbec602efab0f7a5a91d78ecd73954304cfb3749067563cf03d3d SHA512 b6b8ad078d5a97b401e492dd5654fbdd1da0acb1c190ca8224891ca0d8f55da08e535b8922d92e64f3b60408d680c8be3c070f1946ad1bea31ebb23bf0dfb0b3
+DIST firefox-90.0.1-hsb.xpi 574886 BLAKE2B 4544532f23189bd87d37059c6df790acdf8b2145e3ce3e1332e08bad02c1b8128e99a924f2ac1fa11c5394646e87123525ddd765a36ede1e1fc8fb821151d0ea SHA512 7096869a1d81a2ac7179576e60a18ef5b573c7505ef853404c6c7cec8eee2498cd4bb262f1cce62d71e02bf3e022bb18bbffab38bb98e40866554c701742f9d1
+DIST firefox-90.0.1-hu.xpi 578493 BLAKE2B 910f323df1b5844676c6f220cef8bf90720f410327e38fff709d1ff98037792287839895eaa275291884fd8edcb0b4eff13e73216f68d7dfea9400e44bb643dd SHA512 d95e663a2ea9d547252d7bb56451b62b0c2571499e715a9c5d0dbe7b8e14047bb3c24fadc5c8eec3f0a330c9d015984b1236fd803bb314c506502753b5f8448c
+DIST firefox-90.0.1-hy-AM.xpi 604407 BLAKE2B bcc43eba7b02525dffa4cdb2bf99a784e2da16960484292cdc5485d6be72b5050b64b10e82358eb73e10bb4680e8d8491623c5af44ec28f9207d82f4edd26e24 SHA512 cd592044b0de3e8a37cc43be6b0a9abecdee6d674806c9b2efd66f6d0c2a999198790a86545cbd15134b8367192765c82427fe39296a11cf7ea2d6c129255ed0
+DIST firefox-90.0.1-ia.xpi 543884 BLAKE2B db092153d18b7cd15a74f5bb9d5fcb253c6b69ec3b7a83f43ef74c3d79d95361b58c2eb07110dac5fed6ab77db9b6f9284b5a29f5c37beb688f5f849d40c7b2a SHA512 91650c07d39fba5cc76d60df856535bdf1e9eb5d837a87de1c46821f2f31a7733be5609374901a6ffc93090cbf0c5036f9dd7a2445a0c934ae85202264894359
+DIST firefox-90.0.1-id.xpi 540018 BLAKE2B 2866cda1253e0594ab3627459c600b3a52aea7facbdfbae7df98f1212f7f2ccfabfb887e10ff1bd9e6dcd230d667aab57d2f3c25bbea116b42aff5e32984ff61 SHA512 51401b509b947a45c7fc97f89cc1b10a9e42578a4b861f39bafa85b1c6096611929346f412907f94665413291aa78660b9df1e1325b87cf51bec1617ad428d1f
+DIST firefox-90.0.1-is.xpi 483701 BLAKE2B 12f83d8122e399405805f9a5fddb49db066d1e361e4a1ebb09f8dbaa7bdc5f0d2d5f1bfdb447f14a09e3944f4d909491b84c15e48b33f3144ccedb6692aa35a9 SHA512 4e96600455d02705375a4dc7939042d54b6effc8785ef3528476d36e135e987eeb3a1205373477eaeff09e080a47a40390efd92c7d5d777f37f535f49c6cc36c
+DIST firefox-90.0.1-it.xpi 472095 BLAKE2B 6c797b7272f88d5ae64ba62e2cc4fa662b1ecad4a2247f9ca170b315c0f619005cb5ef0a5f621522afc1e3421146ddede47c1969fbad1c4ab3229eac682bf4d9 SHA512 f4893dbf1834b5c2bc57d4b4e8341f17c6cccbfd9944928869159dcc430547479cd34ca633c8e2c376b975d03c50eb9df3b5628635a4fc420891bf633788e904
+DIST firefox-90.0.1-ja.xpi 605305 BLAKE2B 11ec52280078d6edf0ceea06572ea54e7c31de81ae8fa3d8d776a3f42d788e919af5838e8bfe325c77aef20681bc9e33dcb9c396eec015f5c304bd2ea449c605 SHA512 06c3adfe55ac510fa09a9952b66541b84470facfc73fdf8422beeb505865b3fbf61494bdcce2810e7966eb4eed0391a53686f5fd25a4f73587e508e17fd643e8
+DIST firefox-90.0.1-ka.xpi 606618 BLAKE2B 6c0d9623bd4ed893fd8527e97265f544fd6bcd5e044381dc2b0da9da416a8d98341daab642d966f174476f4c2fc37b9fdc3f488ee64364b86546a3016c955b51 SHA512 10ec5f34c551f4c095eac2d5ae0468cb7fc9e5209ac95740c3aa321f212b82b0599760da00110f64ead5a3e118bde07871ef9e7c5e9af89068bfc20fcaee1bae
+DIST firefox-90.0.1-kab.xpi 562723 BLAKE2B eebf8fe2b650132748beec57f468b4830f0c6a885fd21d215d1f734e93896d1d07b5eb7f85973ab80260fd301d197273ba783ecd5fbfc9f370d68e4354725a2b SHA512 480694521805d67a10818ae1f98cb42836d5719930713b68aa38d53aee7879a055ee0d8921baaa6d9841d5e068538ce64ec216e14b893e5602afc08106f9b67e
+DIST firefox-90.0.1-kk.xpi 621558 BLAKE2B c7d385c2e4ac96488f8596e5883f693ab91ece3bf6e0b3cd5d847c1169f07c0c81fd2585d7fcf640c05eb7d67e723f06959c2a90b62507ae8e4240cfb7827f66 SHA512 3345b0e31a162bcbc87230e7f01ba47cdd3836863d4adb267000bbbcbc976359ff289f5f1381cc3d6cfc30001cf1554d46395d530f802dc72081966823d8cf0f
+DIST firefox-90.0.1-km.xpi 546421 BLAKE2B f51e28d94255d3f0e7d4a830aa5284004d932f78f123ad701cb4d8ef18c9d39f3c0adb973dce710acdb74428521ab8af9ecbe01bb2adddfd1a84e71c5c2d9db1 SHA512 6da239caa4b2a2481eb42fd6f4efbdc4694e90ef4c1e71a627e42ccc3679ac390c275cb639a3476cbd266aaf45341a200a4351807635049c64942bb050c88da6
+DIST firefox-90.0.1-kn.xpi 510711 BLAKE2B f78f4f5054628ac2bc345066f309d43783d1400fa85ceccf6abf75d285bd83c6b5276a7e312b0b51ec4b2368aae4834fb16d458c61076e8ab1b7de6dde145f7c SHA512 f4d9f197b49b443c3cecf3535762686b3210f10cbf22c4403334081daf448b0c11f1f347af3d4f1d523a68e2ad0ba1141fbfb6897c4f1db91873a90f958c4aea
+DIST firefox-90.0.1-ko.xpi 590157 BLAKE2B 5a1a3353870ca211487e99c9d2b51d086d4ae4cdf15fb23e34991e4375e1abe3ba3ba31622d191ddcdb53ae36adde003015fd3f51b0f7d387fd053e6ecc93289 SHA512 dc4673e0eb02ffcaec666113f3a8ba412731fca3776d2819bf080b529f16cd36501b1e090d066e8ae0485fe137b1d289bc507692960ab8dd10b619941a550689
+DIST firefox-90.0.1-lij.xpi 484744 BLAKE2B c7c87de7ec80380db073ab34bf5ea5de962c29f0748752cb86afd1a6d9bab1020eb997d917440691701a89432605c1d0fa959bad0581eb9221ca27bd688f83b9 SHA512 5d3118803438e43b014e5eb7079dfa51afb131c548c08764601ba7f2040250994cdf74b6c5bbea3d8656661169852386a6042bbfdac2e857c6c35692c23ab969
+DIST firefox-90.0.1-lt.xpi 571831 BLAKE2B 7ec88a3b6772d41dd7fff3154234e1d3aaacb15b2b51981b635b13cf7b49a20846e263650fb84800326c9dc208bea2e9257bb7efb1fbd8830e0bb5e7a10cd2b2 SHA512 47e357b716a75b44cc703507d680ca71df91af4383be32637be3a3c2649909ac8645c734ae3257e68ab58b4e402e39475b6245584609f816b0ec1487ccdbf90f
+DIST firefox-90.0.1-lv.xpi 475676 BLAKE2B c6aa771d4123813e8e086673b9ba84b03a78d8b74908d0b11c1332dc40171c4f39e219aa2ba69ba7b2ec9e1f343a82056b8d18a1af95b318ed28287d7bd2394a SHA512 fa22507a1a28d9ae1bdcf04bddf7ba22598d6f3389b0bbeed4a20fd7029fc28f845627c5eff6db2998628e076ff48a03ba78a62cb9010b99f13713805e5d8bd4
+DIST firefox-90.0.1-mk.xpi 472343 BLAKE2B f78cc1d87ecd2849c2508f4a132971691a66f96f49b3a44970b9a3f0c8d6c2fb56fbe264737f46754c243afe724095d5b46d292bdba3923817d09ccb28951209 SHA512 72bf3948a3948079b2ffce5dcd56fcd9507db42adfcf005a77f1f03646fb4e3065076fca316a0e35c0a6fbfba36b71feb632a3796c4650db1d47dfba3badbf9d
+DIST firefox-90.0.1-mr.xpi 547689 BLAKE2B cbf722e8adcfb2f355123137d61872c7cd0c26a3ee60f0190edcc59b2c24eb71640fdb27f7ffe96e4b0b3533c0d37b1ebdaa368af1bc76697259c6f5941d4889 SHA512 2ce3b7318c7a58a37e7ee9ef2fd18228aeeb00ec313b340e17614e40ad260387ac9d7800a8ee404abd833845dd1092fc40aa75191827b3fb8fb5e4ccd7a8d668
+DIST firefox-90.0.1-ms.xpi 459291 BLAKE2B 30abfe885821c6240dcb5a20d25037392d1b1cc001188dcfe135f1d24af14fd5d40c0f839b49ea1fd6f798070dca31892c3868807a243dd095638505ac08f4e2 SHA512 740a0954aa61e12665e1fe0dcbbdafb14291b56e68686d28f8ed0d63e79b83061ffb9c3a29dfe188b1e162142fbec06cfe3643f1bb99f102dd01d8b041627df7
+DIST firefox-90.0.1-my.xpi 531244 BLAKE2B a4a133bec87f4bcea72dfe58f86749306dd180e15047cf6da401d6b0bd8dd865a01942c283dae594735133c7a6f021717ccfa90674ce1bf30e93ea919362a7df SHA512 49e9a2b9ecdb0b6830d5c4ce117d836912259183b8ce33e52ea53f95d78845fcbacfe0037db5d2dd5ceec39674bae71eb476cd963c3927fd732232d6c06483b7
+DIST firefox-90.0.1-nb-NO.xpi 540501 BLAKE2B a2c949325e861d437d69c8173609cf0062db681ed9d8b2d4c90d3816b27ea181b0ae9b079b66de57678c2200a103959547f7d5e083a6e696af8bd1c189aa9087 SHA512 d0178d9c479f8786ea81e861303205c43f85ce51a8f2b2bae3eef49060ff86c87379af795de9bfed36a6a6e5fc1ff3f614086b96a7a58dab2a52bf17425e1e86
+DIST firefox-90.0.1-ne-NP.xpi 488250 BLAKE2B 1ea7f4249a85e4b123c317852b31a1d4c0c2bdde66058cc66a2cddeea13f6be9eb80bbf79053266a661f4d2de898f48ebffa9034722c0b6bf1450d9637cf672a SHA512 e386310bf8dc2b1c72a5b62682b8189ccd60d7fb71a8c7df9f8c80ecd7e56b9d95d941ecff13fc866b627e77a2daf2cf09ae1496260a4e7666c2dc4d878cb01a
+DIST firefox-90.0.1-nl.xpi 548832 BLAKE2B a02ba3ce88030183ce63fdabd1e730cfdfcb38a907d92df37e2fb4fc1b5ac1a7c4de3df7828a6069e0b8442d85309454396bbcd5aee13b306b5d6d4e7831b2eb SHA512 a2c218a19b55e9eae308b49fe9bd32693686c1c8cb3aa203592de0e30b5529bb43a88e92e927dd1ad8f1f18d269a7f7693e99091102d02beaf119551de2c7ad0
+DIST firefox-90.0.1-nn-NO.xpi 543211 BLAKE2B f57ea76c1ffbaf650f75882e5a667701e30caeff578319c046f9ebd04df29bcfa39da84a36499ef0b25d295a76dca96eb0b710a46f78c99fa40cf0f75143a3a9 SHA512 845e6c71d771ccceaca224631f78ae0408482126f1beadd1890b64b43b36070f014cb92fcedab4fa82c6a1287f9e0eb87a28c65a98db078fae99cd405039557f
+DIST firefox-90.0.1-oc.xpi 565279 BLAKE2B 42bf5fee3c71dacb9837f266f989677c7c0b9930b34b2b91866d5cbbfe29609fefac5510891d9f9850b12597c34846b666b1dd94066bc5b808f44180eb17b5c9 SHA512 543b606c35d0c173752fc0e603160a004c684fcb0f2e7aad30bc2e1c772f68403bffc38ea97a1174eec26336d4ea82b13dbab98e7e1c1d38c96b2773c5bcdebb
+DIST firefox-90.0.1-pa-IN.xpi 612462 BLAKE2B ed516d3d2de5d6e40c8e6d92b84a10f157c1d236f2baf01a76a80b0420d28ac6c6660b02c6711295776995ab5b508bb215feec0e02951d933b569d566e89cdd0 SHA512 2d9abd3b3ebe6ddd0d0aeef48d9c49061505d2090bc2dbf6d1ffaf35b6fd99b60429b46c85db6af0477d1a0ad05ff453a57c2a0ab57a23b77c8c4a9b9ee0399d
+DIST firefox-90.0.1-pl.xpi 568699 BLAKE2B 16c3835d0637614ff24705bd4d2abf1f02876e2d35620db9c45a59579d314f63853d9d5d20a81fe767cc474001bd65a1efcdf58f730ab79755fc3897943301b5 SHA512 bd87870d8f960d6a16bf5b2cf2c21c2e4758ac9cfbde031b3346430b4b768102bf99e572cad9bdc384d8d569879cf0bf1a2b97ed4a3e33ca2501d6ab04030450
+DIST firefox-90.0.1-pt-BR.xpi 554548 BLAKE2B 1656bfecd902a811097caaebc121a9827166483369e68e74c3fae84ceebaa180f263a54986ad9ac788190b007db8c0e4e437b655d6765082c1a8c90eb4031821 SHA512 45b65b270b7b436331438aec2e2deeb63ba8f86ce6103a4ab0449642e17698806e26178efeaf26a4ab162075cb566cabd6e2305bc976e6d183ac35dcf573e17d
+DIST firefox-90.0.1-pt-PT.xpi 558173 BLAKE2B 492bb5003f2430207b4cbdd61529e4c36ff81df0b9313074f6b768d7c0621b8242934ce9d57a4203b8b1b8b3a8fa0c7bfa8d5f9591a11af5e1aaff92d60615ce SHA512 3a6e364b3a8d8ecfc6c8a6417d98c02d04957e1a73557e87a98e74de0c1d111b907612a3c9a779f1eaa8f819f171bd05fd798c7de1e232a0891c3dc69be1ba75
+DIST firefox-90.0.1-rm.xpi 547503 BLAKE2B 2d87fc0c3af1860e0fea0a5d381e23f5cc908b95461c0ad2a26a4ac291607aacd052bd67396d1a4cd2742edb81f75e5ad156fa88c74075d5eaf13592cd0dd6b1 SHA512 f6014616daba4feeb7a1e8fd5329b3ebf3a70794a3596ba716bf3ada2d005a9d22a5bd5dc67d51ffbbd1ad6c724601671c8332d16c99dcd5780f123bc3d7a962
+DIST firefox-90.0.1-ro.xpi 542097 BLAKE2B 1b62114e852af6662ddd389fce7e5d4c6138eded8157e7deeae2150d45ced14e514d71ec9fa597eccfbd73683a53cc8bd5c8bb390619dd41bab436d92b3cbe98 SHA512 5c96ec5e56d1d6773801fbcc761138097ae6eb1c2e21a2e6b4035b210a76871d7421f67ae54b12119968da0af70dd300a16a4233619b2d53bf1bde4164aab25e
+DIST firefox-90.0.1-ru.xpi 641411 BLAKE2B 9610816c6ae04edadab61a6db39aa739ba99e3aa9adcfc6e0cb97eb90310232526e80f36a48cc25c5f40e53ad2339a7301b0090c0d1449a9faf6bc75a1847b31 SHA512 e08c752107758e0ff5e9148938b4d4a21fbac2e3977dd88f9608054b4071917bcf2637a5c4232a2f2c4dbca48eb6e43a00f75aef309fd7659ccf5c2c39a5abb7
+DIST firefox-90.0.1-si.xpi 497029 BLAKE2B bb10d6b14684f186681f1f296d7dcb59d7d2a53610f35a9875359dce4493ea73568940a12ac58a61e27f19f69a1c3e1eb29bcc1f49e4fc18cdca155c3c497090 SHA512 833970c43c9326b9a9ed8a3f178201b86d8ebad66d2b0696947bcb1187d3f7958a6abf2065da08b1a725bd40e9c19fef4d8efcf4f2905081e236ef64f4cf08bb
+DIST firefox-90.0.1-sk.xpi 578292 BLAKE2B 028082c05bfe03f616056b4494487e14ecdd6fdc8dfa0267a0b3f451e65247fe28f5c8fe1808d53b8c6e1d29df7d9a3f4882fafddf8eb69bd4c1fc06c1726715 SHA512 477884de80be0ba0cb52ccee12ca05ffed9b0f5ca08fea94878619802bd35f3b355b4f68ebb16cf922b1be78859d09e0125ac5acb607f4582c9b72a2af558146
+DIST firefox-90.0.1-sl.xpi 547668 BLAKE2B f61794f628b490fdce7d769f056ca31c8d9b39909346c29cd108b9c9f5ac320157c022cca085ff200f398301968e0a47a4636e0e43a5b81283e39b829de56b45 SHA512 ad71713cd34c8db73bbf230ee75630c435145fc93f5f80c2fe12f2aa87086c27dfe431d6b63ce98679f36b817a090b15e80923332e01ce6fe89b91dd0bb0830c
+DIST firefox-90.0.1-son.xpi 427998 BLAKE2B 436c379781d1faedbb92e0e25ff97849a9b21c4360b95ef3d54831affdfd60cea01f9d7b53ca21fca5d9c03bb7632f7bcf350ce9c43251dddf35725726f69341 SHA512 e591de6888eb35c4ad441513235da632a99ee0d593dcd439ce69687328b13a8eb7f97847007285d07a0af0debe0b3b15f3a5e22c94a113efc23fd909a3ff34ff
+DIST firefox-90.0.1-sq.xpi 568604 BLAKE2B d21c1103537c9a62f935a97adc4df9e6653e63aa020e9eea343a5602e8e2b2317e6b4392ff563c27c588166771c3e38d3b437ba4d0e3f082e8e12746d5e56c1c SHA512 d53dd171bdb5431e880fdf6464fafea04ae54b693ee1d35f1e59e468878fbd9736d40f2562b8f82298cb5cec05588c1f2217fabb19f8b5ed95c2458b934f6aad
+DIST firefox-90.0.1-sr.xpi 602764 BLAKE2B 2de2802aa5ea0c277276a4e2cebb11371270cebf7e78b632df3cbdc6a21516c3cdbf8347af0e23d8427b2ab326fd673e80ded765551b0731df012b64b42b16b7 SHA512 8f87e8170098860a04a7dca4d897bb4935d019d1b8b906bd071554f72876977f2c8be811b1e0694090d10432fc849254053032f392eb635d966c4feaa9a0c793
+DIST firefox-90.0.1-sv-SE.xpi 551932 BLAKE2B 5120ceb910caf1d68a67fc489d3332d97609acd77e41845118aca945100a86778300586284aaceb16cacaf97641059314c99b5110d8ebb3b02c7b0814b332fe9 SHA512 81754326c6e34dd74969004394cfd5346d2946d0fe133b25ed00f34d0b5e5c6c3080a7ea6c5b7bf2cdead15c7a59fa944acb66d7beb656178a7c4b9d0fc283e3
+DIST firefox-90.0.1-ta.xpi 526012 BLAKE2B 302a98bd0426cadd2461dc6d1cad9e22d6a62219bf6aa3543295c9b3b044b1b05162fde424498eb5dd0a7622a257f344e2355fafe13bb4aebacbf43d5d326f04 SHA512 159f870c5a7ddc3130892a9c5b54bad0a057d7cc79382a6cd1dc06cd27fe3011b77c968048e53e6d9dcd8841b8df8259e2136312bcd99fa3efcf2d98ccbf619a
+DIST firefox-90.0.1-te.xpi 568758 BLAKE2B 66bff30e615a47fa2575f57e3c07979a9fcec781a1e6770c4931d64837bc2723093fef569742a609d51ae597419690f41c69e42822382ef5d704aef55ac2ad51 SHA512 50a6f471594531b21edd3d5fe337734838f5d6a8853657d2021ba48f3fb492b19355fb6723b37439fca6a3406161efc1ea741b970a3547367848a9d6780a5dda
+DIST firefox-90.0.1-th.xpi 620993 BLAKE2B 2b8a6348b1f697fa031abc03a774d4ae94e73ad1a30cf1eacce9148c3de682e80e771028122f76009a7cb81612f56908dd47f9c3aa95cd51c09ef2207fa8d334 SHA512 9d24ba44a322cca2bd0488be7ae618d4ba195bd620865357c822f3171297123ae9af741ffd794d23a86ae01a7b8dba79d2015171b693cbc0ea322eb6060220b2
+DIST firefox-90.0.1-tl.xpi 533275 BLAKE2B 3750708f87f9e96c917342f4380486b215010531bb8b875f45285c72e57431dea6cc04a01f70bad16e53284fcb6882449b70480578f73f230136d43360e29944 SHA512 3d57655eb3ea8f0b4ce8b35279b537ea411300a372eca3da6aa9533cc164708d269c46763de19acc3f5240021eee8bd53ed8dc8074fadcf03e49efc3836d9845
+DIST firefox-90.0.1-tr.xpi 564312 BLAKE2B 05731029c793289914508f46d50f9603af0bfd48db91991767ac28ae9e84aff248a6f61541a8519323680e6ed24e8ce80ec9e12bb5085d78694020a1b923a36b SHA512 46a09eae3bf342fb0b4b4d4ffb15b6f87d8641397b87da12aaa1c407289bdf14c99d2a61633cc0525316a0f09987d068e533012703a53af35769dc5c266a8cc0
+DIST firefox-90.0.1-trs.xpi 506677 BLAKE2B 08da46351de4cb9d24b1fc07d1a5c92a604c931a4877ed7d7eda1da59c8c20b03a2511858caf84f4f2fcc1283d67a098f4887e9e13d58a2e0b23b83a403b9d64 SHA512 9070aa494fe4a25e115340e687534d2dc30edf63ba8eaf22d01d232536aa39c577ba032e31b29c646eab265692118845cfd8a9fa56d271cee5c469861f9a2275
+DIST firefox-90.0.1-uk.xpi 635103 BLAKE2B 431a3645dbf1f6e9fdffdaee16214ab96935bd51123024a0b2e7fce5f5157a89971a1e61422d10f501761f2e478336f8cef81d6fc541bc34a5425f8985d9c1ac SHA512 61d06b6317acd6f7146084f6da4c911c8a324cfd79f29eebe050e9c42bd17aa12e791d4e6a9d3191d048dc5cd7bdc1565fa159f7be4366a55931795ce120de7b
+DIST firefox-90.0.1-ur.xpi 577975 BLAKE2B 5ee7b72ae6b4b4ee5d3ac924af13f2ec7a711786bd2f161e77740607a2ff095f3440e862ba6304854097586a6d50a22eee9590cd0a6e8c79309a2f475fdd0588 SHA512 efb5f7cbb4833a7c446bfbbbe305e066dbb8a88ec3e24df93858a079ed6b5f768753e60baf9707d7b02da2e83b1b6aaa0cb17cda4c6c9fc830b32ceb857b03bc
+DIST firefox-90.0.1-uz.xpi 483019 BLAKE2B 2c16d2a9fa9153c06a5e18bd0ff63c1e9799d42ca3b0940f7e0882c54f393f62639fe38d63af34ae5f25d0674b1097fa08a4e47e040334bbef167b7e44899a6f SHA512 84ab9393d666b359c84f5b66b290236a4a3b78e4a4f186d6aa5ff5e97fc80bf2cfa9ec9cf633060eab5c974af56a6dc54d73d8aeb65eb255f62c9bb2115eb537
+DIST firefox-90.0.1-vi.xpi 586296 BLAKE2B 84a9030f542819e1b7a5190bebc3250d6bfb279c42c5ba5624a4c7cd05c91420ffe131f280289801ccd6ae10f06d5b5784f89b05983ff8fb75ce26a93fb65d7d SHA512 4f2fc779dc113ed9bffbb2abb51c3407f9a9bc90d2f5db9445876d39b646da6b5787e9ed41b2d1215c68117455438aac69ae339a92fc2664be172266cd0a13c0
+DIST firefox-90.0.1-xh.xpi 430169 BLAKE2B 0a312479f39d55f26f65dc169cdb781a72a39282ed89311e4c2d0df50fbd05c387b30e4d9aa7a8bc29d813b2ddf428f432a65b3071bbfd24acc49e73d53ccfb1 SHA512 aee61bdacd17ecea84be1f8c66360a2bd43ded757d2ececef35247222c89553b0b0ff7ecb2a32a0de7391757f24d06f9c8032bdf0ce51b1b9a21dee30105c3ea
+DIST firefox-90.0.1-zh-CN.xpi 587656 BLAKE2B 56ece7e539135c2002cd52f222aedaed17f7b2c4adccb2001a9595f572b837b3a273e2a5a0124a5b005e695ce476e32ff39c06b2e760eaa1878855e7aaaac3e9 SHA512 0ce6b36c395aa9182b882f46e80d7958a478326b7db5d2c18b33ea44a419da7ab2700b3222a2523d16ddd46a31152953ebbf2533ecb26bfda4b693a9ed4ea9ac
+DIST firefox-90.0.1-zh-TW.xpi 588101 BLAKE2B e15b3fef7649e09599aedb4e154737bc6bfa819fd0266d81579ae9b34a733db3f232cfdc7c8cc2955dc9a3b12bacdb840ac14f6e081cccae0c8883fbf68aeb4a SHA512 40f1c9d93e73e570bd423101ea07c8b23953d52a641466d7c6376b6875b28ec59bb1f1c2dfa1c6c20e582fb57e74fe354b845f4ca0573eec91ea244fbb6c1434
+DIST firefox-90.0.2-ach.xpi 467582 BLAKE2B eb20fc04a512be8d1eba219f7541af93dda781080337d76bce276a5583bab5db1938bff037a238377250b6810232b77534bbcf835362ee385b4b1bb6aad60067 SHA512 2f726bfe18bc7e6aa3cde436e9c142382513a1175269b710449cbf7481dc3d91171d21ca1bc30563901bb35eb31befa3c2aba115ac596951d3d6aeb5b94bd1ed
+DIST firefox-90.0.2-af.xpi 430709 BLAKE2B 05cc8dde801efd97dfe56d1d102fa48e1b6e62b3e905648007dc488149628ad3eb297445319f0f1b620f2549d7830c16b81c53e06fdff1d43fcc70e815875256 SHA512 3865c9e96b66def2e640d747cf73ec97127b58e15e0fa01d5374d2ebe35a91d16a8176b68f4025122af56648415b47d03fe6a4a1e007a64da8a9ff4e1eae8ef8
+DIST firefox-90.0.2-an.xpi 515453 BLAKE2B fe5487cceed1fe4f941adf78760cbfa313f58408a5034eb72809e82b3a404e6515222058ae0fe8e7b18807eff8baa72a7ffcfe80798ce4ef9213be7bd52fc2f5 SHA512 1958e46092c05ba266896dffa83af98adad83572a31e769219b88a044ae132f2d2625154a20abbe997147188033f4924ef50e678d435aba9fdf0d8a291c89ed8
+DIST firefox-90.0.2-ar.xpi 580224 BLAKE2B 0ce2771752d9c3e6a2bb4d39b4eb4da5ba9ce4d530b04fe11b7775cc08107a78d3cdee033cd2a564523481cf69954fd07fc6adbcdc56ac0abea192be98fad91e SHA512 eaf2335811cf451dfff085efdd0256a3c72d08c59b1d31dbb08a968d40d5c20d45e590479e10738726bdc597a523c036a2b26bdbf41ee469a6bc3dd3254f0ea2
+DIST firefox-90.0.2-ast.xpi 508002 BLAKE2B 74158545d969e4181c4a80e3a1a2d9d2dd0e4d358c7846b9c426b25a00fac9d11bf10f8dc39e594ad9fc8395fa0e427d06824e3981a7dd7e59db1bbe4b0930c3 SHA512 7a5b98e537ea3a930016884fe13c1bc91ebb6f13267f759aa1c689a80f9e3243eafcbd8de16060bdacd6c59295b6a6fa5ad419cea3328acb20be5fd53f909b5e
+DIST firefox-90.0.2-az.xpi 503461 BLAKE2B 15c7e6b13ab47639c611df6c51ebdddc2a365b6f0ff0e93285e17f9de8b85f91d028467c3f80ffab4a1ba0e28d8f16543db994b5b6970c5a22a8d4e36713a6a3 SHA512 18f759e63ad51e9719b3e5f4695f8e592360e612835e9f9ea5cfc616bbe07fd46bf110f881b42663d0e2384f12d34ad3a9207aa62247e582b1cfc62065205210
+DIST firefox-90.0.2-be.xpi 637220 BLAKE2B 1e10160eeef6b14da9431ffbdb6b94b244477d23f9b38ecec6dc8a40a188461624cf5fe9395f93c41cb2701eb2e18367db1ee991debdf3927fb44db33631cb31 SHA512 c9eeece43756e020e39908ce1d99f238c3d581cfa66b9accf8ad23fc0691d461b976ffe7027e29cc21914a07c9b009c19d5a7d17013b70739d5cb13dfe20ae8a
+DIST firefox-90.0.2-bg.xpi 590496 BLAKE2B df82040f0991b69549e5983a6d3988bd71bee2aa367bfa2552d571cd1702e555ba0c488aed195f16541eff54a4b714e3d54ef6c99da573d451a69af44967ac85 SHA512 0429124d8eff17ba6cdb5b1f3b8107f1e37e8fba9445ad88532b5780db1e139d527bdf4bde37a1287657828a68357ee47e9d308b540f1130eaea65332ecfb3a2
+DIST firefox-90.0.2-bn.xpi 579586 BLAKE2B d989d0ffb3b396eff5f4cb3b42e503e52395715c371af60f7437e7c05d5153c1641c67ebd68870f019458ea9f9f32c888c7ffa8522d18403823571bbffd7835b SHA512 49d2b6d9bddb60140dabc91d7566318a7a33cc96664459fe75b29d07238a22056db615e6964b9cec9b0390cbd482bdedf4362acf144f752a8d82e7aeee76c360
+DIST firefox-90.0.2-br.xpi 539710 BLAKE2B 0691c6011c853e856577e7d2faf320b3d5cc276c360365f63f97fa03860ae1eafc02a31cda92506bfb3182a1eb2f345fc9f8661cd3446dc4dd11bafc09d587ac SHA512 630169e5a074099a3d965da66253c3707a3fc898a9b5aa3f5f5830c948c589e2f260ab6a50795417d19e63528658daadbeec2ef3117dc3c30d026cf9adb684ca
+DIST firefox-90.0.2-bs.xpi 475430 BLAKE2B a6fb2a37cd6517c5816e036eeb794ff0de0c71f75b620b795a463ab33a6e47c8982c060ad128f012972a8c6759a6ec5cc178f31f2d242b86949597fae59e372f SHA512 44208f322553d88e59fea067a1216f8795a0359d330ff26762b420031bf8f31ae87d3fa1579153e5e6dcb53058c048b1df49eda74deace4bec8262ea6fd0d20e
+DIST firefox-90.0.2-ca-valencia.xpi 548479 BLAKE2B ccda2b43e7ca3ccc3cb2bcdcc78e668d51b940d571c2c7a7dd117ace3cbba8696304aacf9dedaff9d3655e3dea96d0c694a4fe1788e8c0eb6c7e9d7595786c65 SHA512 64b6e4854cc9e1866a6ee7218d499dfa66a62680d36b2ba5973bcb99cdf09ce9664f078f0f93946575e4daeb872fbdeef28d7bd302113f83668be2376a1d4602
+DIST firefox-90.0.2-ca.xpi 546603 BLAKE2B 4a73a815709f2c9fd30be7bd282cd889d3babf08af0513e022999fc4ee789fa7ebc57a1b5798a465d46bc530830edceb1ff9b1e09889a139c25364436b32e09a SHA512 7b3d1f509dda3e9adaa8e15d12d1bb2a33c16356e7eebf99a0cf73fe2611bce6d84a9b7c328704dcc6caedb60fb9faffd9773e6e099f7379f5020b9c9263aaf2
+DIST firefox-90.0.2-cak.xpi 574164 BLAKE2B 442b69ff8957b047591f21ea22ce9d04a5d2ed88d870b321eecdb527c95dea94806ad76b8d88127548e35fd87f647b15c21e9a5c2f9ad7a7ff4582c94e500d48 SHA512 05a50ad71449ff9828fcbd4cb089d23c27fe885c43bb7f02bde303c0223f0e64036589e52049140fcdc1b92180d4f8fde430f2d984fdfbc3e0a0dec7bcf33bcc
+DIST firefox-90.0.2-cs.xpi 577720 BLAKE2B ddc2062e0bd2642236266c47bf763121d2581ab0cb99da04860fb33d688b26c4c887760feb7356c5808ce889497fd62b12e01f00b55131ca45031a9e977bf153 SHA512 7e277710908892964749f446b48a8624c199d5d45f780608ce0ac6a7a5f7cbf57cfd4ae986f79f76a46ef2a0b41828104daf97028b54a2d83f6f134597ec28a6
+DIST firefox-90.0.2-cy.xpi 554650 BLAKE2B a8b3f9879534e4f59763adc1ae6ac310d14223faaa23056cf7248130489f993228083fca854d15ee3392761c33fd37d506402fb657b51dd1a607432e9a1d19cb SHA512 c18522048efc7edbcba01c1bee79e43d5db7b9816ac32d91f4441d3a0cd65155581966372101f14264fed70eaec881d5a099995a5b4beb9c6a3af54c88045212
+DIST firefox-90.0.2-da.xpi 546288 BLAKE2B 580541804a971226172c4a5405c2d97e57b0a8f6eada7d0658cffd79bfd5e4b915cf29c8ca58887f328a2601103b52b328ce5fca67d5e7a261a09dbeea347d76 SHA512 41beb225ae75c34dab6133f98464f10e9b7faa6405a15199272d05039a4c0417f7bcb67c0b4d058b716c010b9afba7508779aab664fa9acfcdeaf8a12b336a6e
+DIST firefox-90.0.2-de.xpi 566471 BLAKE2B de4bed3a835be63460e938cfeb73ea00d3db1170a83fcddc7d67c7031028547205f1d9c016d46927bca1040ce9dde1a6dfe091647ea89d13425e559980baab67 SHA512 5dff86f82a0ae5dd86180d1bbb50af329a8d753905464728eb608e67db7cab66030d76617d119807642cbe16362498fef67658f07eda7ad7edc76a59093db3cb
+DIST firefox-90.0.2-dsb.xpi 579297 BLAKE2B 24b04ee03cbba2269150674c994c073c5f114cc56e8703a1f993b2572a64ad9c78c49c65bd4b064b785faf2f95c3676a978cd01b54bfb0b5a36fe9b8273c4a09 SHA512 1d2e7a9b4f701d05ce9af4420c3458872cce5e8be2ecf1644bedfac5dae294f13056ca649a112bd2d7d0fdfa5a50574a107cfc51eae3cbc3bccceadca94f78d4
+DIST firefox-90.0.2-el.xpi 652899 BLAKE2B 00d52fd1ac72f2ef57958b02cccc7270dc7f565ba3844dd0be495930eb7a26cd72c0f1c289961aa940fbf5dfe4b070159fe6f511df78ee26e0fc793e245a5227 SHA512 dd9e5a59bf81ba93ffb131fc4dff873e557cd252941c2986d37730752258a2034db44e53672e7e2174c6f5467fd784ea22538e8e2334b441aeae8e99a326ca96
+DIST firefox-90.0.2-en-CA.xpi 521250 BLAKE2B 0db675cf883e92fc41c640f9c599b7fca295ae4f28f686440ea2e2b9a4436445b9eee2c2fe6eb625b1cf96db87642c341084696b35911e52239486fe11d3ce6e SHA512 c1f4a0e29e4e7313b0ae8efea43cd436f199fc249dcd6fd15d6ad7b2be106a90e83f49083f7d1a018be580f783fae5bb07ed5c01012b5adc59526dabba72fd30
+DIST firefox-90.0.2-en-GB.xpi 521806 BLAKE2B 1a04f7c7953f1f32e11484ef2b21559428f37ae00911d5560a504e42fd2bffdbef8f18ca55f924ff19f62679e74f6886b4901bb3027a25f85ddb525c38416315 SHA512 42690b90fcedd3f42ef373c8bd987b0bf2fb19d30071e451c33ffe3f6baa9c089ff870dce41274841a06a6d126ad09364b399f2d44f96b69441dc9dfae2cbf35
+DIST firefox-90.0.2-eo.xpi 548059 BLAKE2B cd513f81964c574fbb8436d28e6af185c74009466ce843f18d7414a730b709b26c8c8588e5e9eaa3ed3c057ffe16ddf56b179f048fa180760155e04151946c90 SHA512 8a02dae10df6d178fc32cc71df44b85bc7f9645dcce699a67a0910f4a91e058e99d05464b62a00fda32d7e1d43c629d2b6401e89288d1532fc08cd4868b5916e
+DIST firefox-90.0.2-es-AR.xpi 559628 BLAKE2B 3d253e9bd11b29a3dd5783bad9e8b3e5f64b10baa3f497369c8175d295827159ff61b5a46abd4a0a6792838d18fdfb363316f64600bd4d786035e11fe4066129 SHA512 bbc319566de8dcb9911f76d5edaed504bb24bf5d65af518a5645f4941e8fddeab4e1fcc750d6a2ecb223b41c9746a5192822c99c7a30fd4e913d9177ac34f26f
+DIST firefox-90.0.2-es-CL.xpi 558527 BLAKE2B bd89d7e8cfdf892115438b7fc92a18c48b633e9f856c9a4821ea2a7dfb90120e1b6dd233854ea96c2f1cb7dbdadd71aa369a7c879092ab6b0b109ae21864ec25 SHA512 b70799b720dc11a06c641f8bc21726d16e1979a2bbc9bfa8ed3fce019c24298ef0539ea47bf497663971d6de5a8d7e42edd73eecf259e4af966f41dcfd1827ba
+DIST firefox-90.0.2-es-ES.xpi 548794 BLAKE2B f0320caafcc35a4e71abab33ae4a35f341d7f869661f7f7e2c8eec9fd68ac1d5be0502c9fae795005365f6d4e8d6024c86bb932ec3baf9b538b9595ee8ca06ec SHA512 5d2840475edb3659e7bf5428ddd92cf4929bb94a76884686a3c3271a6a4053e1bfe623d803488ab058b0b9860d9f4d659d36701eb6b90aaf5ea1723b3d83a0c0
+DIST firefox-90.0.2-es-MX.xpi 562244 BLAKE2B be7fbfe6d4780a871dea7127a786820ced8b139cd5ffd61989cf003ceb5d333910a9b7421a40008bf0290140a927a5ccdb0e389f9078f9b2a031cde00b5789af SHA512 b7fe64cf33d7be4ac13b66891a7b6ae350b5a8177537e321bfe1b8da2a1234980d0bfbc819102dba975d169baa9b26a356c80f41b41751d36e1ddf1defe5911d
+DIST firefox-90.0.2-et.xpi 496662 BLAKE2B 31829a9cc3c809b6a0d91a68671f44e197db7f5b9b10426dbf4722f74b577de1db4be84f11f48eaae0d1152ac82af5f9d86922dcce2cf75738d3322485c0de52 SHA512 906f6f819baf2a96dfe0189ed322cb25e046d38dec7037cf5526da71cfbf3d1c0de600baf31c511d08eb18067beb4bfdd35ce5f7de91364847d0a0a7b21c7a3f
+DIST firefox-90.0.2-eu.xpi 544791 BLAKE2B e8df641b3d57ec9d044f80c274de17e23e216257e0d78cd0e86450ba5fc39b18839896b3d3976e3be0ebf394b0d966d6ee4af0dafa2e3ca1a9751b3370d775a9 SHA512 920522a5fd26a53d27f15533f40c5972bd330037656b1c1f94828c4d7b87e33a446f49c4f311cc15dba16a931c73255887de25b91036a1057422a25727e6f481
+DIST firefox-90.0.2-fa.xpi 565155 BLAKE2B 1dc2ffd9990b923247d487670dd734c67db0ca5703834fa052f21684597de0bfc9902062d5c7f6fdfb4d68c85684fd93db5e060091af220c3c2ab74f4f9138aa SHA512 a929bfc80b3c217da3eae1773898a646d9c2c06d7e13578d1b3147a7497155953ca2a297156b1012ee7f8630b7764d2953ec25d610f958ee7a19965859666455
+DIST firefox-90.0.2-ff.xpi 488049 BLAKE2B 751ff1cc8b0cdb51af4f0cd42db3d1c96662d9994fbe5fd2e4a1d2a1ab57a9b4b5ae8bd8c3e5d3454de83365c6a1391be3e07ecfd58efcfa4ae7b412c402a826 SHA512 0b6e0b583f97722a57f9d28caa14aff4fe7d342e4f1b188a1b0186e865eaad3b1b5ab0d911a9187c082760e85b9f970c71be6e44d84827a575b102f28a7011f5
+DIST firefox-90.0.2-fi.xpi 545936 BLAKE2B 1d992fda4a9cbe8ff43c786277c55ca005888eac771095d037d595974ad6430994ce7c0f741acf96f175a816e800bc77496e318290914912ceba8a82e3c6ae68 SHA512 2143f3b989153534f61a394c94e9edc74f0070e8d6d389b455999d4cb4cb0597322871c100a1114adaf1073ef29d7cc5ff6c13e8f59de5f4064683dfe1f12fd5
+DIST firefox-90.0.2-fr.xpi 570078 BLAKE2B 75cf2bd14e3e8b67053aea83d492033ef46ddd88ab69a902f17a4e21c36e1fffd72d855d48be825da3928717eb726447435bf345f26b9edb5cbf949f08b19209 SHA512 a03b42c77585f70136aaaa3e102ab53550ec441933814e817f10a5ab846a47f5b1203738c22fdc07fbd7968421aa3be07fd3966f54a3d7a1f564e5733a4f01e9
+DIST firefox-90.0.2-fy-NL.xpi 555597 BLAKE2B 3508589c747154ebd7a9b712b58d38776990b8d9d2fbc6f83209a3e395b844a0bbc7ff0c62afbfefba58d509514fe0614bef7f711b1b44bad0605beffdd7c07d SHA512 5dac5d2c758eedfe7d351ba5185bf2f680d1816ab74256c9821b7846140130908976a979563438f910ddb51294ac8045e86620f9b35fc58e30ef4d9e3bc8cfae
+DIST firefox-90.0.2-ga-IE.xpi 473120 BLAKE2B d72e1ccb36942bdf00b337efd0231ae5b338a28e17eb6a5bc51e613df4658c27da61486319ac08d4f9a0373dd2f42e7358afdb29da680bafcb97b9a96f61a7f8 SHA512 9826db654e10053ebad1b78caa2bca440ec8ef2eec30e1d3f70b04679c5a89ae8eb9098531b13aed6957a2c4fc7a885e0ac7afa36d0f98d40fe0d95574c7ee55
+DIST firefox-90.0.2-gd.xpi 550980 BLAKE2B 19032850535ac7c4d5129ae61a901cefbfd14b7c0ecc6acc22ad29422290775c61f0343442f823dff4039f99a40428ce138987e178471190515c91b509eab110 SHA512 86d69a91cfc1c836cf2b5d8b25ad509e32fd5d1d3732379009e50b8d2a9222371e287a3e00c0d9541165d79bed59732b8e144f3b638e43db9838bc29d62d4b20
+DIST firefox-90.0.2-gl.xpi 554486 BLAKE2B 1bc91d2cfe2639d84dd080198d5129414c581ac3c02dce8b14aec1e6c4a169e9aa07d6ebfd8fa98dca4546fe85fd1a35054e561912c4744e07f0768f71c7aab6 SHA512 4f36662c5eab07f649aa21aa85dc57ec82c8ab7b961fcad80fe4f487c40a041b98c2102b4f7b96cb4259e931333db4ef357e4a69779412f4fabe7cc7f66f0b21
+DIST firefox-90.0.2-gn.xpi 571719 BLAKE2B 37d4265185ec26a8ea8e86b57aa0aae529295e1ad54e5229e0e108872fea8b039acb4dfd85153e8a9218db46ea59288558d9c60cedf04554bde32faac85275e9 SHA512 937a9bf0c77e2d5a5f7d48c0aecf6b27bd6377ef05a82e2f674c38bcaa392a3f2d92f7b6eed97551eb26f39758f215bbc102b01314c3326e54c0d70abf91aa7e
+DIST firefox-90.0.2-gu-IN.xpi 547542 BLAKE2B c207abe6581170975581f1ec5f074fff4113be5eb19a3f6113c2c6d660d66474c21a46b73ec87e4afdb03c04b9d052c77732b676108b89decbf04f2ed7cf3f71 SHA512 ec9de8cffd0ffc3828d69fadcf8c2a42215aa1d84474b08b3eab42d1466324cf2f5d5a035fd9f17b90230b3778eec7d229ea2d0fbf4aca6d652930249255a2c8
+DIST firefox-90.0.2-he.xpi 569407 BLAKE2B 7e69b976f53760242da74042d85573159082d3edd5e1d3ef1fd185b09c6863f8c275214d9a2fd420ca559f83099b393c979b701305e3c2c02bfb63aa8e0194fc SHA512 1094fd8b6d6435ba094d0ec2ed70a5b1d911059c1bb4850033209604521d21d8ff579e829224c494ed4046da16ab804381138a1d3893ad5b0e14787442136b3d
+DIST firefox-90.0.2-hi-IN.xpi 579616 BLAKE2B fbd00e727022b20e0bdfe3adea70558b5e992fcf40805d0ae3407ffc49b41db5579cbff3780bfb05825bcb7d2b5cd7265dc5fd18f6be934806ea461d3c2a2629 SHA512 209bbac0799e13114ce20f3ae853dfed6c4e4c56efe71a78d765b6c1f725a52b0e88b87d6cef6efeccc1391413f9d322f60f0fcf79b197a1ca2256ab7861dd88
+DIST firefox-90.0.2-hr.xpi 549998 BLAKE2B a051f4591139d4e51114b39df0089cf970f6cecd368785c36592b5f3d4d129850510044f6e3b48ad7298ede1b2765ab502de75530616195d7d636599b8c275fa SHA512 8d77ca7fd7dbca5926ed4f8becd356a8bd31b8ecea36fe26b8641ce9d02daac2268e71e19968ff9f3338b379e943f041a4518207491a170bb629ea4045e2a0f5
+DIST firefox-90.0.2-hsb.xpi 575410 BLAKE2B b952d82e59ac118efb537453ebe7a87c15792c52b005da779d7d06f7fd665e8dea05984ab07b9dde17371828fe6f44212aef4dd492a32e7f9d6ad87c68369be9 SHA512 b59caab36be18ffd000a9976e3703e9e8d520c523494f080ef020f49ca239af17ca97dfbfb7dc70d36a32bdb51388c8ba2e8d4c4195d6b15c0f6ac57895df6cd
+DIST firefox-90.0.2-hu.xpi 579113 BLAKE2B 206d00a85161b6aa2f2422d825a54fdb8a77c856f5da5a92c707729d078ed7a020d6f0b6e288bc117cdcddeded316811eabea264198633f11a27ec35e7a592d5 SHA512 8cc740c1454279b9bd20d78abf4ce352db596e85e879eeb335b79b00c0160de6b2a704f3c6c44d4231c80d2d40b58d676def68cd77bc2ed916eb617cbb0ad964
+DIST firefox-90.0.2-hy-AM.xpi 604422 BLAKE2B f49a46b07e6bd9aff619d6ecd142d53da4366899bfaa0cc13051b4132cfa8c81c16d0a1cb999b190373e64fda1434df9ce965c91969956dc1d4fd64c35fc5bb0 SHA512 737b37f8a96eeecd920297911cfaed9664c0327f7498cce5d0c0dd942335498cf7b15c203226dd3128b60a08a176556cfc8abdb434a77fbd5a846948faf4044d
+DIST firefox-90.0.2-ia.xpi 544431 BLAKE2B ef3eb4e133074467183d3a54f2cc6af6ded4e8edb618868115fa6366d61c2d379a3903c0eadad8ad2a0d0e2d9eb57539d317a04b784a41b45a2cab8d73e64a56 SHA512 e3a72c94be0f03c93f85ea9b7ea1b37542f759d5de9a0522003abff9c12f30ff377221794d351d82c2b23afc07631b7fbdc0c0e629655877714e0ea3f9e49c47
+DIST firefox-90.0.2-id.xpi 540133 BLAKE2B 52d47167ec02bb0917c0b84df77e34694594ed3f7493d1790fe036268f304b1efa1097ebcaf2eaa9347e73d07faf4fd46e97da1d8961c9b1eeb68e13b222a1f5 SHA512 c510bc024f902e795fc851b0709570f5d493cd9bfac12ecb6f552144dd8c96c1ba607e6fd05f765e0f0425792859e86e661579b89b700320c044d18b28171cfc
+DIST firefox-90.0.2-is.xpi 483713 BLAKE2B cae0f001ab5767163706140ca2ecf6e15c6db37a147882586d40073d2598fad2e5fcce962d4d51d0af5a925e634ef59117f5f93f70347237470f047d727083f8 SHA512 22da40eb5089e2a267a66c17c9ee8ee400753f0a9cd7337d8eebbb0d1e66f1ac31316ab875a6645107b7cabe884308f2a1d1d0a64ea96449c984ec74963d85b1
+DIST firefox-90.0.2-it.xpi 470917 BLAKE2B 2b8ad1812676dbca90ea2164e4b534a3f246bb883bb3db7dfdf90c324733563903ddbe4345803e77085fd37c5a099d9b787f94e01a413349c744ca67b25f519d SHA512 018de01e7aab5f3f8319ec1f1c74ffc5a77d9b6fb2e410f700785448d3c5cb267b095edb9c9cd69ed08ad529295a859086a7f5d4ba53c39e464716e206098606
+DIST firefox-90.0.2-ja.xpi 605314 BLAKE2B 34739e38a812f92c8579a226b36f2c7622eb758f2942069193715143f0d63e9f0b85e08ef4ecee75d1006a97304a6905b15e0e76c65b55d7e1d3cb29c45cbea8 SHA512 7687014e78fe50b692e97bbb22bb08c8c1e25b54aeb104b766587428aeda8fea935ccb089320e72dc1efaae7656c0de5485fc3905b98127b45f59e38ee58276a
+DIST firefox-90.0.2-ka.xpi 606361 BLAKE2B 618a913593b9ef7832fd810ffd769cadb47bb93ef9d9362b86539a3d6da86957aebe412364f32ad4c77974cb97fb801edb3938a29c2326a66796bdc0d3e1fb54 SHA512 2bd7a719dbcd9cf2d7881260d5c0ae0892882983d7d07c7e7348c6c82b2e2f861236afaf5f9ee4f60940f3a2a6d9d3865949c5e2e92b6f26c09c4081f752c412
+DIST firefox-90.0.2-kab.xpi 562888 BLAKE2B 96890638bab2d4acc87390ee56c4c26c93d5514c32ebbc1c833aebab51e793a2e3d336e2076912edbe68843f83c8f02559a3f36feeab56329eea8ee9dd0fa320 SHA512 c8397002c9027ac7786957076c202a6db069ec1eee58fe0623291b5a72821131007ce2eeecde1d522d06af571e4dfa87694977d25fddb0e3c76d84768cbab447
+DIST firefox-90.0.2-kk.xpi 621558 BLAKE2B f57a4466136e3ed9adb06d0b693e7a653d4a06cd25153f42cb35ec6387530b6029d6d6d08b5b9dd0d7a5bf6a17f6e46992b443491ef23fcbe0d05347788351cc SHA512 6ad921f93a0e788aa0f2d59a422643eb48b85f54eab32066e6eac1338d0e73e0a6882f73f562c3011e4f53db8f00f92817a3539086d8c97f4f3a7940290257ea
+DIST firefox-90.0.2-km.xpi 546445 BLAKE2B 0b5eeb9fb63549f3f9ff6c875418764e8191317bd8a167c2102face45b88dcb569c2df47fba209c5935e2fa7c8952b9f200de43cdd49caa0418b413b22ab8f93 SHA512 760431880427fe5abb65fb0a351fe80bc1ce84368c90b454594d6b13185254a19e88eaa2b095c38b9338c88230254df0fc0d1929fa24875458a1d7a8076ccd6d
+DIST firefox-90.0.2-kn.xpi 510724 BLAKE2B c24388d4c872b798ed62e83c6d15d8f9bb33be6d258e16af43f34d94d05df348df09295a2d9c2b7ea54ec876cd4a84570648f3d0c964ee3c628b246ca145a15d SHA512 4483428d7a968f259b13787e94b845e0a9ffe55be1fe83b5fdbda01a7bbb970c959d7b24acaef729b9814a0e54b32be7967191936671d0224e92bff35570699e
+DIST firefox-90.0.2-ko.xpi 590731 BLAKE2B d5178a54243b80c34dd3221fb0f9447cc9933ca03b7231ed13a006682f38a2f9b60734284a015326dda508c1801d50bcaa5fb6d299d13548012ab8c3bc89867f SHA512 7678485b6588e369067467250b5dc4a8009009850d3d63d8e2340d989b7ef383e81ea6af2f305a8b70115bdedcac5fabaf8a201eeb2b254de938bce818462e83
+DIST firefox-90.0.2-lij.xpi 484766 BLAKE2B 382c5ff77eb58e58e5c8e32ed0d7fe135d61974adaac1c990d514a1683c75d45fc68048a22f2d66ba0edc12e3ae119d9f75a217eb37cfee1180654c1288bd7f0 SHA512 3eca5e9266846d6b3c7ac108986da092dee5178e321aa8bf6892d4ffe009c2ab205ff86bd3d16076f8b9214b55578f81d0907bed9043c2c41e64e4316478de29
+DIST firefox-90.0.2-lt.xpi 572555 BLAKE2B 63f4b6095ed7e5cee86a4a25eefabea77a1c3ddc0562d7bfda0bdf08de5ffe90c9020e106d729572177386cff9461bf0427ecbc13368ea3dd8d6bb21388e18b2 SHA512 579ee64b4b3683a433b265b6c4c71d6c1006aa7c81e850b3b7f4d1ec7f3376c2bcfb89db76a5ced145343f11010fba24192f3fde365421b3e855b66755630e9b
+DIST firefox-90.0.2-lv.xpi 475696 BLAKE2B 2675056a88af23b89dbec450aa2ed11621f6de09bdc21f0d06bcdf662c1421d517660f30d7648debbd588ce23651f525bf2f5255af6305c27defb40bdb770d4c SHA512 d48159a8e812bd321db05e8a865a8f680feafb0e4767e0d35d74795eda5a889fea5e2d8745bb0d2b438594aa72bd73981c2c2474e0ec089a29e0eafab13f550a
+DIST firefox-90.0.2-mk.xpi 472368 BLAKE2B 91a36844e99016d7e2e4aa7d0d99680fa8d83e6a1e9282f6c3eda916e4cbaf826e8d66349eee4d905ab9c15eb6af7ccb7599bc0710e5a11d3dcfc39a0ca0a259 SHA512 408884c11556fca1371cb211a61f63ebda6df8df56ce02df0eedcb82d9e6ce72d77436bd9e2202d1e07e244ef08a62d2c7eb41ace62b813a8d80f6c134143102
+DIST firefox-90.0.2-mr.xpi 547715 BLAKE2B a1164b4b71eb42057bf0361e06cf2338f201c6926d7c6547ab256285a6fe7686d64a5674c909c95a31e920940b50c858b179f1607118cb19323e1c01cc075a28 SHA512 74abb04ef83fae4c570e82697ca2353a9e76772650a87e4e5f7c99f7591a8a84c1e5761a21cc2952a5846bfe873ab50339b958c9411141d2e636d1573e776b28
+DIST firefox-90.0.2-ms.xpi 459315 BLAKE2B 9231c3e855cf744e053e84978c97e071dbea39046434d7e6d1639e985ee5422ce71fa07f3189594873c3ef062fa9b1edc42bb3df1f6d8cf77ae456490f1938e1 SHA512 4dbeda882792988e58d6b6df7f2f7bc8b9ebd9ece288bc83f92561c62366ed8c59043528fbbff14fc4856188b22878a0bdc146ac95aa1a3e840a4f543ffa087d
+DIST firefox-90.0.2-my.xpi 531263 BLAKE2B abcc403d73d5fb9ba0f6e8baa8b01a0547dd4e94a809b66bb6a2dd30f2fbd0bd55bd16b6ea6d353140802d415b894e607f4a79a0be4468121c2cf7c9363c9cdd SHA512 11679d0de73764b3efa6578b858394b941d7e45587b8e46adde984b60db349981086855cdb67721b477853e19806efff54c2c2f1cab1ce11f395e6833fbb62e9
+DIST firefox-90.0.2-nb-NO.xpi 540211 BLAKE2B e73bfe5862495669d645543576b64b3d66534e3d9bf3b41dfd871dbfa4146bac3ed46a6f58ae369e237d76f9024e7b462c60c2afe0fe91c0d2555bbe92abbf66 SHA512 8b13a9a28c36fe4438c52d85c3948b5cedc6a68fff0e7968a952fc5183b69104df5b9d74b71ca43cf3018cbab184f019b556b30075bcf67cabd04549cfd22fe7
+DIST firefox-90.0.2-ne-NP.xpi 488264 BLAKE2B 25f40a5eb34b4aa07d3852f0967cdc37c4cb0dc58524bd5c3cc773d4db4c73bb9ba8969f4e8d70d43282586b479cf09e62af1aa823a77c656968ae824f31e847 SHA512 80ff7b32a58e631b88a46588039774c258d02312d0e2fd98589725b882e481e3ea9b48923a0b9b37dad3c777dccc8395608f20aea6d757d7be1b0f9170033659
+DIST firefox-90.0.2-nl.xpi 549132 BLAKE2B 61413733011e4fc81224f223f570027f2ae60b8fdd89acc9ea1bee2940a26c28a4ef18425e12182cec9ca40f7dcc829eb885193a9ea7cb10cf9b10e4c27d62ef SHA512 544abdd3cb7b19076ab96365c63dc521b3658420472d7afd83ea4d199bf9399652bae7a1945dcdc89262902b3060df75984f573cafe69ef2dfdb2d9cd2e32173
+DIST firefox-90.0.2-nn-NO.xpi 543785 BLAKE2B 851daaa399a7e15fb795365c3e81ba09e6ffffae19968c18b686e74f92cb7d8fcc84fce0383e791a59ac001790123c00791a5a763ab3e601bfdb7467f5928c47 SHA512 59ca8671c752e5a0d399166f8a4ce52cf20d158358d65810e85498bb00982a90a5fff86382f155d63f2060447d9e9119773bed41f389a88341d3034f10e4cf7a
+DIST firefox-90.0.2-oc.xpi 565026 BLAKE2B 63786a9a4c8a11828ca2e00d5eb718d9ed5171f1f5ec8554002d966884d5d2c7cd14ad89286537bf93b1e79255df5f191b9e9a7ba4fe238d6d083092706a4bfa SHA512 2bccaece0b3a0c0e8e3d9bc978c909fadae0d032a8a2e4df9778580cac0c60efb6228534ed8f1629281330e0532b0ded70118e9456995e6d43d9970cf41d4c68
+DIST firefox-90.0.2-pa-IN.xpi 612507 BLAKE2B 03d21a09f80ff1b4a7e6f5fcdad46036fb8c91f1eb46d04b7e7ea8bd84888a94e05a3b49004d1cd8b4d2b711287beea6f0c4a3dc2f8cebd772d6f5ccaa896e0f SHA512 da912c4ee934f2d44714ea31c139c1c794949466281a377c7fcfc314c6eac78fd85d5e795b11d8c24a131442c125b80fffc4c173b8e7fb08064db75bd3480cdd
+DIST firefox-90.0.2-pl.xpi 568488 BLAKE2B c9056f7a8569d435781e3a17983fbd7889ee2e87acbae27bc79d78cb129c08da9b3d623d746cedb12282f8668fad1f5929050bbb5a1cc066358147d5b74ec4fe SHA512 bcbfe1b6975ec1ae940b08be4f45d7f04f4f30a80536e1cf912fddd6cb899d4aceb470e8dea8424bc0cc36435d75a8e865ba91f04ae87b293f6119e9cbd6f7e8
+DIST firefox-90.0.2-pt-BR.xpi 554982 BLAKE2B fcc2d465fd7f5a15ea861e5c1150888a308851b5fe0cb62847a5c6ef83d059ed5c80c1cd5720665525f17d3fad512b7fdbbd82f28a206df2a5224e9e3ff3cc9a SHA512 6d1e85376bfeb12558617f710671c31473707d738d839e78e107e93711b80c975191210dc293f7837795ce8d2e0acfeb9af09796ecf491a701adf932a78b9ab6
+DIST firefox-90.0.2-pt-PT.xpi 558862 BLAKE2B acec5024cc929b4e29e624b00db49d108535e2d270967c1b60298badbfb5f424a133da648c995fb00afc828fb03389af9e2a65d3fd57fd7aad038283109996bd SHA512 2fafd35e5c0106f9a3bfe54f032e826a37e6b7cd98941a8ee0255bf56116b1d65bb31fce8f711f8f7d1431d0b97bbb94f53c5ec3910864fbcf6e8e774f70e0cf
+DIST firefox-90.0.2-rm.xpi 549899 BLAKE2B 9df12c0b8c193e33ba5822f909e9a1c91594f15baace3bb146b3e69ea93a526a37ff2ae72f65e4acf094ed08ea81b5f7541853f60dd4c819944b081dbcf89c83 SHA512 04858971ce69fd2d219a3d0ba97a5d72a5af88b6725f66aab79a8806a192cd6c6f4f17d0e5804abb937aac921e40a9494cdf41badc5ce6a96ec1d64ddf3d6470
+DIST firefox-90.0.2-ro.xpi 548131 BLAKE2B e6a19832c5252abdfb07a74374cf8604d0357e025d9093f9005c7ad252d162a99eb9cea38bb10f3a1554095747b8e7a3f950174f60fa219a9561ba9b861672a2 SHA512 9d65785acac5a8767960744a569aaf4bd9aace691376771415e6de9b6a3f392c70c406cd9837d7c6504931306132c0aa884dca83d785ea6fc66afe8cd7b4df49
+DIST firefox-90.0.2-ru.xpi 641994 BLAKE2B 9124781768996090200198864e0b24ca72d10c36e371b9631fc03a3a336a2a2cbd8a227ed12f8d3282c14b06b7a31efaad98f185b65cf29f602d8b958c695395 SHA512 8455deef343028d99810c01b3dcddff85bbcd31307dfd0aa461b0b66b194eea2d915be1abac7902b10bfa18e09bd16880c3b22f3e78a7bc62a7bc580c9e6b89f
+DIST firefox-90.0.2-si.xpi 497038 BLAKE2B 1b5bd85f054bdac7d3bad8e64f3a9d8fe2ca2912cf0231ec92213c9ab80f68bcf48109567115a8e6b5ec02ee5bff759a1a3a44496e19045da6871045ee392027 SHA512 6c1712c1f282ce5ff842aa39203f4fee5aa38df79c49f203dab0c3269b2b43c7d1a350da76d435de7b995fed1559784192137bb8b703ab08eea652481142917a
+DIST firefox-90.0.2-sk.xpi 578642 BLAKE2B 30fb46e4287edd81e32625926e3b8e510d6f4faa84247e4ce4646078c9e7c407e275a3e35473d530c2c425c351096e867ae1e88422231afb2729287cf52737c5 SHA512 742afc3b57cec29e12f546acbffc50dc34259655b934b7edeb0a431fad9f69a76891f4a3d504bd68325bc11af8eb090931f9c681041f26b4dafd330388b73dc9
+DIST firefox-90.0.2-sl.xpi 548456 BLAKE2B 7c47551255551b2fcab86fc8a0a75d7b3a86f1ddd17ca0dce53945b18290191f221b3230bfd8063573e55f42be9f6204583db1d2c960e0c3cc4db5aa569594d4 SHA512 85391db88fb1b87836a9509abd8b635562280b79ec6a501b7fe0a5da685028e5331d77168307a3cf395dd314cfeb61bc68405ae46ae70e6a6d724d6f46a1c73a
+DIST firefox-90.0.2-son.xpi 428012 BLAKE2B 0c1d466b53f148b315e4b4e1a621e4b0dac3f8ed789514a335940f8d1a48d5be9df072e7baa3b6c0ee79446834f2606ae4420cf8121c5423cb6b5a9467eb12ca SHA512 cbd2db587f7b2e94bb888d0649754c2a8f9b423f7ad88577cb629e5b4ea2a7ad203ce755003a3ccb2a6551910617bd4f62c8bef84775873cec7410f39c3bd1e2
+DIST firefox-90.0.2-sq.xpi 568627 BLAKE2B cd6dab95c8ae6f597ac62ca649e8037624a1c91768587d574eb5762bde10ef58e6c23d8ce5da9d5731a009c65d9fc901f602db435b8986c2b9f9bd8ce53d0d0b SHA512 66e7251f67f43340a8f9df2a45748032e8b859057993eb834cafc663146b594e25d54af81dcbdcf402b05a84512198f3f50205c73a45da9f4aab738aa03e08f8
+DIST firefox-90.0.2-sr.xpi 603101 BLAKE2B ef378fac2d8a5ba7df6753620a4bb0b28c9cd53861f4f15001707fd1517942c1e40e8911d10e830808490abcd131f9d7c36f8636d4f647a9af1750be0b192e58 SHA512 e7c5767d77ef0f705aa1d1c567bed89fc2b4da24d669faba9d60beb0bd12d9f8b45ebe0b0027d84e8194fa1000e63bd10a419b649e8e3c47eb045b4d1d220f40
+DIST firefox-90.0.2-sv-SE.xpi 552226 BLAKE2B 5114b1443f8ed57b05ad9bab185ae3fd4831f6c0bc434401721cc11bb5fc11e5e42a09b8da76d8f2a280dadfd5af6bfdd18081b43c3c17915dee34d1e506e102 SHA512 6986de8362530f0db5903d277f70188ff7e7e53e41c44c1f01ceac640b53262dd8bf92c9c967d8e33ce7c31cb39d9089c7d493ea6c28a9907c1ba67795d2607a
+DIST firefox-90.0.2-ta.xpi 526631 BLAKE2B d4b8bbf41992fbbaba840bfb19d62801a8b6d3921fc5c92379ce5baad6d5a45f7b730250cad9e90ee41220b7fc7ab3f360c0aa5b609cad2660965e69065ab6b3 SHA512 d88eb96df7bff317df242a8eec99140eae0eb121e1ed6ffa9242a9b540064666c0db9af36a4fa729e23bfd8fab9abbd32a2c5c3ff85b6ad2723be8da6ccfa956
+DIST firefox-90.0.2-te.xpi 568744 BLAKE2B 401da427b76f0c455aa880ef64721a8bc8d3ad25093cd67b48d4d37a65bef7aa6c02db37c94bbd7190ad036a49255351756f12f7c7bfb3894bdd8566cd4b63a5 SHA512 4388b917725a32522c0c50e72a4ff2e96eb61a4514bc6311adf8b99f386691720c78168007661790698d1aa14bdda9e28e0a24d35995460ad0f3ba642e8a20e8
+DIST firefox-90.0.2-th.xpi 621169 BLAKE2B 20bc114e791056e866ca87fa717270afec022ece33cf3568f445f460c690e5d98aaeb409744298d94b17b2655f6ea39165c0b4d2de7b1b87d94691e832f43b5e SHA512 b775f9b6235dd154a7f26ff194ea6de858c5c8d98698afe9eb2173e3ff388726572583c9f4b3fc4c762e244751c623151baaf0effd8a12056ecde7236e3ce0c7
+DIST firefox-90.0.2-tl.xpi 533288 BLAKE2B 9d2b4fe2251c08621b0fccc7492d8dd9879a80cccf64e7096e97e3125f5dbc06ea82e57fa52ef975c2da28d4226bd8a3cf77860140b3f5eb0055b476326701f7 SHA512 eb47c4a62a2b51131d0da056ac6ade774f59e8610fced36fad3cb64fa661c1eafa8e6fa8e6b53508ebc6a190cb45c68e17485310c215b96af2938a588452e57e
+DIST firefox-90.0.2-tr.xpi 564703 BLAKE2B f70afbf4ffb27efa5ed52cd102449a9a853afbe16271b431739e456f81a5603ba29b8faf8de16978c0f9dc41d554c2b4f5cbf7c74e454e8bed1d46639babed7e SHA512 8242f1173f9e3f3c596591bb6d14801d72870123619148087fca33e5ac7d74b52850c5ba772727a2c831009d36d975c0f3826bcc01846042f21531b0f7ddc8e4
+DIST firefox-90.0.2-trs.xpi 506694 BLAKE2B 00fb05e468dfa0e3c1ba6e572189be68118a45e17d9a5b929821b0bf063bbf114935f9ffb2fa12ff13ab3e0050de62f6c893b324d29df8922096bbe1f609042c SHA512 f174dcadfbf38d413040543bff026ff940448fb39337379cbd15c4254b12115329c682618d6d62850c62ae0b9607a83bf5182b0b16ddeeb6109605ea10fd277d
+DIST firefox-90.0.2-uk.xpi 635684 BLAKE2B 79f8a22184a62e25d52219fb662d8bab2e6844579b593d56ccf9036156e52111ee28219b1d6d25c8b959bba80104b560ad4679083a9a048284b780cd7e262859 SHA512 9289e74724069d8e3a881d5694a394da908b1c781df37a9bb163249a9730e157f34df91c290a6c2019980934b386da5e7037a3471117b41b08f3bd7c0e53914c
+DIST firefox-90.0.2-ur.xpi 577991 BLAKE2B 4f0cabc51071c71a1b0c88de4b699f16940136240a5d8a9f273434c4d56d69eddb4b04fbf1420bbebc85c0f00df031c15e4b21b66f19342b02e9348e0ecf3ec5 SHA512 80cab1941a57798914be843899e7c1164c28df0f293ec70efa00536221c3cb49a72ce327595085747367220bf399f681f1066018c7530b14bb42cc6fd0ce340c
+DIST firefox-90.0.2-uz.xpi 483022 BLAKE2B a125d2b044afff77a72e426ac1554465907a306139c1b602502d2ca77c03eb9768bbc3f90c3c2cc445d93d57fda97d164209a235e92bb7b606e4c6c9e5746ca0 SHA512 b799b862fb047ef0c48b351c8a7b42bf372dc6785beceb977ff4aac6933e3958f972706af77a74464a105d10a6ffba8be3cac5d9e1813575e04852af2800845c
+DIST firefox-90.0.2-vi.xpi 586903 BLAKE2B f1b143163e443d76a213e7c4aa57a5375adf809f9a8d2c246d036be9d67ab7678e1eaddf27a0c386935327bc44e4e21df1716c0f3dc2ea24a50b1077e31dcbc7 SHA512 3bb4186633e2b353266ac17fbd5277c4befe544e966d3d2d7312743966ee1f5407404f94542f25a3242521616a744108703d115a761a849832c9b0697b0bc406
+DIST firefox-90.0.2-xh.xpi 430182 BLAKE2B d849e34655c8b50abb2ce4d2197cdf8761b27129fe8fedfdaef04221ecd0300ac8a8ae998b07a39d21bf3a3187693e818846c92da0b5e7e3eeda522e536f86e9 SHA512 5bd4f80060e5b75f56b3a02489717f58bc39a33785c08bf3e308131f690437ab072860e3cc9cacc00eaa0f58da9cdf02491d75b31909f1d8f8423c1378d60ac6
+DIST firefox-90.0.2-zh-CN.xpi 588311 BLAKE2B 6656456291738d7b7651e14558a288eec053c1815fec33826e6db4c36058007d9131fb2c2847fda57f8ac75d8b5da9e7c0334db6c9cda0043c8bcb2a84db92c1 SHA512 6ee44936371e07a21903565bdacffb593a4a4fd64413bdc1f6998cb406afa11d934eea20e5ad5117468750d3eca53e80aa6afd9ece1c63ad4eae59a459a3b0c5
+DIST firefox-90.0.2-zh-TW.xpi 588723 BLAKE2B 295e5ebb3f810f1ab8b66f301ee5fcd67d147cc640daabbb12e481baf835a439992fc5e1d1195bcd8b28e91336281b2e94d207d77261ec1297c784fdc3fba5eb SHA512 a6b5747fc3986357f13db401dd93763f370e547e3fae61330108debd981fbc630f6af8003d6146e73cdcc948e4b79fc00614e6a257358155b3cfe0176d2e55de
 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_i686-90.0.1.tar.bz2 77994663 BLAKE2B 0999e8f3f0a655a89b76b89ce4d909a9c66b31da9d5fbf4ae73e70100f925714c5646857b4dd9e13e5f80f9362a21af880ee831b1a557c8ef2a2054f374e42af SHA512 e2be4dcec7214bd5a1deb48e0323690b9b42e3f8a71b0e7ff39cfb707d407ca941dee5a534ce269bee044be6ff51922ffadfd6eeac56883f99bbd00304c2c18e
+DIST firefox-bin_i686-90.0.2.tar.bz2 78032029 BLAKE2B 75427a146836abc83bb64eb4a2d281932b0f5cbafaf31d4b92dec785dfcedb74f90665c2ed2a8e41b57c19801fff6e669fe7e77454c3668941f5eb9d24961087 SHA512 6ea1e90afa4c67b2d0e5b5aaa78bc20ea26653271fdaa3135a22c8d64bfe090e43b1de05803181355fc652cc6134953ea1562cd6f37589d0b25731c4d06c3feb
 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
+DIST firefox-bin_x86_64-90.0.1.tar.bz2 74857210 BLAKE2B 723a7da223eda8a8dbc9f657c6dab48424ca91b41d2ec14a815ef5ab7be8ca483ac0639e868c182adb2689e1a97566bb5da8ca6efa726ce40da17f3ec3b278be SHA512 886b10eae140b68534ed613daf55fd07c95fb349dfc89f3c22d72a6d52bf8165e93f588fcba646ef33e9bfa2a3870ea14dec49ef4174fd3d21d71998bc60d3b6
+DIST firefox-bin_x86_64-90.0.2.tar.bz2 75026836 BLAKE2B 98b378bba9aed805990e14d45cfcc42f873fd7104e98c5f98a32c680d41a21ed309397de0d5780cdd7c9a44080627be80466e60adbb5eec237009cc5bf1b2420 SHA512 eae9329460a0ad3819b0ada1f95994c8e3ffaf70e040606d70aea70cc88311afcdc0d98d8c9e49b1f5fffad70488c1670b5d3886667ae1dd27538d777e8b1e40
 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
+EBUILD firefox-bin-90.0.1.ebuild 11510 BLAKE2B 5efff8a24494246164446815ce83035bd9361d5e664d4eb2d19b0ac6e4efbb23ae9064efedaf501963736621595910d7586517adc6dc76e8bcf703bfaf1ff952 SHA512 2f1da478e0ec5b497d97346e69a4158a685cae285b78c31fa7413c685893f7fe4bfc27db3311e412876e693bdbfe754ba29fd7870ad7c7f30214131c0d9ce0f2
+EBUILD firefox-bin-90.0.2.ebuild 11510 BLAKE2B 5efff8a24494246164446815ce83035bd9361d5e664d4eb2d19b0ac6e4efbb23ae9064efedaf501963736621595910d7586517adc6dc76e8bcf703bfaf1ff952 SHA512 2f1da478e0ec5b497d97346e69a4158a685cae285b78c31fa7413c685893f7fe4bfc27db3311e412876e693bdbfe754ba29fd7870ad7c7f30214131c0d9ce0f2
 MISC metadata.xml 425 BLAKE2B b26681e09f7a128942a50f9edf7ea7db4060a91bf5384200793ee3020b48907d034617dba59b6f71a54414270b1f94909eb2d2e659cf845ce2ac7ee095405fed SHA512 abc41a669eb3f658829ad46631cdb560b4bb26297f6398981a66e19b54bc2403b3b2913c904421b1afaa92884d55a910a1fbe3f029911b2073557d1311236ff0
diff --git a/www-client/firefox-bin/firefox-bin-78.11.0.ebuild b/www-client/firefox-bin/firefox-bin-78.11.0.ebuild
deleted file mode 100644
index ec5fd743a588..000000000000
--- a/www-client/firefox-bin/firefox-bin-78.11.0.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# 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 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
-}
-
-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-89.0.1.ebuild b/www-client/firefox-bin/firefox-bin-89.0.1.ebuild
deleted file mode 100644
index 811038b1e175..000000000000
--- a/www-client/firefox-bin/firefox-bin-89.0.1.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# 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 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+-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
-}
-
-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-89.0.2.ebuild b/www-client/firefox-bin/firefox-bin-89.0.2.ebuild
deleted file mode 100644
index 811038b1e175..000000000000
--- a/www-client/firefox-bin/firefox-bin-89.0.2.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# 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 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+-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
-}
-
-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-89.0.ebuild b/www-client/firefox-bin/firefox-bin-89.0.ebuild
deleted file mode 100644
index 811038b1e175..000000000000
--- a/www-client/firefox-bin/firefox-bin-89.0.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# 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 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+-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
-}
-
-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.1.ebuild
index ecadc88f7e5b..ecadc88f7e5b 100644
--- a/www-client/firefox-bin/firefox-bin-90.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-90.0.1.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-90.0.2.ebuild b/www-client/firefox-bin/firefox-bin-90.0.2.ebuild
new file mode 100644
index 000000000000..ecadc88f7e5b
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-90.0.2.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 5de3ab18d0dd..2f5ececdf00d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -591,11 +591,207 @@ DIST firefox-90.0-vi.xpi 586288 BLAKE2B 3e357d30dd5feddebba17a4fcb19cd4ea24ef8fb
 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.1-ach.xpi 467563 BLAKE2B a30f7816f4d606c1465058d871fb492edfba413f515b076ca030b77fb79c8b183081791405ec5435845bb2569a227dba00c88350f39a5a177a1bf1b35131c09b SHA512 f49f245bda17b165cdae9e0d809051c669103db87bc48c93bec7086fb4d178d428619738a32dcd74c153ef3b09c34dda39ee061e379ea5e1e664fd161e1ad2f1
+DIST firefox-90.0.1-af.xpi 430695 BLAKE2B 2b354ec1bbebb37b35783113524594fe2b884bb9b269ee8b8d69d65f21844fb6c2099a5aa05ef6646c8d596bc71b30a2e85c807e23e039f5f07fc2dd52c5e07c SHA512 7e25f43572fc58462c94a83a5fe3be2bcb44f3745419b34bb224835bb7fe063a841b0598f85ee4284ad20365b0099bf2e01d04d068739adf68c152ab5612cf79
+DIST firefox-90.0.1-an.xpi 515449 BLAKE2B 5bbc0d9e7db02e96bb6587bd26608986cd3602aba35daaa468accb1f06e82995c2ce3509091f2c9c9b280c8eb40267b086acf2a343b0fb51d384ffd7d85cdbac SHA512 448222104996df23cb93cfb6fb89739bae2449f22c773cca9ef0e5442d0f825a58ec3ef7661d196495bb2c6ce7686a987ac55d6a80d6b838b838fdc8236f7305
+DIST firefox-90.0.1-ar.xpi 580200 BLAKE2B 6efc4c47593c8c259e637e2ab089dd2042bc1620e5d31af225ee6edaf7748cee28262a4680bfac6bbe85d77d8783428082f07ca1b113ab8d358e357412b3b434 SHA512 a80677952af00ec887e0726bf349c36371f5fce96ae395727942e0f0beed3e45bdfa2d53cf5964eb6251ce233b36229affe4ebee31a0c41eb6aa73215aca6dc2
+DIST firefox-90.0.1-ast.xpi 507903 BLAKE2B f0f1962483fa41eda3ba740c53bcde712d3db152379e15b502367f5b3b189c95be1ff17183ac24ac5d788f09aeb9897e0a0ef6170415ac42ec018d345aaab963 SHA512 98332f1a5f74e4358822c5d4e0e4139af2ec0cd7010ff8e4a7f6f8ee08e993c7e7c351fcc836a12fd0b7c1665268706c6941f26119292b5923d9dc66936fb9b8
+DIST firefox-90.0.1-az.xpi 503441 BLAKE2B d1c0fed64089657ffefe97a0c69f6bab42df2764db766551454ba5567522e2e5ef657f70587aae09d3b1d6a30be080f84ff5359d236768678c0e95b712505499 SHA512 91fa9eadfa0846a30beeff72acc5520903970b1fe756de0b19db93f3c540ccd88e9afa1d16e7ef5cd82f94524cf4a14408c568cdcdbb0a31f41be36c9d703204
+DIST firefox-90.0.1-be.xpi 636667 BLAKE2B 7a4f2dca65233c667b3b1ee21f55c62706ba929cdb598a492f3cba6bc0ded7b578201e81b0881807a933140b6e5f2173cec1e447aef7d5103eff958a821de53c SHA512 04dd0afd76166da9025fa9113cc20f309087860d9e86d2c2a3f7aeb027e20bdc1a1b87f65dba52039170a24b25315a2f3bce566e231e18f4299c1075bcd600c4
+DIST firefox-90.0.1-bg.xpi 590435 BLAKE2B d97d552caadf822476cf35f7c488bcdc2ed588450581eded137b57dc207fc1f4720352ccd4c6efe08f7bb36ba72cc3f3bcea5a8724fd74de584ff26e7e2b90d2 SHA512 0d1f5b229b32713b27d37102c361f5b1c7b9eb1b9e38b30391a9d32bc142c7c848a881dbd0c217fe69004a179566d247e77b31b22744c4ab4347d581a13fd3e5
+DIST firefox-90.0.1-bn.xpi 579582 BLAKE2B c577016265972d1d764dee0f5f23fa789ef9950e70998e803c896922ec59ff95b281e4c36b9304c50fc981808e598e94a0557397b0f7bcde0a1fd7e400d6c7b1 SHA512 17d897aa3269142fae4127da0134508970809e34a74de9878e2b9f1a3e5c62c3bdf2f067ea42068b18138a40458743aa830356357405dc8b678cbf1798537bb9
+DIST firefox-90.0.1-br.xpi 537487 BLAKE2B fc699ec4b602f6f51c7cbcd66ee9e97e34bd4fa0ab453eb45ee03d8c88e1f75a5dc0579a341bd28c95e50dcf4c49a5058cf74adc93a439d4b8548e7cfd64d60b SHA512 c588a26b6727f48c5812ad640101236dbbb95153c9ab38bc82fd7b6b2fc35e6a652f536082590c4f4b4a3122c2bd3a8d7203fa54722e7f233cda69e46b5d945a
+DIST firefox-90.0.1-bs.xpi 472335 BLAKE2B 96c1870305b7a690eed96bcb41066a08665f53409decade572bdc9e198b98a2d1be31faa331d109a0d107af70f90ff4341660bb3c08a2627fd6423d39473896c SHA512 c2ccb864d1b3c5b20ba574b94515948aa1c260048822a3e324664935aa452dfba022724f085efddb30762b7e1af481246f968205a4aa69758fc5c570b86cc08e
+DIST firefox-90.0.1-ca-valencia.xpi 548463 BLAKE2B e04fc7c21b2bbd7a9b71f23016a0d58a2d31469dbd39b14b78d8c43d9ec29c926f61c826ebc080a65e4531c42c3bc3aafdf095019da08711edd2615fbb4293bf SHA512 62bb4e239b797b1aea9a217c1478e220b9d4d2d4eae65d3ee99f9afb6231947982f04707953293ce8cebd10fb937e6f9fd44777edd5199953d361219e70382f5
+DIST firefox-90.0.1-ca.xpi 546577 BLAKE2B 867f7834d6463140d7d57c50c85ae9261c4fc73603fa8071a2a7ed10ff00b02b0e7982254309cf50af4dc3094121117f4494fa6d9b69b7bbfdadf5fd4457a95c SHA512 f8e8fa64da11cb0100a8a9c5f9ff9cf97616cdc24a308e50ed63d3bf4ed465d1546f5ed3c3bc1e06d1a71981ea1ba970c53654855a96ba094a3f74d90672ded7
+DIST firefox-90.0.1-cak.xpi 573755 BLAKE2B 7c7dda98de119ece958e1009e906a63ea1aa88f5f18f830b072ac8b365c73a9a572e29f6a47e0e0740441a9275fcdccec2e8c277f7f2b399256feb20de2521b7 SHA512 b741e9cbeba4214b188cfe0c638babfbfd12692e90e0e8593383f298f1e5d398cd2ea0ce4c49bb892446d6bc72493d06d16beeb1ff23d7cf08163cf9dd36e6c9
+DIST firefox-90.0.1-cs.xpi 577430 BLAKE2B ec80c26bc53f6acc5aab20e9a72f0d83ff089766c4e52a552c7022538bf6b768abce4f884a688a3ec064cffd3fb06eda33d5a074a8ab44d7c7e7b05d30c114f1 SHA512 1732ef51b6427ff0a3bfa37e84cd640ca9c4c856f136083efade14e98868680c42aaf1e21780acdb08b8ce7c15a32ba2ca6721d0eed1c1737e53f871a7f169f3
+DIST firefox-90.0.1-cy.xpi 554151 BLAKE2B 47c6de44dcb551663b99b2bcaab6e68a5ea1c073de37bca91444e06a55a926ed2398daff5c4b99f31e4c411de0a324cfe166cf739c2f60c67c935161e63ab4a4 SHA512 f516d5122465be7ff89cf5c90646f2b712f1c1868ec096c51603bf093f18c8d3d9572f0e3e8762faf5aee2ef6dc6100cc4f86b473aba5c7e4093cfc7f4df126b
+DIST firefox-90.0.1-da.xpi 543830 BLAKE2B 79f8d98bfe8015b51844ae44af19d6ba84aabb5d20ff825b0c9fa74fcab7e41e3464e6c1382343c5b72630d369e9418466077e15f1eb5473e5b3617a0746359c SHA512 c203a1b544c785a6d059a71e46e13329a4e6e97cf59fb2a83f45f2224888c442b8d821566b7e71120005fa9a28708824b9ae8a134efd5ede5f1fc4ef5b54a9db
+DIST firefox-90.0.1-de.xpi 565907 BLAKE2B b37ca7f0bb9c20d630ce07943343a744a67bf8902f7ee05c62bda49196933c6b8fd1875ccd0dc0215413b2d2ef8bb67914afe66fa700cc18b3fa025792bcd42e SHA512 2c6887b3ff9c11b44b7dce40883eb9f7b2b98c643d7bb3c3e418380f606965bf9bf286eab496d4e591b0595ea99f16461872f9607ea6d443cc16b13d448b4e4e
+DIST firefox-90.0.1-dsb.xpi 578732 BLAKE2B 994d2d7c9934afce2c76d3706fc35c112e98b64e5718618edfce8d2dfbad39b79fc245a8c33369c1f641b2e5ccadf489086b25d24618f0178d6319ed973bf912 SHA512 a096bdaaa5e2adb055b019d09ca2df27c414416944c0f0bdb27501ed98052c6daa5bb92dec5b9606da178e7d7b02ec4403319e5ddbc8bc54271d278774d903a0
+DIST firefox-90.0.1-el.xpi 653313 BLAKE2B 11e45840d7359d15a929872a3224e42ecc069a2b0051fe17ef59a6dab3a3f2bba11e57f3e49e256821010f514e5acf0a8080f76db69497fba3ec5a6e7605c79c SHA512 dc287455d86c89369163a4ccf56e3348d74210bffadcc9f1aa311d106ede11f0ea0048b4a45d4a398e9fe07a1f606ac7cb47a6ccf40fc8082fcc340ec90bb3a2
+DIST firefox-90.0.1-en-CA.xpi 520981 BLAKE2B 37f9d58a60b71c5c9f830fc3ed76ec4dc04166388eff87c75b0b3c5dc3f25138cd30c87edf963171fa4ad982216256c281537af5270d39dcaaea4738a765ebeb SHA512 db8f9c529e5ba055e56e7be5d906a2d63d0027ac9f9ccf17f3bfa0ab2084baf4dab490b24375f6bd2bdc2ce55fde9f31655d7de2b36288fe8e2160251d25ade4
+DIST firefox-90.0.1-en-GB.xpi 521294 BLAKE2B d70ceb560b0cba17b8c9a198e759012714b72b49b8bf103b340a68355d8a32d78eebfaa26fa0d5ac8330dc7d52937e14234d7a3d895a706d371444477581dd56 SHA512 f2a6cf86752c70dda3b4394e6bdb0c9f2f772ca91dfe4ff76dfd5409c48f44e6287c532c6777c19df8e633cb473a661a699021b81516a7e2caef8517342ec0e0
+DIST firefox-90.0.1-eo.xpi 546171 BLAKE2B 6ed24ad03698d384137248122edc8f4afcb1e1a3c4534114ba79614b2923bd7cf7a0c3852b9a6868722a877a12c8161e6a4d6c78ad0151e34f369b1dc16ba034 SHA512 15ff184598812a5cbaa8202c0728478b5a3ac10ed634554b1386c81892099e616faaee4cddc61cbb35d812e6ad641a78ba2cc2d66468f26e51766e332092498d
+DIST firefox-90.0.1-es-AR.xpi 559091 BLAKE2B a9164380b7908c6cd0a1d09e9bb74bad715be0bc6e953511dfa8e47cf6304f810f263c9fd05648de311fe3dbc785494ad1ab3e3937384be4427a956e2bad94ce SHA512 5bf406c19f61df5f16d8e35a027d3779e0f256ba1e9268611200c926b8b27619a41b63df68bbfb1519fd87469e7b6e7c0621697f8fd5ad32fed71327915ad4b7
+DIST firefox-90.0.1-es-CL.xpi 558226 BLAKE2B d6a3b3c4c86276e87737a7765e3671fc89f894ceeffed60665b91436d8fafe3e3a594182c8f72c7f9ff7126e797ff5bc2f038117af8219229f6f3aa178e78d03 SHA512 bbe0bcda78c434d0ed7e8b34f38f39a476b415e0d353722381655e3b753c81d221bc02e29469633ffed9620bb28ab339b49bcf5a13ae13c03a3ce608302fe481
+DIST firefox-90.0.1-es-ES.xpi 548979 BLAKE2B 63eb9b61c94a9000a754d6555fd468a04099ae198c27be4bd218ccce7bd93d226029f56b94ac0a4179a7173d82bd5510e9cb0fd822775f821ebf1acaf99cac93 SHA512 fed06130a8d868e86a57ea6b26dd1b5e5db7de6ce4a898bc039efbc17416a954d8eef96a1e10d66aba50c80e24d2b78a99ee0bd09ff8b9b09f5db7b380e064fe
+DIST firefox-90.0.1-es-MX.xpi 562420 BLAKE2B 57dfde811a33ed1ef52cb1e06045d52b7dd21b45054330bcff87d60440df5858d0288bfd9fb2835dc724559e5c4cc8154ca8f2444532bd33a86570518319f161 SHA512 c816b47239ed61ebca03f6766f4f665a37882311e2805566f5cd3da6a00797e2cdd4973cd3a4137b7309fdc02f45022adcc3446e906402c40fc727ca5d9c5587
+DIST firefox-90.0.1-et.xpi 496641 BLAKE2B c560f85ce62046723a7dff4fc7aa31cc4f25ba5301d5f93dd422a6e0559e7a041cf55476cb8399861cf132416cdac4990f0f3a6b10a1d22f535028662ad2826c SHA512 07cafeec25071e9d7c712ef5394cd49794d01c73a4acfb8dcc700aac3c3ac80b6e45606fbef2fb417123942bd8a9fdc50d64948fa8dd0f9845a1728eb48fcd35
+DIST firefox-90.0.1-eu.xpi 544759 BLAKE2B bed804c5daedb6d00f5beeb60da9b30e0a3252d2f09433deb0b1ba913961c6780edda3160552f7188f3db11fd35e62bf5a32e071ce981f42d8c58ea42e3dde72 SHA512 43da4484590334777b7acaec5e7962f5848bf17781f4085467125d6a1287d777d77f8143a637c3bf67c346e793ae2af18bc24915043377e6c65223421f90e7a0
+DIST firefox-90.0.1-fa.xpi 565130 BLAKE2B e94ffbcc42348bfb2b7b0448fb7ab0bfe86541250bf2f4673426cf74e4a9c553186b722291d00bda2dcb3f64bf5ebad0e5f044af736d623d21cce3b3ac6c1445 SHA512 4a5a26023ad95a61139c16dae1b1583b2ab0be31c64f0e32c92597b9d796f93a7b0cb15465f3d6e50ad06e7b78b4f916033ec60b51a8719dd473c3e69db54d45
+DIST firefox-90.0.1-ff.xpi 488041 BLAKE2B 52843f1d77a2e6bde4ce42e3eb7dbd1cb0ef01d0e1d46dc8418f182253b43c2706e326833ed733e4fbaf38fdc88fa83f0d0805f27fd40069fd4cdab0c7bd6d50 SHA512 2b9ea0f7225d0e5cc93d0fa942bd2785a12def41600a9afe2ebb69df6ce926b5aefa13237a7c9483dd2caf9121052ffbabdb04262ca8505ad8b65a523f160e6b
+DIST firefox-90.0.1-fi.xpi 545674 BLAKE2B 73bfc8d8f0cf4f6dab55e4ed804fb0a2a9a80b577e645ef6f2105fae5e285d404c3e0913b76ca3909ea49c846c9e2424a22d03c962bb9776a3d27cd1e51b44cf SHA512 6b66c1c7ceaeaef83adabac0c0988e9315da2e3e9ce42bbd845e642f2eaae4ab56968393690bef5d1369fff21dbdf566499316115149172189498576953cdfe9
+DIST firefox-90.0.1-fr.xpi 570206 BLAKE2B 4c8f2e9e4b0c762bc0498b08a76885adcb7c36164506c433b91dd5fd22e69a6ce91e93b966e64e762e9c96105e71252c12dd20783fb4065093f56db61904a5f6 SHA512 b142455937ba139f2385cc22f2da357e36a1d082a77731860d2115f9eaf8266a988bbd9cc1ec30dd899a5d1ed4831872a6f494e4d203151328006f782db04b51
+DIST firefox-90.0.1-fy-NL.xpi 555046 BLAKE2B 89d741eb945138cca6471ac0b3e3b09588c6b9fe5d2fac250d2f40cbf005f445c894cc152dc692855598e288c8d356ba1d0edfe5ddaf5d23c1526fb64cae3b70 SHA512 5df49977394f88e99c55f1f4e914d96614e70f30c5d611210b6e40283074968bc7906c44389164d5d9390248fada6aa8aa1940408982ef08c3a83a8039a2c171
+DIST firefox-90.0.1-ga-IE.xpi 473117 BLAKE2B b2da1ab90b7af89f970f4980a189640674e23a0cd88b5c0daaa88335ee48f36e531cff39ab80a2edfb60a2f6e1ded89101b04c5a45869886ccb3ba79fdc0ddaf SHA512 04bd5bc068fa2787d1af54d4ba780f1bb4bbc9f53c8826ad91e351c76742a2d4ac672bb8e8300dc89f2189d635ec00ee3e750ac0622296f85fb68e9fc6da3205
+DIST firefox-90.0.1-gd.xpi 550989 BLAKE2B 2e2bd993fd17743a892997c23671ddde4633acb77685de2949882921a53d11a9c7675da7eb292ea609d910a9ffb09a12356eaa73c331950249f4f5817a79a300 SHA512 640f27de1df4fff3b7da6bd01c69e16f9bc5b036e711d51bf7641cfd6a39aa0fd30b5b3f04c4c00ffe44397ae3079504b13c36577f8c9e772390b31009c24c4e
+DIST firefox-90.0.1-gl.xpi 554475 BLAKE2B 8052c752b431b96d9bfbc4c137f5c1f40d3377445631327cf79234774a324fd03c82701fd01884a945f02b3b8fbc96974a1665705f007d59c8b9e99d889e78fc SHA512 5fd8701e1d67c3bb065dc1f409cdd67089e883a0b76ed0ac9ee4d4f13be75aa9eebe4d22879529ac94ab4091b0a4ef981cee7abad1960acc755c2267b07bad36
+DIST firefox-90.0.1-gn.xpi 571174 BLAKE2B 5b71ff90d2128c9aae6fcd7ff87a9a8dffce9ce63fec18e7f0f336e17744dbf9365089d931025416da7bd1759f82a95b9556911b7ab2d253cbf649e162c7b4d1 SHA512 b359f7717a18cff6e4d3472215321d09f5077637c344ecf7da56639879b043ef6c5809913b011e125c985d022bb8e921328dcf4a96b90bd8d8231d462ed8f88a
+DIST firefox-90.0.1-gu-IN.xpi 547526 BLAKE2B a9586665e12001c1eb7327b8fc3b5edc2ba4ade85cdb11aeb8cafe1357771f1728b4b158ed3abfd2fc4d032b7f73019e536365a6e95aa17fc7ab1be7de5a7fb6 SHA512 f8459b05537ae768e3fef891a49202ca2351a7e2f3305d11a8c7b8b840d9f2f88efde014f0de078a9cf1f4eaa26db5a842d87cd140169827ce44d96975e21265
+DIST firefox-90.0.1-he.xpi 568991 BLAKE2B 57a4249c93f96fb7bc0d7a32ba41aa74b0661ca57cdcde2efbe695bb681835f8d3babb8b91ae8519a64b0e27ebfc0c6603fc85ebf09412a436e1fefc9b2bb29d SHA512 9bf1f56d47bca657848be539fc4aaf4cbe208deea22a9ecf912babc6e69587afefa8618f81b841d1634cfccc88d145d9cc0350a1b4527a16920459be57c2cc4d
+DIST firefox-90.0.1-hi-IN.xpi 579605 BLAKE2B e79e14b8f290f67003d3316506255944ff883d9d2600c7c95293eb4de96efcc53895ab22b2edb804e97b88a1fa9ebc9be7fe8210e21edeff1b4d7dfa3f710e21 SHA512 ca9517f8427dd756aa08cd6343cef09980530ec08d34b01075d274ccf898cf6885cc56f2f97d42dc6daae5f607b4f926834d4c40262e82512031ae28c35e425e
+DIST firefox-90.0.1-hr.xpi 549989 BLAKE2B 179e37c8303ce34809bc87274cd8bf4a82fb465efff9e4806540adbdbf15771e147bfd4285afbec602efab0f7a5a91d78ecd73954304cfb3749067563cf03d3d SHA512 b6b8ad078d5a97b401e492dd5654fbdd1da0acb1c190ca8224891ca0d8f55da08e535b8922d92e64f3b60408d680c8be3c070f1946ad1bea31ebb23bf0dfb0b3
+DIST firefox-90.0.1-hsb.xpi 574886 BLAKE2B 4544532f23189bd87d37059c6df790acdf8b2145e3ce3e1332e08bad02c1b8128e99a924f2ac1fa11c5394646e87123525ddd765a36ede1e1fc8fb821151d0ea SHA512 7096869a1d81a2ac7179576e60a18ef5b573c7505ef853404c6c7cec8eee2498cd4bb262f1cce62d71e02bf3e022bb18bbffab38bb98e40866554c701742f9d1
+DIST firefox-90.0.1-hu.xpi 578493 BLAKE2B 910f323df1b5844676c6f220cef8bf90720f410327e38fff709d1ff98037792287839895eaa275291884fd8edcb0b4eff13e73216f68d7dfea9400e44bb643dd SHA512 d95e663a2ea9d547252d7bb56451b62b0c2571499e715a9c5d0dbe7b8e14047bb3c24fadc5c8eec3f0a330c9d015984b1236fd803bb314c506502753b5f8448c
+DIST firefox-90.0.1-hy-AM.xpi 604407 BLAKE2B bcc43eba7b02525dffa4cdb2bf99a784e2da16960484292cdc5485d6be72b5050b64b10e82358eb73e10bb4680e8d8491623c5af44ec28f9207d82f4edd26e24 SHA512 cd592044b0de3e8a37cc43be6b0a9abecdee6d674806c9b2efd66f6d0c2a999198790a86545cbd15134b8367192765c82427fe39296a11cf7ea2d6c129255ed0
+DIST firefox-90.0.1-ia.xpi 543884 BLAKE2B db092153d18b7cd15a74f5bb9d5fcb253c6b69ec3b7a83f43ef74c3d79d95361b58c2eb07110dac5fed6ab77db9b6f9284b5a29f5c37beb688f5f849d40c7b2a SHA512 91650c07d39fba5cc76d60df856535bdf1e9eb5d837a87de1c46821f2f31a7733be5609374901a6ffc93090cbf0c5036f9dd7a2445a0c934ae85202264894359
+DIST firefox-90.0.1-id.xpi 540018 BLAKE2B 2866cda1253e0594ab3627459c600b3a52aea7facbdfbae7df98f1212f7f2ccfabfb887e10ff1bd9e6dcd230d667aab57d2f3c25bbea116b42aff5e32984ff61 SHA512 51401b509b947a45c7fc97f89cc1b10a9e42578a4b861f39bafa85b1c6096611929346f412907f94665413291aa78660b9df1e1325b87cf51bec1617ad428d1f
+DIST firefox-90.0.1-is.xpi 483701 BLAKE2B 12f83d8122e399405805f9a5fddb49db066d1e361e4a1ebb09f8dbaa7bdc5f0d2d5f1bfdb447f14a09e3944f4d909491b84c15e48b33f3144ccedb6692aa35a9 SHA512 4e96600455d02705375a4dc7939042d54b6effc8785ef3528476d36e135e987eeb3a1205373477eaeff09e080a47a40390efd92c7d5d777f37f535f49c6cc36c
+DIST firefox-90.0.1-it.xpi 472095 BLAKE2B 6c797b7272f88d5ae64ba62e2cc4fa662b1ecad4a2247f9ca170b315c0f619005cb5ef0a5f621522afc1e3421146ddede47c1969fbad1c4ab3229eac682bf4d9 SHA512 f4893dbf1834b5c2bc57d4b4e8341f17c6cccbfd9944928869159dcc430547479cd34ca633c8e2c376b975d03c50eb9df3b5628635a4fc420891bf633788e904
+DIST firefox-90.0.1-ja.xpi 605305 BLAKE2B 11ec52280078d6edf0ceea06572ea54e7c31de81ae8fa3d8d776a3f42d788e919af5838e8bfe325c77aef20681bc9e33dcb9c396eec015f5c304bd2ea449c605 SHA512 06c3adfe55ac510fa09a9952b66541b84470facfc73fdf8422beeb505865b3fbf61494bdcce2810e7966eb4eed0391a53686f5fd25a4f73587e508e17fd643e8
+DIST firefox-90.0.1-ka.xpi 606618 BLAKE2B 6c0d9623bd4ed893fd8527e97265f544fd6bcd5e044381dc2b0da9da416a8d98341daab642d966f174476f4c2fc37b9fdc3f488ee64364b86546a3016c955b51 SHA512 10ec5f34c551f4c095eac2d5ae0468cb7fc9e5209ac95740c3aa321f212b82b0599760da00110f64ead5a3e118bde07871ef9e7c5e9af89068bfc20fcaee1bae
+DIST firefox-90.0.1-kab.xpi 562723 BLAKE2B eebf8fe2b650132748beec57f468b4830f0c6a885fd21d215d1f734e93896d1d07b5eb7f85973ab80260fd301d197273ba783ecd5fbfc9f370d68e4354725a2b SHA512 480694521805d67a10818ae1f98cb42836d5719930713b68aa38d53aee7879a055ee0d8921baaa6d9841d5e068538ce64ec216e14b893e5602afc08106f9b67e
+DIST firefox-90.0.1-kk.xpi 621558 BLAKE2B c7d385c2e4ac96488f8596e5883f693ab91ece3bf6e0b3cd5d847c1169f07c0c81fd2585d7fcf640c05eb7d67e723f06959c2a90b62507ae8e4240cfb7827f66 SHA512 3345b0e31a162bcbc87230e7f01ba47cdd3836863d4adb267000bbbcbc976359ff289f5f1381cc3d6cfc30001cf1554d46395d530f802dc72081966823d8cf0f
+DIST firefox-90.0.1-km.xpi 546421 BLAKE2B f51e28d94255d3f0e7d4a830aa5284004d932f78f123ad701cb4d8ef18c9d39f3c0adb973dce710acdb74428521ab8af9ecbe01bb2adddfd1a84e71c5c2d9db1 SHA512 6da239caa4b2a2481eb42fd6f4efbdc4694e90ef4c1e71a627e42ccc3679ac390c275cb639a3476cbd266aaf45341a200a4351807635049c64942bb050c88da6
+DIST firefox-90.0.1-kn.xpi 510711 BLAKE2B f78f4f5054628ac2bc345066f309d43783d1400fa85ceccf6abf75d285bd83c6b5276a7e312b0b51ec4b2368aae4834fb16d458c61076e8ab1b7de6dde145f7c SHA512 f4d9f197b49b443c3cecf3535762686b3210f10cbf22c4403334081daf448b0c11f1f347af3d4f1d523a68e2ad0ba1141fbfb6897c4f1db91873a90f958c4aea
+DIST firefox-90.0.1-ko.xpi 590157 BLAKE2B 5a1a3353870ca211487e99c9d2b51d086d4ae4cdf15fb23e34991e4375e1abe3ba3ba31622d191ddcdb53ae36adde003015fd3f51b0f7d387fd053e6ecc93289 SHA512 dc4673e0eb02ffcaec666113f3a8ba412731fca3776d2819bf080b529f16cd36501b1e090d066e8ae0485fe137b1d289bc507692960ab8dd10b619941a550689
+DIST firefox-90.0.1-lij.xpi 484744 BLAKE2B c7c87de7ec80380db073ab34bf5ea5de962c29f0748752cb86afd1a6d9bab1020eb997d917440691701a89432605c1d0fa959bad0581eb9221ca27bd688f83b9 SHA512 5d3118803438e43b014e5eb7079dfa51afb131c548c08764601ba7f2040250994cdf74b6c5bbea3d8656661169852386a6042bbfdac2e857c6c35692c23ab969
+DIST firefox-90.0.1-lt.xpi 571831 BLAKE2B 7ec88a3b6772d41dd7fff3154234e1d3aaacb15b2b51981b635b13cf7b49a20846e263650fb84800326c9dc208bea2e9257bb7efb1fbd8830e0bb5e7a10cd2b2 SHA512 47e357b716a75b44cc703507d680ca71df91af4383be32637be3a3c2649909ac8645c734ae3257e68ab58b4e402e39475b6245584609f816b0ec1487ccdbf90f
+DIST firefox-90.0.1-lv.xpi 475676 BLAKE2B c6aa771d4123813e8e086673b9ba84b03a78d8b74908d0b11c1332dc40171c4f39e219aa2ba69ba7b2ec9e1f343a82056b8d18a1af95b318ed28287d7bd2394a SHA512 fa22507a1a28d9ae1bdcf04bddf7ba22598d6f3389b0bbeed4a20fd7029fc28f845627c5eff6db2998628e076ff48a03ba78a62cb9010b99f13713805e5d8bd4
+DIST firefox-90.0.1-mk.xpi 472343 BLAKE2B f78cc1d87ecd2849c2508f4a132971691a66f96f49b3a44970b9a3f0c8d6c2fb56fbe264737f46754c243afe724095d5b46d292bdba3923817d09ccb28951209 SHA512 72bf3948a3948079b2ffce5dcd56fcd9507db42adfcf005a77f1f03646fb4e3065076fca316a0e35c0a6fbfba36b71feb632a3796c4650db1d47dfba3badbf9d
+DIST firefox-90.0.1-mr.xpi 547689 BLAKE2B cbf722e8adcfb2f355123137d61872c7cd0c26a3ee60f0190edcc59b2c24eb71640fdb27f7ffe96e4b0b3533c0d37b1ebdaa368af1bc76697259c6f5941d4889 SHA512 2ce3b7318c7a58a37e7ee9ef2fd18228aeeb00ec313b340e17614e40ad260387ac9d7800a8ee404abd833845dd1092fc40aa75191827b3fb8fb5e4ccd7a8d668
+DIST firefox-90.0.1-ms.xpi 459291 BLAKE2B 30abfe885821c6240dcb5a20d25037392d1b1cc001188dcfe135f1d24af14fd5d40c0f839b49ea1fd6f798070dca31892c3868807a243dd095638505ac08f4e2 SHA512 740a0954aa61e12665e1fe0dcbbdafb14291b56e68686d28f8ed0d63e79b83061ffb9c3a29dfe188b1e162142fbec06cfe3643f1bb99f102dd01d8b041627df7
+DIST firefox-90.0.1-my.xpi 531244 BLAKE2B a4a133bec87f4bcea72dfe58f86749306dd180e15047cf6da401d6b0bd8dd865a01942c283dae594735133c7a6f021717ccfa90674ce1bf30e93ea919362a7df SHA512 49e9a2b9ecdb0b6830d5c4ce117d836912259183b8ce33e52ea53f95d78845fcbacfe0037db5d2dd5ceec39674bae71eb476cd963c3927fd732232d6c06483b7
+DIST firefox-90.0.1-nb-NO.xpi 540501 BLAKE2B a2c949325e861d437d69c8173609cf0062db681ed9d8b2d4c90d3816b27ea181b0ae9b079b66de57678c2200a103959547f7d5e083a6e696af8bd1c189aa9087 SHA512 d0178d9c479f8786ea81e861303205c43f85ce51a8f2b2bae3eef49060ff86c87379af795de9bfed36a6a6e5fc1ff3f614086b96a7a58dab2a52bf17425e1e86
+DIST firefox-90.0.1-ne-NP.xpi 488250 BLAKE2B 1ea7f4249a85e4b123c317852b31a1d4c0c2bdde66058cc66a2cddeea13f6be9eb80bbf79053266a661f4d2de898f48ebffa9034722c0b6bf1450d9637cf672a SHA512 e386310bf8dc2b1c72a5b62682b8189ccd60d7fb71a8c7df9f8c80ecd7e56b9d95d941ecff13fc866b627e77a2daf2cf09ae1496260a4e7666c2dc4d878cb01a
+DIST firefox-90.0.1-nl.xpi 548832 BLAKE2B a02ba3ce88030183ce63fdabd1e730cfdfcb38a907d92df37e2fb4fc1b5ac1a7c4de3df7828a6069e0b8442d85309454396bbcd5aee13b306b5d6d4e7831b2eb SHA512 a2c218a19b55e9eae308b49fe9bd32693686c1c8cb3aa203592de0e30b5529bb43a88e92e927dd1ad8f1f18d269a7f7693e99091102d02beaf119551de2c7ad0
+DIST firefox-90.0.1-nn-NO.xpi 543211 BLAKE2B f57ea76c1ffbaf650f75882e5a667701e30caeff578319c046f9ebd04df29bcfa39da84a36499ef0b25d295a76dca96eb0b710a46f78c99fa40cf0f75143a3a9 SHA512 845e6c71d771ccceaca224631f78ae0408482126f1beadd1890b64b43b36070f014cb92fcedab4fa82c6a1287f9e0eb87a28c65a98db078fae99cd405039557f
+DIST firefox-90.0.1-oc.xpi 565279 BLAKE2B 42bf5fee3c71dacb9837f266f989677c7c0b9930b34b2b91866d5cbbfe29609fefac5510891d9f9850b12597c34846b666b1dd94066bc5b808f44180eb17b5c9 SHA512 543b606c35d0c173752fc0e603160a004c684fcb0f2e7aad30bc2e1c772f68403bffc38ea97a1174eec26336d4ea82b13dbab98e7e1c1d38c96b2773c5bcdebb
+DIST firefox-90.0.1-pa-IN.xpi 612462 BLAKE2B ed516d3d2de5d6e40c8e6d92b84a10f157c1d236f2baf01a76a80b0420d28ac6c6660b02c6711295776995ab5b508bb215feec0e02951d933b569d566e89cdd0 SHA512 2d9abd3b3ebe6ddd0d0aeef48d9c49061505d2090bc2dbf6d1ffaf35b6fd99b60429b46c85db6af0477d1a0ad05ff453a57c2a0ab57a23b77c8c4a9b9ee0399d
+DIST firefox-90.0.1-pl.xpi 568699 BLAKE2B 16c3835d0637614ff24705bd4d2abf1f02876e2d35620db9c45a59579d314f63853d9d5d20a81fe767cc474001bd65a1efcdf58f730ab79755fc3897943301b5 SHA512 bd87870d8f960d6a16bf5b2cf2c21c2e4758ac9cfbde031b3346430b4b768102bf99e572cad9bdc384d8d569879cf0bf1a2b97ed4a3e33ca2501d6ab04030450
+DIST firefox-90.0.1-pt-BR.xpi 554548 BLAKE2B 1656bfecd902a811097caaebc121a9827166483369e68e74c3fae84ceebaa180f263a54986ad9ac788190b007db8c0e4e437b655d6765082c1a8c90eb4031821 SHA512 45b65b270b7b436331438aec2e2deeb63ba8f86ce6103a4ab0449642e17698806e26178efeaf26a4ab162075cb566cabd6e2305bc976e6d183ac35dcf573e17d
+DIST firefox-90.0.1-pt-PT.xpi 558173 BLAKE2B 492bb5003f2430207b4cbdd61529e4c36ff81df0b9313074f6b768d7c0621b8242934ce9d57a4203b8b1b8b3a8fa0c7bfa8d5f9591a11af5e1aaff92d60615ce SHA512 3a6e364b3a8d8ecfc6c8a6417d98c02d04957e1a73557e87a98e74de0c1d111b907612a3c9a779f1eaa8f819f171bd05fd798c7de1e232a0891c3dc69be1ba75
+DIST firefox-90.0.1-rm.xpi 547503 BLAKE2B 2d87fc0c3af1860e0fea0a5d381e23f5cc908b95461c0ad2a26a4ac291607aacd052bd67396d1a4cd2742edb81f75e5ad156fa88c74075d5eaf13592cd0dd6b1 SHA512 f6014616daba4feeb7a1e8fd5329b3ebf3a70794a3596ba716bf3ada2d005a9d22a5bd5dc67d51ffbbd1ad6c724601671c8332d16c99dcd5780f123bc3d7a962
+DIST firefox-90.0.1-ro.xpi 542097 BLAKE2B 1b62114e852af6662ddd389fce7e5d4c6138eded8157e7deeae2150d45ced14e514d71ec9fa597eccfbd73683a53cc8bd5c8bb390619dd41bab436d92b3cbe98 SHA512 5c96ec5e56d1d6773801fbcc761138097ae6eb1c2e21a2e6b4035b210a76871d7421f67ae54b12119968da0af70dd300a16a4233619b2d53bf1bde4164aab25e
+DIST firefox-90.0.1-ru.xpi 641411 BLAKE2B 9610816c6ae04edadab61a6db39aa739ba99e3aa9adcfc6e0cb97eb90310232526e80f36a48cc25c5f40e53ad2339a7301b0090c0d1449a9faf6bc75a1847b31 SHA512 e08c752107758e0ff5e9148938b4d4a21fbac2e3977dd88f9608054b4071917bcf2637a5c4232a2f2c4dbca48eb6e43a00f75aef309fd7659ccf5c2c39a5abb7
+DIST firefox-90.0.1-si.xpi 497029 BLAKE2B bb10d6b14684f186681f1f296d7dcb59d7d2a53610f35a9875359dce4493ea73568940a12ac58a61e27f19f69a1c3e1eb29bcc1f49e4fc18cdca155c3c497090 SHA512 833970c43c9326b9a9ed8a3f178201b86d8ebad66d2b0696947bcb1187d3f7958a6abf2065da08b1a725bd40e9c19fef4d8efcf4f2905081e236ef64f4cf08bb
+DIST firefox-90.0.1-sk.xpi 578292 BLAKE2B 028082c05bfe03f616056b4494487e14ecdd6fdc8dfa0267a0b3f451e65247fe28f5c8fe1808d53b8c6e1d29df7d9a3f4882fafddf8eb69bd4c1fc06c1726715 SHA512 477884de80be0ba0cb52ccee12ca05ffed9b0f5ca08fea94878619802bd35f3b355b4f68ebb16cf922b1be78859d09e0125ac5acb607f4582c9b72a2af558146
+DIST firefox-90.0.1-sl.xpi 547668 BLAKE2B f61794f628b490fdce7d769f056ca31c8d9b39909346c29cd108b9c9f5ac320157c022cca085ff200f398301968e0a47a4636e0e43a5b81283e39b829de56b45 SHA512 ad71713cd34c8db73bbf230ee75630c435145fc93f5f80c2fe12f2aa87086c27dfe431d6b63ce98679f36b817a090b15e80923332e01ce6fe89b91dd0bb0830c
+DIST firefox-90.0.1-son.xpi 427998 BLAKE2B 436c379781d1faedbb92e0e25ff97849a9b21c4360b95ef3d54831affdfd60cea01f9d7b53ca21fca5d9c03bb7632f7bcf350ce9c43251dddf35725726f69341 SHA512 e591de6888eb35c4ad441513235da632a99ee0d593dcd439ce69687328b13a8eb7f97847007285d07a0af0debe0b3b15f3a5e22c94a113efc23fd909a3ff34ff
+DIST firefox-90.0.1-sq.xpi 568604 BLAKE2B d21c1103537c9a62f935a97adc4df9e6653e63aa020e9eea343a5602e8e2b2317e6b4392ff563c27c588166771c3e38d3b437ba4d0e3f082e8e12746d5e56c1c SHA512 d53dd171bdb5431e880fdf6464fafea04ae54b693ee1d35f1e59e468878fbd9736d40f2562b8f82298cb5cec05588c1f2217fabb19f8b5ed95c2458b934f6aad
+DIST firefox-90.0.1-sr.xpi 602764 BLAKE2B 2de2802aa5ea0c277276a4e2cebb11371270cebf7e78b632df3cbdc6a21516c3cdbf8347af0e23d8427b2ab326fd673e80ded765551b0731df012b64b42b16b7 SHA512 8f87e8170098860a04a7dca4d897bb4935d019d1b8b906bd071554f72876977f2c8be811b1e0694090d10432fc849254053032f392eb635d966c4feaa9a0c793
+DIST firefox-90.0.1-sv-SE.xpi 551932 BLAKE2B 5120ceb910caf1d68a67fc489d3332d97609acd77e41845118aca945100a86778300586284aaceb16cacaf97641059314c99b5110d8ebb3b02c7b0814b332fe9 SHA512 81754326c6e34dd74969004394cfd5346d2946d0fe133b25ed00f34d0b5e5c6c3080a7ea6c5b7bf2cdead15c7a59fa944acb66d7beb656178a7c4b9d0fc283e3
+DIST firefox-90.0.1-szl.xpi 525932 BLAKE2B a2bc9440a8960450c810926c65ace1e0d45783b257482de444337e9f56a8ea66687daf4f73d15781bde1d18bf8a0a72b9e3c5b627021cfe03c854feccb189322 SHA512 5d3e2b4203ce1f247a19eb6a900778fe1d7a52ebc85658f53d819a89e843b2ae138a463117941a46a7564452d157133bc920614c421d7fa7600f023821db3b68
+DIST firefox-90.0.1-ta.xpi 526012 BLAKE2B 302a98bd0426cadd2461dc6d1cad9e22d6a62219bf6aa3543295c9b3b044b1b05162fde424498eb5dd0a7622a257f344e2355fafe13bb4aebacbf43d5d326f04 SHA512 159f870c5a7ddc3130892a9c5b54bad0a057d7cc79382a6cd1dc06cd27fe3011b77c968048e53e6d9dcd8841b8df8259e2136312bcd99fa3efcf2d98ccbf619a
+DIST firefox-90.0.1-te.xpi 568758 BLAKE2B 66bff30e615a47fa2575f57e3c07979a9fcec781a1e6770c4931d64837bc2723093fef569742a609d51ae597419690f41c69e42822382ef5d704aef55ac2ad51 SHA512 50a6f471594531b21edd3d5fe337734838f5d6a8853657d2021ba48f3fb492b19355fb6723b37439fca6a3406161efc1ea741b970a3547367848a9d6780a5dda
+DIST firefox-90.0.1-th.xpi 620993 BLAKE2B 2b8a6348b1f697fa031abc03a774d4ae94e73ad1a30cf1eacce9148c3de682e80e771028122f76009a7cb81612f56908dd47f9c3aa95cd51c09ef2207fa8d334 SHA512 9d24ba44a322cca2bd0488be7ae618d4ba195bd620865357c822f3171297123ae9af741ffd794d23a86ae01a7b8dba79d2015171b693cbc0ea322eb6060220b2
+DIST firefox-90.0.1-tl.xpi 533275 BLAKE2B 3750708f87f9e96c917342f4380486b215010531bb8b875f45285c72e57431dea6cc04a01f70bad16e53284fcb6882449b70480578f73f230136d43360e29944 SHA512 3d57655eb3ea8f0b4ce8b35279b537ea411300a372eca3da6aa9533cc164708d269c46763de19acc3f5240021eee8bd53ed8dc8074fadcf03e49efc3836d9845
+DIST firefox-90.0.1-tr.xpi 564312 BLAKE2B 05731029c793289914508f46d50f9603af0bfd48db91991767ac28ae9e84aff248a6f61541a8519323680e6ed24e8ce80ec9e12bb5085d78694020a1b923a36b SHA512 46a09eae3bf342fb0b4b4d4ffb15b6f87d8641397b87da12aaa1c407289bdf14c99d2a61633cc0525316a0f09987d068e533012703a53af35769dc5c266a8cc0
+DIST firefox-90.0.1-trs.xpi 506677 BLAKE2B 08da46351de4cb9d24b1fc07d1a5c92a604c931a4877ed7d7eda1da59c8c20b03a2511858caf84f4f2fcc1283d67a098f4887e9e13d58a2e0b23b83a403b9d64 SHA512 9070aa494fe4a25e115340e687534d2dc30edf63ba8eaf22d01d232536aa39c577ba032e31b29c646eab265692118845cfd8a9fa56d271cee5c469861f9a2275
+DIST firefox-90.0.1-uk.xpi 635103 BLAKE2B 431a3645dbf1f6e9fdffdaee16214ab96935bd51123024a0b2e7fce5f5157a89971a1e61422d10f501761f2e478336f8cef81d6fc541bc34a5425f8985d9c1ac SHA512 61d06b6317acd6f7146084f6da4c911c8a324cfd79f29eebe050e9c42bd17aa12e791d4e6a9d3191d048dc5cd7bdc1565fa159f7be4366a55931795ce120de7b
+DIST firefox-90.0.1-ur.xpi 577975 BLAKE2B 5ee7b72ae6b4b4ee5d3ac924af13f2ec7a711786bd2f161e77740607a2ff095f3440e862ba6304854097586a6d50a22eee9590cd0a6e8c79309a2f475fdd0588 SHA512 efb5f7cbb4833a7c446bfbbbe305e066dbb8a88ec3e24df93858a079ed6b5f768753e60baf9707d7b02da2e83b1b6aaa0cb17cda4c6c9fc830b32ceb857b03bc
+DIST firefox-90.0.1-uz.xpi 483019 BLAKE2B 2c16d2a9fa9153c06a5e18bd0ff63c1e9799d42ca3b0940f7e0882c54f393f62639fe38d63af34ae5f25d0674b1097fa08a4e47e040334bbef167b7e44899a6f SHA512 84ab9393d666b359c84f5b66b290236a4a3b78e4a4f186d6aa5ff5e97fc80bf2cfa9ec9cf633060eab5c974af56a6dc54d73d8aeb65eb255f62c9bb2115eb537
+DIST firefox-90.0.1-vi.xpi 586296 BLAKE2B 84a9030f542819e1b7a5190bebc3250d6bfb279c42c5ba5624a4c7cd05c91420ffe131f280289801ccd6ae10f06d5b5784f89b05983ff8fb75ce26a93fb65d7d SHA512 4f2fc779dc113ed9bffbb2abb51c3407f9a9bc90d2f5db9445876d39b646da6b5787e9ed41b2d1215c68117455438aac69ae339a92fc2664be172266cd0a13c0
+DIST firefox-90.0.1-xh.xpi 430169 BLAKE2B 0a312479f39d55f26f65dc169cdb781a72a39282ed89311e4c2d0df50fbd05c387b30e4d9aa7a8bc29d813b2ddf428f432a65b3071bbfd24acc49e73d53ccfb1 SHA512 aee61bdacd17ecea84be1f8c66360a2bd43ded757d2ececef35247222c89553b0b0ff7ecb2a32a0de7391757f24d06f9c8032bdf0ce51b1b9a21dee30105c3ea
+DIST firefox-90.0.1-zh-CN.xpi 587656 BLAKE2B 56ece7e539135c2002cd52f222aedaed17f7b2c4adccb2001a9595f572b837b3a273e2a5a0124a5b005e695ce476e32ff39c06b2e760eaa1878855e7aaaac3e9 SHA512 0ce6b36c395aa9182b882f46e80d7958a478326b7db5d2c18b33ea44a419da7ab2700b3222a2523d16ddd46a31152953ebbf2533ecb26bfda4b693a9ed4ea9ac
+DIST firefox-90.0.1-zh-TW.xpi 588101 BLAKE2B e15b3fef7649e09599aedb4e154737bc6bfa819fd0266d81579ae9b34a733db3f232cfdc7c8cc2955dc9a3b12bacdb840ac14f6e081cccae0c8883fbf68aeb4a SHA512 40f1c9d93e73e570bd423101ea07c8b23953d52a641466d7c6376b6875b28ec59bb1f1c2dfa1c6c20e582fb57e74fe354b845f4ca0573eec91ea244fbb6c1434
+DIST firefox-90.0.1.source.tar.xz 378978080 BLAKE2B f512781f5ef51cef5f72234c54622602f8f506c03f68ad2436f28b0e3ac9ba6a8bc35f840437c23a6ca989dbace4290d6ac5632c71cfcefeee2267bf4b64ce8c SHA512 9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590
+DIST firefox-90.0.2-ach.xpi 467582 BLAKE2B eb20fc04a512be8d1eba219f7541af93dda781080337d76bce276a5583bab5db1938bff037a238377250b6810232b77534bbcf835362ee385b4b1bb6aad60067 SHA512 2f726bfe18bc7e6aa3cde436e9c142382513a1175269b710449cbf7481dc3d91171d21ca1bc30563901bb35eb31befa3c2aba115ac596951d3d6aeb5b94bd1ed
+DIST firefox-90.0.2-af.xpi 430709 BLAKE2B 05cc8dde801efd97dfe56d1d102fa48e1b6e62b3e905648007dc488149628ad3eb297445319f0f1b620f2549d7830c16b81c53e06fdff1d43fcc70e815875256 SHA512 3865c9e96b66def2e640d747cf73ec97127b58e15e0fa01d5374d2ebe35a91d16a8176b68f4025122af56648415b47d03fe6a4a1e007a64da8a9ff4e1eae8ef8
+DIST firefox-90.0.2-an.xpi 515453 BLAKE2B fe5487cceed1fe4f941adf78760cbfa313f58408a5034eb72809e82b3a404e6515222058ae0fe8e7b18807eff8baa72a7ffcfe80798ce4ef9213be7bd52fc2f5 SHA512 1958e46092c05ba266896dffa83af98adad83572a31e769219b88a044ae132f2d2625154a20abbe997147188033f4924ef50e678d435aba9fdf0d8a291c89ed8
+DIST firefox-90.0.2-ar.xpi 580224 BLAKE2B 0ce2771752d9c3e6a2bb4d39b4eb4da5ba9ce4d530b04fe11b7775cc08107a78d3cdee033cd2a564523481cf69954fd07fc6adbcdc56ac0abea192be98fad91e SHA512 eaf2335811cf451dfff085efdd0256a3c72d08c59b1d31dbb08a968d40d5c20d45e590479e10738726bdc597a523c036a2b26bdbf41ee469a6bc3dd3254f0ea2
+DIST firefox-90.0.2-ast.xpi 508002 BLAKE2B 74158545d969e4181c4a80e3a1a2d9d2dd0e4d358c7846b9c426b25a00fac9d11bf10f8dc39e594ad9fc8395fa0e427d06824e3981a7dd7e59db1bbe4b0930c3 SHA512 7a5b98e537ea3a930016884fe13c1bc91ebb6f13267f759aa1c689a80f9e3243eafcbd8de16060bdacd6c59295b6a6fa5ad419cea3328acb20be5fd53f909b5e
+DIST firefox-90.0.2-az.xpi 503461 BLAKE2B 15c7e6b13ab47639c611df6c51ebdddc2a365b6f0ff0e93285e17f9de8b85f91d028467c3f80ffab4a1ba0e28d8f16543db994b5b6970c5a22a8d4e36713a6a3 SHA512 18f759e63ad51e9719b3e5f4695f8e592360e612835e9f9ea5cfc616bbe07fd46bf110f881b42663d0e2384f12d34ad3a9207aa62247e582b1cfc62065205210
+DIST firefox-90.0.2-be.xpi 637220 BLAKE2B 1e10160eeef6b14da9431ffbdb6b94b244477d23f9b38ecec6dc8a40a188461624cf5fe9395f93c41cb2701eb2e18367db1ee991debdf3927fb44db33631cb31 SHA512 c9eeece43756e020e39908ce1d99f238c3d581cfa66b9accf8ad23fc0691d461b976ffe7027e29cc21914a07c9b009c19d5a7d17013b70739d5cb13dfe20ae8a
+DIST firefox-90.0.2-bg.xpi 590496 BLAKE2B df82040f0991b69549e5983a6d3988bd71bee2aa367bfa2552d571cd1702e555ba0c488aed195f16541eff54a4b714e3d54ef6c99da573d451a69af44967ac85 SHA512 0429124d8eff17ba6cdb5b1f3b8107f1e37e8fba9445ad88532b5780db1e139d527bdf4bde37a1287657828a68357ee47e9d308b540f1130eaea65332ecfb3a2
+DIST firefox-90.0.2-bn.xpi 579586 BLAKE2B d989d0ffb3b396eff5f4cb3b42e503e52395715c371af60f7437e7c05d5153c1641c67ebd68870f019458ea9f9f32c888c7ffa8522d18403823571bbffd7835b SHA512 49d2b6d9bddb60140dabc91d7566318a7a33cc96664459fe75b29d07238a22056db615e6964b9cec9b0390cbd482bdedf4362acf144f752a8d82e7aeee76c360
+DIST firefox-90.0.2-br.xpi 539710 BLAKE2B 0691c6011c853e856577e7d2faf320b3d5cc276c360365f63f97fa03860ae1eafc02a31cda92506bfb3182a1eb2f345fc9f8661cd3446dc4dd11bafc09d587ac SHA512 630169e5a074099a3d965da66253c3707a3fc898a9b5aa3f5f5830c948c589e2f260ab6a50795417d19e63528658daadbeec2ef3117dc3c30d026cf9adb684ca
+DIST firefox-90.0.2-bs.xpi 475430 BLAKE2B a6fb2a37cd6517c5816e036eeb794ff0de0c71f75b620b795a463ab33a6e47c8982c060ad128f012972a8c6759a6ec5cc178f31f2d242b86949597fae59e372f SHA512 44208f322553d88e59fea067a1216f8795a0359d330ff26762b420031bf8f31ae87d3fa1579153e5e6dcb53058c048b1df49eda74deace4bec8262ea6fd0d20e
+DIST firefox-90.0.2-ca-valencia.xpi 548479 BLAKE2B ccda2b43e7ca3ccc3cb2bcdcc78e668d51b940d571c2c7a7dd117ace3cbba8696304aacf9dedaff9d3655e3dea96d0c694a4fe1788e8c0eb6c7e9d7595786c65 SHA512 64b6e4854cc9e1866a6ee7218d499dfa66a62680d36b2ba5973bcb99cdf09ce9664f078f0f93946575e4daeb872fbdeef28d7bd302113f83668be2376a1d4602
+DIST firefox-90.0.2-ca.xpi 546603 BLAKE2B 4a73a815709f2c9fd30be7bd282cd889d3babf08af0513e022999fc4ee789fa7ebc57a1b5798a465d46bc530830edceb1ff9b1e09889a139c25364436b32e09a SHA512 7b3d1f509dda3e9adaa8e15d12d1bb2a33c16356e7eebf99a0cf73fe2611bce6d84a9b7c328704dcc6caedb60fb9faffd9773e6e099f7379f5020b9c9263aaf2
+DIST firefox-90.0.2-cak.xpi 574164 BLAKE2B 442b69ff8957b047591f21ea22ce9d04a5d2ed88d870b321eecdb527c95dea94806ad76b8d88127548e35fd87f647b15c21e9a5c2f9ad7a7ff4582c94e500d48 SHA512 05a50ad71449ff9828fcbd4cb089d23c27fe885c43bb7f02bde303c0223f0e64036589e52049140fcdc1b92180d4f8fde430f2d984fdfbc3e0a0dec7bcf33bcc
+DIST firefox-90.0.2-cs.xpi 577720 BLAKE2B ddc2062e0bd2642236266c47bf763121d2581ab0cb99da04860fb33d688b26c4c887760feb7356c5808ce889497fd62b12e01f00b55131ca45031a9e977bf153 SHA512 7e277710908892964749f446b48a8624c199d5d45f780608ce0ac6a7a5f7cbf57cfd4ae986f79f76a46ef2a0b41828104daf97028b54a2d83f6f134597ec28a6
+DIST firefox-90.0.2-cy.xpi 554650 BLAKE2B a8b3f9879534e4f59763adc1ae6ac310d14223faaa23056cf7248130489f993228083fca854d15ee3392761c33fd37d506402fb657b51dd1a607432e9a1d19cb SHA512 c18522048efc7edbcba01c1bee79e43d5db7b9816ac32d91f4441d3a0cd65155581966372101f14264fed70eaec881d5a099995a5b4beb9c6a3af54c88045212
+DIST firefox-90.0.2-da.xpi 546288 BLAKE2B 580541804a971226172c4a5405c2d97e57b0a8f6eada7d0658cffd79bfd5e4b915cf29c8ca58887f328a2601103b52b328ce5fca67d5e7a261a09dbeea347d76 SHA512 41beb225ae75c34dab6133f98464f10e9b7faa6405a15199272d05039a4c0417f7bcb67c0b4d058b716c010b9afba7508779aab664fa9acfcdeaf8a12b336a6e
+DIST firefox-90.0.2-de.xpi 566471 BLAKE2B de4bed3a835be63460e938cfeb73ea00d3db1170a83fcddc7d67c7031028547205f1d9c016d46927bca1040ce9dde1a6dfe091647ea89d13425e559980baab67 SHA512 5dff86f82a0ae5dd86180d1bbb50af329a8d753905464728eb608e67db7cab66030d76617d119807642cbe16362498fef67658f07eda7ad7edc76a59093db3cb
+DIST firefox-90.0.2-dsb.xpi 579297 BLAKE2B 24b04ee03cbba2269150674c994c073c5f114cc56e8703a1f993b2572a64ad9c78c49c65bd4b064b785faf2f95c3676a978cd01b54bfb0b5a36fe9b8273c4a09 SHA512 1d2e7a9b4f701d05ce9af4420c3458872cce5e8be2ecf1644bedfac5dae294f13056ca649a112bd2d7d0fdfa5a50574a107cfc51eae3cbc3bccceadca94f78d4
+DIST firefox-90.0.2-el.xpi 652899 BLAKE2B 00d52fd1ac72f2ef57958b02cccc7270dc7f565ba3844dd0be495930eb7a26cd72c0f1c289961aa940fbf5dfe4b070159fe6f511df78ee26e0fc793e245a5227 SHA512 dd9e5a59bf81ba93ffb131fc4dff873e557cd252941c2986d37730752258a2034db44e53672e7e2174c6f5467fd784ea22538e8e2334b441aeae8e99a326ca96
+DIST firefox-90.0.2-en-CA.xpi 521250 BLAKE2B 0db675cf883e92fc41c640f9c599b7fca295ae4f28f686440ea2e2b9a4436445b9eee2c2fe6eb625b1cf96db87642c341084696b35911e52239486fe11d3ce6e SHA512 c1f4a0e29e4e7313b0ae8efea43cd436f199fc249dcd6fd15d6ad7b2be106a90e83f49083f7d1a018be580f783fae5bb07ed5c01012b5adc59526dabba72fd30
+DIST firefox-90.0.2-en-GB.xpi 521806 BLAKE2B 1a04f7c7953f1f32e11484ef2b21559428f37ae00911d5560a504e42fd2bffdbef8f18ca55f924ff19f62679e74f6886b4901bb3027a25f85ddb525c38416315 SHA512 42690b90fcedd3f42ef373c8bd987b0bf2fb19d30071e451c33ffe3f6baa9c089ff870dce41274841a06a6d126ad09364b399f2d44f96b69441dc9dfae2cbf35
+DIST firefox-90.0.2-eo.xpi 548059 BLAKE2B cd513f81964c574fbb8436d28e6af185c74009466ce843f18d7414a730b709b26c8c8588e5e9eaa3ed3c057ffe16ddf56b179f048fa180760155e04151946c90 SHA512 8a02dae10df6d178fc32cc71df44b85bc7f9645dcce699a67a0910f4a91e058e99d05464b62a00fda32d7e1d43c629d2b6401e89288d1532fc08cd4868b5916e
+DIST firefox-90.0.2-es-AR.xpi 559628 BLAKE2B 3d253e9bd11b29a3dd5783bad9e8b3e5f64b10baa3f497369c8175d295827159ff61b5a46abd4a0a6792838d18fdfb363316f64600bd4d786035e11fe4066129 SHA512 bbc319566de8dcb9911f76d5edaed504bb24bf5d65af518a5645f4941e8fddeab4e1fcc750d6a2ecb223b41c9746a5192822c99c7a30fd4e913d9177ac34f26f
+DIST firefox-90.0.2-es-CL.xpi 558527 BLAKE2B bd89d7e8cfdf892115438b7fc92a18c48b633e9f856c9a4821ea2a7dfb90120e1b6dd233854ea96c2f1cb7dbdadd71aa369a7c879092ab6b0b109ae21864ec25 SHA512 b70799b720dc11a06c641f8bc21726d16e1979a2bbc9bfa8ed3fce019c24298ef0539ea47bf497663971d6de5a8d7e42edd73eecf259e4af966f41dcfd1827ba
+DIST firefox-90.0.2-es-ES.xpi 548794 BLAKE2B f0320caafcc35a4e71abab33ae4a35f341d7f869661f7f7e2c8eec9fd68ac1d5be0502c9fae795005365f6d4e8d6024c86bb932ec3baf9b538b9595ee8ca06ec SHA512 5d2840475edb3659e7bf5428ddd92cf4929bb94a76884686a3c3271a6a4053e1bfe623d803488ab058b0b9860d9f4d659d36701eb6b90aaf5ea1723b3d83a0c0
+DIST firefox-90.0.2-es-MX.xpi 562244 BLAKE2B be7fbfe6d4780a871dea7127a786820ced8b139cd5ffd61989cf003ceb5d333910a9b7421a40008bf0290140a927a5ccdb0e389f9078f9b2a031cde00b5789af SHA512 b7fe64cf33d7be4ac13b66891a7b6ae350b5a8177537e321bfe1b8da2a1234980d0bfbc819102dba975d169baa9b26a356c80f41b41751d36e1ddf1defe5911d
+DIST firefox-90.0.2-et.xpi 496662 BLAKE2B 31829a9cc3c809b6a0d91a68671f44e197db7f5b9b10426dbf4722f74b577de1db4be84f11f48eaae0d1152ac82af5f9d86922dcce2cf75738d3322485c0de52 SHA512 906f6f819baf2a96dfe0189ed322cb25e046d38dec7037cf5526da71cfbf3d1c0de600baf31c511d08eb18067beb4bfdd35ce5f7de91364847d0a0a7b21c7a3f
+DIST firefox-90.0.2-eu.xpi 544791 BLAKE2B e8df641b3d57ec9d044f80c274de17e23e216257e0d78cd0e86450ba5fc39b18839896b3d3976e3be0ebf394b0d966d6ee4af0dafa2e3ca1a9751b3370d775a9 SHA512 920522a5fd26a53d27f15533f40c5972bd330037656b1c1f94828c4d7b87e33a446f49c4f311cc15dba16a931c73255887de25b91036a1057422a25727e6f481
+DIST firefox-90.0.2-fa.xpi 565155 BLAKE2B 1dc2ffd9990b923247d487670dd734c67db0ca5703834fa052f21684597de0bfc9902062d5c7f6fdfb4d68c85684fd93db5e060091af220c3c2ab74f4f9138aa SHA512 a929bfc80b3c217da3eae1773898a646d9c2c06d7e13578d1b3147a7497155953ca2a297156b1012ee7f8630b7764d2953ec25d610f958ee7a19965859666455
+DIST firefox-90.0.2-ff.xpi 488049 BLAKE2B 751ff1cc8b0cdb51af4f0cd42db3d1c96662d9994fbe5fd2e4a1d2a1ab57a9b4b5ae8bd8c3e5d3454de83365c6a1391be3e07ecfd58efcfa4ae7b412c402a826 SHA512 0b6e0b583f97722a57f9d28caa14aff4fe7d342e4f1b188a1b0186e865eaad3b1b5ab0d911a9187c082760e85b9f970c71be6e44d84827a575b102f28a7011f5
+DIST firefox-90.0.2-fi.xpi 545936 BLAKE2B 1d992fda4a9cbe8ff43c786277c55ca005888eac771095d037d595974ad6430994ce7c0f741acf96f175a816e800bc77496e318290914912ceba8a82e3c6ae68 SHA512 2143f3b989153534f61a394c94e9edc74f0070e8d6d389b455999d4cb4cb0597322871c100a1114adaf1073ef29d7cc5ff6c13e8f59de5f4064683dfe1f12fd5
+DIST firefox-90.0.2-fr.xpi 570078 BLAKE2B 75cf2bd14e3e8b67053aea83d492033ef46ddd88ab69a902f17a4e21c36e1fffd72d855d48be825da3928717eb726447435bf345f26b9edb5cbf949f08b19209 SHA512 a03b42c77585f70136aaaa3e102ab53550ec441933814e817f10a5ab846a47f5b1203738c22fdc07fbd7968421aa3be07fd3966f54a3d7a1f564e5733a4f01e9
+DIST firefox-90.0.2-fy-NL.xpi 555597 BLAKE2B 3508589c747154ebd7a9b712b58d38776990b8d9d2fbc6f83209a3e395b844a0bbc7ff0c62afbfefba58d509514fe0614bef7f711b1b44bad0605beffdd7c07d SHA512 5dac5d2c758eedfe7d351ba5185bf2f680d1816ab74256c9821b7846140130908976a979563438f910ddb51294ac8045e86620f9b35fc58e30ef4d9e3bc8cfae
+DIST firefox-90.0.2-ga-IE.xpi 473120 BLAKE2B d72e1ccb36942bdf00b337efd0231ae5b338a28e17eb6a5bc51e613df4658c27da61486319ac08d4f9a0373dd2f42e7358afdb29da680bafcb97b9a96f61a7f8 SHA512 9826db654e10053ebad1b78caa2bca440ec8ef2eec30e1d3f70b04679c5a89ae8eb9098531b13aed6957a2c4fc7a885e0ac7afa36d0f98d40fe0d95574c7ee55
+DIST firefox-90.0.2-gd.xpi 550980 BLAKE2B 19032850535ac7c4d5129ae61a901cefbfd14b7c0ecc6acc22ad29422290775c61f0343442f823dff4039f99a40428ce138987e178471190515c91b509eab110 SHA512 86d69a91cfc1c836cf2b5d8b25ad509e32fd5d1d3732379009e50b8d2a9222371e287a3e00c0d9541165d79bed59732b8e144f3b638e43db9838bc29d62d4b20
+DIST firefox-90.0.2-gl.xpi 554486 BLAKE2B 1bc91d2cfe2639d84dd080198d5129414c581ac3c02dce8b14aec1e6c4a169e9aa07d6ebfd8fa98dca4546fe85fd1a35054e561912c4744e07f0768f71c7aab6 SHA512 4f36662c5eab07f649aa21aa85dc57ec82c8ab7b961fcad80fe4f487c40a041b98c2102b4f7b96cb4259e931333db4ef357e4a69779412f4fabe7cc7f66f0b21
+DIST firefox-90.0.2-gn.xpi 571719 BLAKE2B 37d4265185ec26a8ea8e86b57aa0aae529295e1ad54e5229e0e108872fea8b039acb4dfd85153e8a9218db46ea59288558d9c60cedf04554bde32faac85275e9 SHA512 937a9bf0c77e2d5a5f7d48c0aecf6b27bd6377ef05a82e2f674c38bcaa392a3f2d92f7b6eed97551eb26f39758f215bbc102b01314c3326e54c0d70abf91aa7e
+DIST firefox-90.0.2-gu-IN.xpi 547542 BLAKE2B c207abe6581170975581f1ec5f074fff4113be5eb19a3f6113c2c6d660d66474c21a46b73ec87e4afdb03c04b9d052c77732b676108b89decbf04f2ed7cf3f71 SHA512 ec9de8cffd0ffc3828d69fadcf8c2a42215aa1d84474b08b3eab42d1466324cf2f5d5a035fd9f17b90230b3778eec7d229ea2d0fbf4aca6d652930249255a2c8
+DIST firefox-90.0.2-he.xpi 569407 BLAKE2B 7e69b976f53760242da74042d85573159082d3edd5e1d3ef1fd185b09c6863f8c275214d9a2fd420ca559f83099b393c979b701305e3c2c02bfb63aa8e0194fc SHA512 1094fd8b6d6435ba094d0ec2ed70a5b1d911059c1bb4850033209604521d21d8ff579e829224c494ed4046da16ab804381138a1d3893ad5b0e14787442136b3d
+DIST firefox-90.0.2-hi-IN.xpi 579616 BLAKE2B fbd00e727022b20e0bdfe3adea70558b5e992fcf40805d0ae3407ffc49b41db5579cbff3780bfb05825bcb7d2b5cd7265dc5fd18f6be934806ea461d3c2a2629 SHA512 209bbac0799e13114ce20f3ae853dfed6c4e4c56efe71a78d765b6c1f725a52b0e88b87d6cef6efeccc1391413f9d322f60f0fcf79b197a1ca2256ab7861dd88
+DIST firefox-90.0.2-hr.xpi 549998 BLAKE2B a051f4591139d4e51114b39df0089cf970f6cecd368785c36592b5f3d4d129850510044f6e3b48ad7298ede1b2765ab502de75530616195d7d636599b8c275fa SHA512 8d77ca7fd7dbca5926ed4f8becd356a8bd31b8ecea36fe26b8641ce9d02daac2268e71e19968ff9f3338b379e943f041a4518207491a170bb629ea4045e2a0f5
+DIST firefox-90.0.2-hsb.xpi 575410 BLAKE2B b952d82e59ac118efb537453ebe7a87c15792c52b005da779d7d06f7fd665e8dea05984ab07b9dde17371828fe6f44212aef4dd492a32e7f9d6ad87c68369be9 SHA512 b59caab36be18ffd000a9976e3703e9e8d520c523494f080ef020f49ca239af17ca97dfbfb7dc70d36a32bdb51388c8ba2e8d4c4195d6b15c0f6ac57895df6cd
+DIST firefox-90.0.2-hu.xpi 579113 BLAKE2B 206d00a85161b6aa2f2422d825a54fdb8a77c856f5da5a92c707729d078ed7a020d6f0b6e288bc117cdcddeded316811eabea264198633f11a27ec35e7a592d5 SHA512 8cc740c1454279b9bd20d78abf4ce352db596e85e879eeb335b79b00c0160de6b2a704f3c6c44d4231c80d2d40b58d676def68cd77bc2ed916eb617cbb0ad964
+DIST firefox-90.0.2-hy-AM.xpi 604422 BLAKE2B f49a46b07e6bd9aff619d6ecd142d53da4366899bfaa0cc13051b4132cfa8c81c16d0a1cb999b190373e64fda1434df9ce965c91969956dc1d4fd64c35fc5bb0 SHA512 737b37f8a96eeecd920297911cfaed9664c0327f7498cce5d0c0dd942335498cf7b15c203226dd3128b60a08a176556cfc8abdb434a77fbd5a846948faf4044d
+DIST firefox-90.0.2-ia.xpi 544431 BLAKE2B ef3eb4e133074467183d3a54f2cc6af6ded4e8edb618868115fa6366d61c2d379a3903c0eadad8ad2a0d0e2d9eb57539d317a04b784a41b45a2cab8d73e64a56 SHA512 e3a72c94be0f03c93f85ea9b7ea1b37542f759d5de9a0522003abff9c12f30ff377221794d351d82c2b23afc07631b7fbdc0c0e629655877714e0ea3f9e49c47
+DIST firefox-90.0.2-id.xpi 540133 BLAKE2B 52d47167ec02bb0917c0b84df77e34694594ed3f7493d1790fe036268f304b1efa1097ebcaf2eaa9347e73d07faf4fd46e97da1d8961c9b1eeb68e13b222a1f5 SHA512 c510bc024f902e795fc851b0709570f5d493cd9bfac12ecb6f552144dd8c96c1ba607e6fd05f765e0f0425792859e86e661579b89b700320c044d18b28171cfc
+DIST firefox-90.0.2-is.xpi 483713 BLAKE2B cae0f001ab5767163706140ca2ecf6e15c6db37a147882586d40073d2598fad2e5fcce962d4d51d0af5a925e634ef59117f5f93f70347237470f047d727083f8 SHA512 22da40eb5089e2a267a66c17c9ee8ee400753f0a9cd7337d8eebbb0d1e66f1ac31316ab875a6645107b7cabe884308f2a1d1d0a64ea96449c984ec74963d85b1
+DIST firefox-90.0.2-it.xpi 470917 BLAKE2B 2b8ad1812676dbca90ea2164e4b534a3f246bb883bb3db7dfdf90c324733563903ddbe4345803e77085fd37c5a099d9b787f94e01a413349c744ca67b25f519d SHA512 018de01e7aab5f3f8319ec1f1c74ffc5a77d9b6fb2e410f700785448d3c5cb267b095edb9c9cd69ed08ad529295a859086a7f5d4ba53c39e464716e206098606
+DIST firefox-90.0.2-ja.xpi 605314 BLAKE2B 34739e38a812f92c8579a226b36f2c7622eb758f2942069193715143f0d63e9f0b85e08ef4ecee75d1006a97304a6905b15e0e76c65b55d7e1d3cb29c45cbea8 SHA512 7687014e78fe50b692e97bbb22bb08c8c1e25b54aeb104b766587428aeda8fea935ccb089320e72dc1efaae7656c0de5485fc3905b98127b45f59e38ee58276a
+DIST firefox-90.0.2-ka.xpi 606361 BLAKE2B 618a913593b9ef7832fd810ffd769cadb47bb93ef9d9362b86539a3d6da86957aebe412364f32ad4c77974cb97fb801edb3938a29c2326a66796bdc0d3e1fb54 SHA512 2bd7a719dbcd9cf2d7881260d5c0ae0892882983d7d07c7e7348c6c82b2e2f861236afaf5f9ee4f60940f3a2a6d9d3865949c5e2e92b6f26c09c4081f752c412
+DIST firefox-90.0.2-kab.xpi 562888 BLAKE2B 96890638bab2d4acc87390ee56c4c26c93d5514c32ebbc1c833aebab51e793a2e3d336e2076912edbe68843f83c8f02559a3f36feeab56329eea8ee9dd0fa320 SHA512 c8397002c9027ac7786957076c202a6db069ec1eee58fe0623291b5a72821131007ce2eeecde1d522d06af571e4dfa87694977d25fddb0e3c76d84768cbab447
+DIST firefox-90.0.2-kk.xpi 621558 BLAKE2B f57a4466136e3ed9adb06d0b693e7a653d4a06cd25153f42cb35ec6387530b6029d6d6d08b5b9dd0d7a5bf6a17f6e46992b443491ef23fcbe0d05347788351cc SHA512 6ad921f93a0e788aa0f2d59a422643eb48b85f54eab32066e6eac1338d0e73e0a6882f73f562c3011e4f53db8f00f92817a3539086d8c97f4f3a7940290257ea
+DIST firefox-90.0.2-km.xpi 546445 BLAKE2B 0b5eeb9fb63549f3f9ff6c875418764e8191317bd8a167c2102face45b88dcb569c2df47fba209c5935e2fa7c8952b9f200de43cdd49caa0418b413b22ab8f93 SHA512 760431880427fe5abb65fb0a351fe80bc1ce84368c90b454594d6b13185254a19e88eaa2b095c38b9338c88230254df0fc0d1929fa24875458a1d7a8076ccd6d
+DIST firefox-90.0.2-kn.xpi 510724 BLAKE2B c24388d4c872b798ed62e83c6d15d8f9bb33be6d258e16af43f34d94d05df348df09295a2d9c2b7ea54ec876cd4a84570648f3d0c964ee3c628b246ca145a15d SHA512 4483428d7a968f259b13787e94b845e0a9ffe55be1fe83b5fdbda01a7bbb970c959d7b24acaef729b9814a0e54b32be7967191936671d0224e92bff35570699e
+DIST firefox-90.0.2-ko.xpi 590731 BLAKE2B d5178a54243b80c34dd3221fb0f9447cc9933ca03b7231ed13a006682f38a2f9b60734284a015326dda508c1801d50bcaa5fb6d299d13548012ab8c3bc89867f SHA512 7678485b6588e369067467250b5dc4a8009009850d3d63d8e2340d989b7ef383e81ea6af2f305a8b70115bdedcac5fabaf8a201eeb2b254de938bce818462e83
+DIST firefox-90.0.2-lij.xpi 484766 BLAKE2B 382c5ff77eb58e58e5c8e32ed0d7fe135d61974adaac1c990d514a1683c75d45fc68048a22f2d66ba0edc12e3ae119d9f75a217eb37cfee1180654c1288bd7f0 SHA512 3eca5e9266846d6b3c7ac108986da092dee5178e321aa8bf6892d4ffe009c2ab205ff86bd3d16076f8b9214b55578f81d0907bed9043c2c41e64e4316478de29
+DIST firefox-90.0.2-lt.xpi 572555 BLAKE2B 63f4b6095ed7e5cee86a4a25eefabea77a1c3ddc0562d7bfda0bdf08de5ffe90c9020e106d729572177386cff9461bf0427ecbc13368ea3dd8d6bb21388e18b2 SHA512 579ee64b4b3683a433b265b6c4c71d6c1006aa7c81e850b3b7f4d1ec7f3376c2bcfb89db76a5ced145343f11010fba24192f3fde365421b3e855b66755630e9b
+DIST firefox-90.0.2-lv.xpi 475696 BLAKE2B 2675056a88af23b89dbec450aa2ed11621f6de09bdc21f0d06bcdf662c1421d517660f30d7648debbd588ce23651f525bf2f5255af6305c27defb40bdb770d4c SHA512 d48159a8e812bd321db05e8a865a8f680feafb0e4767e0d35d74795eda5a889fea5e2d8745bb0d2b438594aa72bd73981c2c2474e0ec089a29e0eafab13f550a
+DIST firefox-90.0.2-mk.xpi 472368 BLAKE2B 91a36844e99016d7e2e4aa7d0d99680fa8d83e6a1e9282f6c3eda916e4cbaf826e8d66349eee4d905ab9c15eb6af7ccb7599bc0710e5a11d3dcfc39a0ca0a259 SHA512 408884c11556fca1371cb211a61f63ebda6df8df56ce02df0eedcb82d9e6ce72d77436bd9e2202d1e07e244ef08a62d2c7eb41ace62b813a8d80f6c134143102
+DIST firefox-90.0.2-mr.xpi 547715 BLAKE2B a1164b4b71eb42057bf0361e06cf2338f201c6926d7c6547ab256285a6fe7686d64a5674c909c95a31e920940b50c858b179f1607118cb19323e1c01cc075a28 SHA512 74abb04ef83fae4c570e82697ca2353a9e76772650a87e4e5f7c99f7591a8a84c1e5761a21cc2952a5846bfe873ab50339b958c9411141d2e636d1573e776b28
+DIST firefox-90.0.2-ms.xpi 459315 BLAKE2B 9231c3e855cf744e053e84978c97e071dbea39046434d7e6d1639e985ee5422ce71fa07f3189594873c3ef062fa9b1edc42bb3df1f6d8cf77ae456490f1938e1 SHA512 4dbeda882792988e58d6b6df7f2f7bc8b9ebd9ece288bc83f92561c62366ed8c59043528fbbff14fc4856188b22878a0bdc146ac95aa1a3e840a4f543ffa087d
+DIST firefox-90.0.2-my.xpi 531263 BLAKE2B abcc403d73d5fb9ba0f6e8baa8b01a0547dd4e94a809b66bb6a2dd30f2fbd0bd55bd16b6ea6d353140802d415b894e607f4a79a0be4468121c2cf7c9363c9cdd SHA512 11679d0de73764b3efa6578b858394b941d7e45587b8e46adde984b60db349981086855cdb67721b477853e19806efff54c2c2f1cab1ce11f395e6833fbb62e9
+DIST firefox-90.0.2-nb-NO.xpi 540211 BLAKE2B e73bfe5862495669d645543576b64b3d66534e3d9bf3b41dfd871dbfa4146bac3ed46a6f58ae369e237d76f9024e7b462c60c2afe0fe91c0d2555bbe92abbf66 SHA512 8b13a9a28c36fe4438c52d85c3948b5cedc6a68fff0e7968a952fc5183b69104df5b9d74b71ca43cf3018cbab184f019b556b30075bcf67cabd04549cfd22fe7
+DIST firefox-90.0.2-ne-NP.xpi 488264 BLAKE2B 25f40a5eb34b4aa07d3852f0967cdc37c4cb0dc58524bd5c3cc773d4db4c73bb9ba8969f4e8d70d43282586b479cf09e62af1aa823a77c656968ae824f31e847 SHA512 80ff7b32a58e631b88a46588039774c258d02312d0e2fd98589725b882e481e3ea9b48923a0b9b37dad3c777dccc8395608f20aea6d757d7be1b0f9170033659
+DIST firefox-90.0.2-nl.xpi 549132 BLAKE2B 61413733011e4fc81224f223f570027f2ae60b8fdd89acc9ea1bee2940a26c28a4ef18425e12182cec9ca40f7dcc829eb885193a9ea7cb10cf9b10e4c27d62ef SHA512 544abdd3cb7b19076ab96365c63dc521b3658420472d7afd83ea4d199bf9399652bae7a1945dcdc89262902b3060df75984f573cafe69ef2dfdb2d9cd2e32173
+DIST firefox-90.0.2-nn-NO.xpi 543785 BLAKE2B 851daaa399a7e15fb795365c3e81ba09e6ffffae19968c18b686e74f92cb7d8fcc84fce0383e791a59ac001790123c00791a5a763ab3e601bfdb7467f5928c47 SHA512 59ca8671c752e5a0d399166f8a4ce52cf20d158358d65810e85498bb00982a90a5fff86382f155d63f2060447d9e9119773bed41f389a88341d3034f10e4cf7a
+DIST firefox-90.0.2-oc.xpi 565026 BLAKE2B 63786a9a4c8a11828ca2e00d5eb718d9ed5171f1f5ec8554002d966884d5d2c7cd14ad89286537bf93b1e79255df5f191b9e9a7ba4fe238d6d083092706a4bfa SHA512 2bccaece0b3a0c0e8e3d9bc978c909fadae0d032a8a2e4df9778580cac0c60efb6228534ed8f1629281330e0532b0ded70118e9456995e6d43d9970cf41d4c68
+DIST firefox-90.0.2-pa-IN.xpi 612507 BLAKE2B 03d21a09f80ff1b4a7e6f5fcdad46036fb8c91f1eb46d04b7e7ea8bd84888a94e05a3b49004d1cd8b4d2b711287beea6f0c4a3dc2f8cebd772d6f5ccaa896e0f SHA512 da912c4ee934f2d44714ea31c139c1c794949466281a377c7fcfc314c6eac78fd85d5e795b11d8c24a131442c125b80fffc4c173b8e7fb08064db75bd3480cdd
+DIST firefox-90.0.2-pl.xpi 568488 BLAKE2B c9056f7a8569d435781e3a17983fbd7889ee2e87acbae27bc79d78cb129c08da9b3d623d746cedb12282f8668fad1f5929050bbb5a1cc066358147d5b74ec4fe SHA512 bcbfe1b6975ec1ae940b08be4f45d7f04f4f30a80536e1cf912fddd6cb899d4aceb470e8dea8424bc0cc36435d75a8e865ba91f04ae87b293f6119e9cbd6f7e8
+DIST firefox-90.0.2-pt-BR.xpi 554982 BLAKE2B fcc2d465fd7f5a15ea861e5c1150888a308851b5fe0cb62847a5c6ef83d059ed5c80c1cd5720665525f17d3fad512b7fdbbd82f28a206df2a5224e9e3ff3cc9a SHA512 6d1e85376bfeb12558617f710671c31473707d738d839e78e107e93711b80c975191210dc293f7837795ce8d2e0acfeb9af09796ecf491a701adf932a78b9ab6
+DIST firefox-90.0.2-pt-PT.xpi 558862 BLAKE2B acec5024cc929b4e29e624b00db49d108535e2d270967c1b60298badbfb5f424a133da648c995fb00afc828fb03389af9e2a65d3fd57fd7aad038283109996bd SHA512 2fafd35e5c0106f9a3bfe54f032e826a37e6b7cd98941a8ee0255bf56116b1d65bb31fce8f711f8f7d1431d0b97bbb94f53c5ec3910864fbcf6e8e774f70e0cf
+DIST firefox-90.0.2-rm.xpi 549899 BLAKE2B 9df12c0b8c193e33ba5822f909e9a1c91594f15baace3bb146b3e69ea93a526a37ff2ae72f65e4acf094ed08ea81b5f7541853f60dd4c819944b081dbcf89c83 SHA512 04858971ce69fd2d219a3d0ba97a5d72a5af88b6725f66aab79a8806a192cd6c6f4f17d0e5804abb937aac921e40a9494cdf41badc5ce6a96ec1d64ddf3d6470
+DIST firefox-90.0.2-ro.xpi 548131 BLAKE2B e6a19832c5252abdfb07a74374cf8604d0357e025d9093f9005c7ad252d162a99eb9cea38bb10f3a1554095747b8e7a3f950174f60fa219a9561ba9b861672a2 SHA512 9d65785acac5a8767960744a569aaf4bd9aace691376771415e6de9b6a3f392c70c406cd9837d7c6504931306132c0aa884dca83d785ea6fc66afe8cd7b4df49
+DIST firefox-90.0.2-ru.xpi 641994 BLAKE2B 9124781768996090200198864e0b24ca72d10c36e371b9631fc03a3a336a2a2cbd8a227ed12f8d3282c14b06b7a31efaad98f185b65cf29f602d8b958c695395 SHA512 8455deef343028d99810c01b3dcddff85bbcd31307dfd0aa461b0b66b194eea2d915be1abac7902b10bfa18e09bd16880c3b22f3e78a7bc62a7bc580c9e6b89f
+DIST firefox-90.0.2-si.xpi 497038 BLAKE2B 1b5bd85f054bdac7d3bad8e64f3a9d8fe2ca2912cf0231ec92213c9ab80f68bcf48109567115a8e6b5ec02ee5bff759a1a3a44496e19045da6871045ee392027 SHA512 6c1712c1f282ce5ff842aa39203f4fee5aa38df79c49f203dab0c3269b2b43c7d1a350da76d435de7b995fed1559784192137bb8b703ab08eea652481142917a
+DIST firefox-90.0.2-sk.xpi 578642 BLAKE2B 30fb46e4287edd81e32625926e3b8e510d6f4faa84247e4ce4646078c9e7c407e275a3e35473d530c2c425c351096e867ae1e88422231afb2729287cf52737c5 SHA512 742afc3b57cec29e12f546acbffc50dc34259655b934b7edeb0a431fad9f69a76891f4a3d504bd68325bc11af8eb090931f9c681041f26b4dafd330388b73dc9
+DIST firefox-90.0.2-sl.xpi 548456 BLAKE2B 7c47551255551b2fcab86fc8a0a75d7b3a86f1ddd17ca0dce53945b18290191f221b3230bfd8063573e55f42be9f6204583db1d2c960e0c3cc4db5aa569594d4 SHA512 85391db88fb1b87836a9509abd8b635562280b79ec6a501b7fe0a5da685028e5331d77168307a3cf395dd314cfeb61bc68405ae46ae70e6a6d724d6f46a1c73a
+DIST firefox-90.0.2-son.xpi 428012 BLAKE2B 0c1d466b53f148b315e4b4e1a621e4b0dac3f8ed789514a335940f8d1a48d5be9df072e7baa3b6c0ee79446834f2606ae4420cf8121c5423cb6b5a9467eb12ca SHA512 cbd2db587f7b2e94bb888d0649754c2a8f9b423f7ad88577cb629e5b4ea2a7ad203ce755003a3ccb2a6551910617bd4f62c8bef84775873cec7410f39c3bd1e2
+DIST firefox-90.0.2-sq.xpi 568627 BLAKE2B cd6dab95c8ae6f597ac62ca649e8037624a1c91768587d574eb5762bde10ef58e6c23d8ce5da9d5731a009c65d9fc901f602db435b8986c2b9f9bd8ce53d0d0b SHA512 66e7251f67f43340a8f9df2a45748032e8b859057993eb834cafc663146b594e25d54af81dcbdcf402b05a84512198f3f50205c73a45da9f4aab738aa03e08f8
+DIST firefox-90.0.2-sr.xpi 603101 BLAKE2B ef378fac2d8a5ba7df6753620a4bb0b28c9cd53861f4f15001707fd1517942c1e40e8911d10e830808490abcd131f9d7c36f8636d4f647a9af1750be0b192e58 SHA512 e7c5767d77ef0f705aa1d1c567bed89fc2b4da24d669faba9d60beb0bd12d9f8b45ebe0b0027d84e8194fa1000e63bd10a419b649e8e3c47eb045b4d1d220f40
+DIST firefox-90.0.2-sv-SE.xpi 552226 BLAKE2B 5114b1443f8ed57b05ad9bab185ae3fd4831f6c0bc434401721cc11bb5fc11e5e42a09b8da76d8f2a280dadfd5af6bfdd18081b43c3c17915dee34d1e506e102 SHA512 6986de8362530f0db5903d277f70188ff7e7e53e41c44c1f01ceac640b53262dd8bf92c9c967d8e33ce7c31cb39d9089c7d493ea6c28a9907c1ba67795d2607a
+DIST firefox-90.0.2-szl.xpi 525937 BLAKE2B a5c7eb4385823339d56ada2771a8cf130c8c29ccf7d60a65f0e88a7e1ede5413b663c6429efb92770ffbeb55f271f6df6b09b13c158332bddbfcd48b01ac2808 SHA512 6e0b0b0d20c19db95699156397d71bf5719c9f92b44864942bcbd5f1b6226f57998d92dcf8817f8030c09227dfed1780ad5671b4edff40e7270c7d3ce2c4e769
+DIST firefox-90.0.2-ta.xpi 526631 BLAKE2B d4b8bbf41992fbbaba840bfb19d62801a8b6d3921fc5c92379ce5baad6d5a45f7b730250cad9e90ee41220b7fc7ab3f360c0aa5b609cad2660965e69065ab6b3 SHA512 d88eb96df7bff317df242a8eec99140eae0eb121e1ed6ffa9242a9b540064666c0db9af36a4fa729e23bfd8fab9abbd32a2c5c3ff85b6ad2723be8da6ccfa956
+DIST firefox-90.0.2-te.xpi 568744 BLAKE2B 401da427b76f0c455aa880ef64721a8bc8d3ad25093cd67b48d4d37a65bef7aa6c02db37c94bbd7190ad036a49255351756f12f7c7bfb3894bdd8566cd4b63a5 SHA512 4388b917725a32522c0c50e72a4ff2e96eb61a4514bc6311adf8b99f386691720c78168007661790698d1aa14bdda9e28e0a24d35995460ad0f3ba642e8a20e8
+DIST firefox-90.0.2-th.xpi 621169 BLAKE2B 20bc114e791056e866ca87fa717270afec022ece33cf3568f445f460c690e5d98aaeb409744298d94b17b2655f6ea39165c0b4d2de7b1b87d94691e832f43b5e SHA512 b775f9b6235dd154a7f26ff194ea6de858c5c8d98698afe9eb2173e3ff388726572583c9f4b3fc4c762e244751c623151baaf0effd8a12056ecde7236e3ce0c7
+DIST firefox-90.0.2-tl.xpi 533288 BLAKE2B 9d2b4fe2251c08621b0fccc7492d8dd9879a80cccf64e7096e97e3125f5dbc06ea82e57fa52ef975c2da28d4226bd8a3cf77860140b3f5eb0055b476326701f7 SHA512 eb47c4a62a2b51131d0da056ac6ade774f59e8610fced36fad3cb64fa661c1eafa8e6fa8e6b53508ebc6a190cb45c68e17485310c215b96af2938a588452e57e
+DIST firefox-90.0.2-tr.xpi 564703 BLAKE2B f70afbf4ffb27efa5ed52cd102449a9a853afbe16271b431739e456f81a5603ba29b8faf8de16978c0f9dc41d554c2b4f5cbf7c74e454e8bed1d46639babed7e SHA512 8242f1173f9e3f3c596591bb6d14801d72870123619148087fca33e5ac7d74b52850c5ba772727a2c831009d36d975c0f3826bcc01846042f21531b0f7ddc8e4
+DIST firefox-90.0.2-trs.xpi 506694 BLAKE2B 00fb05e468dfa0e3c1ba6e572189be68118a45e17d9a5b929821b0bf063bbf114935f9ffb2fa12ff13ab3e0050de62f6c893b324d29df8922096bbe1f609042c SHA512 f174dcadfbf38d413040543bff026ff940448fb39337379cbd15c4254b12115329c682618d6d62850c62ae0b9607a83bf5182b0b16ddeeb6109605ea10fd277d
+DIST firefox-90.0.2-uk.xpi 635684 BLAKE2B 79f8a22184a62e25d52219fb662d8bab2e6844579b593d56ccf9036156e52111ee28219b1d6d25c8b959bba80104b560ad4679083a9a048284b780cd7e262859 SHA512 9289e74724069d8e3a881d5694a394da908b1c781df37a9bb163249a9730e157f34df91c290a6c2019980934b386da5e7037a3471117b41b08f3bd7c0e53914c
+DIST firefox-90.0.2-ur.xpi 577991 BLAKE2B 4f0cabc51071c71a1b0c88de4b699f16940136240a5d8a9f273434c4d56d69eddb4b04fbf1420bbebc85c0f00df031c15e4b21b66f19342b02e9348e0ecf3ec5 SHA512 80cab1941a57798914be843899e7c1164c28df0f293ec70efa00536221c3cb49a72ce327595085747367220bf399f681f1066018c7530b14bb42cc6fd0ce340c
+DIST firefox-90.0.2-uz.xpi 483022 BLAKE2B a125d2b044afff77a72e426ac1554465907a306139c1b602502d2ca77c03eb9768bbc3f90c3c2cc445d93d57fda97d164209a235e92bb7b606e4c6c9e5746ca0 SHA512 b799b862fb047ef0c48b351c8a7b42bf372dc6785beceb977ff4aac6933e3958f972706af77a74464a105d10a6ffba8be3cac5d9e1813575e04852af2800845c
+DIST firefox-90.0.2-vi.xpi 586903 BLAKE2B f1b143163e443d76a213e7c4aa57a5375adf809f9a8d2c246d036be9d67ab7678e1eaddf27a0c386935327bc44e4e21df1716c0f3dc2ea24a50b1077e31dcbc7 SHA512 3bb4186633e2b353266ac17fbd5277c4befe544e966d3d2d7312743966ee1f5407404f94542f25a3242521616a744108703d115a761a849832c9b0697b0bc406
+DIST firefox-90.0.2-xh.xpi 430182 BLAKE2B d849e34655c8b50abb2ce4d2197cdf8761b27129fe8fedfdaef04221ecd0300ac8a8ae998b07a39d21bf3a3187693e818846c92da0b5e7e3eeda522e536f86e9 SHA512 5bd4f80060e5b75f56b3a02489717f58bc39a33785c08bf3e308131f690437ab072860e3cc9cacc00eaa0f58da9cdf02491d75b31909f1d8f8423c1378d60ac6
+DIST firefox-90.0.2-zh-CN.xpi 588311 BLAKE2B 6656456291738d7b7651e14558a288eec053c1815fec33826e6db4c36058007d9131fb2c2847fda57f8ac75d8b5da9e7c0334db6c9cda0043c8bcb2a84db92c1 SHA512 6ee44936371e07a21903565bdacffb593a4a4fd64413bdc1f6998cb406afa11d934eea20e5ad5117468750d3eca53e80aa6afd9ece1c63ad4eae59a459a3b0c5
+DIST firefox-90.0.2-zh-TW.xpi 588723 BLAKE2B 295e5ebb3f810f1ab8b66f301ee5fcd67d147cc640daabbb12e481baf835a439992fc5e1d1195bcd8b28e91336281b2e94d207d77261ec1297c784fdc3fba5eb SHA512 a6b5747fc3986357f13db401dd93763f370e547e3fae61330108debd981fbc630f6af8003d6146e73cdcc948e4b79fc00614e6a257358155b3cfe0176d2e55de
+DIST firefox-90.0.2.source.tar.xz 380670372 BLAKE2B 782e548663d3538d834feeea54c9fa54ff5580472b967bb60be331e591b782fff2a6877f2e8db29511ac4b4b3dff847f30dc8f0a8333ece3d4156d6ac10a723d SHA512 4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e
 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-78.12.0.ebuild 34231 BLAKE2B 9b2ea45f07fe496c48bef55c7dc0c0e0a2326199bce1749c74debd122bfcc743fef00f4b832c882cd12426f841506be916c5411ee2830e22830488657fb30f1e SHA512 a50ff887ab082afe33f79187bc4fd1547e02d8375278270b06e5a5c3ffc5b319bb3d518f67057632ed28bbabae7db72610ee4a4999882dd7faadf5d5facc81a1
 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.1.ebuild 34223 BLAKE2B 037f674055e4d81adf41ca0f708a5c728a3932ff86673261031aa4ac94ba3e785af06ac1e13615bb836456049a37632f8c0301538863056702d702b564293e2e SHA512 e999a8e1f13e4d79ce8f346a0d3899cbe54e444641d445769f15075f932e60e4916b6082ec353ad1965411f180557654c087e6d171e9f59384c3d9f243659445
+EBUILD firefox-90.0.2.ebuild 34223 BLAKE2B 037f674055e4d81adf41ca0f708a5c728a3932ff86673261031aa4ac94ba3e785af06ac1e13615bb836456049a37632f8c0301538863056702d702b564293e2e SHA512 e999a8e1f13e4d79ce8f346a0d3899cbe54e444641d445769f15075f932e60e4916b6082ec353ad1965411f180557654c087e6d171e9f59384c3d9f243659445
 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
index 3e0e8d7fc1ea..08852893e373 100644
--- a/www-client/firefox/firefox-78.12.0.ebuild
+++ b/www-client/firefox/firefox-78.12.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0/esr$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-90.0.1.ebuild b/www-client/firefox/firefox-90.0.1.ebuild
new file mode 100644
index 000000000000..b2acecd2054c
--- /dev/null
+++ b/www-client/firefox/firefox-90.0.1.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/firefox/firefox-90.0.2.ebuild b/www-client/firefox/firefox-90.0.2.ebuild
new file mode 100644
index 000000000000..b2acecd2054c
--- /dev/null
+++ b/www-client/firefox/firefox-90.0.2.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 1aedae40acbf..b67397559e67 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.101-1_amd64.deb 79846520 BLAKE2B 6f2dc28106ec483ab2222ab442862aa486978dbfd549a989e4126bfe824ce515b946452ffafa895af3f050643c386777df16a1ddb5eeab2388e4f30494261ad2 SHA512 e258c1c45ddc99ca287c9ec9bd0f1538a03862671797420d8dd3afe8d81208e7c5e972a8597a290b46d1aaedeaaeeb4aacd57f9b0d7675a03b1ae8f05c58c832
-EBUILD google-chrome-beta-92.0.4515.101.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-beta_92.0.4515.107-1_amd64.deb 86204868 BLAKE2B 4a5e6256d30a1534a72c2f2a719eb570e13d9a9fe7fe780d1a8cab9316a8170f281977c532299d0b95df2abb27564a4a9ca80b500eeed1884bafd561c3d4686e SHA512 337f78ecd93ffdf18659d1d85e34afa32e7c2946d04d1e29f1ac40c9984d05d97f8723d265df2a341936e51600b30981701cf0429002ef798f4e2efff122ad92
+EBUILD google-chrome-beta-92.0.4515.107.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.101.ebuild b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.107.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.101.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.107.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 2d08226cd237..2eb93a69d65d 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.4573.0-1_amd64.deb 82156356 BLAKE2B 747e668f35787115de94514420576228733e63221964b5eb6b0ada4258eb69a9a8a473500e726c93828d73a56cfc3d76ac56ed075ca56e7f9b2d7d7aa7b0c762 SHA512 c8c79600525aac5bfc81cbac749c348bc7d875f8c43969f8d2271db7d1493615e816fc95e5f4624bb3ab164477f837104b631dcab3617a75cc1747bb8a2cb6df
-EBUILD google-chrome-unstable-93.0.4573.0.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_93.0.4577.8-1_amd64.deb 81222028 BLAKE2B 06b4582214f14af16611ea426250b95dbe2aa7344a533b32f8b2e01ce9f11317169543afd28a1ea631603929db0cd3704a98d3df28bdbc852e9ec7df2a748228 SHA512 cfbb85289482b18cf7a63ca80c9c410c93f3bf81f5d63ba3b056b9085789a666d60e20d7214e9c53dc36cd26dcf1e52c72895fa801dd3bbc0e8b40c097a2f1e4
+EBUILD google-chrome-unstable-93.0.4577.8.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.4573.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.8.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4573.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.8.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index f1543f0b0e72..3b1ba063632e 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-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
+DIST google-chrome-stable_92.0.4515.107-1_amd64.deb 86193152 BLAKE2B 3b1bcdb5b117b24546ca5476706c786881c0a68d7eb720362f7128d1ea9cad298ea4d5f0bfb708848264fc51d0265ba67c9f206bc6a89ea4e8d1b0bdc9ce0ff9 SHA512 c842e423e8d6dd42bace4d5bb835f7dbf44f46bce0723317d41f4bf56c6250321351b68bdc3d4b46336a6cfbfb78b621eac1df0b530b345bbd2997612e0561cc
+EBUILD google-chrome-92.0.4515.107.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.164.ebuild b/www-client/google-chrome/google-chrome-92.0.4515.107.ebuild
index 5378595af7f2..5378595af7f2 100644
--- a/www-client/google-chrome/google-chrome-91.0.4472.164.ebuild
+++ b/www-client/google-chrome/google-chrome-92.0.4515.107.ebuild
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 977e6d0864e9..45e0f13d8bf8 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,8 +1,9 @@
 AUX luakit-2.2.1-make.patch 1349 BLAKE2B 9f13f93b00908d15fdad63fa4fcaff607512237f6d0a065fff54cf3726bb6274b0e3b163a82d2cf11f01f18990bc0a80dc5d2cc11a16d2a8b834db9ab7f35ff1 SHA512 d7a9250ea33748514f942f38198bedf2bcaf19756c9d75014e6bbb781695443e3b0e280b621db785b0f907bbd80e3971a53d8131e0ab52a136aa72c90db64d1f
 AUX luakit-2.2.1-pkg-config.patch 779 BLAKE2B 6ab9e9d8af10f8d8dde8f01a77481f16aaf285718e4fe520d026b6054b175a72b5bd880793a3379dc3cc500bb3889e2f429fdaabdd5d47f261ddfc5b40e5e29e SHA512 f51ba29b41841cb1dc1b5cf4917182b86c9aa1e71ddc8b834314e70700ac805660f87f49c3a5ce3a8b093d1ee49305c008f72a37fbefc0edcbd9ad77ce8f5f95
+AUX luakit-9999-make.patch 1349 BLAKE2B cda6b6e11515535e4fad3c3dd8cb589fc1a03acbcd3f7b8b738a022bf7b59672de4adf85726baf2bae31da50f5ec79e4824de41944cf6c3fc8fc24ef440a8fc2 SHA512 b15ec51344e6e6a59c92a6cab74ad274de7fe7e87926957a472e0f88c123ffef59b2b7a1300688b5e0e53ac16d6e77e953c2bed2bbbd0482fa1d5b1ce32fee58
 DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
 DIST luakit-2.3.tar.gz 497470 BLAKE2B 980eabba255a83a26acf565df170907805df5eb6ea7bfc978c5a180c27575d7ebadec7c97ba7af1a60cdc08654f4c4ca1967b25272dd4788a553815f91cc1502 SHA512 98a473bcafbd082093689fd58b8c9828e3d79b8ae367ea4d030bb2b1671bf4f61a4f07fe57b99e6c69c40e26ad8b96b88b67e48ce085187923a1a1d976bdcee3
 EBUILD luakit-2.2.1-r100.ebuild 1860 BLAKE2B bd07f3d1076dc881e857c0a692a6aaea7451291a9b4b58d4514efebb670f6d4df2d7651fbc9d7c345b25a8c0f8f6017415fdb8db14c215e4642cf76cd90a2da9 SHA512 83144c8943ca6a476d1992ac9651a2d850c8a05a9cc100683673d271f5238e9134d1a567516f56c6528b7c3682a95a894277c7503f343bd5fc8145011a4a8872
 EBUILD luakit-2.3.ebuild 1817 BLAKE2B 54512ea88e235848818064be3fb8214b42dbcae1a16f85bc64c4aca907c12fcea0e35836c05f27deeedd400170aea5be2fe008c273ede3956e6bc660638443fb SHA512 561034356fc6104e905466df3d1f57008a858044dd79848f89a6f426adb7ed32eecc366e870dbaa28849c53efac5b392ace2181ae597100f7e71c2d941c93b45
-EBUILD luakit-9999.ebuild 1817 BLAKE2B 54512ea88e235848818064be3fb8214b42dbcae1a16f85bc64c4aca907c12fcea0e35836c05f27deeedd400170aea5be2fe008c273ede3956e6bc660638443fb SHA512 561034356fc6104e905466df3d1f57008a858044dd79848f89a6f426adb7ed32eecc366e870dbaa28849c53efac5b392ace2181ae597100f7e71c2d941c93b45
+EBUILD luakit-9999.ebuild 1816 BLAKE2B c082967efdb0006a81a3adaf895cc9157cba5a68b7445953cf584614f63ea617143b4ab21a2b3747161e309ce2ee944420dd8ffa6b79da0b5be38950faf92876 SHA512 ac3059f16dc27d44575644f2089173e7e1d2b4bda7737872aaf19a4277732c59df9ad874d08833d2c8d6dc92e34b1f00441a658cc8db7e67d8ba833907b4748f
 MISC metadata.xml 871 BLAKE2B 2d59ed03db36b8be588985a249a7d67269407643844d2077c5f718700a6a952287d1c8df7ffa07878c6309e6bf0750dbac1cfec152f6b3f84ea360f2f3d1aa2b SHA512 dd803fecc7fd65582ec8d5817b7e95133a4052b131f99b47c38256162b53604e9221b187a2e259a4d19b5e1971a48432d4dec7ac79f3b3a6ceb391ef13edcda6
diff --git a/www-client/luakit/files/luakit-9999-make.patch b/www-client/luakit/files/luakit-9999-make.patch
new file mode 100644
index 000000000000..f0b9c49c6b23
--- /dev/null
+++ b/www-client/luakit/files/luakit-9999-make.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -57,22 +57,18 @@
+ $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
+ 
+ $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+ 
+ $(EXT_OBJS) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
+ 
+ widgets/webview.o: $(wildcard widgets/webview/*.c)
+ 
+ luakit: $(OBJS)
+-	@echo $(CC) -o $@ $(OBJS)
+-	@$(CC) -o $@ $(OBJS) $(LDFLAGS)
++	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ luakit.so: $(EXT_OBJS)
+-	@echo $(CC) -o $@ $(EXT_OBJS)
+-	@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
++	$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
+ 
+ luakit.1: luakit.1.in
+ 	@sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
+@@ -116,7 +112,7 @@
+ 	install -d $(DESTDIR)$(APPDIR)
+ 	install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+ 	install -d $(DESTDIR)$(MANPREFIX)/man1/
+-	install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++	install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
+ 	mkdir -p resources
+ 	find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
+ 	find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 4898eed6a661..81da040c1b33 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 	)
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-make.patch
+	"${FILESDIR}"/${PN}-9999-make.patch
 )
 
 src_configure() {
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index a285364c584c..7c1abcb8fee3 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,5 +1,5 @@
 AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
 AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
-EBUILD lynx-2.9.0_pre6-r1.ebuild 2534 BLAKE2B 66704dafefb5c8e6a87fbeca84068474bd688e424eabd63032194c8aafccd9feb0662482ac4ee191cd05fe4d61ba8f58152bafdcf714d93f7a76eb776e80ba75 SHA512 067a44bc79bfcd104f352d9952541072511aeedf7b5cb495c59d84f9d1785ca6985090933c12964f94c7bde079813fc420a7f2b75a7fd3238f3bccf6f1e906f7
+EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
 MISC metadata.xml 537 BLAKE2B bfecef317392ccba874d2291fd60140313675be5a4e503f2ac9bec1c20e817582d98800570188082de4ec23bc5a15b5b4785dddc79c907da2c553eec0022026e SHA512 068e36de4d5883757a52b05efc3180230521f58f7b3e9686a09f0841339c9f4c54104e558015aaddc0b9be74602b76fe667d995ff7b4bfef810124d21f6ae6dc
diff --git a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
deleted file mode 100644
index 1b0d91e551a7..000000000000
--- a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-case ${PV} in
-	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
-	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
-	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
-esac
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="https://lynx.invisible-island.net/"
-SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			>=net-libs/gnutls-2.6.4:=
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:0= )
-"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${PN}-2.8.9_p1-parallel.patch
-)
-
-src_configure() {
-	local myconf=(
-		--enable-nested-tables
-		--enable-cgi-links
-		--enable-persistent-cookies
-		--enable-prettysrc
-		--enable-nsl-fork
-		--enable-file-upload
-		--enable-read-eta
-		--enable-color-style
-		--enable-scrollbar
-		--enable-included-msgs
-		--enable-externs
-		--with-zlib
-		$(use_enable nls)
-		$(use_enable idn idna)
-		$(use_enable ipv6)
-		$(use_enable cjk)
-		$(use_enable unicode japanese-utf8)
-		$(use_with bzip2 bzlib)
-		--with-screen=$(usex unicode ncursesw ncurses)
-	)
-	if use ssl; then
-		myconf+=(
-			--with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr"
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	# Compared to openssl gnutls-openssl API does not use
-	# default trust store: bug #604526.
-	sed -e \
-		"s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \
-		-i userdefs.h || die
-}
-
-src_compile() {
-	# generating translation files in parallel is currently broken
-	use nls && emake -C po -j1
-	emake
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
-			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	if use unicode ; then
-		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	fi
-
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	dodoc -r docs lynx_help
-}
diff --git a/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild
new file mode 100644
index 000000000000..6818ac17dadf
--- /dev/null
+++ b/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${PV} in
+	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
+	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
+	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
+esac
+
+DESCRIPTION="An excellent console-based web browser with ssl support"
+HOMEPAGE="https://lynx.invisible-island.net/"
+SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	ssl? (
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+		gnutls? (
+			dev-libs/libgcrypt:0=
+			>=net-libs/gnutls-2.6.4:=
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn:0= )
+"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.6-mint.patch
+	"${FILESDIR}"/${PN}-2.8.9_p1-parallel.patch
+)
+
+src_configure() {
+	local myconf=(
+		--enable-nested-tables
+		--enable-cgi-links
+		--enable-persistent-cookies
+		--enable-prettysrc
+		--enable-nsl-fork
+		--enable-file-upload
+		--enable-read-eta
+		--enable-color-style
+		--enable-scrollbar
+		--enable-included-msgs
+		--enable-externs
+		--with-zlib
+		$(use_enable nls)
+		$(use_enable idn idna)
+		$(use_enable ipv6)
+		$(use_enable cjk)
+		$(use_enable unicode japanese-utf8)
+		$(use_with bzip2 bzlib)
+		--with-screen=$(usex unicode ncursesw ncurses)
+	)
+	if use ssl; then
+		myconf+=(
+			--with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr"
+		)
+	fi
+
+	econf "${myconf[@]}"
+
+	# Compared to openssl gnutls-openssl API does not use
+	# default trust store: bug #604526.
+	sed -e \
+		"s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \
+		-i userdefs.h || die
+}
+
+src_compile() {
+	# generating translation files in parallel is currently broken
+	use nls && emake -C po -j1
+	emake
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	if use unicode ; then
+		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	fi
+
+	dodoc CHANGES COPYHEADER PROBLEMS README
+	dodoc -r docs lynx_help
+}
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 54e9b5bae385..9bd794fac678 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_92.0.902.15-1_amd64.deb 101256948 BLAKE2B 6fea611d12041d3d575b1b86c70ee693330dd6e4f6b2b476228aabffe6fba62140d373b4c7d9654e75f3cb86343f712413d4374e88a2310b30270f87f78db2bc SHA512 64d36b08a68abee0126128ec7595f31c8ecbd5200a2fc86c83c3ecd2f1dc2bb870feda66018b512d5f7a7c2a3b8e29a1b22ea1f90d5ae591baae96d4f9923ca0
-DIST microsoft-edge-beta_92.0.902.22-1_amd64.deb 101892898 BLAKE2B 706b1dcc4b2f419f62fa578672bce71fb75809f06ff36938d33f1434697b8f72c9eb07d3b9dcf99a84a9739566a35ba8a921cef1dbee64e3a4509f4290dd1321 SHA512 fc4cbf6ec062acca48efef3cbbc1ceec4bfcc92bcc79d243e4ede658e394660b514687f5d73d1940fbc962c59e9d9bf271e6226bfd164978e54dc9974341d980
-DIST microsoft-edge-beta_92.0.902.30-1_amd64.deb 101794110 BLAKE2B a7b61913588b974d92bcc131f604824b548738f38fdd0f6e60ac643fdd1bb874386cf6dc875a7ed3352f250b223fbf1b12934d8e088e747210ceafdf1b8b5870 SHA512 6ce2e36a7d27123139bb3c19287981195be7efddab7a93c29ff59e2449e2b5310a51ec45a3fdae63e56e2ed7af348ab7388c086490f63bd7d662010c0daf6d85
-EBUILD microsoft-edge-beta-92.0.902.15.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
-EBUILD microsoft-edge-beta-92.0.902.22.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
-EBUILD microsoft-edge-beta-92.0.902.30.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-beta_92.0.902.45-1_amd64.deb 101831812 BLAKE2B 007c3b081a8ddf294c0ccb14d93cf0e245c6142075e9d5792ae6f2d812e17f4c563b85c30aaed058f8c5da02eebad499ee3943e163ac433ab0b97487d06f2a8b SHA512 b06e72d7cd181c5c6ab9b08b318dcc588865bcaa8743b2cc07f89aa5c75c0b6867758381889fc60237823fb70856bc9aa2872fec83299723e1cd2b5a14e04c2e
+DIST microsoft-edge-beta_92.0.902.49-1_amd64.deb 101813676 BLAKE2B 45cf8c9a3bca228639914c63ecfd70f29611361b8e3a0194e1a60baa3d044f5e8a0b976cf72dddc940679fe0a3929e8378a36534d37572ccea988618960b4759 SHA512 f33b024576d6263a4f27488858ddfbec2fd4d160cab67c679d9f68423334dae47a68e69610cd9bba8d9cb55f067167ddd676cc64af3792824924d2f4618f61e3
+DIST microsoft-edge-beta_92.0.902.55-1_amd64.deb 101830296 BLAKE2B b5194d43b28e73f2764e0b27b42fba737d2b1b12c03d7b7f9066ef9bfe41895b39acc160d27174fee214b157d17216613dc6960c0c868a037799368ee3476829 SHA512 4bf960e814576f72232bb40a0abfad634cc6fae1101b053cf831c12e04806feead2b6886acfb1a70dfd0eb812214cc2dbae3f0aba98293c1f3a6c898864aa59f
+EBUILD microsoft-edge-beta-92.0.902.45.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-beta-92.0.902.49.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-beta-92.0.902.55.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.15.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.45.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.15.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.45.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.22.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.49.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.22.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.49.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.30.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.55.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.30.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.55.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index fc24b29eaa29..92057e1d1722 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_93.0.916.1-1_amd64.deb 103556490 BLAKE2B ee34a0f126184b7dffd87313f40357c0bb8c8aaecf4f404b352068c7e49cbeee035e6d61a1110e21b7e8ad5ff34dc6d80b039486882edc6891c9545895773bf9 SHA512 3405b3d36239d4a77134ca3ca923d9b0c44548ec8405523d75a138605074e42342cfef7848a760e4aa16dadf9b653055791c5664366a3605d9877bd50f69639b
-DIST microsoft-edge-dev_93.0.926.1-1_amd64.deb 104014232 BLAKE2B 67f8d21e0a88bde8190d7e1d284ddc775073fd8430594505916c7af82a532f7a5cd77194096bd3d4cb1dd9311010fbe635dd7dc5ee7a583aed97d4c0070b3099 SHA512 68ab0860df68c61dead78e633500b6d66517ed842b67919e725aeb92a03cd711900ad851a27a2ac2af93adab0013359d70ea0f880f7b47287f53a00b3dddaa1f
 DIST microsoft-edge-dev_93.0.933.1-1_amd64.deb 104478964 BLAKE2B 4170ce02f723ce3ca37de84e44cda1f85045c0bf8272e9f055fc5619cc6f33bf5dd1716224d5fcc4f24ce25d634e87d94c5c4fa19954d09c325af82a61b1bec0 SHA512 31672076b2535d473d05dcb3388423fd240d57794dc6bc8fa149f380f9f31abc32399907564e341d2c46d38a3fa99acb9f5c92becf6f4ddd3777e57ecd2c9e74
-EBUILD microsoft-edge-dev-93.0.916.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
-EBUILD microsoft-edge-dev-93.0.926.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-dev_93.0.946.1-1_amd64.deb 105576242 BLAKE2B 2f7d21dcb74435d3dd1d45d1c813dc3cbbb67a20f651e0f93e5d4f26480e0399c540c28951a4167dec270bc137eec8ef4751cbf81101b4a70014c214290e6875 SHA512 e13da0ed4ac97ecd47977bcd319b30b7211fd86bfb9f78e9df14a24e139bc30021820ff96bf1ed765bd5ffd41fbf04c3fbc24f0a0a796147fd03ae01f2d07723
+DIST microsoft-edge-dev_93.0.957.0-1_amd64.deb 105580462 BLAKE2B f613e641658cbe6dd08a99e955f8d77b51b1af59e296a95a5bbcb4555a476bb20fd2dcf5794e07729cdb53ce6b5b0ef4869c87a48aad95f573563a8bedd17f31 SHA512 21c541674e6ff4445cf9dcf474b1a1596e3f9064b35657fa915cdf6b6c234e6779e17a0bcb4055548a1b8226232a6b5f4be8cbe8ce2b42125d3598ffc9b45e7c
 EBUILD microsoft-edge-dev-93.0.933.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-dev-93.0.946.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-dev-93.0.957.0.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.916.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.946.1.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.916.1.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.946.1.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.926.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.957.0.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.926.1.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.957.0.ebuild
diff --git a/www-client/netrik/Manifest b/www-client/netrik/Manifest
index 7920b5fc4b97..d948188d25e6 100644
--- a/www-client/netrik/Manifest
+++ b/www-client/netrik/Manifest
@@ -1,5 +1,5 @@
 AUX netrik-1.16.1-configure.patch 1598 BLAKE2B ab512408ebc804feecb523cb8a17a6af4ed6b7f151de2612ecad46fe105556e2ab1afa8e9fbf2f86e5cf28832fdac2e52a9a4d5db4912ee88ef73bc1731de795 SHA512 fd03a8b9d627e79d5eb962228fe78f31281a67fbd2f68b7a839c5ee36f73af5a9cb7636ef8fda7ccd51406415408cbef393d556373b7118b5083d21b75f90cf8
 AUX netrik-1.16.1-ncurses-tinfo.patch 261 BLAKE2B f5ca6b454ed26d16e88de7fa08f0c74e7165071377217e093b57c646ce02dcc7f4c5f059e23374cf16516947a252897cd8132efc993c73b000ed8a4cc065e492 SHA512 82b10cccff84b83613f312f9d644a5de3b10f68fd27295cada67a53d4d081f6469f79276c0c601c75937be95d38a9161416c0ecf334ef4b4a590c765130c1509
 DIST netrik-1.16.1.tar.gz 476669 BLAKE2B dc0b9f0ccaaa81def843b8df3b9b70db9c48667e306e992d7e3161800666b92714f5137d38f56719a652022160a5fda835eb31dad71a93a66331bf35e83ea6d7 SHA512 73e754f8ce34226446b47c9438fb45dcc094c19ca8a2933a6cc68ed32e9cf40c9ace3189c8e63bd4537d286b608c515efd8433f795d4238ad30bd6612dd850e7
-EBUILD netrik-1.16.1-r2.ebuild 874 BLAKE2B 7a08535702b1390cacb302a9f5b4ba090b26ee98ef19d427dc537fa551b8cfe484f20bedd40202d87d044c8185fbb91f2f0e95e31cd0f5de2184af8702baf3f7 SHA512 c6cd710fec5ad2b8089dd4507e14d2996e4dfb4f4c63b480c1c8460fcc617614f8eb39cda99dc1253b72cbf50568041852c8fbc73b59db18aa7f2e33b8b6be3b
+EBUILD netrik-1.16.1-r3.ebuild 877 BLAKE2B 07ce05329e164d835c046c861b001af062f19c990c11007f413bbdbc16df075726c79465766ae80863ee47ffbed83ed6fa87ac594a26756f28dda5297284ebbd SHA512 f186dfe3aa4a9af1325dc62d06fa57a36349254015d75f4c7f3e0f29e4cf6b086afa085c659a2c16f3c79d3881adfcaec98a3066b1ec9e2453057d6291567580
 MISC metadata.xml 303 BLAKE2B fc4bfef2b83e524928195e57df9d65cc43ed9361cef2444558d8ed22cdc9a78661cf5b106c098368f5b6fb2c5b09ac3c56447823f0c45d5114f7a629b3ddbb17 SHA512 dd51a4b51ad9fa0bfac8f2486d96a5a40790c8c50e0e28e54edce8e2aee67a72121ed93d9ec3d628d18b91da473bdde672121e5cb2fcc7350f05c5b2968d8f24
diff --git a/www-client/netrik/netrik-1.16.1-r2.ebuild b/www-client/netrik/netrik-1.16.1-r2.ebuild
deleted file mode 100644
index fd4d5b1a9866..000000000000
--- a/www-client/netrik/netrik-1.16.1-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=7
-
-inherit autotools
-
-DESCRIPTION="A text based web browser with no ssl support"
-HOMEPAGE="http://netrik.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-RDEPEND=">=sys-libs/ncurses-5.1:=[unicode]
-	sys-libs/readline:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# bug #459660
-	"${FILESDIR}"/${P}-ncurses-tinfo.patch
-	"${FILESDIR}"/${P}-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/^doc_DATA/s/COPYING LICENSE //" \
-		Makefile.am || die 'sed on Makefile.am failed'
-
-	# bug #467812
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		configure.ac || die 'sed on configure.ac failed'
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install
-}
diff --git a/www-client/netrik/netrik-1.16.1-r3.ebuild b/www-client/netrik/netrik-1.16.1-r3.ebuild
new file mode 100644
index 000000000000..8b8725fa2b9f
--- /dev/null
+++ b/www-client/netrik/netrik-1.16.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A text based web browser with no ssl support"
+HOMEPAGE="http://netrik.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1:=[unicode(+)]
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# bug #459660
+	"${FILESDIR}"/${P}-ncurses-tinfo.patch
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "/^doc_DATA/s/COPYING LICENSE //" \
+		Makefile.am || die 'sed on Makefile.am failed'
+
+	# bug #467812
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		configure.ac || die 'sed on configure.ac failed'
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index d05a9850ace0..523dc44db10e 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,8 @@
-DIST opera-beta_77.0.4054.38_amd64.deb 74524540 BLAKE2B a62a16d139561fa29d56cece83768815e220e1da8e72b25e09d540c7180f53b4c5d7aed14fe947864b69622816476a89f717689e7fd45f046c4691929996b27f SHA512 110ddc0c6bb6d9cee9f56f363669bc847ea90c2c86257a6e146dc87fa04f8e89ee4316de83d4243699b31724a5214fef4715f11c5c56cba11534ad829533512e
-DIST opera-beta_77.0.4054.91_amd64.deb 80822784 BLAKE2B 4d13e5e6f978f7cc3094c45e097485c64b7137ce6bc8a58c7a41092ef40dd85c86547750b2aa8e9b90b896bb5c1a2d87f852ce3a7e54e2c6711d82f62adb6b63 SHA512 66ac1dafbc4c0ee45b5b1e07efc940e5b8865cab5f5842f386c06de0692ef4bb186c4d306e066d19d54a70b2fffe071f106b2a753a7cc0f28d46f311d01e4f3b
-DIST opera-beta_78.0.4093.34_amd64.deb 77036960 BLAKE2B d83d5075a8c8979d258c204725f28004fac3f81cdfb348de707aab0baa118c734b67a201f330be87ea86f4f5065c3d4172b301c2034eedbbfb8e1a6e6fabc54b SHA512 a239612c25aa98e78c8c7970dda4dc59e9b7a0e4d03207a0f279987c93e74edd7b05dedd6cdf82b308ac806b90ff936601a65dedcd5a2b95f4e74005e979d151
-DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
+DIST opera-beta_78.0.4093.46_amd64.deb 77075956 BLAKE2B 0eb0d05dc2dd98d6f600b9f36ec247fba96bb51ef5c19dc7813448e8f65150bb0ba83018de2acab809fb5bdc6eafe7e56f47a8bb9aadf84b00d89da266a2b555 SHA512 72f16bfb20ca1aadee6f89db5ffb5b4cd5f031504629124f48d46c8799e490b82a37939c5079797c863675f0dfac02cb8980b3230f45979e4a21c38c4da8eb82
+DIST opera-beta_78.0.4093.68_amd64.deb 77090336 BLAKE2B 852cdf096bd15454ab75403bd7bdceb22e49775c630381dff1687655ee2c41718eb4cdd574e92be3816cd74418595858be44c4d89cf048905e010145956cd2f3 SHA512 77bef8fc5e99856a8ed1d52485c876c6df90fcd6d4d2fc1918947eeaf51fb7c6c142de0fdfa752e4eeb1f818b7c1c8c3fa15f26626da5ffc9bad393f6fd2ff57
+DIST opera-beta_78.0.4093.79_amd64.deb 77241316 BLAKE2B 3d678a96ccc40df1047380ca7c15b018663407406d267d30eb0dfd328a7eb1b28d78734b45034ff2ebb4ab73bb6d38adc24be031f6e451ad2f97f5d97c4090a1 SHA512 d1abb8bf7494ac36d8268f3c2c3862b3337948bc68b4a5c65bb070f5aa391e2c45d0c328ba572b745d68dc54b306a9c913eb0fffa0bce557e1f3b9ec7cff09fb
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
-EBUILD opera-beta-77.0.4054.38.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
-EBUILD opera-beta-77.0.4054.91.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
-EBUILD opera-beta-78.0.4093.34.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-beta-78.0.4093.46.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-beta-78.0.4093.68.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-beta-78.0.4093.79.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-beta/opera-beta-77.0.4054.38.ebuild b/www-client/opera-beta/opera-beta-77.0.4054.38.ebuild
deleted file mode 100644
index ac62c3431ac4..000000000000
--- a/www-client/opera-beta/opera-beta-77.0.4054.38.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-FFMPEG_VERSION="91.0.4472.19"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-beta/opera-beta-77.0.4054.91.ebuild b/www-client/opera-beta/opera-beta-77.0.4054.91.ebuild
deleted file mode 100644
index ac62c3431ac4..000000000000
--- a/www-client/opera-beta/opera-beta-77.0.4054.91.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-FFMPEG_VERSION="91.0.4472.19"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-beta/opera-beta-78.0.4093.34.ebuild b/www-client/opera-beta/opera-beta-78.0.4093.46.ebuild
index 5f5790fcf46c..5f5790fcf46c 100644
--- a/www-client/opera-beta/opera-beta-78.0.4093.34.ebuild
+++ b/www-client/opera-beta/opera-beta-78.0.4093.46.ebuild
diff --git a/www-client/opera-developer/opera-developer-78.0.4093.0.ebuild b/www-client/opera-beta/opera-beta-78.0.4093.68.ebuild
index 5f5790fcf46c..5f5790fcf46c 100644
--- a/www-client/opera-developer/opera-developer-78.0.4093.0.ebuild
+++ b/www-client/opera-beta/opera-beta-78.0.4093.68.ebuild
diff --git a/www-client/opera-beta/opera-beta-78.0.4093.79.ebuild b/www-client/opera-beta/opera-beta-78.0.4093.79.ebuild
new file mode 100644
index 000000000000..5f5790fcf46c
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-78.0.4093.79.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib pax-utils unpacker xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2018"
+SLOT="0"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="92.0.4515.20"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	rm -r "usr/share/lintian" || die
+
+	# fix docs
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 34989f20e9b0..7e076910683a 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,9 @@
-DIST opera-developer_78.0.4093.0_amd64.deb 75190012 BLAKE2B 342eebc815364866eb93dbe231b7a24a09f130809de8266c0ec0d9808aa2e433200fa4cf51d823564020e56973d831c10fe54e72a8f34822be4eb917145b83ec SHA512 e470122a7490c9009a28469b21108cafba232ef040027e8faea190551a97b1dfe60a7e2caa092d6d4459cf67b3cb22aa5d0da73384fb4528c24a6d925f840691
 DIST opera-developer_79.0.4100.0_amd64.deb 76878004 BLAKE2B 285aa5b687280a0d76e06ce40d7ae3b20e172e3b8a1d8da7b66b4f029dc203581cca7e4b336373bb3d78a5cb66ca50ae38a535770225f75197cf4ebdf4248ea5 SHA512 346ad075121e114d3efd96e8b4dca5f5e502c71dc9bd25ed6c5699e5b8a2d100e74b6bfad3d2bc7ba482025856c155f88c85f5a0ec6ad50dcdecde6d6238d1f5
 DIST opera-developer_79.0.4105.0_amd64.deb 78242532 BLAKE2B 8034f10c0eb04d50367bd929bcb1d7ef8ef432ac15f3f8ce5c03a1c456814d0db89b2411e1d92703951d2a545f454329d7121a9b52d10931e4115e9fac9fa2e7 SHA512 9852c04e6659f63f6602a34b466fa4af1fc9ef11f654f3f3db348c27d9964387eb550cdbf40f718452e741e57beba76ca7511f0f36c45f0e8c6fc81b3719690d
+DIST opera-developer_79.0.4114.0_amd64.deb 78296160 BLAKE2B 459d37a4c08654f2e3ec1b7ac8b61384ad263b5cde08d8a6fee50c57fc8534db3167d6a6e1791f53fabaca59fbecb99accada01126b53294b55309fc8bd3ba93 SHA512 8f66ad70df8ef978cec906ee2f4bcc811a5b23bff9769ba27450aaedfca3e30be7ece88e33d07b4404624fe8a49c0d73883aa0c48cffe1c9896e7960494ebe9d
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
-EBUILD opera-developer-78.0.4093.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+DIST opera-ffmpeg-codecs-93.0.4549.4.tar.xz 1389084 BLAKE2B b7895bca319f9626c4ffe582732c3c28bd188e0c4704b349114f988eec0dc9ef46805ef07c49155eb7b6b9ec2fa0a675c3b4e156cbf0bf5fccfc927c5502be9b SHA512 b9b8cc78e9fce5dddf32e7b2ab937b0f94fa2a7c6ca528c6274820e649609427a389bcf829f4c4e5db155e361d27454071b235df5978feb2a683012dc3b92dfe
 EBUILD opera-developer-79.0.4100.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 EBUILD opera-developer-79.0.4105.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-developer-79.0.4114.0.ebuild 3041 BLAKE2B 4469ab77ae37a2490c4ed9d397c197c3e2c2503847f5f0a82b0ef8af0c563bf314a2a69ed8ece5ae0693c58647983ad4c5fa3e6e1c5b537186e59d1346e29509 SHA512 82bfbde1ffad4f436b0750703455ab7a7e7405667cbaf6d303688e2afbfedbc563e9a7f55c5b3d2eeb2f5a212417eae7942d82e3afd3ab868cc86cd715a24b78
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-79.0.4114.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4114.0.ebuild
new file mode 100644
index 000000000000..798d466ec55a
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-79.0.4114.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib pax-utils unpacker xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2018"
+SLOT="0"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="93.0.4549.4"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	rm -r "usr/share/lintian" || die
+
+	# fix docs
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ccfc08c7e0a4..d0dcb93e3de4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
-DIST opera-stable_77.0.4054.146_amd64.deb 82485584 BLAKE2B cbc8240af50559b8ef0a8adab0750c6a0a787b3fc71c3759e9d100fd3cdf3af3a3469bd5eff03680f3d0ecd3566d41006750bd45c5ca45279b6593d270c9544b SHA512 7190f3e5425955b152e55e71c4feaa3e83dd5984680a55df3b05e9e80d283a33b27b0dbd63a04e12c4bc03f5e5530e69651631e151f458b4a24b9572e80f7365
-EBUILD opera-77.0.4054.146.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
+DIST opera-stable_77.0.4054.277_amd64.deb 76233876 BLAKE2B a130d96215aba2b453f89ecfd4f6cb2f445be1994e46f2567f2cdf5c64fa80385371965465e7d8fa8f4c4571c8643fe737f42f6734086ab280e022d6d12c0e28 SHA512 0104ed6cb539ca7993286d21e2d4d8add2fa077bd7ca001e6b797838bccb9d2753b6a50a39146cec93e53cc1d2c9a609afc909160808f680fc225bc344555c46
+EBUILD opera-77.0.4054.277.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
 MISC metadata.xml 589 BLAKE2B 6264d0b26100282d9399d5922ef7a49b99add9ebad066559201db4fddf7e33598eb5f8c1f8b4bf569ff9e636154be2d377df1326b653633a5bd7764302cf1a29 SHA512 2c3a8e587d5548372f0d27246aa439b532f9b61387a35dbf9752060ad9f013f7996c7524217e426498f3eb4b983a4fd674116f124a4b680ca78b328c02647f45
diff --git a/www-client/opera/opera-77.0.4054.146.ebuild b/www-client/opera/opera-77.0.4054.277.ebuild
index 644b37a1b9d8..644b37a1b9d8 100644
--- a/www-client/opera/opera-77.0.4054.146.ebuild
+++ b/www-client/opera/opera-77.0.4054.277.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 356bf91f6822..934975996ecc 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -8,9 +8,12 @@ DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a
 DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9
 DIST seamonkey-2.53.7.1.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
 DIST seamonkey-2.53.7.1.source.tar.xz 283452108 BLAKE2B 4f0a73c5d57c708e4b5d5af6ddee1c9515b6bf401b0181da17c03cdeee1afb9d120c0157cdf2a07e8fa6495462e8bbb4b85e3e6646dbbead123934c565732926 SHA512 21f52b2668b8cb31670a80f3fbcd04d714527545ddd36fa5782999be398428cfeac989da4e3e7e049202249d43c71228ebc8640dd0b594150c8cff0b587caf7e
+DIST seamonkey-2.53.8.1.source-l10n.tar.xz 13542220 BLAKE2B 8b043136595e481077e60cf202ae66d04ad30f089e842f6d4660807cdaf086b99c9252afccf8a6302558f4a1ce38e8e59f72ade6f72929335b0bf7bce72b4569 SHA512 047defbfac18f360ad089d90de3c0e139d3707dcfa74570fcfa1f2f1e789ca2930d08ee0c94f7d88cc79f4e162eda2d0073493656528e0f9b579f452fe13ad8f
+DIST seamonkey-2.53.8.1.source.tar.xz 283254760 BLAKE2B b078e0333a992b5b6fc9b3966528cc8201ea2c3fddfff8584d3ae9fa5e4b3b7b8abd25dc85dc9fb5ce60b55efcc1692dc56490f520a3b486dca7e873689f0f26 SHA512 1e3eb8686b3b04bfc95f0229c71df7e6ffe085e3ba0bf043c6714789b08e701ede1e288c47df238fa3c5d5979efffe7a9b73b04a32a85f04259ce2c77937a366
 DIST seamonkey-2.53.8.source-l10n.tar.xz 13542220 BLAKE2B 8b043136595e481077e60cf202ae66d04ad30f089e842f6d4660807cdaf086b99c9252afccf8a6302558f4a1ce38e8e59f72ade6f72929335b0bf7bce72b4569 SHA512 047defbfac18f360ad089d90de3c0e139d3707dcfa74570fcfa1f2f1e789ca2930d08ee0c94f7d88cc79f4e162eda2d0073493656528e0f9b579f452fe13ad8f
 DIST seamonkey-2.53.8.source.tar.xz 282833240 BLAKE2B a44f38a635353f2962dd93d102f2cb1f191279b71004f6d62efa375aeb820daf9b8ad307e7facd544bb3be01f14678d3d453e6bb87a200d6bbd6f886412af547 SHA512 7f5668f70710527618e44148180f80b7b2be8807b76843419a98567362a05b4db7341ab29774f59ca97188989830e2ff2ae9b20d6aaea88752f4396a33f0eca1
 DIST seamonkey-2.53.8_beta1-patches-01.tar.xz 43208 BLAKE2B 947b8131810f3f9855e1e8ff45d841e05dde9dc8c1d1204b1a3d55a743c2c7f9b23b251460d6743ca760edc4609eb08c1df3b165acc56af95e5ecb3c871fec3a SHA512 8196be87112926de0becf272bf44c1ce5522579d4b66f93f455cc0e503c4c3bb96fba5ec48a73e0d53ad9683820cb167e677bbf2497fe266e93d154c8d4a7837
 EBUILD seamonkey-2.53.7.1-r1.ebuild 17026 BLAKE2B 1b9485e7f91c76c03604a985f5b60ff24d3ea45abf3e516abecf6473526e460764a256a3419f754c2dc96258617c72ea93599c85147bba287d0d5684d0698e1c SHA512 bdeec5cae22f0b60344c3f6871804e5b2e824609150e5e30146f4da6115e2de9114d3aca1bcb2345b592aba0e394a7b268a420e1fb1359fd1db29fb37e673ae7
+EBUILD seamonkey-2.53.8.1.ebuild 16799 BLAKE2B fda78b24a14ab6c5feb470d3c4db6b97f743e88d1fb49884cecadc44562c8094249b81e546fc001f47579acbfc64d2e2e45f8b784605706b78e0fa4c9f0c7875 SHA512 abd455618841d250701f7acc600bf84ac40a185005b82cca322f58b9d6d5d61ea1e2581d24ccc53e688a9f585c5dbafca70f91744984d68e0b92771b67251b14
 EBUILD seamonkey-2.53.8.ebuild 16799 BLAKE2B fda78b24a14ab6c5feb470d3c4db6b97f743e88d1fb49884cecadc44562c8094249b81e546fc001f47579acbfc64d2e2e45f8b784605706b78e0fa4c9f0c7875 SHA512 abd455618841d250701f7acc600bf84ac40a185005b82cca322f58b9d6d5d61ea1e2581d24ccc53e688a9f585c5dbafca70f91744984d68e0b92771b67251b14
 MISC metadata.xml 1931 BLAKE2B 3cb5bb9f57b5b669b2c9c0d90616bd04928483f51bf0c0909e63836e069f6a87cfd0a2f37b8753abe8976a11219c7daa577ac0d9ee6f2335eec7c375614333ee SHA512 9ee6b67335f7a66a8ad1d211f257042fe9b741432691502be8b39d71888a1f783310fb1049757cb5059c530aa3b6e0c1d6b94f86feaf74fd096168c21611f524
diff --git a/www-client/seamonkey/seamonkey-2.53.8.1.ebuild b/www-client/seamonkey/seamonkey-2.53.8.1.ebuild
new file mode 100644
index 000000000000..56f6e7a4db09
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.8.1.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+PATCH="${PN}-2.53.8_beta1-patches-01"
+SRC_URI+="
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
+"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/nasm-2.13
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? ( ${ASM_DEPEND} )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( ${ASM_DEPEND} )
+"
+COMMON_DEPEND="
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/libpng-1.6.31:0=[apng]
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	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
+	>=x11-libs/pixman-0.19.2
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/mozilla
+
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
+	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	use system-libvpx \
+		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Don't error for format with gcc-9
+	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			build/unix/run-mozilla.sh || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# 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.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	######################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	######################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_use_enable chatzilla irc
+	mozconfig_annotate '' --enable-dominspector
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# 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
+
+	# workaround for funky/broken upstream configure...
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
+	#emake V=1 -f client.mk configure
+	./mach configure || die
+}
+
+src_compile() {
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	#emake V=1 -f client.mk
+	./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	pushd "${BUILD_OBJ_DIR}" &>/dev/null || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	popd &>/dev/null || die
+
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	#emake DESTDIR="${D}" install
+	DESTDIR="${D}" ./mach install || die
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use chatzilla ; then
+		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	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 "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 7e3f115a07a5..2cf2f7d07265 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 468175d81893..567b8e78a97d 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.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
+DIST google-chrome-beta_92.0.4515.107-1_amd64.deb 86204868 BLAKE2B 4a5e6256d30a1534a72c2f2a719eb570e13d9a9fe7fe780d1a8cab9316a8170f281977c532299d0b95df2abb27564a4a9ca80b500eeed1884bafd561c3d4686e SHA512 337f78ecd93ffdf18659d1d85e34afa32e7c2946d04d1e29f1ac40c9984d05d97f8723d265df2a341936e51600b30981701cf0429002ef798f4e2efff122ad92
+DIST google-chrome-stable_92.0.4515.107-1_amd64.deb 86193152 BLAKE2B 3b1bcdb5b117b24546ca5476706c786881c0a68d7eb720362f7128d1ea9cad298ea4d5f0bfb708848264fc51d0265ba67c9f206bc6a89ea4e8d1b0bdc9ce0ff9 SHA512 c842e423e8d6dd42bace4d5bb835f7dbf44f46bce0723317d41f4bf56c6250321351b68bdc3d4b46336a6cfbfb78b621eac1df0b530b345bbd2997612e0561cc
+DIST google-chrome-unstable_93.0.4577.8-1_amd64.deb 81222028 BLAKE2B 06b4582214f14af16611ea426250b95dbe2aa7344a533b32f8b2e01ce9f11317169543afd28a1ea631603929db0cd3704a98d3df28bdbc852e9ec7df2a748228 SHA512 cfbb85289482b18cf7a63ca80c9c410c93f3bf81f5d63ba3b056b9085789a666d60e20d7214e9c53dc36cd26dcf1e52c72895fa801dd3bbc0e8b40c097a2f1e4
+EBUILD chrome-binary-plugins-92.0.4515.107.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
+EBUILD chrome-binary-plugins-92.0.4515.107_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4577.8_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.164.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107.ebuild
index 575d76b0e179..575d76b0e179 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.164.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.101_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107_beta.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.101_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4573.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.8_alpha.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4573.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.8_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index f71f1e48d641..c87334856e4c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 76e5acb8809c..6d6f79320826 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,13 +1,7 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
-DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
-DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
-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 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
+EBUILD apache-2.4.48-r2.ebuild 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.46-r7.ebuild b/www-servers/apache/apache-2.4.46-r7.ebuild
deleted file mode 100644
index 95d53cb994df..000000000000
--- a/www-servers/apache/apache-2.4.46-r7.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20190402"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.39"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling
-socache_shmcb status substitute unique_id userdir usertrack unixd version vhost_alias
-watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.46-r8.ebuild b/www-servers/apache/apache-2.4.46-r8.ebuild
deleted file mode 100644
index 7343e87cea34..000000000000
--- a/www-servers/apache/apache-2.4.46-r8.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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"
-
-# FIXME! Move this to eclass once all ebuilds are EAPI-7
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.47-r1.ebuild b/www-servers/apache/apache-2.4.47-r1.ebuild
deleted file mode 100644
index 7343e87cea34..000000000000
--- a/www-servers/apache/apache-2.4.47-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm speling
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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"
-
-# FIXME! Move this to eclass once all ebuilds are EAPI-7
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.48-r1.ebuild b/www-servers/apache/apache-2.4.48-r2.ebuild
index 8012fad06ea6..8012fad06ea6 100644
--- a/www-servers/apache/apache-2.4.48-r1.ebuild
+++ b/www-servers/apache/apache-2.4.48-r2.ebuild
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e4affd5a1f94..38cbd9a33d8c 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -5,6 +5,6 @@ AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88
 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
-EBUILD h2o-2.2.6.ebuild 2224 BLAKE2B fd17796b921cbe3d7661d472994beb73986a20601f5e8340e79aeb05bcb3e206e45f120c2fc0ef7a27ee9b8fa3aa3dc62767cd2c0206d93dc5e0a2bc6a0cf5e2 SHA512 cf53a31af03f929ebaf1636fba907e099e7ce2611ddd1095f17cd18f5f8e45a3fa58ecedd42fca031e87f0477866eac0ed2271748f5f71938191c718e996d9c7
-EBUILD h2o-9999.ebuild 2193 BLAKE2B 28f0e00c529caf8c7902e53d8a1d05d99f86c390f25b23da149049c3c09bc09a5f7b72b58bd46d27a1ec9cd30f016a09374b155d8b23aec8fe9fb218f50ab244 SHA512 34be235676dbde6a78d1be49b2d34b44d72faa85d62f3d5bcb35bf64d1992f442b8b1689aafa0197655acbdbd363b98edf6cd23145197eaf1dfb6e5b72ef5e35
+EBUILD h2o-2.2.6-r1.ebuild 2163 BLAKE2B d6ebe88928543b55862cc873d249936a42bca48a3c346dd35854e8f953b77c935e7ac6a28262e6d81b88dfc85f6b5d607b88caae0828dcdb600db9279460d73e SHA512 a164fac23f2b3b99c7117b3d08be01d70513a364846a088199056faca628de39308bec40758953c3c91a717de5d0b969fca23b382529cebd600f05580625df2c
+EBUILD h2o-9999.ebuild 2135 BLAKE2B ff1a8e72fb4201990106aa6cbb5ab04c6b1be6953606cc527ef203ab7c91aa6fc6b07c4dfce4d8c361698fb278c0b7a8ef744a414a3cb13914e9487a4355d73f SHA512 dad92e25d6d9789143606eeb9c2aeab315979294bd2fc5958b29e2553743a3167f7c62e1e380830e13f0059ea37f54e5b1fae723db2c828dc3113b667d4aba02
 MISC metadata.xml 664 BLAKE2B 8b54065efeaf5a0506a1a2a3c0b6cfd803812c25b27fba925c5bc88c5cf5062eb7b56a6240f8461d6874f9aeff7f42c3b8b6d80561714106405ee4c7d5cc266b SHA512 171a99429df373753f72898d7b51399738e0c4b792aadec4a74ec0ca64d1651ee2947878db455bb48587b02165d6ec440a14e1c0a567c2e002e2805585086415
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
new file mode 100644
index 000000000000..3c0c14adba6b
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs
+
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libh2o +mruby"
+
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
+	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
+	dev-libs/openssl:0=
+"
+DEPEND="
+	${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
+	mruby? (
+		${RUBY_DEPS}
+		|| (
+			dev-libs/onigmo
+			dev-libs/oniguruma
+		)
+		sys-devel/bison
+		virtual/pkgconfig
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+
+src_prepare() {
+	cmake_src_prepare
+
+	local ruby="ruby"
+	if use mruby; then
+		for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+			if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
+				break
+			fi
+			ruby=
+		done
+		[[ -z ${ruby} ]] && die "no suitable ruby version found"
+	fi
+
+	sed -i \
+		-e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+		-e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
+		-e "s: ruby: ${ruby}:" \
+		CMakeLists.txt
+
+	sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
+	tc-export CC
+	export LD="$(tc-getCC)"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+		-DWITH_MRUBY=$(usex mruby)
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 0750 /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
+		install_cert /etc/ssl/${PN}/server
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
+	fi
+}
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
deleted file mode 100644
index 41caa3e517e4..000000000000
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
-
-DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
-HOMEPAGE="https://h2o.examp1e.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libh2o +mruby"
-
-RDEPEND="dev-lang/perl
-	sys-libs/zlib
-	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
-	mruby? (
-		${RUBY_DEPS}
-		|| (
-			dev-libs/onigmo
-			dev-libs/oniguruma
-		)
-		sys-devel/bison
-		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local ruby="ruby"
-	if use mruby; then
-		for ruby in ${RUBY_TARGETS_PREFERENCE}; do
-			if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
-				break
-			fi
-			ruby=
-		done
-		[[ -z ${ruby} ]] && die "no suitable ruby version found"
-	fi
-
-	sed -i \
-		-e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
-		-e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
-		-e "s: ruby: ${ruby}:" \
-		CMakeLists.txt
-
-	sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
-	tc-export CC
-	export LD="$(tc-getCC)"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
-		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=$(usex !libh2o)
-		-DBUILD_SHARED_LIBS=$(usex libh2o)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	keepdir /var/www/localhost/htdocs
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.conf
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 0750 /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
-		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
-	fi
-}
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 24da7a201180..d1f780ab5f1b 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
+inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
+
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="libh2o +mruby"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
@@ -32,19 +38,14 @@ DEPEND="${RDEPEND}
 		)
 		sys-devel/bison
 		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	local ruby="ruby"
 	if use mruby; then
@@ -75,11 +76,11 @@ src_configure() {
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	keepdir /var/www/localhost/htdocs
 
@@ -98,8 +99,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
 		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
 	fi
 }
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 2df446aeef2b..4de4dfdae135 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,6 +4,6 @@ AUX monkeyd.confd 172 BLAKE2B 12259f30705d5f9e20971a4966056481636b5134951a850c1a
 AUX monkeyd.initd 601 BLAKE2B 178c97cb2d8281a971c43ec78d5904238b180ad43ea47a7aaf272010fcceb9942a3b6b2089ea7b8244d265a1f4d241fb82b483073f75204356fd775769992625 SHA512 e356742c537b5bbc8d9696e5fdad0c08d93ace5085f8939fa50d97498ebe0d85712af5da675e76c642296856768081ee14d6f0d3d73a17ce4642cf46e9056a79
 AUX monkeyd.initd-r1 608 BLAKE2B c6ce981294e6e852d346166ba71493470f8ac3604cf597a35a8d38a0ab1fe4c808de018a94149832d0f647257cff42c189dbfc6ef9876a06a338c4cfdeb1c3ba SHA512 d1a30f0033d9f2a0957028a6873b71903d8051340ac272ccbaf12daba9a89bf0c2e476b8aa22a0e60697ffd10ab5c1d6a4aa0ff7b204f8b4adc76ebe91b8abaa
 DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
-EBUILD monkeyd-1.6.9-r1.ebuild 4105 BLAKE2B 8f0bfd98497958e81bec0684bf3014e3fc12b9270ca0f848f2385bb36419ad5d85b6efa1bfce4bc6926d7e596286d1157f8c67624b9761078cd6709f7e1f6b39 SHA512 a4a12ffba7f6c679dd1fa9e0a1958dacd483ca6df250d42f71b257f092d9e4abb11a1f5e5e55378dcf30254befbddb2a67e0d8c2fd862bdfac68ca764310b293
-EBUILD monkeyd-9999.ebuild 4086 BLAKE2B 7b3af0c73a8f44197e127ecec16f5cb3448a13c0cad8780d9c313713e532306ca03a7d312f1775ee83099636dd828e80e7a79de1b4419d716cdaf6a588862ab7 SHA512 3bc63c7cfc8b1dc08b0785b4dfee69e1993c5d0e4f6cf67383c25d97b04c7ee79f7b3f329432622e2b96483275af9a4597e8159a7f04d0ada9176e64ef6e4df6
+EBUILD monkeyd-1.6.9-r2.ebuild 4017 BLAKE2B c4dfcf32e3bc7bc12a552e94a9e9586e80d41cb99e3b0d8a526bd19db02328178cd8cc2cb94230cecd7934c3530a80fe1d4039adcd949349866c87fe501d6c4f SHA512 dfa2e7765f2e9d9f486fee05c15244c456214ac80c1629b1462477aa54bfe80986e87d22b1b5767902bda39f93c042ce1bda8933c90bc1f5a7f73452b4160f2d
+EBUILD monkeyd-9999.ebuild 4022 BLAKE2B 26e3870863f59b607f2c597c99361e1e2112b732fc2206c4a73f6f0aef90679c15b8f908ad15e7f66482a37578518926c267b6b0f0500c8047c5fb21b97906cf SHA512 adcfea12de7ee6195b8ef2b0cc610ca38f9babf30d1d722a22c7930a5b2b7ecc6cadf4e1539460eea35604b7126655e61168fe967ed2e3071b0515b1b0468c87
 MISC metadata.xml 394 BLAKE2B f5849f3a0f249bfcfe85c51bda735406b5d10e97bba70c0427b57994dda956c5b402e98aee9bf9359e966a8d40f72b44d04622217020a5e26dac44497ca487d6 SHA512 9431b7f6722baa7c18ab2341a35aed3978f54e92c0b2a686bef0f7dc20934a14f93b6a1f1208b47b720f11e5f901e634c3b278eb540dfcc06c3a7c668fc0a209
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
deleted file mode 100644
index 47ed44923c33..000000000000
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic toolchain-funcs user multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-r3
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-util/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
-}
-
-src_configure() {
-	append-cflags -fcommon
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--default-user=monkeyd \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/monkeyd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--sysconfdir=/etc/monkeyd \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}
-
-pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
new file mode 100644
index 000000000000..0be511e56215
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
@@ -0,0 +1,147 @@
+# 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
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-r3
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
+RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
+}
+
+src_configure() {
+	append-cflags -fcommon
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--default-user=monkeyd \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/monkeyd \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--sysconfdir=/etc/monkeyd \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
+
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}
+
+pkg_postinst() {
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
+}
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index dc3dfa6306e1..3308111d6ea3 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.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 epatch flag-o-matic toolchain-funcs user multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -37,6 +37,8 @@ DEPEND="
 	dev-util/cmake
 	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
 
@@ -44,11 +46,6 @@ S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
 pkg_setup() {
 	if use debug; then
 		ewarn
@@ -62,11 +59,13 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local myconf=""
 
 	use elibc_uclibc && myconf+=" --uclib-mode"
@@ -136,16 +135,13 @@ src_install() {
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
 
 	# This needs to be created at runtime
 	rm -rf "${D}"/run
 }
 
 pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
 }
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index ba4fad0f7929..b9ce779160ea 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -4,6 +4,6 @@ AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a6440
 AUX thttpd.init.1 735 BLAKE2B c50383feccbae81c835ccb1f0803001474dec2790916634b375b958357ca02d66f933fd7f0091f9a9918220101b1150c6e39a53bc26c29d6c6329339dbe0f1ed SHA512 991b8153fa030026e3fadc0b838b26fda75ab706e4fdaf1195931ed63be15dde290e4e3653951c78f41ec70464ed2d3dd984dc10bee4551cbf069435d447bea1
 AUX thttpd.logrotate 197 BLAKE2B 8b801de472c4c7902abf133218a6df79023bf54023c0217576ef1a23a30d4905b3d7815fbcfe3c3254a9ed86d137d1bf681f2fa187325a57442dd05ac4ded7c6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd
 DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24
-EBUILD thttpd-2.27.1-r1.ebuild 1934 BLAKE2B 915d05cdb713af0e5ba8ca0ec57fe926aca871a2d0f2a55ae05e4c42253eca0551b87d3f695ac2463114ca5107060c0412deeecb5a9ed85f9e50455c9375ca10 SHA512 e585083be6c6bc6818b966331adb6288d7803f5857bc1f0b96f7703cfcee952b13a85f482f208c113497fbf1f1d046c36e22194f48dc16072cd7ef2d36923b5e
-EBUILD thttpd-9999.ebuild 1940 BLAKE2B 542b9d12e6e25278dcf223f58d47abdb3c0fd23c844e037b25372f9286fdf2998ee76614fbb5dbb947a87def726d1578991ac7cc5c7649079bc3f93e5f0e8d26 SHA512 acbf7b55774926e401d7cdfa1a303c03a9b5d1749fce9c743e3a8506952da2de28dc83dededb6e6381f301c72f8cf14f5d61827c3861ff602af89e4c91244502
+EBUILD thttpd-2.27.1-r2.ebuild 1653 BLAKE2B e829a3813f6225ae16a5bffe7b3e620e474000b991ada02698617a514b5daeab65a38ded09d98f303c37ee0dc011bdc948ce7b081e57b72191437ae63695e362 SHA512 a01f8ad22d5e8b0f698fe7d9ce4c225512fcbb07635baf823c4dc7877cf51c122adb2f597caa160090c6c8a18a2aaa006355b69d6bc0b87234d9d12267c294ba
+EBUILD thttpd-9999.ebuild 1659 BLAKE2B fa6230f1d75f5b461b3885016f7a98c8b04008b4808f2f845998e4e51796b7d107e095aff57d908daf01721a858100a3d64cce7ce8d44e5c4870a73dd5fe6961 SHA512 2cc8f1ac1979fb148371ab69d7e9b40fb3ef74d7985755f75c6b5d817aec7aa97caea2231eafb7ec3f5b1be9d8c9b5cc8873079b351fc672d78fe4d5940d054d
 MISC metadata.xml 333 BLAKE2B 9613233b895b29ad968791a6273aca58fbd161fba4acf4f41cdf4fba8c4623ea1fbac2cc393ae5e4ecda30cb67a039fe2c638e73b9a277113535a0b4eb80fce1 SHA512 7e1d7ed4947be16a3954c510004c21d26f45b4a05dd05102dea5c1f4001787aea9e602862afd204d529c8abb5746c5fe2148ffb533cebbbf38747717b6bf2877
diff --git a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild b/www-servers/thttpd/thttpd-2.27.1-r1.ebuild
deleted file mode 100644
index c7f0958f6ecc..000000000000
--- a/www-servers/thttpd/thttpd-2.27.1-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="6"
-
-inherit autotools flag-o-matic toolchain-funcs user
-
-if [[ ${PV} = 9999* ]]
-then
-	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
-	inherit git-r3
-else
-	MY_P="s${P}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-RDEPEND="virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-
-WEBROOT="/var/www/localhost"
-
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
-
-DOCS=( TODO )
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
-	eapply_user
-	eautoreconf -f -i
-}
-
-src_configure() {
-	econf WEBDIR=${THTTPD_DOCROOT}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
-	newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/thttpd.logrotate" thttpd
-
-	insinto /etc/thttpd
-	doins "${FILESDIR}"/thttpd.conf.sample
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"${WEBROOT}/htdocs || die
-
-	keepdir ${WEBROOT}/htdocs
-
-	chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chown makeweb"
-	chmod 2751 "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chmod makeweb"
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
-		|| die "Failed chmod printenv"
-}
diff --git a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
new file mode 100644
index 000000000000..bab74ced7884
--- /dev/null
+++ b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
+	inherit git-r3
+else
+	MY_P="s${P}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
+HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+RDEPEND="
+	acct-group/thttpd
+	acct-user/thttpd
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+
+WEBROOT="/var/www/localhost"
+
+src_prepare() {
+	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
+	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
+	eapply_user
+	eautoreconf -f -i
+}
+
+src_configure() {
+	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
+	newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/thttpd.logrotate" thttpd
+
+	insinto /etc/thttpd
+	doins "${FILESDIR}"/thttpd.conf.sample
+
+	# move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"/${WEBROOT}/htdocs || die
+
+	keepdir ${WEBROOT}/htdocs
+
+	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
+	chmod 2751 "${ED}/usr/sbin/makeweb" || die
+	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
+}
diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 4a0042d502cb..d26b6c0b54f5 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs user
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} = 9999* ]]
 then
@@ -22,23 +22,15 @@ HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
 LICENSE="BSD GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/libcrypt:="
+RDEPEND="
+	acct-group/thttpd
+	acct-user/thttpd
+	virtual/libcrypt:=
+"
 DEPEND="${RDEPEND}"
 
 WEBROOT="/var/www/localhost"
 
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
-
-DOCS=( TODO )
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-}
-
 src_prepare() {
 	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
 	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
@@ -47,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf WEBDIR=${THTTPD_DOCROOT}
+	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
 }
 
 src_install() {
@@ -62,18 +54,14 @@ src_install() {
 	insinto /etc/thttpd
 	doins "${FILESDIR}"/thttpd.conf.sample
 
-	#move htdocs to docdir, bug #429632
+	# move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"${WEBROOT}/htdocs || die
+	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"/${WEBROOT}/htdocs || die
 
 	keepdir ${WEBROOT}/htdocs
 
-	chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chown makeweb"
-	chmod 2751 "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chmod makeweb"
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
-		|| die "Failed chmod printenv"
+	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
+	chmod 2751 "${ED}/usr/sbin/makeweb" || die
+	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
 }
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 1285821a1ed8..7f26005e19ba 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 1e6f1859650d..25d09fb4778e 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,3 @@
 DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
-EBUILD xprop-1.2.5.ebuild 380 BLAKE2B 66132baffddc704f0263cbaddd4fcf25f946af46ec5688b3cdf704799c755d8f08dc440b68ca50bb2857e94171e0269fe29832799c73e64187a22fac4f7f69c5 SHA512 12ed30ba9651b8ccd13ff82eb47db6e86dc4682afbaaa6adc5d0beb5ae11184dc898feda0c511d9be56270522d827395c78b7e11459c691db02fbc32420f19c1
+EBUILD xprop-1.2.5.ebuild 387 BLAKE2B 518785a7f335ab812873b958403870af87cae2f819ba1159833c67a7d9afa1ea09fc8c6937fd11d4af62d091ff1efc6f2d16b2d15d04efcfaa926a98026657b7 SHA512 7148ee04b1e1110263d4b680bfe7e51b021804c42350cd471a97c5a2a3f7940e8d0a7f46569cbcef3fe3eda14eaec5bfeb256a2c671f284c4b33af747535b2af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
index c942b74ed6cd..fac099387d44 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 13825ba858c0..0ca3e8db3f02 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,3 +1,3 @@
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
-EBUILD xrandr-1.5.1.ebuild 525 BLAKE2B a394dc203108c0af0f6a739a81d9e8872c9c93313380339978ef65f843c18dfe3fe9ccf9a32c9d9b9b7465da37603babfa2a2f59b3e407152b1eaa7a41ac289b SHA512 f2c54876005d415a295b8a558fb7f6e9d52bf059ff1626ccfd28f8b27b3542db6413e7515986265ff356d88cd4da39515b3ab78039d0fd12920c0e930df7d432
+EBUILD xrandr-1.5.1.ebuild 532 BLAKE2B e4b8f07b010108ed5bf7d3b2bbe175b424df34a00adf9fba216d351b80d373d2bf0c9623d1e020b542eab65b695be83e984c3dc11f054b488d855ac5ff1687b9 SHA512 42d089aaa5a4552b771f488e9b8051a967cab3f6d9783ee46dd5bd1c5436460e8d5027076b093c8bdb83b7094fd29d3464e30edbacb723af815fcfa4b04cef54
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrandr/xrandr-1.5.1.ebuild b/x11-apps/xrandr/xrandr-1.5.1.ebuild
index 69e360a0e17b..9cc7f69c9d5b 100644
--- a/x11-apps/xrandr/xrandr-1.5.1.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 47a8d8d9669a..937198e58c77 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,3 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.4-r1.ebuild 484 BLAKE2B c5529d6a6392f04ac8e2eb9f5f3083bc70262f7497d82fc90885a5d7347d6e27d7e90012f2a6e8b90bc356f6b11714a05d679a166f3b244c3c37123db06f72f5 SHA512 b10584c6ed0fd94da17b6c365fe3df37a00af0d9246b169ecce1bca71f80a2708f91abfbe48c50de31260bf0a2f9165b7458bf0a0a987bc83bc1cf45974a1b60
+EBUILD xset-1.2.4-r1.ebuild 491 BLAKE2B 46eccc7e51333797b3dd1b654738d88d8330a65ff3e6c86f52e8c8e5b450cf9e72d40b67b816fbfdc2abc932534e821617020f676db1ef2faecb481cb90bc82d SHA512 3fd6ecab1e4e98186baab34aecb3ee018e5b0fbb2837fb3ca3739abb45856de95ab572f8e8e1145a0cc33246fd39d22e7cd8a2e451e48f049eb8d3ad0a569bd9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.4-r1.ebuild b/x11-apps/xset/xset-1.2.4-r1.ebuild
index 9d83f67dcbca..d40a34dd2555 100644
--- a/x11-apps/xset/xset-1.2.4-r1.ebuild
+++ b/x11-apps/xset/xset-1.2.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xset application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 387d494620bc..5edc4d98836d 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,3 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.2-r1.ebuild 400 BLAKE2B 2bb32cc2a38baf71ad72fbdefc8b5531386483629054e65a7a1c9c62fc9cbd9094a85271d40941ce004fb62a204e3ee4ed8063aa3b04db42100bda593540a2c8 SHA512 f23c9986d192463dfc9ac374c9c30e023f098f9a5768ea585bd69575a79d065f073e3a75ee72fcc3f1d95af4281b13a1bc8a2f7cdc34c79d7faed71fe3c70390
+EBUILD xsetroot-1.1.2-r1.ebuild 407 BLAKE2B 5ca71535d95cd240b92baee7a8cce8351ffed0da0c13f3843c8e4d050bf8d877f8882b57b1b7d6c5ed0651a97e926cddb8ee02c0d87e955d8b92fcb89611a424 SHA512 d2570abf11c0c0eb80ab1c3faa016bcd2751233b41764d696d48800b3f9ecdc0516786465eef49a998ec366d289a3f61e3ed65ac358bc4c81862dc1f293abd1b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
index 89ade361ca81..6e1e3c271e3b 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-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"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 773823e754b4..a83365e33b0c 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 612a4c8a316a..ac3fe6bc22cc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -7,5 +7,5 @@ EBUILD xorg-server-1.20.11-r2.ebuild 5219 BLAKE2B 7bd00eb534c539e80ca36cf387d0d0
 EBUILD xorg-server-1.20.11-r3.ebuild 5295 BLAKE2B 85bd4a2d53afaf305953f0f125bcf501b0f4c720748efbdeb6a596242881c37c65a5aedd4c3685c35fdf55f6db718fa4854b49fbfc125bc896f8e161e53f9189 SHA512 ad61d98793d0edfcf8f77f1fb0155d695404a2295a07511a329e6d1344fbefd3208f18072f3f312b535988497d0e0ab28a9a7a120f7c28311094a9d82ab85b43
 EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635
 EBUILD xorg-server-1.20.12.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
-EBUILD xorg-server-9999.ebuild 5352 BLAKE2B d4252c7a306132aebd61ef63a4f9ca11ea6ddb05adcb606804ff24eb97bdaeed8b9a87b39f131f7edb0cf2cb1f26803a275dc27882d4fa1f2fb64f1080adf431 SHA512 ca8b56e5b9cc5c165ca9e33e857890b9b3b617d09fa1be491345bcb979fd9cca940229480881a72076255cbded697dc636f8a725943e0578f89d5b4e70a8a8e7
+EBUILD xorg-server-9999.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 0df6890d7a70..9d8b35301a6c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -92,7 +92,6 @@ DEPEND="${CDEPEND}
 			)
 		)
 	)
-	wayland? ( x11-base/xwayland )
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 10508f916f3e..ca85035f7794 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 0830c00a5e5e..f4aa8313a352 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,76 +1,57 @@
 AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131c47510d3350511b918cd47fcf44f1ccd4746e4a41f2f8aa36511f20c2c6f313010e89a79b7869771b9ee6 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7
-AUX nvidia-169.07 639 BLAKE2B 00b279e3c338dc84258d8018fe80efc4b87f0fb1fcd61eda0ac2f698897605f4675a3ebb53d8baa3bdfa9f137aff214046464a642113a1b01a8c3e35bf5f99b8 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f
-AUX nvidia-390.conf 199 BLAKE2B e7eabfb3a61cc0e95da78270964a6bb55ae71fdad81376d41c0ae0d38142f693511911ca8a9202e30f70efaa852b6b5c0ef776872e68597ed4ee14c4e9a86eed SHA512 0f691f5ba0aaedf1c670d3f2bfb632bdf253e94199fc2cf02277dbfae3055ef5887388af7922e65c39116bd0ed6ba13fc966145582933a5f35c3a1e9483a3c92
-AUX nvidia-430.conf 734 BLAKE2B 8332fcce02f603e84598cf817a4ba6c948f198c962b699d5d765f868eb0f4e88586390b3d0ebb14f9b3defa8ab84db9196358c9cd5754b5f4e336ace441abf95 SHA512 51691436b9ccd2e21b2a1a8b5f431865aa811ec9ca07899b1f4d8f9ff8e38a71a8c7f910a06df5b686e274447e2e570e96c07bd13bbb69bc6a570c8dd393daec
-AUX nvidia-460.conf 734 BLAKE2B c266b4ffcc3f8f3666c8838273da1eb21527dfc29ab1c276fbd77c4bad993e4f206112e0e0bf6e4a899f417ccbe4522053df8e019bbbeac29ec9364ae2fa3bef SHA512 4f716c9c67f269f361ad48cd18039df3cc4495e29a8a74d1b162fc0db96942afbdc440ef21a8477271b9e561483715ce7e0c2863f382d8721f235406fcaa3095
-AUX nvidia-blacklist-nouveau.conf 150 BLAKE2B ab88433271de205cd928589eda1c5b7ca88d5febb9ca5f6a743e038d461e0d1bf4a1abddf272c8f15633c04a8ed1c09daed4eb81391768dfe96586b966186f33 SHA512 f345998328e28a34ba578e96f0ff08a94b909b151f9fe883fb59dfcffe754d0eb324caa8bbb1f42ca1c9604960b6ab1dc4e72b5edb773c3c7ade59d7adbb3057
+AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
+AUX nvidia-470.conf 1188 BLAKE2B f7a7dbe01021c3a4ac5a3103492e27a6e247dbba0fec8abd5e13fdd6d813eb6a3a3dcb7be46d03d1abeab092952a44f4459803e45c872686998836905cfbba80 SHA512 7b31dc492a7ba8695664992685eff9d7957bf6b3ec6fdf39d185819e04576c30a658cdbc24435242a99e5e78a0f5c2320f6494c419fc49525306463bf058e2d9
+AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
 AUX nvidia-persistenced.confd 213 BLAKE2B dd57e63944a97a77e83a8373dd34ef2f56824dcfadcfbbb54cdf6eeac17066d78753bd1b21a9bad8f0437c279c95492319205c15b84b7f96e0515415dfddbc26 SHA512 a311b73bb47448538e5261ba658d42e923890c909c335eeac3cc90ad0ffd3fd5fb983df8e91077f3098eaa13b07f27b23dc24a4579b1df411ae272976ef089b3
 AUX nvidia-persistenced.initd 404 BLAKE2B 2115075a9b0c9d0eeee55e2b3c531da82ae6aea5bf25bcedc618b108aeddab95c0ac852d6d9b96bd9bf6dba62a13db487d7c3627b244ef29c047bb7a137f2413 SHA512 34143639ca5456cacfbfcb2bc30e51dce02d9af4784791a84ba93a26f2f7f31f2dc75685bbed52138c35df310cca1c19072a5fab2b067f854550f5ee4d96aa9c
-AUX nvidia-rmmod.conf 108 BLAKE2B 8a14963d7498c08f22c60f0e7286b66375c22e9db081454d973738bf847bfd4343c82f4e1c529ec6b904ae3e8cf29e2570dd4cf2fbb8c8aa9bd33491d2e4f543 SHA512 cb6b70ba0fc9c6d81d43f31d724538beff79e7e9b02c610485f1e46757d7bf16410d5cb2853d8d67ea6e4da59e7e1687ad14dc4b494415c6db6fab517a03b28b
 AUX nvidia-settings-390.141-fno-common.patch 478 BLAKE2B 2b222b26049aeb6692350618bd1e4dff3c4f25452c1e18c5789fd3e85ffb3edba4c54c4cdf02aec95f65c7eafb2c01e39a76b888a4f0691de6279d2981ab4f5f SHA512 a6574bc7be6299ab6f7aa3b7872506cc135ffda5591f6d385f6828ca5691e964852b4461fde771130a17b315798f986c2af6e1108e9d2298dcdf3f786e665a93
-DIST NVIDIA-Linux-aarch64-450.102.04.run 80469462 BLAKE2B dcabed08bdd2c4c328794238e175e96831ceb0ff683c7727a1873b5aaf07612f997d47c915ef7d3c5dcfcd1d40e75f9a51a83fb28eb84d4200e7e5bc41245d9f SHA512 6b0fcdbe8a0ef3a86357bcd7a48d38c2bb65d9608bfbde0fa270b7cec198acaf9b60d458406fc7c841c75c98089644e8dcfb87bd9d0d3c45bc77ec3c936d9371
-DIST NVIDIA-Linux-aarch64-450.119.03.run 80498137 BLAKE2B 1834fb1d1f6254665339b7c0476466223240e8e8fc61223825d7aa51b23becef0c88106dc0b01a59922f815309836f5c03bd6c0dc44096ca150432a83a6201f3 SHA512 60d757be68714aa8d0da754ccdd760858ad787216822766f34ec3c1b85feef37b247feb4d369eef1f2c73be08c99f5d9d6acd344a15058f6d7f71a6eccc2ce25
 DIST NVIDIA-Linux-aarch64-460.67.run 112551235 BLAKE2B cc1166454f6e8771c7fe97010906919e9f2afd74ac86321006628f90f4d8dee033c3e09b2d9cac9063fe3fd313c0b529b347bcf38c051588ca7a972617c45026 SHA512 6ba17844dd215967f2f55a6620535464f244075a13f4b2b6d0ffaeeb6d97397fae0ba0de032d971847556d7b78ac8a1010ecec5127f45eb7ec73db87b1507ca1
 DIST NVIDIA-Linux-aarch64-460.84.run 112602151 BLAKE2B 7c8fee69c61f94d461286b2e96577b20da7e3ecfbb32fa9791e14006797bcc02d3123cb2101e718998fbc04d081f35c5802ddc52c71bc5eb51aefc27f45b8233 SHA512 76516a880fa5f28020ff7cb7a92d216f79ef9d510e0a1e696b614c1eb01702381f04bb1456588d43ff0a6c2824710f8b11f2e9788219207bd8b61821401306de
-DIST NVIDIA-Linux-aarch64-465.31.run 149782108 BLAKE2B 3f0efbfe48d901538ed627df127bfe98267ed9fa055c82da3de9e64ea32de53fc2f0b2e0bc2748c3ef0732e5f25db2b51bf8e3315010c70b21dc726575c862eb SHA512 093f74f8b0b068ba1ddd6dd80024d39def935c01bc7e98a3ed9965142ace773565f6768bff118098eb574c9ba0f34e4dbfa65754930e27e153a514310470ae67
-DIST NVIDIA-Linux-aarch64-470.42.01.run 184108907 BLAKE2B ce2e35d90d7dbcecb6a3fd2e00e3d44de729cb61b5c8cbd707d6e304f9c41a5e0d8d97c80ff3428fcb121e6b993d96bf78cd28ac2edb7d6a555136a0d31b3c00 SHA512 d56fe68f0e060027191310a7144f50dead6913dc7a8759300a40c00e3c4f1a5a876358e2e32d6811d42fcfef7624280fc41efaf9ca40036a449b66700cd575bf
-DIST NVIDIA-Linux-x86-390.141.run 49589744 BLAKE2B 304672806b89885adbf8459ea99ca872769e44a42ff041a5b79ef05d113d7717f505f543441e7a2fc6c569f6d66391f0380a4f23f3e68108c8de817bf251f850 SHA512 6dfde3b54520070954b45f6bc071251084e1741f55e582b1abd806eb367e4b9ce0015615bf6a887fa784d075b3db08b6940da4163b960969773d1bdc52b4961e
+DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 24ab316e216caa61f7edb4dbcb34541709d3229d495e6ead95e99db7403cddee03467ee28d007f0fa3c4f2fa267e1994533c90a7a67885e9e76d501ab0f8aaa5 SHA512 edcfd3b11afe625c8996cda488a8de2e0e40eb4b95c8cf0ead9e1226d7cee8140a83c247d745ceefe997a39cfcf3e3f9bde575d97aa39090f97f88817d89cb28
+DIST NVIDIA-Linux-aarch64-470.57.02.run 184167283 BLAKE2B 8c321b60874ddc5497226515dd778e402227ff391e63ad7fd735cd23eb7e1f61550c96d5578534b06104da64f221c1db9cf2ed595be6fc11ce826efee0fbab89 SHA512 2af613184a9d2e6ebd65807beb8007dbfd69d1c08cc75bc5da404ab7eda9217c68be44a6bf61f666be2adb9b74f791007aa5b2bdd5066cb8b50977ff8882c2f7
 DIST NVIDIA-Linux-x86-390.143.run 49327068 BLAKE2B c6e0600885bfd834be6dca18346259a58e05640afe4b1ea394d5795e4c8a4b0fa9fdf5c4a331a128843708ece9e95df2ff7e0b3cf2ac5875b5d731c73423c112 SHA512 17bbcc2f5e9dde3f131b7924ea1e99a591b5e18b835dd324c528d17f74eded94e087c6a9a2b364189851e9972ad27bcd47e901c9ec14eedc568b99890f1e0a4f
-DIST NVIDIA-Linux-x86_64-390.141.run 85330901 BLAKE2B 7759d8cf6c9a75607b9a3ecd53cdd6f6a93f2f372d740a5a87d4d3f41a22f3bd953cc7dd6a0dc0e23a829ec86df8d65b9de499a76cfd4266a13b0aa3288aceb5 SHA512 5448d70e6e64a6403e61a004d83c69a442dd8ed0d61da3a31d3e3b7943c06c559a66b0f8d135982868ecbf209a965f60dae1a633367630b4d9287f725bbaa53c
+DIST NVIDIA-Linux-x86-390.144.run 49210937 BLAKE2B b7e6edb55af88be74e4322ff1d270388a60a9d9809314c3a0502f86ed97edb99dfcdd3c81c5f51e681c8fcc47ecbfecd124b4d733141d23726226a3965b4c1f1 SHA512 d962c7e7b4b9c4635a887767d34a49c401a89e5975a5e57fa83366ca824ab70d5b8a81f3dce2e05e0528afddc72d70b2fcd69a216bd16d75e7b88ec704390546
 DIST NVIDIA-Linux-x86_64-390.143.run 85686808 BLAKE2B 0ad3ec661565cc52553c0b4f73256665fd3b505e39bffbfbffb3d148193369471b5160d59717dbecbd5f00bd28d9d17c9c7b5284e493f57f84ce19e310e477dc SHA512 79b61bd274964ed2e6a7ce99f0066d616d65b5a074de2ed84cdebb9ec6e8a608f71e511105e9a03e0c6e6d259f0111fed5772638ea72b08951eb2712c80505d0
-DIST NVIDIA-Linux-x86_64-450.102.04.run 141391114 BLAKE2B 019f928464b23d2a86bfdd255b7651e3cfe2b0b6ebf58d1b4a6ba1f27990e1d050d1e2429ba4aa60b966b04e775939084a04d82d1dd3482a10b39375b17b1c31 SHA512 1d13de540da36274a360ea6bcd1ce01eaae103fe417b42aa8f9ac757c382b06da455a78cf6798310179f90e2afeadf3a8c9f3398186490c3c0f9079021e850ed
-DIST NVIDIA-Linux-x86_64-450.119.03.run 141295706 BLAKE2B 854dd0063ea1f11e052f6ba5454792ebeb41dc50cd5cde17260d8c715b4401fa19514cfd3d2fad905564607244748e8083880bc2e360a86f8dbca970ebe5e744 SHA512 5557328f445381e23358c8bce220da062cdd3b5d396764228f7eb285e8dd6419bfc3943fc9e98516ad8cd2db13d0d7c125fc9c94c1e565668f76c872140d9082
+DIST NVIDIA-Linux-x86_64-390.144.run 85000417 BLAKE2B 8ecfa768fb8fe92170ff5b82698a7fb22da8bc557ab2036464bf5650b6fffc7028e25a68e1f5638f6bc171eb45a4aba459465490c7a99aacd36dc769994062e8 SHA512 9503ebf41037a14deba995288a364768cb03fb682de8653a4b0c05955b23603443c41c4216c93eac7d7efc301734416012864ede728324ab47b93ff167d93da4
 DIST NVIDIA-Linux-x86_64-460.67.run 177691692 BLAKE2B 25a7d87cc128933a98100d7c5ef37f93c3a870c096eea3228a28ef79d712ce104608f9422221cc1eadc21dccbbc8bc41ab1832795cfee75e217600ed0d76489e SHA512 80fdc023a8ce80e3a103896f28a5564bb43903af6bfc719f755c48eb225e79ec6abf219ab20eb80ada5808ef932ef5fa0fe710c6e0a07dd8a248daff2ba3b898
 DIST NVIDIA-Linux-x86_64-460.84.run 177840337 BLAKE2B fbaa295c59f1af79c59c28845b79924812ac1386cf2e42aa762120a618253686f1249d777cc6c8df88b52afa34b96131663962bf0b6621dea6dcbc1bad7f9e22 SHA512 2483a4d251da63334363f4ba9f7b5d2cbf310afdf16fbcfecf1269f65beaed0325f825472feea26ddca2455ed44f284f57a73662600a3b4a270167baeb33e4fb
-DIST NVIDIA-Linux-x86_64-465.31.run 236060463 BLAKE2B dfa877ddeb31961c7cdb621c30b1c61282152c27787e45542ee4a411ad8a08f732b149996a0b522638ad98f47a7c7f575a0f8b65e82413aee7823a6f0ac58426 SHA512 3ea65eda463320d0e2301e45daa5a725bd07f664ab117053f106b981801ae314faef320304f4b87dd8eb8868f9f86478b23fbca51d27ddc3968a5f5300e8cbf9
-DIST NVIDIA-Linux-x86_64-470.42.01.run 271781957 BLAKE2B c85b7fc77c1d104f0b3279f261954e200a98799929c4e763483d6bc36632dce5b9fc93545d91e4a5e58c67b96cf867082eec101e95459f8c6534dd80468370d7 SHA512 f933e249b9e0b043283ba164d56bd235240a34098e4ab9d1070809e17f8c2cd24d7319217c02c2417414f4c811216181d7ab8842755cd0d25b00ee51de70b2cc
-DIST nvidia-installer-390.141.tar.gz 205299 BLAKE2B b95ddcf9a8d61247572d73faa04558564962782b0eb222601315d741d1ee71fa0636fa87d31105ecc5ec61328d3174a3ed646046e02b6b5f29f071215a0e8bdd SHA512 3848a4ec17510bf4d3060e5ef8aafa1ad921215ec39d26c54b3bbdd8a5867c46e01d247b24b05ad6906fed7fb4ae6dc37346a7da6e5aae88b5b47584c0b07a02
+DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
+DIST NVIDIA-Linux-x86_64-470.57.02.run 273219658 BLAKE2B 4e9b6d0f08226f38e76157a64923a4b4bb07b46e1b37879da353a4ff39bcf6a3aa0689a04e16ebcb2ff19f453d9b265c53546f101f34cca998a5da4dba5c2826 SHA512 7123ee05aa0cc94c4cf1f0717daf85b116f0200b8f78f9322ea847db70e56386a065e0085959f27cbf0a8f9befe6fc7a0145d1bf2a28616df9bc8b5effd812f8
 DIST nvidia-installer-390.143.tar.gz 205320 BLAKE2B 5c27dd769ec5a2effc56ea86474ee45b86362c26844d2f902d7bb2ab8e58b2763f4f761341ce4051e85cfd8189eab9d441744f1b9946a6dc46105888dc5ba58a SHA512 a45cbae70e8d9f1108d5e2c04b4beee350b8469df987ff80793dda7fc4e6efe3a787db0d47e7dfe22b88b29647b99cc24ab418666d1ef2fc038143f574faba36
-DIST nvidia-installer-450.102.04.tar.gz 197642 BLAKE2B 5d94dee76057eaea236090e2eb8cba4fdf90f4959a0ae26805bc771262a0eb05640846c191f2a5a5485e0584ae07ba64d2989201118594df747c3ac13503f90d SHA512 2c1608c0dd971122978a395edc5a51de6cb76d72aac45b4f9303e1a99e292ec0ddd9c03f2e95b10c357c0da1dc2824197c2553828eedbd0c4434b431aa593f6f
-DIST nvidia-installer-450.119.03.tar.gz 197635 BLAKE2B 01581676e11622e3c6c32171e699f13483e08a9b5256f6248cad190008a875b0b06561ff4d6732265c35b2429aaf6ba4cddf1a618d46730c88c5de63550bca9e SHA512 7491873e6324aefbe0dcbe57edeb2d1194352c6a9738c3b47f2562eb9e3ad58ca9519e5499f56d1208c2151900e2b43582fdbbe8ca80b6ebee824f8f8050c552
+DIST nvidia-installer-390.144.tar.bz2 150017 BLAKE2B 1a633594ecb9b54ee5a1e3620263a95db30c1ddebf547ecc7f267e1f0b799bcdb44cc3ddd6c96eda085d9be5c8f691e92556296f250495d80eec0c2f155f5bd5 SHA512 e4c624afc18bd1d61264f93bdcbc72afe42687baadf31683a6dd11a45c6257f6a5185b91f4b3d4c0316b8eb03ed79511f9ad260ee9e6f299fc136f5dc2178e42
 DIST nvidia-installer-460.67.tar.gz 198484 BLAKE2B 0eaf3e3eccd6749e4fe89394905dded58e739f42cbc33c8a91575f4505030a216670fc8c0fd4d1d42659acf301c9ba59d4052a80c6eba6c5db84ed022acb2620 SHA512 8fff0fa13a82cb7eaf2fd1d05be509e9124e67bb05810f8937fb1f16c4a2362a5c1a50bc9a5155cfc90a9bbcee38a54fb5ae0ae164e205900a49f6d21779d54f
 DIST nvidia-installer-460.84.tar.bz2 144516 BLAKE2B 1da114e13d675198d1c011d4f32cc5da350b0d10ffaa49634c06d91d520d40bd24be60d032fd0988e7be54691dbe9755e3b7297596bd4ab88c72c0fb831aa894 SHA512 afab294eddfea19a0d70b7193d40438c209ede757d614e96a6028b2569797a24cc26c4eafb41a4f35fff4496bfa7529f276ae054c9060b714f43ac0e9d3cf301
-DIST nvidia-installer-465.31.tar.bz2 145645 BLAKE2B 455160cff1173a363d401083443f8c870d2e207c0b20ec6b8976e682c572a5d2561311dc8431ec66a022c4c99a6f9adcc38b9f5c1d29c3e365fd044de70222d0 SHA512 a9a0f377ea435a256faa0b5ee1edb8c8cec1d928f20d8c9fb8d0ded76bb6065033c7f09522a46c6d06a432a8d9486472052ada41558cb3271a05abd485fabbc2
-DIST nvidia-installer-470.42.01.tar.bz2 145890 BLAKE2B 8073cc77ec240778afb66c9fa2a86bb77ac4c154b1f58db5e05c609455945d73d28ae7299bcbffd6602a2a1c6d0208aab12030be30e9756451623565896bf8b3 SHA512 ff09bf9d6895ee78b7005c23895dc93b6458ceda37c0202983bef3ed5e3c89646c2a25cfa43b85d014e6ac862b38370d86203576526876f57d51034e1d9d8850
-DIST nvidia-modprobe-390.141.tar.gz 39965 BLAKE2B 46c01ec3e53569454a032e42561a81154712485ffb11d0393d9e9007a3825a33c8d045ea7296dd8465ad9b2cee36a639274c55ff31c70e93d334ac9fe724f7b1 SHA512 c0abec334fee4293a55a43edbcc6a7a8cd8ff6b6fbb954b428182542a24eba90f47100977c84ea9cbe557a39fc5fb90677b4f2227f49a6f30a56f6941508f40e
+DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
+DIST nvidia-installer-470.57.02.tar.bz2 145923 BLAKE2B c0350e143ca3d4bd1f18c2f137df363c57f6c4bf87f1f3dd92e2dd62d1e79de5efba850fcd3638b2b25ab5c07f3b5f8484863350a35a358a764ef27cf96817e2 SHA512 8a72ae9643acaa566b05bbc400cae02dcfbad00da9084ea441ec65f3895efdb224e16075a5f4e373eac048e91b7c8fcdd877425bf76e573b4bff0233dfd5519d
 DIST nvidia-modprobe-390.143.tar.gz 39968 BLAKE2B 09f043521f195327630c0ca575473da42e051e2d34def22dcfb54295a94ca85e95ff41ee9564765567df19b88f90aba3d8cfffd489054779f2ce7d29f6e64b76 SHA512 066aaf031907fe2ba424e3b92e677ae78b4a938308bea82b7aa20cf0ba5c3678f93b6c9bf8a41fcd4fadcdcc870674a2be777ddcc2a5018974bd56b09a9ef271
-DIST nvidia-modprobe-450.102.04.tar.gz 42139 BLAKE2B 79218a4e76dacdafadd31e45a27d3578924db6a74894064ce856498121fbf9d80e7b07046dfc36426340e0cefd78b416b017202bc93858fdf8cc77ba335bbaf8 SHA512 ac9d8d8849606d7ef3772570c976e5efab36f66e83a62f959b28c88cd798bba860052033dc5eb18c0f9e4a6f2d8e6082456d9b1586977a23f240cfa3a750d7ef
-DIST nvidia-modprobe-450.119.03.tar.gz 42137 BLAKE2B 054879187d33fbaaf4debdaa530b5f70bf19347891b905ac519bcb612146f0c4481629b88b07a872a4aed0f13e25fbbba3d1ed7f96ec3bb8a5c8da0855a1822a SHA512 c299d08c82b3f226f5861a61c523100809eeca90f4573ef5c2d3968f74945aae652b7ad07c859ef31f1df5c3a8687f34af6cf1f5f26e45b928a702de4bc19e73
+DIST nvidia-modprobe-390.144.tar.bz2 35308 BLAKE2B 1930c315aeb0e296c0d4795170d44a275da5ff8838fd8230559227852001b679fbca2830142ca7abcfa9c84626c9d9f222f7ab0cb3984d8d517f5ce431e5a9ea SHA512 d542c1a7634a8c5ff803ca79f2fc02b17b129185177226ad60625a4d246bbaf740719ff024dbde0f5aa8273949446561261d700a27cf88217c2572e69882142c
 DIST nvidia-modprobe-460.67.tar.gz 43140 BLAKE2B 8243d355f9d51495c9d09f25ccbcb39c0a6ef472cbfaded98f10818fae655e1cf62ff2edcf40baea72b8cca9eebc947742b2516bb057410239193201bb843538 SHA512 16c8239b54988622196e0eea113173e44ff8b60cdcdf585bf859e6440aff2c6699bb107962776e69056dd7d5e3bbd6289ea628a2255ac27e22ef79521e9baad3
 DIST nvidia-modprobe-460.84.tar.bz2 38114 BLAKE2B 5e08860d3fa1a3025b413ccc9e5c24f64deab475852ca725104eea76f1e919f70a76f99809fe3d92d024f9aecb8fb9622ddced926bc51bebe663422959d358ba SHA512 4bf971b7fa3b155a25123c8a0c0305c53da1d2d3bb509f31698d1db2b821517836bdd111faccca5fb1d998dc13771568e3cee5c56f73ff497ca36fc55ade4a00
-DIST nvidia-modprobe-465.31.tar.bz2 38370 BLAKE2B 0c4c4974d8f1b017bd6676304d5714b19d494fa13bcd986641ab1b523dc20260fd050a1bf3bb729faa51420bb494ceac0b4124abb69fdca388c7e5b13e33c8f8 SHA512 37b1120a26257538ada0ab6d6af0f81ce2b59ac3ce7305ac7a448264fac2ba23156ec89c6e9adb60f4bc43ad0da9f09e7b0acf9f0ceb15bd28f3b86b926ae139
-DIST nvidia-modprobe-470.42.01.tar.bz2 38362 BLAKE2B fd00d7200d7f6423ea8accb57866220498b89358106ddfbb5e631d0e38aa6709ed33f943c1c643ce6f6f19d1214baf7d55e8960291cc18f10a5d4a0f0484763f SHA512 e140c7e36e980888f7db6d96b642a60670748ca9ef172601adb7f77a3c84066da7a6977152233a41f524b0cc4b72be3bc351eb29259d7318d1b148d2a795e27e
-DIST nvidia-persistenced-390.141.tar.gz 55984 BLAKE2B c4e889d15643f6e8a4e37b32d89e14acaa792c681863c74281b17e414021dc56e4692e91e7552762ef8b8ef977284ee2f307b14216a2562a9d30b2ab7a1ba522 SHA512 d9ea32c842d8d13a59128b28ce985fe3a421d2848eac30fc8a671a391c63516b58c46d3c5b21403b4e5b016577d23aebaec1f5b4e59b25a20668120f52e231a5
+DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
+DIST nvidia-modprobe-470.57.02.tar.bz2 38363 BLAKE2B a718d9ac5c34ee66136e7471f7ede65d268183935088d85b9fd69a0a3a5109e10ef2d2da2f8d07896aee219ca17647bbe38831cf81457f5d4f33e6bf74d4c08d SHA512 be4ade3425dd9557d4759889b1376e20c158c34136386c87b944ba24776fb056792be9bf449f04075e4e5ccc150fd065321fcc0e7c1af2d2b0be4d0a1bba7e4c
 DIST nvidia-persistenced-390.143.tar.gz 55994 BLAKE2B 1cfa469b84ecc9abdf0423d624244e7023a63225dfb16ac93223c462230b50099e4b59493be2d10cd6f2717e31c02655c76797e3222947d561f02ff72a52dd46 SHA512 37c3eb0bcce83e9b9ac5bdefa736e26e94b82de379a0f5c29e1611631c79103a797e58f5d1dea34221dd3a3f1a521b6db556eed48b1f38465481da2509d2f21a
-DIST nvidia-persistenced-450.102.04.tar.gz 52485 BLAKE2B 1fec24c86875789303aee8bf4362c9c35f76957a2906e2682aa5c07e914cc2acde769439d88007420904a71526e9f0d03ab9d0a3c5dcd1355047e03958d006f9 SHA512 6c51daaed3e7ecdb8d98bdcf0618e50962895895f88cc45a5f861c08d3c10f590d4a6a3f0a683ce0dce0e327d5977da1a76fdde974a97031dc698120ef990b07
-DIST nvidia-persistenced-450.119.03.tar.gz 52488 BLAKE2B bb6c759ce73f8c143d04e0cc5cb05cd0cb39f12f330485a0a4fc628b0ba3752f0bdee686f55675e60c1365ee7d9e0f9dd8c3c883ecb6fab9a1b78903664c20c9 SHA512 b8040d8bff15cb97252b6a7311c1cd0dbcf3dda17f91e8b46a1f950a388a0e2ed72d9ac59c808376dfdb1d1fd64fc721b55b95022f59afef17a37c20c646171b
+DIST nvidia-persistenced-390.144.tar.bz2 48672 BLAKE2B 82a92a33eb40971e56b772ffab121214f5675d0a8c618e356e7b55bc38ff9605fd2701d740d00a1e26c158c9df0ab38d0ba10891a3850f8e8cbee8fb231ba52d SHA512 4432f2dd18c7c91fd0d59e4f2bdf7254f58ed2a6b652d319c4f7ce674522da1797a68dd6939c38e71710dcd3b754ae7cc8c6e7acb47a76e13d2091e8a8ee99c8
 DIST nvidia-persistenced-460.67.tar.gz 53334 BLAKE2B 1354ec98fd2b95d264fd7df6219f639cf5d73173e6f0843a0880e6b18953904412cb756bd2c60432f6ae4c253d047515a9e32a128210fd94386ae6bc9a341b5c SHA512 0b4f7d8aa781c3536f6cd020225d2a3bab4b83498090419198488a2bec811534e61ba90461ae846bd09f4530f19984d77ca41edf0a851b1b700d1c0e053d537f
 DIST nvidia-persistenced-460.84.tar.bz2 46048 BLAKE2B e3dc6168458d5da3517167cca43373b815104894f8e01785baa3c654717f4eb4841db014a7f8c73d4c24a1e849b86ffee51c33e457fcb4804cae856cd630100c SHA512 43fbc5caa13f1e47d59054ddb4ff6129cd464dd558f8166b1103a9238b42205695e78c75aa89af89921d928bf9be07d2a9593306ce53d29a5bfaf90699917b13
-DIST nvidia-persistenced-465.31.tar.bz2 46227 BLAKE2B 57d66035908a4d7e9525538da61fa8038b9c53459d75db20cac170fa851369f5a7f143d76243889510559ed1aa251c48023319bf99947f8cc23eca2bfd1a0919 SHA512 2a447fa7a6b839db5a366f1deda33d74dfb034e664861807b3127d538d3822f9a7ef378bc6a5288a43fc447c64082e0a70551d13d92d560013c81aa48fd91bf8
-DIST nvidia-persistenced-470.42.01.tar.bz2 46695 BLAKE2B 28f51ba8a09ab9d51d0a13c3426665d4268b8f7ccb8c0235aad4489e88f58d201784c121d5fe11e06410c4ceedcd7e6f77abf23d540e2fe5157b7867b5b9eee3 SHA512 fdbf3c1284e84000060dc6c8f5cce3ba41afb664cc91591dec75dac0f8913420b2f02d2d5c43346a7c601a80e088e4dad6a020018a6911c1f9d38776314ec2e3
-DIST nvidia-settings-390.141.tar.gz 1297261 BLAKE2B 452870df1ba598692f5da47444eb2daf4db40c79cac98c10b1c994c0ff39fc7936909b9d7788cbfe784999e68a2bdbbc12e85d63c3bc02ac872e6b3c46834697 SHA512 dbf7c389bbdc94291a1b974adfa33414148b1ab752aa7d948a27e91ee1bceb3b8435aceb6b7ef3cb806333572db11b5524667045ef7686b119d7955d2699cb04
+DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
+DIST nvidia-persistenced-470.57.02.tar.bz2 46533 BLAKE2B 8a9660b1838dd4096237200974cc8d21f9f12864b346abbb52671c84a3f4612af550905643324699d6dc6ba068e7d7b373079e8493646b58051bb85e21f386fa SHA512 774fea16044838480d809423ca498f517d95d1225b455a6e1a1a95254c7761eaab33e33fb19d407e3ed80cabaeb7de2d150de60360761b5e61f01fc27c6556a5
 DIST nvidia-settings-390.143.tar.gz 1297258 BLAKE2B d63b48c03069d4d2ae7f7034b4bc13ff3a1004bd64ce54ee553e614cb88cb081842b6c1428fd556e031ce69361927074822c5c620d2cde8d37a5887051ff56de SHA512 7bbef03e77e73bb1e05585cfaf6823913e2446b1df8353044ae01f80693bb884fdcc1b38fa51b171756edaa234479cda027d6569d025b120b7b64f226f8eedce
-DIST nvidia-settings-450.102.04.tar.gz 1229675 BLAKE2B 166b73a0e9fe1cc1c16f83128aa94f3b9ef44fc71004e80c2681299dd564df6b458b52bedfd60eaaecf6142d0ea7d5147cb9c509d4db4e6b85bc72dd4dc75751 SHA512 c514bb3cc72954a52f4821674f9b783ebc0bd8c7294a296716619ddad15f2b63f50ada47797dee1386709deb7d407cb1d6c04532b7ca6e03d84234555751c9a9
-DIST nvidia-settings-450.119.03.tar.gz 1229730 BLAKE2B 17c7f4803b1a5ead8ea6616f3575325459aa6abb4759f7146bd99b4cac8c4cde80b92fa2d82897392a5fed20d4f324418ac9990caa4557b0d457e7f3b24fcb71 SHA512 f0c2226e05063bfd78453b561a92e28f64711ba3ce3d82026c39db3cd44959a2cf98f8a781fb604108bf6ef9dfe52cad4a9270b94005d8e4e5134f6ea4966da7
+DIST nvidia-settings-390.144.tar.bz2 1109104 BLAKE2B 6724f49c7e469f580206fc17308190bd346b6167348a8b8b3886209f58aca61b65eff30658484c1fee40af8c0d89fb62f73329b05a6ac45178ea4a6870e5aa85 SHA512 90afe201361d492c3152057d3ec46d68c0cd722fe0ea0587aa1156718017d59fb5f26f3db89d91d4680b2390617867dbe93bd14e1fb3dc70402527bfacf0ae5c
 DIST nvidia-settings-460.67.tar.gz 1233189 BLAKE2B 33ffceefea4e184cb1873cdce97db26637e87cd20c82bcabcbfe88bcb084ac3d833ac5688cafa33a5a89383040d5c1c5d46de9c3f9a8ba6174574aa57aea2e46 SHA512 d1828379aa477394747ae3e5d3505e864d38a349dd159a04cb263613380afea9aea2081300b0d2b8ae205b800bfe6e8ba504e612989da394d757f00e4399b617
 DIST nvidia-settings-460.84.tar.bz2 1061100 BLAKE2B 9098116b29dcb3124dfa2e8ae6e6e62e865ece37c4307843570753ecef1541feece3a945e0b2671da9273ec53fd97b75d6b07ed5db01a1ebb9e65a08b06f1fab SHA512 9cb7dbe97bd15e722d151cd6131c56e23eafbd8b491b774b7940165cefb446253c50d8794fcec5809d1e6c82cdf4236bc06b25059a28bdfa0dc17ce77eaf6476
-DIST nvidia-settings-465.31.tar.bz2 1061200 BLAKE2B a7085e3eddd6e978b7efe349c3f9471210db139a1911e2c57377b7890d7bc9c1d258df16e57af3f031b9c1e19c65086bc8ad01958819c06c4d104ed770bbf6c7 SHA512 1a5631ad64fa2959682c86c6188a2f5f5c864faff85bfda0554d783183f17ce61b13c6adc1125cd7dc24276de32ce152d3fe0e438c58ce57929e6c950a628143
-DIST nvidia-settings-470.42.01.tar.bz2 1061961 BLAKE2B 0b9f368ccc68b2399d1eafb2db6b231b925ef08c0d2394b190149d183ce97d88b83ae03d1fd024e6227468f96937403af77faae9c28feb71e3b584bb307b72a2 SHA512 f5b23ebe59ef3209f0ef94cfa69dca653cc3902d31109e4db28e84e8c43d24917c3c705132ffd0470c2bffb46fcdbcf63ab9885d95ab80692b44c2817335c15e
-DIST nvidia-xconfig-390.141.tar.gz 140293 BLAKE2B 08ee93be953f75dbe078c557af7c062092ce8a3b53af0735d43b7feabe6d1c99390b9533027fbc5017d207a70dfa5aecf88d211905bf8f0e846f769a6ea16c2b SHA512 9fedee2f720d86bd24e393328249bf970a1f242b9e750543e757eb13ca30f6ecfda6c63441093ab96ae28d5f38d4e55cc6de6316eb82d2a2f33074144a1eef2f
+DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
+DIST nvidia-settings-470.57.02.tar.bz2 1062237 BLAKE2B aace056c25027ba9f139fc2a5c7714fe8207eb32e6cfbdc9ee7d64b49277ab588249fb87a1d8049c24e8d46b77e4f5ba198a7b4519078ce094f5712b486e29d3 SHA512 91e03cf7e1ed974204425e7223587987101934ddbcce52717990de244840d89b37b7f84b0222e96e85844c9ac4f3812771303ec285a32d0339f519bf38813be0
 DIST nvidia-xconfig-390.143.tar.gz 140282 BLAKE2B 3de0fe4bc0a049381e4504002bbe94887334310ca7b17d83add1237d7c15b7783e4f418acba3e261da564b1c00ca244f4ad02f3d2cbca0f0f68ee2900098fb36 SHA512 0c82dda4dd6db0c21cd9a2b88e4a77129bc4a0be8a17b398497328f4f1cb5c319f0428d7fbc3b0177d69246d55f96b03dd740d3480d67bb03049cd0cbe190132
-DIST nvidia-xconfig-450.102.04.tar.gz 141072 BLAKE2B 0d299429ccb10f351de0e7b81fa7ce8199da83db346483a7d791fd77276ff6d70b46ba153cdf6503b945d80f4a0108a6ec02a3955c9d7310de901f0e3b1e6e36 SHA512 f5752d7c49d1cb3c0061caace8cf5899c8d61e76f0b7080e05d70cd77758496dd8646a1551d93a12c8ad5f9fcfd53a49c51206af96f36ec1eec7ccfe59505f2d
-DIST nvidia-xconfig-450.119.03.tar.gz 141079 BLAKE2B 15200bdc8cfecb2575d95803b62fd110c4ff5bbfbe529ffda35455caba1ce3de91b26b21e40604cf5f57bdca0d6da2754a578ffb376a5582d46c6bbdf0adccbe SHA512 d30f46d56dc3dc0e2ee4c26acb8a229ffb47b5fc45dc288c1c25d197d0138b2cc0a0e94f4a821d5613b359f12b5a34872d7631a9d606916e9f92c61e87cfb0cb
+DIST nvidia-xconfig-390.144.tar.bz2 107147 BLAKE2B 1b6ea6dfbe33474cd3e9409a7559a38716c4ce8d2583354232225a2a7ec10c7dbc2163f07c6849f4929e16c2fad179d583daad8a67d9cba950a62209b8ebebfa SHA512 09bb3558be178deda4b26031560ebad4e98e68b6186e247d4638cbcb4bb5dc05937c6baeaf1cd4db5a7b7433af97c3150c526ed972ff51b6e1c7552235ec6b51
 DIST nvidia-xconfig-460.67.tar.gz 142323 BLAKE2B 09c7281de09a2c2968b5f4a48eca63110e6db988429c844b55f8efc28fbcd9d44c79ad47149c25f657c2a98ae7576c01b2c9b7f643b8321fe1393adc571ebcaa SHA512 0e65c81ec40d3eaeec036fbd8f46a3052a75ff0ad200c58438ff6c782a5764e62e51d03b4a2080770c32522894641288ac495f62bc39c3d5658b1ff87c9f6cdd
 DIST nvidia-xconfig-460.84.tar.bz2 108471 BLAKE2B cc3f100902778b66088bca3ff74df19f9ec47f45b4137a60c702f6c6742f011af890d67cbee685f1d3e27d337e3dbf9c23b0ba0b46e5bd341c4c679e7ff54584 SHA512 0c1060d7107a9557e90291829dd0f8728b0c7d6315a898ea17485c8932db528439aa84cb769f5c14d3c70f57942ca6e4cc4248807ffd43c961f3c145752aa5a3
-DIST nvidia-xconfig-465.31.tar.bz2 108616 BLAKE2B 3ed2e0df9e109534192df6a451bfae6c7f71db5d6f56c1d498daf64d60aa6271cab3dc7a0ed956364a14c96259e7816c62c01b73ea109696791c6282b6d0acaf SHA512 bbd0dbb1be452dff7e94ae4a58234d08d7004af02d7b4aba5623712c884b14a7828cc4d930b099231e149d6cae23336704f7a991f0b9ff87e2be967d535e54ab
-DIST nvidia-xconfig-470.42.01.tar.bz2 108653 BLAKE2B f98d98d75bd8ae412b6fad5c4ea1e0068a86b3a78472ddcfa61ddd5d8090cca6629e82ffd1c60571306e24e886a55d099405b468ecc82b9e8b8d811adb53ef9d SHA512 5af9e3a2a3b2b18e777c934aec4798464fbf88c42d0eb462b6259591491e13997f5769cfebee93111d4f45f281aeb368f0273fb5588973ee5b217cab694abb2f
-EBUILD nvidia-drivers-390.141-r2.ebuild 10849 BLAKE2B ddd98ffc162302957d18aa4a4688f098ad26bea8d7a12f86146998b3e23a8cac87b0e94628127f47d10b90edeb91d6c90fbfe70a5dd65c788ca40481359fa88d SHA512 c48adaff9f9f95f06a5b973036d5b885856dd954716fb04a9f8d651d2554f64bbeecce3c673db069a007f122ae2bd46c9121e376ed9a71af3eff5b089ae0ed42
-EBUILD nvidia-drivers-390.143-r1.ebuild 10851 BLAKE2B ee36a1f6addf6f8cf31751bccc831eba746e8d7e9d12bf4b92776d7a8ab03bbbe7ff342ea1c0500f8879be57d67fd3049b2a5cf62194c02d50e85821a8f421dd SHA512 e6e6e50d10d092549937101f76f526069521e3049be712bea2df493193e5388830aa37816fe5167d9a54fcd99766445b310310916ae8f7d676b9d8186a9185f2
-EBUILD nvidia-drivers-450.102.04-r1.ebuild 11071 BLAKE2B a792c5e83e93e11142ff81ef106f20826e30f374c09760584f9d50d8e49befee62fbddd7a1334b0f622557fb561d19a24c6ce8e7ea2245c2d35de899d746e2c1 SHA512 20197c57a202b1455f98b37ed5157a2996d40023ea9b5cf43c019c29a88deb54209591b45b0a71af9af001d2b92595f40fcba6543319348ca79ed56542c76ebe
-EBUILD nvidia-drivers-450.119.03.ebuild 11249 BLAKE2B 8b8134afcf9303ddc8cb9d26eb0a5dfd520d770df5acbc4223ecec56004a507a58b03d78bed8054789b3aa53a3d0ccd7c26b5b7908e507af9f49cc11553425c9 SHA512 5579bbe75e10dc5888ce052869ac04783f4e929945c70b483b0f3691d3a054f72d6f67bfb4640924e602d0442028d42335f31ce93ddc995f6c940a781606badc
-EBUILD nvidia-drivers-460.67.ebuild 11233 BLAKE2B ab91232fe9adbadbacbb5866f34926a2e0c306b89cda119dfa0cc637b92273badeeff045ff22e39bbdcfb43c69df6f44e61df22659c02047b21acd5914af1869 SHA512 b0b836581ee82f00c102acd46af349076386c0c29bb7a265776958cd7c4200d5265584e5d88b396ebb57e429ae50acf4eb518b0f98610750c88c771f4417c16f
-EBUILD nvidia-drivers-460.84.ebuild 10911 BLAKE2B d122049e8ebcd289c73cb183e17b243a142068587226e32d99038e4575cf862896cb78e5260830517b7f7c7aaa4b2bc12bc5ad01786b1d2c06f271b70f574a4a SHA512 754061884a32dc8e17ec9528ff80f9c77a9ce4927ba0fd78f6408b4350eff74c7021758a62c3d282bd26f34bcfe0f9db5cf43edd32ff26ebc3e8e3701e27f346
-EBUILD nvidia-drivers-465.31.ebuild 11499 BLAKE2B 6378ec7e0c51b24f34bbd5acb5853c6d834af0f4055a70f1e89a2c8db77549be30f35d3b20c9c88793189eeefe7995f95a2f6eace8a02287072e3d28bf85a790 SHA512 8fc8b41f6436f8a26eb2f9f188c6d047f64dd12abba5e1198544f494ed140891122ac6851d69230d648332e53b54b5f7d4ddb41e65455fc329dfd1266b68ad54
-EBUILD nvidia-drivers-470.42.01.ebuild 11760 BLAKE2B 503988fbb0e3f008a2f22b958e387d0adc0b57bc2c4b90dc1d5a20a2ae816c5fb49f642086034ccdaec89e670109da632c99a54aeae88788fd6d26350dfa9ef6 SHA512 a1521303e0c6824944131aa2a26197eeb933b1e587c9f187e29fbd2510798dd14c9118d9b4bc6632c43a8eca441a6ae7ec3200df6f7b2ab92ad019ef91fb18ca
+DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
+DIST nvidia-xconfig-470.57.02.tar.bz2 109072 BLAKE2B e3a8f98cb31ec323ae0055252611193669a26ff43184b42433b3089899f88b6baeb13d18ee9dd09807710601558ea1e4c6be54326bc59cbff448ec6dd30f425e SHA512 da4d5de04aadb4941837062ba28592135ee2e2344132c6f5561288e22448a40bb2467d39bd09e0bf838caaa178ccc36a0c2fdbdf80006f3769161aa15550e350
+EBUILD nvidia-drivers-390.143-r1.ebuild 11738 BLAKE2B 7812ee0aea4f6e80aa67a088c03f8f5192883e360d867a0c637f228663dc368ac5e1d4706ad8c02fbd2b3f4d3e0312785bf79c38aace63bc1e42aaef9e1717f3 SHA512 f895e434a013b444925876f90374f1ab254d7ae43b91e389ac60938eb904ce5c34be6b9754ceee5f686399c66f8b0ea2fbf55296ea9288c1f65193872cd88367
+EBUILD nvidia-drivers-390.144.ebuild 11605 BLAKE2B e7377375ad3b5e16eefebb3f12b75fe6320d8eec1d16efceccb3dfa04d24d319256cea2a7462b0a78cdd4fa65b97dace4351c1b8a830f377880203f37191e504 SHA512 b625b15f009560310629458bcc701754d16cdd8de1a8e4a0fdbfe7975f3cc74959b4126d967798cbd4cb8fe04c37887ae2833bb1221c26dea68c33b5d753aa71
+EBUILD nvidia-drivers-460.67.ebuild 11237 BLAKE2B 0084f35297377161c1a96e11c2981641f21dedca2fa1eea6d04adc31558107cc1546def9b286e81d1a912993e9b29362c27479084cd5b1a3a3c6050488406a8a SHA512 5e294a7d73c9d5b49b9e8c9c7a98dc93f5cd38f27404ab0a22b4ee1d55f215c963b2edbb942aa6cef5fc856c3e44b5a13c55f4c5027308feb49e0c2e782b8188
+EBUILD nvidia-drivers-460.84.ebuild 11769 BLAKE2B 386291ff10db832ccc664d9b8b211eb7ef8d88ab1ceb349e47ce386aefeb0a960d100672655d23b5c26259e88653c360c54f62e27505b1d82f4a42f94d3890ac SHA512 d5aaceb43c0d25ea69123d8b613840550a92cf83e407a0ee4cf38e2e9b5ff9338effe8053d6caf3aab0e19e818c9a8fe993d9443e3ec37aef27a6319243fa8c5
+EBUILD nvidia-drivers-460.91.03.ebuild 11770 BLAKE2B 8fed287207f2c927feaf0e07654b3761a6f78feb029d4e57a7e4bc69136dcfb8e331f72182eb90299af3f19fc774fe1178b9eabfad8a0fd48faf5bf03846c8b7 SHA512 3b4bc6a406b706ba04a034cb98d2ea0f782af659ce1e9c27a896737c185bbf88e65d484aa8f91946c29b1acbad0920748aca6609a1a7aa51a15911dca0840183
+EBUILD nvidia-drivers-470.57.02.ebuild 13846 BLAKE2B f0403b95170aa6582ce30fa3bbf4ae94720f988da970dae09d9854956c9166f68c4b014a0c59f957b9092da1c427fe3e73c1558419c9dee7df077c17dbd90277 SHA512 3b9916ced8648175c9f70ce60e54792f967479806fcddd7b3a1d601c05576ecd5f2bc39a48b05cdbbf323d42cd59023cc20585d5dc098976c0e712a31fd6c258
 MISC metadata.xml 872 BLAKE2B 288b9c7801429c23f8f07780640c08d4108a55f79de091c6461c46524c6b1d46bf0927ad6ebb9621e587cefb59cbc18576756fd68d27b7e5bc2f8c19737bc652 SHA512 d940a03167959acb9e8c62efb8d47e3dee8c49c12ab281f419780346cbd4703d6f853cab8cd49e1680686378474d38aed8fa188e6d69ea58a404c84cb14a2e01
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd1e40f..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
index 7666989fa475..c873f00c462c 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-390.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
@@ -1,7 +1,21 @@
-Section "OutputClass"
-    Identifier "nvidia"
-    MatchDriver "nvidia-drm"
-    Driver "nvidia"
-    Option "AllowEmptyInitialConfiguration"
-    ModulePath "/usr/%LIBDIR%/extensions/nvidia"
-EndSection
+# NVIDIA drivers options
+# See /usr/share/doc/nvidia-drivers-*/README.txt* for more information.
+
+# nvidia-drivers and nouveau cannot be used at same time.
+# Comment out the following line if you wish to allow nouveau.
+blacklist nouveau
+
+# !!! Security Warning !!!
+# Do not change the DeviceFile options unless you know what you are doing.
+# Only add trusted users to the 'video' group, these users may be able to
+# crash, compromise, or irreparably damage the machine.
+options nvidia \
+	NVreg_DeviceFileGID=@VIDEOGID@ \
+	NVreg_DeviceFileMode=432 \
+	NVreg_DeviceFileUID=0 \
+	NVreg_ModifyDeviceFiles=1
+
+# Should be no need to touch anything below.
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-430.conf b/x11-drivers/nvidia-drivers/files/nvidia-430.conf
deleted file mode 100644
index edd957b58c4e..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-430.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more
-# options see README.txt in /usr/share/doc/PACKAGE
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia \
-	NVreg_DeviceFileGID=VIDEOGID \
-	NVreg_DeviceFileMode=432 \
-	NVreg_DeviceFileUID=0 \
-	NVreg_ModifyDeviceFiles=1 \
-	NVreg_PreserveVideoMemoryAllocations=1 \
-	NVreg_TemporaryFilePath=/var/tmp
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-460.conf b/x11-drivers/nvidia-drivers/files/nvidia-460.conf
deleted file mode 100644
index 03967faa577a..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-460.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more
-# options see README.txt in /usr/share/doc/PACKAGE
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia \
-	NVreg_DeviceFileGID=VIDEOGID \
-	NVreg_DeviceFileMode=432 \
-	NVreg_DeviceFileUID=0 \
-	NVreg_ModifyDeviceFiles=1 \
-	NVreg_PreserveVideoMemoryAllocations=0 \
-	NVreg_TemporaryFilePath=/var/tmp
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-470.conf b/x11-drivers/nvidia-drivers/files/nvidia-470.conf
new file mode 100644
index 000000000000..f5b187ae530d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-470.conf
@@ -0,0 +1,31 @@
+# NVIDIA drivers options
+# See /usr/share/doc/nvidia-drivers-*/README.txt* for more information.
+
+# nvidia-drivers and nouveau cannot be used at same time.
+# Comment out the following line if you wish to allow nouveau.
+blacklist nouveau
+
+# Kernel Mode Setting (needed EGLStream/Wayland)
+# Enabling may possibly cause issues with SLI and Reverse PRIME.
+#options nvidia-drm modeset=1
+
+# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
+# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+options nvidia \
+	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_TemporaryFilePath=/var/tmp
+
+# !!! Security Warning !!!
+# Do not change the DeviceFile options unless you know what you are doing.
+# Only add trusted users to the 'video' group, these users may be able to
+# crash, compromise, or irreparably damage the machine.
+options nvidia \
+	NVreg_DeviceFileGID=@VIDEOGID@ \
+	NVreg_DeviceFileMode=432 \
+	NVreg_DeviceFileUID=0 \
+	NVreg_ModifyDeviceFiles=1
+
+# Should be no need to touch anything below.
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-nouveau.conf b/x11-drivers/nvidia-drivers/files/nvidia-blacklist-nouveau.conf
deleted file mode 100644
index b15fe0a3d92b..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-nouveau.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# NVIDIA's official drivers and nouveau cannot be used at same time.
-# Comment out the following line if you wish to allow nouveau.
-blacklist nouveau
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf
new file mode 100644
index 000000000000..f459c69dad8d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf
@@ -0,0 +1,7 @@
+Section "OutputClass"
+	Identifier "nvidia"
+	MatchDriver "nvidia-drm"
+	Driver "nvidia"
+	Option "AllowEmptyInitialConfiguration"
+	ModulePath "@LIBDIR@/extensions/nvidia"
+EndSection
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
deleted file mode 100644
index 618b9b30b86d..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nvidia UVM support
-
-remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild
deleted file mode 100644
index 50b08991c3fb..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r2.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.10"
-NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
-NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_BIN_URI}x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	x86? ( ${NV_BIN_URI}x86/${PV}/NVIDIA-Linux-x86-${PV}.run )
-	${NV_GIT_URI}installer/archive/${PV}.tar.gz -> nvidia-installer-${PV}.tar.gz
-	${NV_GIT_URI}modprobe/archive/${PV}.tar.gz -> nvidia-modprobe-${PV}.tar.gz
-	${NV_GIT_URI}persistenced/archive/${PV}.tar.gz -> nvidia-persistenced-${PV}.tar.gz
-	${NV_GIT_URI}settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
-	${NV_GIT_URI}xconfig/archive/${PV}.tar.gz -> nvidia-xconfig-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64 x86"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
-)
-DOCS=(
-	README.txt NVIDIA_Changelog
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead.
-	390.xx branch: also used by a GLX workaround needed for OpenGL."
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)"
-	use amd64 && MODULE_NAMES+=" nvidia-uvm(video:kernel)" # no x86 support
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# alternate tls library needed for 390's libglx.so (bug #785289)
-	mv tls/libnvidia-tls.so.${PV} . || die
-	if [[ -d 32 ]]; then
-		mv 32/tls/libnvidia-tls.so.${PV} 32 || die
-	fi
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
-		nvidia_icd.json.template > nvidia_icd.json || die
-
-	sed "s/%LIBDIR%/$(get_libdir)/g" "${FILESDIR}/nvidia-390.conf" \
-		> nvidia-drm-outputclass.conf || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	# 390.xx persistenced doesn't auto-detect libtirpc
-	LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc) \
-		common_cflags=$($(tc-getPKG_CONFIG) --cflags libtirpc) \
-		nvidia-drivers_make persistenced
-
-	nvidia-drivers_make modprobe
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src build-xnvctrl
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-compiler
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-fatbinaryloader
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-ml
-			nvidia-opencl
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				nvidia-fbc
-				nvidia-ifr
-				vdpau_nvidia
-			)
-		fi
-
-		local libdir=.
-		if [[ -d 32 && ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cfg
-				nvidia-wfb
-			)
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		# 390 has legacy glx needing a modified .conf (bug #713546)
-		exeinto /usr/$(get_libdir)/extensions/nvidia
-		newexe libglx.so{.${PV},}
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/libXNVCtrl/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
-
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if use x86 && [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that NVIDIA is no longer offering support for the unified memory"
-		elog "module (nvidia-uvm) on x86 (32bit), as such the module was not built."
-		elog "This means OpenCL/CUDA (and related, like nvenc) cannot be used."
-		elog "Other functions, like OpenGL, will continue to work."
-	fi
-
-	if [[ ${NV_HAD_WAYLAND} ]]; then
-		elog "Support for EGLStream (egl-wayland) is no longer offered with legacy"
-		elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild
index 296ab2902aa6..d90fd0158f56 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
 inherit desktop linux-info linux-mod multilib-build \
 	readme.gentoo-r1 systemd toolchain-funcs unpacker
 
-NV_KERNEL_MAX="5.13"
+NV_KERNEL_MAX="5.12"
 NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
 NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
 
@@ -26,7 +26,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
@@ -76,19 +76,13 @@ PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
 )
+
 DOCS=(
 	README.txt NVIDIA_Changelog
 	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
 )
 HTML_DOCS=( html/. )
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
 pkg_setup() {
 	use driver || return
 
@@ -163,8 +157,8 @@ src_prepare() {
 	sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
 		nvidia_icd.json.template > nvidia_icd.json || die
 
-	sed "s/%LIBDIR%/$(get_libdir)/g" "${FILESDIR}/nvidia-390.conf" \
-		> nvidia-drm-outputclass.conf || die
+	sed "s|@LIBDIR@|${EPREFIX}/usr/$(get_libdir)|" \
+		"${FILESDIR}"/nvidia-drm-outputclass-390.conf > nvidia-drm-outputclass.conf || die
 
 	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
 }
@@ -268,9 +262,7 @@ src_install() {
 		linux-mod_src_install
 
 		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
+		newins "${FILESDIR}"/nvidia-390.conf nvidia.conf
 	fi
 
 	if use X; then
@@ -345,8 +337,19 @@ src_install() {
 	# install prebuilt-only libraries
 	multilib_foreach_abi nvidia-drivers_libs_install
 
-	einstalldocs
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	readme.gentoo_create_doc
+
+	einstalldocs
 }
 
 pkg_preinst() {
@@ -358,8 +361,7 @@ pkg_preinst() {
 	# set video group id based on live system (bug #491414)
 	local g=$(getent group video | cut -d: -f3)
 	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 }
 
 pkg_postinst() {
@@ -385,4 +387,20 @@ pkg_postinst() {
 		elog "Support for EGLStream (egl-wayland) is no longer offered with legacy"
 		elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland."
 	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 390.143 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
new file mode 100644
index 000000000000..24a3a3618ea9
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop linux-info linux-mod multilib-build \
+	readme.gentoo-r1 systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.13"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	x86? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-x86-${PV}.run )
+	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
+	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
+	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
+	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 MIT NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+X +driver static-libs +tools"
+
+COMMON_DEPEND="
+	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	app-misc/pax-utils
+	virtual/pkgconfig"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
+)
+
+DOCS=(
+	README.txt NVIDIA_Changelog
+	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+)
+HTML_DOCS=( html/. )
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+		~!LOCKDEP
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, so enable
+	options such as CONFIG_DRM_FBDEV_EMULATION instead.
+	390.xx branch: also used by a GLX workaround needed for OpenGL."
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition
+	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)"
+	use amd64 && MODULE_NAMES+=" nvidia-uvm(video:kernel)" # no x86 support
+
+	linux-mod_pkg_setup
+
+	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make user patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+	default
+
+	# alternate tls library needed for 390's libglx.so (bug #785289)
+	mv tls/libnvidia-tls.so.${PV} . || die
+	if [[ -d 32 ]]; then
+		mv 32/tls/libnvidia-tls.so.${PV} 32 || die
+	fi
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+		-i kernel/conftest.sh || die
+
+	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
+		-e '/Categories=/s/_.*/System;Settings;/' \
+		-i nvidia-settings/doc/nvidia-settings.desktop || die
+
+	# remove gtk2 support (bug #592730)
+	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+		-i nvidia-settings/src/Makefile || die
+
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> nvidia-persistenced.service || die
+
+	sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
+		nvidia_icd.json.template > nvidia_icd.json || die
+
+	sed "s|@LIBDIR@|${EPREFIX}/usr/$(get_libdir)|" \
+		"${FILESDIR}"/nvidia-drm-outputclass-390.conf > nvidia-drm-outputclass.conf || die
+
+	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+}
+
+src_compile() {
+	nvidia-drivers_make() {
+		emake -C nvidia-${1} ${2} \
+			PREFIX="${EPREFIX}/usr" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			HOST_LD="$(tc-getBUILD_LD)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
+	}
+
+	tc-export AR CC LD OBJCOPY
+
+	# may no longer be relevant but kept as a safety
+	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+
+	use driver && linux-mod_src_compile
+
+	# 390.xx persistenced doesn't auto-detect libtirpc
+	LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc || die) \
+		common_cflags=$($(tc-getPKG_CONFIG) --cflags libtirpc || die) \
+		nvidia-drivers_make persistenced
+
+	nvidia-drivers_make modprobe
+	use X && nvidia-drivers_make xconfig
+
+	if use tools; then
+		nvidia-drivers_make settings
+	elif use static-libs; then
+		nvidia-drivers_make settings/src build-xnvctrl
+	fi
+}
+
+src_install() {
+	nvidia-drivers_make_install() {
+		emake -C nvidia-${1} install \
+			DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	}
+
+	nvidia-drivers_libs_install() {
+		local libs=(
+			EGL_nvidia
+			GLESv1_CM_nvidia
+			GLESv2_nvidia
+			cuda
+			nvcuvid
+			nvidia-compiler
+			nvidia-eglcore
+			nvidia-encode
+			nvidia-fatbinaryloader
+			nvidia-glcore
+			nvidia-glsi
+			nvidia-ml
+			nvidia-opencl
+			nvidia-ptxjitcompiler
+			nvidia-tls
+		)
+
+		if use X; then
+			libs+=(
+				GLX_nvidia
+				nvidia-fbc
+				nvidia-ifr
+				vdpau_nvidia
+			)
+		fi
+
+		local libdir=.
+		if [[ -d 32 && ${ABI} == x86 ]]; then
+			libdir+=/32
+		else
+			libs+=(
+				nvidia-cfg
+				nvidia-wfb
+			)
+		fi
+
+		local lib soname
+		for lib in "${libs[@]}"; do
+			lib=lib${lib}.so.${PV}
+
+			# auto-detect soname and create appropriate symlinks
+			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
+			if [[ ${soname} && ${soname} != ${lib} ]]; then
+				ln -s ${lib} ${libdir}/${soname} || die
+			fi
+			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+
+			dolib.so ${libdir}/${lib%.so*}*
+		done
+	}
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-390.conf nvidia.conf
+	fi
+
+	if use X; then
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		# 390 has legacy glx needing a modified .conf (bug #713546)
+		exeinto /usr/$(get_libdir)/extensions/nvidia
+		newexe libglx.so{.${PV},}
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		# vulkan icd uses libGLX_nvidia.so and so requires X
+		insinto /usr/share/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	insinto /usr/share/glvnd/egl_vendor.d
+	doins 10_nvidia.json
+
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	insinto /etc/nvidia
+	newins nvidia-application-profiles{-${PV},}-rc
+
+	# install built helpers
+	nvidia-drivers_make_install modprobe
+	# allow video group to load mods and create devs (bug #505092)
+	fowners root:video /usr/bin/nvidia-modprobe
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	nvidia-drivers_make_install persistenced
+	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
+	systemd_dounit nvidia-persistenced.service
+
+	use X && nvidia-drivers_make_install xconfig
+
+	if use tools; then
+		nvidia-drivers_make_install settings
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		insinto /usr/share/nvidia
+		newins nvidia-application-profiles{-${PV},}-key-documentation
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/libXNVCtrl/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	# install prebuilt-only helpers
+	exeinto /opt/bin
+
+	doexe nvidia-cuda-mps-control
+	doman nvidia-cuda-mps-control.1
+	doexe nvidia-cuda-mps-server
+
+	doexe nvidia-debugdump
+	dobin nvidia-bug-report.sh
+
+	doexe nvidia-smi
+	doman nvidia-smi.1
+
+	# install prebuilt-only libraries
+	multilib_foreach_abi nvidia-drivers_libs_install
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and will lead to GPU-using application issues."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if use x86 && [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that NVIDIA is no longer offering support for the unified memory"
+		elog "module (nvidia-uvm) on x86 (32bit), as such the module was not built."
+		elog "This means OpenCL/CUDA (and related, like nvenc) cannot be used."
+		elog "Other functions, like OpenGL, will continue to work."
+	fi
+
+	if [[ ${NV_HAD_WAYLAND} ]]; then
+		elog "Support for EGLStream (egl-wayland) is no longer offered with legacy"
+		elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland."
+	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 390.143 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
deleted file mode 100644
index e68be3dba2a4..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
+++ /dev/null
@@ -1,404 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.10"
-NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
-NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_BIN_URI}x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_BIN_URI}aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_GIT_URI}installer/archive/${PV}.tar.gz -> nvidia-installer-${PV}.tar.gz
-	${NV_GIT_URI}modprobe/archive/${PV}.tar.gz -> nvidia-modprobe-${PV}.tar.gz
-	${NV_GIT_URI}persistenced/archive/${PV}.tar.gz -> nvidia-persistenced-${PV}.tar.gz
-	${NV_GIT_URI}settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
-	${NV_GIT_URI}xconfig/archive/${PV}.tar.gz -> nvidia-xconfig-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe nvidia
-	dobin nvidia-sleep.sh
-	systemd_dounit nvidia-{hibernate,resume,suspend}.service
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.119.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.119.03.ebuild
deleted file mode 100644
index 696f3805efd2..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.119.03.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.13"
-NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
-NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_BIN_URI}x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_BIN_URI}aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_GIT_URI}installer/archive/${PV}.tar.gz -> nvidia-installer-${PV}.tar.gz
-	${NV_GIT_URI}modprobe/archive/${PV}.tar.gz -> nvidia-modprobe-${PV}.tar.gz
-	${NV_GIT_URI}persistenced/archive/${PV}.tar.gz -> nvidia-persistenced-${PV}.tar.gz
-	${NV_GIT_URI}settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
-	${NV_GIT_URI}xconfig/archive/${PV}.tar.gz -> nvidia-xconfig-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	if kernel_is -lt 5 10; then
-		CONFIG_CHECK+=" PM" # needed for 460.67 backport (bug #778920)
-		local ERROR_PM="CONFIG_PM: is not set but needed with kernel version <5.10"
-	fi
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe nvidia
-	dobin nvidia-sleep.sh
-	systemd_dounit nvidia-{hibernate,resume,suspend}.service
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
index fe76a9a51978..44fb2c8fbf5e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
 inherit desktop linux-info linux-mod multilib-build optfeature \
 	readme.gentoo-r1 systemd toolchain-funcs unpacker
 
-NV_KERNEL_MAX="5.13"
+NV_KERNEL_MAX="5.12"
 NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
 NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
 
@@ -75,19 +75,13 @@ QA_PREBUILT="opt/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 )
+
 DOCS=(
 	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
 	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
 )
 HTML_DOCS=( html/. )
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
 pkg_setup() {
 	use driver || return
 
@@ -262,9 +256,7 @@ src_install() {
 		linux-mod_src_install
 
 		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-460.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
+		newins "${FILESDIR}"/nvidia-470.conf nvidia.conf
 
 		# used for gpu verification with binpkgs (not kept)
 		insinto /usr/share/nvidia
@@ -351,8 +343,19 @@ src_install() {
 	dobin nvidia-sleep.sh
 	systemd_dounit nvidia-{hibernate,resume,suspend}.service
 
-	einstalldocs
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	readme.gentoo_create_doc
+
+	einstalldocs
 }
 
 pkg_preinst() {
@@ -362,8 +365,7 @@ pkg_preinst() {
 	# set video group id based on live system (bug #491414)
 	local g=$(getent group video | cut -d: -f3)
 	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 
 	# try to find driver mismatches using temporary supported-gpus.json
 	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
index f87b9c480628..8931c3443b48 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
@@ -74,19 +74,13 @@ QA_PREBUILT="opt/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 )
+
 DOCS=(
 	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
 	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
 )
 HTML_DOCS=( html/. )
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
 pkg_setup() {
 	use driver || return
 
@@ -256,9 +250,7 @@ src_install() {
 		linux-mod_src_install
 
 		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-460.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
+		newins "${FILESDIR}"/nvidia-470.conf nvidia.conf
 
 		# used for gpu verification with binpkgs (not kept)
 		insinto /usr/share/nvidia
@@ -345,8 +337,19 @@ src_install() {
 	dobin nvidia-sleep.sh
 	systemd_dounit nvidia-{hibernate,resume,suspend}.service
 
-	einstalldocs
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	readme.gentoo_create_doc
+
+	einstalldocs
 }
 
 pkg_preinst() {
@@ -356,8 +359,7 @@ pkg_preinst() {
 	# set video group id based on live system (bug #491414)
 	local g=$(getent group video | cut -d: -f3)
 	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 
 	# try to find driver mismatches using temporary supported-gpus.json
 	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
@@ -399,4 +401,20 @@ pkg_postinst() {
 		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
 		ewarn "https://www.nvidia.com/object/IO_32667.html"
 	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
new file mode 100644
index 000000000000..f244d91a9477
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop linux-info linux-mod multilib-build optfeature \
+	readme.gentoo-r1 systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.13"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
+	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
+	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
+	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64"
+IUSE="+X +driver static-libs +tools"
+
+COMMON_DEPEND="
+	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	app-misc/pax-utils
+	virtual/pkgconfig"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+)
+
+DOCS=(
+	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+)
+HTML_DOCS=( html/. )
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, so enable
+	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-uvm(video:kernel)"
+
+	linux-mod_pkg_setup
+
+	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make user patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+		-i kernel/conftest.sh || die
+
+	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
+		-e '/Categories=/s/_.*/System;Settings;/' \
+		-i nvidia-settings/doc/nvidia-settings.desktop || die
+
+	# remove gtk2 support (bug #592730)
+	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+		-i nvidia-settings/src/Makefile || die
+
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> nvidia-persistenced.service || die
+
+	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+}
+
+src_compile() {
+	nvidia-drivers_make() {
+		emake -C nvidia-${1} ${2} \
+			PREFIX="${EPREFIX}/usr" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			HOST_LD="$(tc-getBUILD_LD)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
+	}
+
+	tc-export AR CC LD OBJCOPY
+
+	# may no longer be relevant but kept as a safety
+	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+
+	use driver && linux-mod_src_compile
+
+	nvidia-drivers_make modprobe
+	nvidia-drivers_make persistenced
+	use X && nvidia-drivers_make xconfig
+
+	if use tools; then
+		nvidia-drivers_make settings
+	elif use static-libs; then
+		nvidia-drivers_make settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	nvidia-drivers_make_install() {
+		emake -C nvidia-${1} install \
+			DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	}
+
+	nvidia-drivers_libs_install() {
+		local libs=(
+			EGL_nvidia
+			GLESv1_CM_nvidia
+			GLESv2_nvidia
+			cuda
+			nvcuvid
+			nvidia-allocator
+			nvidia-eglcore
+			nvidia-encode
+			nvidia-glcore
+			nvidia-glsi
+			nvidia-glvkspirv
+			nvidia-ml
+			nvidia-opencl
+			nvidia-opticalflow
+			nvidia-ptxjitcompiler
+			nvidia-tls
+		)
+		use amd64 && libs+=( nvidia-compiler )
+
+		if use X; then
+			libs+=(
+				GLX_nvidia
+				vdpau_nvidia
+			)
+			if use amd64; then
+				libs+=(
+					nvidia-fbc
+					nvidia-ifr
+				)
+			fi
+		fi
+
+		local libdir=.
+		if [[ ${ABI} == x86 ]]; then
+			libdir+=/32
+		else
+			libs+=(
+				nvidia-cbl
+				nvidia-cfg
+				nvidia-rtcore
+				nvoptix
+			)
+			use amd64 && libs+=( nvidia-ngx )
+		fi
+
+		local lib soname
+		for lib in "${libs[@]}"; do
+			lib=lib${lib}.so.${PV}
+
+			# auto-detect soname and create appropriate symlinks
+			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
+			if [[ ${soname} && ${soname} != ${lib} ]]; then
+				ln -s ${lib} ${libdir}/${soname} || die
+			fi
+			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+
+			dolib.so ${libdir}/${lib%.so*}*
+		done
+	}
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-470.conf nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	if use X; then
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		exeinto /usr/$(get_libdir)/xorg/modules/extensions
+		newexe libglxserver_nvidia.so{.${PV},}
+
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		# vulkan icd uses libGLX_nvidia.so and so requires X
+		insinto /usr/share/vulkan/icd.d
+		doins nvidia_icd.json
+		insinto /usr/share/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	insinto /usr/share/glvnd/egl_vendor.d
+	doins 10_nvidia.json
+
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	insinto /etc/nvidia
+	newins nvidia-application-profiles{-${PV},}-rc
+
+	# install built helpers
+	nvidia-drivers_make_install modprobe
+	# allow video group to load mods and create devs (bug #505092)
+	fowners root:video /usr/bin/nvidia-modprobe
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	nvidia-drivers_make_install persistenced
+	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
+	systemd_dounit nvidia-persistenced.service
+
+	use X && nvidia-drivers_make_install xconfig
+
+	if use tools; then
+		nvidia-drivers_make_install settings
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		insinto /usr/share/nvidia
+		newins nvidia-application-profiles{-${PV},}-key-documentation
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	# install prebuilt-only helpers
+	exeinto /opt/bin
+
+	doexe nvidia-cuda-mps-control
+	doman nvidia-cuda-mps-control.1
+	doexe nvidia-cuda-mps-server
+
+	doexe nvidia-debugdump
+	dobin nvidia-bug-report.sh
+
+	doexe nvidia-smi
+	doman nvidia-smi.1
+
+	# install prebuilt-only libraries
+	multilib_foreach_abi nvidia-drivers_libs_install
+
+	# install systemd sleep services
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+	dobin nvidia-sleep.sh
+	systemd_dounit nvidia-{hibernate,resume,suspend}.service
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and will lead to GPU-using application issues."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ ${NV_LEGACY_MASK} ]]; then
+		ewarn "You are installing a version of nvidia-drivers known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-465.31.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-465.31.ebuild
deleted file mode 100644
index d0bc741402b7..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-465.31.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.13"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
-	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
-	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
-	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-uvm(video:kernel)"
-	# nvidia-peermem(video:kernel) - skipping unless there is a demand for it
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-460.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.42.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.42.01.ebuild
deleted file mode 100644
index d68e85fb35b5..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.42.01.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.13"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
-	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
-	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
-	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-peermem(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				libnvidia-nvvm.so.4.0.0
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			[[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-				dolib.so ${libdir}/${soname}
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-			dolib.so ${libdir}/{${lib},${lib%.so*}.so}
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-460.conf nvidia.conf
-		doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		insinto /lib/firmware/nvidia/${PV}
-		doins firmware/gsp.bin
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install dlls for optional use with proton/wine
-	insinto /usr/$(get_libdir)/nvidia/wine
-	use amd64 && doins {_,}nvngx.dll
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed "s/PACKAGE/${PF}/;s/VIDEOGID/${g}/" \
-		-i "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
new file mode 100644
index 000000000000..dc6c66192c96
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop linux-info linux-mod multilib-build \
+	readme.gentoo-r1 systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.13"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
+	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
+	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
+	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64"
+IUSE="+X +driver static-libs +tools wayland"
+
+COMMON_DEPEND="
+	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 )"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	app-misc/pax-utils
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+)
+
+DOCS=(
+	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+)
+HTML_DOCS=( html/. )
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, so enable
+	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make user patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+		-i kernel/conftest.sh || die
+
+	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
+		-e '/Categories=/s/_.*/System;Settings;/' \
+		-i nvidia-settings/doc/nvidia-settings.desktop || die
+
+	# remove gtk2 support (bug #592730)
+	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+		-i nvidia-settings/src/Makefile || die
+
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> nvidia-persistenced.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	if use wayland; then
+		sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+	fi
+
+	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+}
+
+src_compile() {
+	nvidia-drivers_make() {
+		emake -C nvidia-${1} ${2} \
+			PREFIX="${EPREFIX}/usr" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			HOST_LD="$(tc-getBUILD_LD)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
+	}
+
+	tc-export AR CC LD OBJCOPY
+
+	# may no longer be relevant but kept as a safety
+	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+
+	use driver && linux-mod_src_compile
+
+	nvidia-drivers_make modprobe
+	nvidia-drivers_make persistenced
+	use X && nvidia-drivers_make xconfig
+
+	if use tools; then
+		nvidia-drivers_make settings
+	elif use static-libs; then
+		nvidia-drivers_make settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	nvidia-drivers_make_install() {
+		emake -C nvidia-${1} install \
+			DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	}
+
+	nvidia-drivers_libs_install() {
+		local libs=(
+			EGL_nvidia
+			GLESv1_CM_nvidia
+			GLESv2_nvidia
+			cuda
+			nvcuvid
+			nvidia-allocator
+			nvidia-eglcore
+			nvidia-encode
+			nvidia-glcore
+			nvidia-glsi
+			nvidia-glvkspirv
+			nvidia-ml
+			nvidia-opencl
+			nvidia-opticalflow
+			nvidia-ptxjitcompiler
+			nvidia-tls
+		)
+		use amd64 && libs+=( nvidia-compiler )
+
+		if use X; then
+			libs+=(
+				GLX_nvidia
+				vdpau_nvidia
+			)
+			if use amd64; then
+				libs+=(
+					nvidia-fbc
+					nvidia-ifr
+				)
+			fi
+		fi
+
+		local libdir=.
+		if [[ ${ABI} == x86 ]]; then
+			libdir+=/32
+		else
+			libs+=(
+				libnvidia-nvvm.so.4.0.0
+				nvidia-cbl
+				nvidia-cfg
+				nvidia-rtcore
+				nvoptix
+			)
+			use amd64 && libs+=( nvidia-ngx )
+		fi
+
+		local lib soname
+		for lib in "${libs[@]}"; do
+			[[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
+
+			# auto-detect soname and create appropriate symlinks
+			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
+			if [[ ${soname} && ${soname} != ${lib} ]]; then
+				ln -s ${lib} ${libdir}/${soname} || die
+				dolib.so ${libdir}/${soname}
+			fi
+			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+			dolib.so ${libdir}/{${lib},${lib%.so*}.so}
+		done
+	}
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		insinto /lib/firmware/nvidia/${PV}
+		doins firmware/gsp.bin
+
+		# used for gpu verification with binpkgs (not kept)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	if use X; then
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		exeinto /usr/$(get_libdir)/xorg/modules/extensions
+		newexe libglxserver_nvidia.so{.${PV},}
+
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		# vulkan icd uses libGLX_nvidia.so and so requires X
+		insinto /usr/share/vulkan/icd.d
+		doins nvidia_icd.json
+		insinto /usr/share/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	insinto /usr/share/glvnd/egl_vendor.d
+	doins 10_nvidia.json
+
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	insinto /etc/nvidia
+	newins nvidia-application-profiles{-${PV},}-rc
+
+	# install built helpers
+	nvidia-drivers_make_install modprobe
+	# allow video group to load mods and create devs (bug #505092)
+	fowners root:video /usr/bin/nvidia-modprobe
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	nvidia-drivers_make_install persistenced
+	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
+	systemd_dounit nvidia-persistenced.service
+
+	use X && nvidia-drivers_make_install xconfig
+
+	if use tools; then
+		nvidia-drivers_make_install settings
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		insinto /usr/share/nvidia
+		newins nvidia-application-profiles{-${PV},}-key-documentation
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	# install prebuilt-only helpers
+	exeinto /opt/bin
+
+	doexe nvidia-cuda-mps-control
+	doman nvidia-cuda-mps-control.1
+	doexe nvidia-cuda-mps-server
+
+	doexe nvidia-debugdump
+	dobin nvidia-bug-report.sh
+
+	doexe nvidia-smi
+	doman nvidia-smi.1
+
+	# install prebuilt-only libraries
+	multilib_foreach_abi nvidia-drivers_libs_install
+
+	# install dlls for optional use with proton/wine
+	insinto /usr/$(get_libdir)/nvidia/wine
+	use amd64 && doins {_,}nvngx.dll
+
+	# install systemd sleep services
+	exeinto /lib/systemd/system-sleep
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+
+	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and will lead to GPU-using application issues."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ ${NV_LEGACY_MASK} ]]; then
+		ewarn "You are installing a version of nvidia-drivers known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use wayland && use driver && [[ ! ${NV_HAD_WAYLAND} ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for EGLStream (used for wayland acceleration"
+		elog "in compositors that support it)."
+		elog
+		elog "If you experience issues, please comment out the option from nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+		if has_version "gnome-base/gdm[wayland]"; then
+			elog
+			elog "This also cause gnome-base/gdm to use a wayland session by default,"
+			elog "select 'GNOME on Xorg' if you wish to continue using it."
+		fi
+	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
+}
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index eba38fb78453..353c8467f6d9 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-evdev-2.10.6.tar.bz2 408138 BLAKE2B 2b5815e6ee71971e5023392e893d0b8bdba315ff73b34926b9facd95141ff541de052b84a569fe7bbd4b98810afb4d643a3bcaa97fe5a4e23c37e1ce410a9e12 SHA512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1
-EBUILD xf86-input-evdev-2.10.6.ebuild 530 BLAKE2B fead986a959a3b953841cce792c7de5852afbeac09fae4a250aa0d271020e4b21470b9d1ea0067eae50b5f9780992037f20b3872cd9bbbab9bc0edb2115d69f8 SHA512 334f11940fe299fa92c4d2eebeef9b31698d4ac599efac799673083bdda8326400fcac50475c3e1d64ce10866f820c98609c256e940616a00f9780bbae78e3c7
+EBUILD xf86-input-evdev-2.10.6.ebuild 537 BLAKE2B c72f01ba38247283472df841d7c854ce553f6e324968820f028a044e379ee45a1f6c886d392559e1de5d850d04082d899a65f00821d90ac61b7a1f91b0090fcc SHA512 aa81208319593885c1d038704dc14b24590f2abba54ab82e5fa585e28d79c4254030c40aada3192414a1b1f4a1e5eb280087174e67a3aa915e42815a6ab37571
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
index 2bdf150ddc17..b694533616cc 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info xorg-3
 
 DESCRIPTION="Generic Linux input driver"
-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"
 
 RDEPEND="
 	>=x11-base/xorg-server-1.18[udev]
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index 2b52523031ba..b19ceafccd81 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-fbdev-0.5.0.tar.bz2 295102 BLAKE2B f3696662e782f35eeae66a755761b8f5d6f1304321976ef7e17758576da014091c0dce9046c4fde6b0ec4cfa1dce998b4b9130e646911d4d1dad983bd530d06b SHA512 c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448
-EBUILD xf86-video-fbdev-0.5.0-r1.ebuild 324 BLAKE2B 7bb325fc6083fa410c52771a0284ef60f015f5f47eee4fa3721ede263e95b4172a539f3ef7cf1e7654873474a04b0cee2d50979d960a88bd0bae9cf565dfe63f SHA512 616c25b25f35090d40441df1e14a91511244877b48d07ecb9ef06ac39b969fe068a16dc40e6716f33c4b2630d6bc2ecb98a65b613f10d6db904cd790d3d6ae8b
+EBUILD xf86-video-fbdev-0.5.0-r1.ebuild 331 BLAKE2B 5d7193b68869d9e0474a67ab18374de9b96c0120bfef94ff4f3624b2a87090a963626b31243e206725dab346bff86a19b531718618ee67cec4d5d3012b4f95a9 SHA512 c5a2260c11bc273942a9543bdceaa3ed66749822800080ed12858bb077003d17f89a273e1e953c777cde44022f08ceb5af8b748cd82e4f3bd05fd14ec5777138
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
index 4f78d63d2c5d..9cf55c8ba7fa 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="video driver for framebuffer device"
 
-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"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND="${DEPEND}
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index b06b1c5976a5..47f5f64e627d 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
-EBUILD xf86-video-nouveau-1.0.17.ebuild 612 BLAKE2B 68e1399d322f6c73932059e0393429f23ecc5ec15336c218f626e326a75f8197ea1205c711725b77ad45d6345cb694de2fa9ed445e87877a0024b55eb5474ffb SHA512 df26a2cd2fa1ca3eb23940298e36b05703adf536b0df57c1ad9a05b13a866a42396ecd810b7efe8504ed5a995fb3b733b470af07c729902c311e23503ddf4455
+EBUILD xf86-video-nouveau-1.0.17.ebuild 619 BLAKE2B b9b60840274196d73ed5677e47ecd8b4836232dc4226d66f41d0d9e7fccd614ecc2526ba61b077d7a0d407d32faf233bcef1043d9ca3f881b5a68bb712e8bc40 SHA512 62cdcea4973125103e009980a65751baaf1a45805c8c1f19da1b7648b1d05a79544c5a60400723562733b4af87f9a67e343c18751f0d4d98f9ed6ce0762637f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index fa0d7d5a8bd7..af511dafe0b2 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 	https://nouveau.freedesktop.org/wiki/
 	https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
 	>=x11-libs/libpciaccess-0.10
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index bba089b87382..e52fe52c9010 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 3de942e3d2fe..2d94b0857843 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -8,7 +8,7 @@ AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0
 AUX fltk-1.3.5-optim.patch 198 BLAKE2B 1fc6df1d2932d8c792802e437c60c6f02f9e50be5a997e60f2017796e0f5ec8c40886af1946c9269b0c5a2e8ca40be92dd499e373f02be6a62eb59d56c0d3993 SHA512 839cb0d543187bbaabb916eeb33a96e14808e65c7e6e1aaed61f33efa1f56857757f48d9b4852c711fb296c3e480175449dd0dc5167f589975220276d05e6a67
 AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.5-r4.ebuild 4463 BLAKE2B abc7134d4b7e7aa702a0c40f78b24ef7a6676271b60b29de9046a1d539555e35dee26b03038e2c8030b956087a28ed7c0cbc079f618654172545f0d5ebaadceb SHA512 7d4e6c3e4972f387b01ae7e82a5d67fc99ed70b90c53145e1b109b103d4a4f0e55232902a82ea7b7a6911b2603cd819f8eb0a72fe31ec56d5132fec61d93a600
+EBUILD fltk-1.3.5-r4.ebuild 4470 BLAKE2B 278dc4c0dae0459e242b92265bbc512428314c7fe9d3655510f27ac6f62e26601ff17ac9cc4d27dfebb327167cf1d4d43785856c6dd2bf5c0d9cd43918fd7fa0 SHA512 30ca06b5fc09f3133ccc9fad608ca032b51398e480a0b92ef99f1e3b9e95bd4b8a879ee3a10c09d305549f284b6d33ead06af20155caa08d4d4413ea3fd771de
 EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
 EBUILD fltk-1.4.9999.ebuild 4506 BLAKE2B 3891ff70b01adc480baf56abe5de071d177893d0718cb7901b2fec1afdb4a3149644d5c77bdb7c126c890215711c3f17b261fcb686c3c80f4de803a302ba9610 SHA512 2b737473c748d04424a41657875096d78dfef7f96853c27f77554f41b963883ef4d25e82ff415da25be3f7372e5eaba65e707e310c131913ac85f0dc469efb46
 MISC metadata.xml 585 BLAKE2B 49cb19e3e7e999c3d23df448b84cc787e1309aee01f578ab9e23174951148f12e22187741eb86dd369e1907cf87d45c58992adbb447a83696db20367102cad51 SHA512 68123ace52b69fc68114b8becf1913297bc82dfa97eb4493711524b19ed256206e296993c7757fd5506dff3349decdade23cd9501d1f792ddfa265f135bc6c26
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index bd03eb94dac6..1a6451f842ff 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-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="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 7fb2e10e0310..bc6a7aaa33b7 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
-EBUILD libXxf86dga-1.1.5.ebuild 469 BLAKE2B d81ea93feec4d70d4cd8a352284f7a5c151c3169102c2d756f4b0e38c7f749923e39a62d1bc3c5e1f3f3b0a0f5794fec0fc0c23a4435c4391bc6b23d49d3c8ac SHA512 35143a33ca85f84a469bcbe9f682452cb8be9fcbe92a51f6e1c7a99326be35dc9d4de1fa5c3be69d90f1eec7a50e07b014a7f1eeeead27af0ec1b21771351dfc
+EBUILD libXxf86dga-1.1.5.ebuild 476 BLAKE2B dfb20be1c5c98832beccf95c614fefcd99d7ae437c77ede7ebc24f27cce152c6c6dae1ab0c9ef0aa06cffc238435522835a8867b3e634735b164319200dafb7c SHA512 34e91ab87c986d3e771551dd2e861318d763214375d9db01a79de4def07fa3ac81bff2821b887002dbfbc3f879f28c9442b331174e3ffba2dc63c4e723433f27
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 1db7cfb3b571..e2585b4330c5 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 3ccf58015160..33afc24262bd 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,4 +1,4 @@
 AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
 DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-extra-1.3.2.ebuild 2236 BLAKE2B 6b8e0e8de0ae2ca4c692ef4742c1a81b251144f8f3a17a03189948a2d751de7a66c957360db0aced719b5331104587b6560f165b3a0217ff4a1793304a4601e5 SHA512 ea71136d566dfd375668b00d58b888c0cbc1c4d45beeec94304c2031ea3910954c20e6b8655e60485bee9dc03265612aa802c6427bbac57364dcf4b5d4196f7d
+EBUILD libfm-extra-1.3.2.ebuild 2243 BLAKE2B 55bc9d1a148934fc2872f6623d712b2f44e58db9bd9e61426ac313da1b91dda1316f0f08d9f1e872c37c0fa0cd9a2bc9a126201eb3b048b46ecb8216bba740f1 SHA512 8d84897b84a5faafb8dc8c4a05e233462b6adb17b5169f622f64fd3d72568e638fee2747a9ef9a2727d99723b3bca9e13dcd11f6aeaf0645ad64d6846b72947d
 MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index 1dd6a3468cda..667df1b32186 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 3f1c6277c0dd..cf803e4060c7 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,4 +1,4 @@
 AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901
 DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-1.3.2.ebuild 3345 BLAKE2B 487b03ad1e84224c412d4a453563fcfa2d107cb0e0a2cb8fdec8de67cc971a79b0c13d00294c9cacee3bdd0efac642d6c57c447d94a1f8a89bc19c71f5411326 SHA512 3fbab2ddc7f25b09ea4603cf55509b7ff84d0ed84650b5c45912e7a8646002d676bd49018a0edf00b0071a839a0b61ba4a778a8c7c6adb0d5c444c43fcc7dc30
+EBUILD libfm-1.3.2.ebuild 3352 BLAKE2B a2474914c53b8189c55fd9faa5421b390bdf92cdc60b04078805107c89c03ac0208cad25f62d2e671cb92a1acc8af0ad29968d4a6cdeda9c3a01174445069b01 SHA512 d7ead11dd70c68e57df516a6794d9481cb6ba7db5cb1715c69f6f10ed2c91dcd2ac417c887bd3f5185a2666ae8050127e5c71965691cb1cae50c61ab4a47982d
 MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62
diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild
index 8bb9a86de8f1..e4daf617f735 100644
--- a/x11-libs/libfm/libfm-1.3.2.ebuild
+++ b/x11-libs/libfm/libfm-1.3.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+automount debug doc examples exif gtk udisks vala"
 
 REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e4bdadcd6418..e8de53fb52eb 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 5062804cb5fa..48a3f9cc8cf6 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
-EBUILD obconf-2.0.4_p20150213.ebuild 976 BLAKE2B aec99c9fd2f2484c4d6354cf270ad54251403f69a065030b530c73e6a01a2816b750319fdf61d5da51a041dbc1efe4a62671969eea14a798a33de126c4c0833c SHA512 ae2642d9d7c25c2168628e4638a7768c40e782fd7b9b874f4fb9147f8d0cced60072bc68e4ead366d04935beb639272f566196e283d2f4468d6f821be1b86617
+EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B b8c9fd85a019c53ffee70bd7f871da3737d063d0cc538ac0b08f1dcf248769a5055e91c0fe374245082e3546db3931fb7a5e749d8a7ba6bd2b86d55e6e5c8c39 SHA512 b5a8209b8d2c0775afd116469d0bc8ab79c5e2d9c28d48def08527d14d0491a68c49c80ea9994fac76a3c23346072d9fe3b2f512f313acd7f965d71c07365e92
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
index ffe3dca0ef43..b7462187832e 100644
--- a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT:0:7}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 7a8b00dc0dae..e9aec5fae2d0 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
-EBUILD pcmanfm-1.3.2-r1.ebuild 1179 BLAKE2B 7e4d10bf5db4c3b814f70d506a894fd6407fa26f9f002b80c7fa019eda18bd1d995505e0dc626a8cdbb9bccecd57798cd698a1928b22e0021bc6ec6b84d5f9b1 SHA512 5086abeafd65f666e5464fb64dc22a2de5313d84ccb55edc4ca840c018de3f0118ed640e7e1a5d173276156a0da1e377ba039e0b3cd4f087f0294461ea68a124
+EBUILD pcmanfm-1.3.2-r1.ebuild 1186 BLAKE2B f778a3d528700b1ef9726da094c0bc73de722b72e2958971ed7b8cd0500439813b0cfa21e195c37f46faf8d9a9042779bbfdbb9a208cf3a9b2a06ec426ff996e SHA512 cf3eb25101ba8791c7daf5e9dc9df5b0ccbe09de3454e94309c7d2a3686186dbccae9dc43cb9e9d4878dc209eadb06e1133b727bc8f961ec3c093bf1ce825e66
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
index f157cddc9ac1..1ddb63ffbf8e 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index a2ede45eedfb..1aa68e8c14cb 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,6 +3,6 @@ DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9
 DIST polybar-3.5.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
 DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
-EBUILD polybar-3.5.5.ebuild 1911 BLAKE2B 805f8315391694f97b9d61169e421dca938922ee03e86355481a27e38530f04deda99cb39fb0b9636f3b947311f955eb70e462a521a3aa3ad0ce7caa9c6029d6 SHA512 587b4f2310137041cab875d2997b3d87bf450573db3f523c25ad6a3cbb95039ba34253f774e9465710fb9cf6f3691a44a7f4559f9545614121fecf355c887fca
-EBUILD polybar-3.5.6.ebuild 1911 BLAKE2B 1dee88289eae8e2472183b2e003f72bfd64592f5c4770b6f3c6ff613229c198a156d668430ddb94def1c12c64a016d81c6b3517cd27f776597502f45823794ad SHA512 3a1cb63773a9a43d8fff76eeba762b3acea4477e259d65d357f46e18b677af0e813058758d8fc2ecbc5398f817d16bbfd038a1aeb5c6a1986e9eddd64ee0686a
+EBUILD polybar-3.5.5.ebuild 1903 BLAKE2B 60af426615bfe96edea2ae7670638c0adb2ddd5fe647d3671b4b32fddc7ef308c0aa93297d21df58978c5198a22619b125ec4b6924e1c6300f969e82ffb8199e SHA512 f13325e46b0af3f3e145793748b7b4c92da3b5d928def009f1cdb6f4c109f06ad7236455d5cc764e9eac1465adb90bf565aa9b006c69c7a9cd20deed938d64bd
+EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
 MISC metadata.xml 690 BLAKE2B a67ba0ba7acc59f754a50d95fbde39c861a0253845f1bf965b82d3b7e9ebaa699ff12ea60ebb2018a6518d7b0fbd3baeed05ff7496d302932bfd11aa3077387d SHA512 16b3f3e709976ac75c8c45d8963d7224d34c36a452cc7beb18883b912abbc901336dc0d9576ccaeb94f4c28edef5bf951306aca4fce0ca163dfbb970d031d88e
diff --git a/x11-misc/polybar/polybar-3.5.5.ebuild b/x11-misc/polybar/polybar-3.5.5.ebuild
index 9cf689dc360d..61bb99a7d5dc 100644
--- a/x11-misc/polybar/polybar-3.5.5.ebuild
+++ b/x11-misc/polybar/polybar-3.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
 I3IPCPP_COMMIT="cb008b30fc5f3febfe467884cb0211ee3c16386b"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
diff --git a/x11-misc/polybar/polybar-3.5.6.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
index ebab3b6c6567..d36b8fef936b 100644
--- a/x11-misc/polybar/polybar-3.5.6.ebuild
+++ b/x11-misc/polybar/polybar-3.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
 I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ca627183ab92..d6067ba8e9e0 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,5 @@
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
 DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
 EBUILD shutter-0.95.ebuild 2101 BLAKE2B 9dbc3526fc832f35ecf43b4f6f9e71ba4bf163d77aafc84745abd8dbe5c2c819c5b099e25ff73a397477e2fa9324228429731a4ba970e84d4a6082e0c6780694 SHA512 e5d94e24724be26f6dc6d6a7b78c55f8ef7cbb1cc261369b12671304276d1b37185904c193b527bfba0622be301f46a5e6aab0a9341d550f004be03e78107f68
-EBUILD shutter-0.97.ebuild 2133 BLAKE2B 110e656054c1268a0f3d1033452b905c106c6b9397836cb242a770772a9c814e16d80fd80f228306a9b5fe75f6afb7d9f511db04ae7b2c5f684808fed6ad874b SHA512 d18f9ebbff1bcf5c553d1fa25e6bfa8e06e8f92a0e77583ea02582c7fffe8a7b266a7e6a3a974a66daa718a6c5c5c7d71350d41afc0a956347d515ee61bd091b
+EBUILD shutter-0.97.ebuild 2132 BLAKE2B de17585c65ff3fc69a490c3ae3e073ce3f750c98268baf9f1ef390f754adfe2fdc05580a2c13bea2252d6c25c4c28bafc717d243732c465befc97199549d6a51 SHA512 b37fcacdb758e8798eca72ef19c3849d84c94f9e85bb0cc496fd00651ef65ff2c603ab67ee5f106f523ac57d5182872b672ce9fcf6376b865a1bed59738ac150
 MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.97.ebuild
index a93ac100854c..e37edd03ab72 100644
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ b/x11-misc/shutter/shutter-0.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 6cb9e898c677..2df30cd705d4 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 1245 BLAKE2B ed18dc22ffb299afd7a1e4db0020fa9fefd61121314ba38aae0fe679be18f8d915f87af88dd4d55500da94b0a1caf52276a5d5c6b5ca0ca5592ad21f6a6f5704 SHA512 14b23e80aac03935b325a64ea74d2bbab0275e6e64d01397b534577c6c25bb8aa1909f4e926c173927946ae27967f6aa6b86604eb553135a3be3127375abbace
+EBUILD slock-1.4-r1.ebuild 1244 BLAKE2B e4987eac42de79fe7ff35f76c8495f628fffb109b1de4bda65ea12dd9abe01722cc1ab501a458788106457a061f7c65025ba46d1a92e8bd555caf08ca4f1e0ce SHA512 7c8d9f5c5fb6d7d55445dd496c3f6642dd6cdec34a05eb69990b275d2c01506611c7783f048849d9d51cf8021c51916fc3a27dcfbddde682ce009ff32f9488cb
 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 5c0b10dd2b89..2753a8449711 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/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 0339bd2636c8..fef49486e83d 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,5 @@
 DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
 DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
 EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
-EBUILD sxhkd-0.6.2.ebuild 660 BLAKE2B aa45349c8cb332e204201991a5c52de18b3e4eb9e7893aa00d3e94e30ce38613dbb70c96ec4125f25eae82f8668ba6351f39b0ba6cd7fdb355f53f74e1d0de91 SHA512 66b15c4bf975886f6cac5123d576f478dbbde6d8b1e857024fc0c5bbb44dd220549679699c82d7f127470932a31fd98587d4e7846dd76552d94cd94f66197943
+EBUILD sxhkd-0.6.2.ebuild 667 BLAKE2B 7f066bf4563c1bedb2ca00c383cc4f9fc85ade14c1241ca6ecc07eb947d2273aae67ec8c08dcd8d085afa6fa69900c2299cf0b104a4e9be0e4b4e1b01b6aa2ee SHA512 32c4aaa0cf8020a71edeadda136db6a124c91ddb3d14898c09011060e536bbe2b5a58fd913bdf94196c676ee810ca1d09fcb6b20e9db740282b4fb4628b776ad
 MISC metadata.xml 327 BLAKE2B 2f3ca988674ff92fd3295c19c9ea30c7d55f1ca7527a5a92a677c4eaaa8d1030dad4acf3589ea9c6d1d81499abc74d8d125a915e02b108bbab8b38d56023a671 SHA512 ccb2545217cf7ca34ec62c6b1c41aa02209bfa8d4d2dcced53df8755850c109ffeefb1a1b7c3824efe1de28778cdfa4460ba22e08d58bab795817390231061fd
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
index 0bb670aea4e9..62e4eb5b3616 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="x11-libs/libxcb
 	x11-libs/xcb-util-keysyms"
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 668f5093e238..edb154c33f05 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 969 BLAKE2B be21de436a42fb6249b12675bc05ea6db5ea054fd8b912286ce80bdaaf264b5c91cd5e8a8cb5829e69028228e22b0b2c08aa05b687a17ad37ab13227f6289d27 SHA512 84cac979d2bc0a2ff7627d3358cc108ba48e1b22e1bb19544fa6dff8b0ccb34db1dc97429f4046b7c4b7daa4e132fe02aaa23eb77f2d6d7590effb47cfb98c08
+EBUILD tabbed-0.6-r1.ebuild 968 BLAKE2B afc340c83772fea0c290492a263204dc61638fa733b0a8c32be76a9bb3edc08ece30cbe22b02d5a85dc7ca03d93e78deda4b19bb4abe67d8e2aa4eb79f920acc SHA512 63026c59d94a4ff5d774d6cfa97092d2137a4022904aa39d54a7b1a0688c4201744eae044714e4978a003d7e1e9ea4ebc23d0225c893d3e2de80990c02dc917d
 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 c2e509149082..d03d6b606626 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/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index f830022484bc..e091d677bb30 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -7,5 +7,5 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 AUX x11vnc.init.d-r1 1737 BLAKE2B ac457d4acf27e3a2e26b6315530d326efae4e5583770623362eed65e45aad5a596a13da5325de8ad4155a2d335d3a8a62a41a1bc01facfdefacd5d5e42005df0 SHA512 b39efb164beeda4cf62c530aae4a3127358cc7ccea888df09e48f6a3a53affad0d3f3fce9cfbcfb17e9de131ec945a51e2680d7410e14b169d0295aa4cf85e91
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r6.ebuild 1971 BLAKE2B ec83908a840e64367f24479464335dc14977b0851e8fd7853afe69fb96ddaf2474e3209c84ed2f86e1b7be2d9fd2eec74f5b1aebd147029570fb180200a248e5 SHA512 b164d832673fcf2752ac7c5d3372ddbaac0196a80cf1f3e82a25784e7ad6c6303f744ff27b45d20f2b5dda5aebcf48d679e3a402d030e95ea589f9d21528f88e
-EBUILD x11vnc-0.9.16-r7.ebuild 1974 BLAKE2B 8fdabc764af69564cb4eb0708f1e231fcd0f2f3473134c53f71a968b80f85c9629652c38e6987e8fcae1685ea89dab88fe0819a5cfc26c6b1bd56a65bcf21472 SHA512 251853ea13121ad3568ddff63f0f252992bd8656e3c7f8df5bde21ffd3cb13ea490f798d167a02778062ddd40ca7e11473e0783b5c89aea97e2ca593ed1f1d09
+EBUILD x11vnc-0.9.16-r7.ebuild 1981 BLAKE2B f8d8b9ad3d5db228def8ccd8d767dad330a62670084494f7f99bfe13d35f7040a7ff8d02399d52102ff3e9eacd109f8caec62b27a326e80cbff1026c507d5fd6 SHA512 0070581125bdae6cc9a9443182ad9143505b9fb33c8415ca5f6b7146e215f66d577bc74b972b0a3ee7cefb2c7415834ac196b175f9c37a424da8a31cda5ebcc6
 MISC metadata.xml 952 BLAKE2B 4ac05ec6aa72acea1a2eb3b8f5b6d2ae885d5dc9c53eceb352f9fdd24ef19d3f269acc438421a2d3b13a0b9e1dba92e05562b5017aee5f8409f1db4b9d424d7e SHA512 4860713eb293d1aa29342953129b92525fb0ef5b6cd5462f1e5a425c6d28bc70a5cb421f2755643ecb42921e574b6eefb932cef80a420458f25ed12211da1c8e
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
index 97a1cb224ec4..74b94b9ee0ae 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 495cfcb5e24c..7125e28bbc1e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc96
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 EBUILD xdg-utils-1.1.3-r3.ebuild 2149 BLAKE2B 2667f35f3884df4914818a4e3d636d8c95d3e5902e529711cc5b747aa3c4fcbd981c865aecb4f89f330b2d8168c0f7acc791f21e710e17da4cbdbda199c579c2 SHA512 1611da3a14d1e2072085a504e637c5bd24ea2a28c1347a07519d66f06cdfd42f4c354f003509e18e575db2eb212816ef6d0523639d7a8e82aa7cdf38123989ee
 EBUILD xdg-utils-1.1.3_p20200220-r4.ebuild 1978 BLAKE2B 95c71a624e36413fbe9784275be219995471464e9e21e43c37e3952a1270f44965309dbcaba1386d84aad103845fddf5b372361df57b8be2f79a8066f05a1d81 SHA512 36a1965057ee1844254bb54e1283dc3dc382f8bdd6e054a294b54303c4fe5d38e8fc657ade7394f6699c7831ec512b75fe8b51279f67e5ae0de528fbba0f5a1b
-EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2052 BLAKE2B dca1a17cf790e51ec895e5030ee8f02387bf211c796657859b8149d126daefade6559622d6320bf5b8ccabd148f524d3279a2fe04787a798a49aa37cb79ddcd0 SHA512 660a8012bdb82b54983e5d3be4ca7af839ae4224c2ed01c7b35d1f0a3ee4d64c948c223a219048d47b1353c575e4af18104040ea18cd22f8e8d0149bc09ad83a
+EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2059 BLAKE2B 409eddc1d402ce75a9104c31e250167ab2d64bb0f887f5e77c5f1ed055abbb7e04e5c815209e8499f9c78f62f03f53e621e47bd66d73cbc704ce6d2fdf171b38 SHA512 6f5311b7b3878e6c65f7dfdb68af8fe2a54399a1a12c0a95eef2bff01cf3a7ff14ef2a767fb2df29334ab90ecdb4bc27e54362cdf4b4e0dad542619c30feddd5
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
index e5f2efaba8e4..013d4ccde699 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b0ce3f1f26bf..e3669d071f64 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -8,7 +8,9 @@ AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c281355
 AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
 AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
 AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
+AUX xscreensaver-6.01-gtk-detection.patch 792 BLAKE2B c941ea71b795af827034196150732848f2c63dde71fef3c87a090da5b652336c4b3220ad4ddeaf50ad80b54ead12632515495acc9ffea31897cd03dc68684aed SHA512 0de9b48fe74964ecd9ceb9421c1a48b15e168e4b89d412162f625d3423a12b20ed8662c6893226aeaeadfc455611e1856049086b9a84625c1b38559e6e2af056
 AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
+AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
@@ -16,4 +18,6 @@ EBUILD xscreensaver-5.45-r4.ebuild 4160 BLAKE2B fdcff85c0e4754ca0363275cf395c132
 EBUILD xscreensaver-5.45-r5.ebuild 4159 BLAKE2B 479874f5e3823dbf1b8570d8285a868d7296935d3205a3d090f8ba2bef4491590ddaf7d838fccaf5f1f513aa7de8f09cc7ac62e25f4c9dd13ed5974e5c32b5b0 SHA512 c57b913d19031492a487f22a998fcbc790886cc7b96d238e84e16d57acc0305f587ae03bc9292b9f499c3ebd326ab51de2b5614d0519785b53708dfe5abd1662
 EBUILD xscreensaver-5.45-r6.ebuild 4264 BLAKE2B 2b8226f3b3695ded5884327e557a8bc9741a78ead7a526a5d7a2bea3fd2ac157f9c741802f1352ea6cdf130d5a3c3a147ecf6c934cd74099f336b92eea75c5ef SHA512 b670776352e96fc33ca2223e2f5d164e179015abc52afdd303c2f5782ac983ed60d12f7e1582e3d9bef05d4ce508a2e3ccf2fb586b7435873510c2b3e1cf8d21
 EBUILD xscreensaver-6.01-r1.ebuild 5084 BLAKE2B 3d62384d1c574228b0237effd608229d4b2d740a0d886320eb49226857372a60781f44a84e547cdabaf90863501ea6f10994b5e19b8837c54373d7fa9ff1c670 SHA512 92cd7a2adbf50dbdc474e10201ee04e699261d29759edf25c22e987608578df7916562c872b48384f579accd7bd0ba4d6eed1840ef6b09eaabfc34cee40d0b43
+EBUILD xscreensaver-6.01-r2.ebuild 5178 BLAKE2B 980f127f3238072282a7441308f9814860bd613bc5e530c8aeb7a378d2b0f6b983003e5667b5416542402359cfd37b0aadcd0b6b21e2b3ad3f21364c52909842 SHA512 fb7a433a13ec93c90f59dca6fa4bec80227a7c7e284f2d70c181bb8f50e24439ab5c3fddadad49c0edea51e853c475cff7a023552294993866aae27ee67f52d0
+EBUILD xscreensaver-6.01-r3.ebuild 5692 BLAKE2B b1189fd5bd80acb5b7c346fccf0842b4b826e9e5fc9229adc033bb41f798cee49fbf7a3456a43bb4e92276a9edb6757c6ffa36b33965f4c1e80bab0990e55555 SHA512 af8ef285717215b82e286e8d8609ea0ab052d488269be32adee903c86444075bfc14ccc59b74f407ee1b72caecb0bd907f80c910faaa8441ab6767405b041ee5
 MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
new file mode 100644
index 000000000000..1f70ad29dbb1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
@@ -0,0 +1,25 @@
+From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 17 Jul 2021 23:50:16 +0200
+Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf
+
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4cb3385..bef0d1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then
+   pkg_check_version            gtk+-2.0  2.22.0 ; ac_gtk_version_string="$vers"
+   pkg_check_version         gmodule-2.0  2.0.0
+   pkg_check_version          libxml-2.0  2.4.6
+-  pkg_check_version      gdk-pixbuf-2.0  2.0.0
+-  pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0
+   have_gtk="$ok"
+ 
+   if test "$have_gtk" = no; then
+-- 
+2.32.0
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
new file mode 100644
index 000000000000..cb8b6e45db2b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
@@ -0,0 +1,56 @@
+From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 17 Jul 2021 23:44:44 +0200
+Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk
+
+Related to https://bugs.gentoo.org/796992
+---
+ configure.ac       | 4 ++++
+ driver/Makefile.in | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eaea28..4cb3385 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4148,13 +4148,16 @@ fi
+ 
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
++SETTINGS_PROGRAM_OR_NOT=
+ if test "$have_motif" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ if test "$have_gtk" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ 
+ 
+@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES)
+ 
+ AC_SUBST(PREFERRED_DEMO_PROGRAM)
+ AC_SUBST(ALL_DEMO_PROGRAMS)
++AC_SUBST(SETTINGS_PROGRAM_OR_NOT)
+ AC_SUBST(SAVER_LIBS)
+ AC_SUBST(MOTIF_LIBS)
+ AC_SUBST(GTK_LIBS)
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index 0e986a9..1877d8a 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -212,7 +212,7 @@ TEST_EXES	= test-passwd   test-uid        test-xdpms      test-grab     \
+ 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
+ 	          test-xkb
+ 
+-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
++EXES		= xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@
+ UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES	= xscreensaver-auth
+ DEMO_EXES	= @ALL_DEMO_PROGRAMS@
+-- 
+2.32.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
new file mode 100644
index 000000000000..628041e77c80
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	virtual/libcrypt:=
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		$(use_enable locking) \
+		$(use_with elogind) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
new file mode 100644
index 000000000000..10eae1bbfe28
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	gtk? ( png )
+	opengl? ( png )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	virtual/libcrypt:=
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	xft? ( x11-libs/libXft )
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:= )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		$(use_with gdk-pixbuf pixbuf)
+		$(use_with gtk)
+		$(use_with new-login login-manager)
+		$(use_with opengl gl)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=$(usex png yes no)
+		--with-xft=$(usex xft yes no)
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index bd422f125762..27cc2b07803a 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,7 @@
 DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
-EBUILD xvfb-run-1.20.10.3.ebuild 775 BLAKE2B 9c070bbee3901b23015422be999c7c853e3a0ba6673648c1ac6083506f14f1dc51fa3dee63e6d9324d2d862438d3b23ab8288d1e96b94caf0dc5edca8ea7b7eb SHA512 36779fcdd347a8fd5021e5614625aec9d91c18bb9b7b2fa628fee9e4f313f0d99507ca8a5200633b511d3d0ce39f449953d55575d2a12b23c6394d655d78a65f
+EBUILD xvfb-run-1.20.10.3.ebuild 774 BLAKE2B 5d28b2fa3704b40bdd5bf9800928b9c3e72678357f8e3d2145d12922794ddb677a0c334c1bf393781fdd0f56548c653c6548b523ad9a87b7e5903fe901c62e32 SHA512 c6b7c50dce35e2496b95812c597e2680ed5107031359e8fb54abfeefd72d68e9930fff6bb9acca54615827712bb2d560e93e88c458c11a53359f5be3eae96f38
 EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
 EBUILD xvfb-run-1.20.8_p2.ebuild 754 BLAKE2B 68043da68ba05bd0e7e054aaed496dd4476ed1c88ebd1f644c9e878b1f92eb5afbb5755799cceb75a027c37965c286c1b1cafe265a0f758b8cae2e3193fb3718 SHA512 c666c2c5b58462cb0a58f90062143e091ae902665825ea1d6c6cfd6a3507501f54073cc050da2a4c8da08105b9c77f18662582d512e22df960d71181f6012984
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
index 4c53cd93e986..d69d1d8e509f 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 41a8456db8bd..bf89862c667c 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 971 BLAKE2B 42e1e0addea931748d0e8ea7aeb1e62bb53f99cb7adeae748edd538c981436264d684ef9a1bf94e3d3b4f5a2fab05f42798bad35ebe1e92aae17f2d2d4deaab7 SHA512 ec15f6d477ac8dc5ea5af86c2cbe725860241dde179eaac399ee6d2824ee786e62b99217ce1b2e543664074961590755fe23211cd678a0259855e289be6a23ad
+DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e
+EBUILD xwallpaper-0.7.1.ebuild 970 BLAKE2B f67defaa9be6474d998299b8e052e2682e0849434bd25ccb348b22250357e3e8406cbd4b3a5ca4c852d782357e88220143cd5e8720d1e65db342d899e32ea28d SHA512 0f44b45d7f56fc62a291a98727091c316555d560e4b6ddb686ac72aa9dc113c50e9bbdbafb037837fb28e4e1bc07040b293963b14a9a4dee34565905609f626f
+EBUILD xwallpaper-0.7.2.ebuild 972 BLAKE2B b4311d7453e1e242967db28ac436806dea2bc2fa75cf6964264635a4f4bfc3d5dc757639c767c5b1a68d3f4efe195946220f583cdd724069e81cef1fccc91381 SHA512 3b9d7c425c81ee841e0c17d463d4b1e52ff9bee238c65ca2d39ffa8ac4686d45d437425050cb4e4fd2115680ee16c0aa6935ce046b506b566cd3f73472c3ce7c
 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.6.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
deleted file mode 100644
index b4afc4de2784..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Wallpaper setting utility for X"
-HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	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 ~ppc64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="jpeg png seccomp xpm"
-
-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 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
index 9f494806c799..65b6db83de5c 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-misc/xwallpaper/xwallpaper-0.7.2.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
new file mode 100644
index 000000000000..2c89348e8c20
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+jpeg +png seccomp xpm"
+
+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 )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 35156a7a9762..30c259291085 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -4,9 +4,9 @@ DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1
 DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
 DIST zim-0.73.4.tar.gz 2648686 BLAKE2B 47ac293494fb61808c80afccbc7b97c5539ceed050abdfd84048b5d0a6dd0667f8f23e1fd9cbd06aa77f8895787da76c3297e041e435ac45d0b5874fd8054fc4 SHA512 8205335e07d99ab340af4f75a429aeb3114446cc9ae2ccfbced4eb95b723c26b5d8c8624e94c5b38373a9368cf058c03f160a36730feb37d9c00abcd61b6d147
 DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
-EBUILD zim-0.73.1.ebuild 2002 BLAKE2B b971044002f24335c7f3daf11968169b09afdecac11ea83b4523f10e1251e6315806862903edfc2c5e2f6856a6d401764ee1cf4ef9d6e79de0ca137f27dbf9dd SHA512 dd386c113cb04feef79e9c00ba5c362789fac4639fffb14b6075b19f78bc81736ba74229407084bfb0f1558fcc1b8069e99b1a02af1800fdf3725a2c70e65ca6
-EBUILD zim-0.73.2.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
-EBUILD zim-0.73.3.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
-EBUILD zim-0.73.4.ebuild 1836 BLAKE2B 48ba230f3107c73756959d990fa50760a274bd6041aefd635a1e71176598532ccf2cc031ddbd7184c1fabe8eb023be97f84533e0dbc1d50e0a468948e314d106 SHA512 4e1b01089107eb7bd13cb5c55245d7b8eed655428c2e92afa49b3bbdb494222931c4b4a29c09e7ce465e4bd49616a0a44ceecb171b9273e44ada685bf24478f2
-EBUILD zim-0.73.5.ebuild 1834 BLAKE2B 24c1e73ef3b410816917da6680b4f9996284bcc7589255a28fd080d1bb1a44a26a5e01f1f4bfa9c7b431e7227739ddade33aae10aaadd2069ddf258e0f5b159c SHA512 147ec7db53eea984d7732d3cec990c91d6e915c7b46492b41a47c69a9bfa13339a8a2b023fcde86ee9a7bd2bcfbda15cfa03bfc6ba878553f1e21ee232d21198
+EBUILD zim-0.73.1.ebuild 1986 BLAKE2B 88fbe13dcd18afd80187f4af47b361bd08b0e2a1ef951f3d3adcec88d8590115057f5a0a371faffeeb7d3e38576838940e63bdd11eb2d511b50f2f7a6ab2c2a5 SHA512 413ea5d8eaa4f4ec8484c3ae84fefd89c1327ed813c7bafc8f6c686bf9de63a83eb86448ee5a5d29ba6a76b158b382ec36de3f2a606893ed11a9cd9542af12be
+EBUILD zim-0.73.2.ebuild 1988 BLAKE2B 698705bf7c0b00ef6eda2fd333d94fe4179748795e8fc526de4e81561cc12fe4299af89f9597e8e253c6933a4e609d563448a4588711b1d604441c261566c20d SHA512 8fc7c4831844b13b24446f5bbb85cbf5fef082cec5de694087b2bd9a9ef85cf8691dcc4766831fcc7de720ab11e318874ab1382f742edc4a81e53947957d0160
+EBUILD zim-0.73.3.ebuild 1988 BLAKE2B 698705bf7c0b00ef6eda2fd333d94fe4179748795e8fc526de4e81561cc12fe4299af89f9597e8e253c6933a4e609d563448a4588711b1d604441c261566c20d SHA512 8fc7c4831844b13b24446f5bbb85cbf5fef082cec5de694087b2bd9a9ef85cf8691dcc4766831fcc7de720ab11e318874ab1382f742edc4a81e53947957d0160
+EBUILD zim-0.73.4.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
 MISC metadata.xml 804 BLAKE2B 3b238d0a00d1ff9edc20e2b65b06aefa6b324e71c70e545372e3d05fb4020a67a2be45ade5065439f7974eaea6fa25ae8d65addc9e940d5c3762f7bd4c6ea1d1 SHA512 95e103028935e95fdb0d3ab00c1695db0f82a6f9cb33c0defd298edb50adf69ba5b00194ea2dbc6adb8b2da500fe45d17451e6354b6020ff9a75de837653244e
diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild
index 729a04173999..10d8bc60c6d3 100644
--- a/x11-misc/zim/zim-0.73.1.ebuild
+++ b/x11-misc/zim/zim-0.73.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.2.ebuild b/x11-misc/zim/zim-0.73.2.ebuild
index 058d33d2b60e..684fc2fc3ddd 100644
--- a/x11-misc/zim/zim-0.73.2.ebuild
+++ b/x11-misc/zim/zim-0.73.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
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.3.ebuild b/x11-misc/zim/zim-0.73.3.ebuild
index 058d33d2b60e..684fc2fc3ddd 100644
--- a/x11-misc/zim/zim-0.73.3.ebuild
+++ b/x11-misc/zim/zim-0.73.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.4.ebuild b/x11-misc/zim/zim-0.73.4.ebuild
index 7b47f41caeeb..131369dc0283 100644
--- a/x11-misc/zim/zim-0.73.4.ebuild
+++ b/x11-misc/zim/zim-0.73.4.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
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
index 2f81c04016f3..db96dd8a5459 100644
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ b/x11-misc/zim/zim-0.73.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index c0789bfe34bd..cd5632282593 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 8cc7e478ba09..e29cf6f742cf 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
-EBUILD pidgin-sipe-1.25.0-r1.ebuild 1367 BLAKE2B 1a7ceb9d5e281d41b9f4240d62c79050abd8577f105963fc2710e78f6f4e37475dcf8e5bca1e1509a4b908d6c57ff4d0fc39838f6127113c88f5dd1e7d15ca37 SHA512 0981b15c4ffc12d268629976b5c2c84528f7cc8fb846ca7afaeb5aac5cf59dd65e48e16f0bcb34c61e4315524649df6e373ce85162e8bde94144b5399f922478
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1366 BLAKE2B 0167ab57a1fb8e372b1db35f6e3b4a6d42653457dd93c057b82b7b6f8080276b95c94208d0ea54a9f464bf9c4367e5ad71edc60b3979035215c39c5f3809bf58 SHA512 d204faf98046a446260bec28df6986af207377ec4bcfdac7d0def55b4dea8366e6335d998fb346b679e232e91b7dfb2b8350aa81c85bce0ed1790ce8014696b1
 MISC metadata.xml 778 BLAKE2B 8128c3886d6f8ab54d3636954904e30fe4da25bf4bd7268fad499842cadd4a2c5104617b32fedcaaceb93c3a44691bb0815cf8d451e0c26a3380b5a4a2953b54 SHA512 e0d5228e0585c317f635838a2905a0354ecc3af1311e817fbdd0ba1703a13e9d4070a9f9db31891bcb819ac03dc93b2764e2f73bacdffb8318c599612b0cb21f
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index 2e14f7d593d8..6d8c1c1b9068 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 6913bc74f7f2..19ff27495dcf 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,3 +1,5 @@
 DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e
+DIST telegram-purple_1.4.7.orig.tar.gz 498573 BLAKE2B 37f741f1e2106db55eaadab70e2bf226609ebd85fa3df28a60b686e207c341f7279ea36ef87137d465b5bedac63e6ec0388714171dd5a594fb28ae02f66bebc4 SHA512 ae3032b33bd2a20b58b2d66c83fbc405f43c38c0e93b00394ad3165b0bc5d5aba02a8e1946872e4bd082894679737fa20f3e1991e9bb16c3c3aba4c7abbbf7d8
 EBUILD pidgin-telegram-1.4.6.ebuild 1125 BLAKE2B 64491aa941b08a2160d497225b07d1fede1657995a6ff625f6072de0706ce19ee3ce6ed99e51f1830ed3fff5c7c1296c3bc5e8e33517ba4c4dc126ac4660a24f SHA512 31d2b45f61c0eb9038321650263780d5b1c8108aef7c75c66812eed87606966ab1eaa29ee032b676aeb43f4ea009ef1753ddbf061165e2ed58b21dca1b241822
+EBUILD pidgin-telegram-1.4.7.ebuild 1127 BLAKE2B beb36d76a67dfae6d6af348f31fd2fe8326bb0e4d7c147b804cebcb6ff9de0e503d820603b0dddcf5fb5711b9d74f896e530ad9e11846ea62121a46e5bf41768 SHA512 31cd4b48505938ea495a69ed6004ab750359b16345eb759ab81c8112586a81993b9d1cd3ca41a3b573aa0985069d4052ff23577c093ca5758a037d4e674ad05d
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
new file mode 100644
index 000000000000..5cb4ffba69c3
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+S="${WORKDIR}/telegram-purple"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt +nls +png +webp"
+
+RDEPEND="
+	net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
+	webp? ( media-libs/libwebp:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' to make it compile
+	find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gcrypt)
+		$(use_enable nls translation)
+		$(use_enable png libpng)
+		$(use_enable webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index ccf0bb4ff3d7..01fd28dd5e39 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,4 +1,3 @@
 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.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
deleted file mode 100644
index 9927a83926b6..000000000000
--- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-}
-
-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 998fff391f6b..892f42d977e8 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 98476d856680..f70e3144131f 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -244,6 +244,6 @@ 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 alacritty-0.7.2.ebuild 6141 BLAKE2B bfc5cec131c17925fcb3946ab46e0dd0e33ffe53a6eb850bb2396a333b604252db1570ee52e1532150aca2ec46e99a4c3424a1b214334d723f8309ee246ca56f SHA512 5d30ed7cc993696e460cb9b3146851824b15b231e2f8c7bce2c67961ec825c02405d9125657d5e4dc6783b760c7e06895b4f99f3a1a74d7940326be82694956e
-EBUILD alacritty-0.8.0.ebuild 5963 BLAKE2B 71e89a89a23f12c5523ada545ed84386c12047eedfc296a3e87d1203b4c9da6b12023955d45d159c3fbdf520c241f76005b864342b50c741a2bbe2198f02770c SHA512 96160a814afebdbc7ae5c37aaf99eadd85e251c97344752f17a23c1fe9b050dd6ae41483a29bf39efcb919bf2eb127c540665b0de89d3ff8196ba766340f72b4
+EBUILD alacritty-0.8.0.ebuild 5960 BLAKE2B d5b15a52349fb45db9ecc8153c802f5eacfe45633cdcd07028ef41c395617f35f1906d788a50a1ae250ae7a10a16ee86740d5ba2587eaca74eaaaaf8dc2e9250 SHA512 19da1c5657fcd83e0a683b749a2470a835a0761dafc7412f225ae4a5318744b3f603ec4a0583cc23045d5584de207178684e316c4aa0a92a7e5deca9dcdb2e02
 EBUILD alacritty-9999.ebuild 2653 BLAKE2B db02653e037110909d0a1f9ef2caa7b29801690d74e0fb779db9f5e5830dab14555a9afe39c9b3affbc6758df894bc898448d081622b069929c202a24456c8b3 SHA512 0b96484226be356d97ca160a3c74c1d4be7fff8b51ef530a78cb469d497f5d5256d7e99012e5b241a9dfdab4edbaf3dbfbc45b2cd7c93fab1a06e004b1c41cb3
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.8.0.ebuild b/x11-terms/alacritty/alacritty-0.8.0.ebuild
index dd54b8122947..e103d182be9a 100644
--- a/x11-terms/alacritty/alacritty-0.8.0.ebuild
+++ b/x11-terms/alacritty/alacritty-0.8.0.ebuild
@@ -211,7 +211,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ppc64 x86"
 fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index ef588c006cff..2b8afa24a34b 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,5 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
-EBUILD guake-3.7.0.ebuild 1791 BLAKE2B 38e91820ceabf6259744e2b549f19d1dcd1d95c5ab7c3991161cef29e2837960dbdd53e7c8db7963b988c7d6b7c0ee5f9cb8f45cddc31c99a555a204c45dad19 SHA512 cf275d91ad2e4236a9893b24f3ef54bf76479163e87949ce1eb1f1cf26ecab298da36fa6f1718350fdbab7699653312f3b57c7676585ab5bb8ef904769c93d3c
-EBUILD guake-9999.ebuild 1562 BLAKE2B d56f4684ab835d08fef52f81b3caba81b8f2eda45c71de8841a9c84886b44db549e79702fe166ecbc3a24f1583f175a23f608e34bb69f341ca350cdbebbead38 SHA512 e22a8baf069ce457b87cadadd9f5c913da74b954f4e300c4a7686e27a2a4f672228cfa53f1ad13a4ac421026c9412cbcf8490a654b713bdf600d729113edbcfb
+EBUILD guake-3.7.0.ebuild 1767 BLAKE2B 3358dad3874118a2af413ba00a48fb072bf3cde0ec0d4d0a371ef0d7de2973ae4ba2f1d4d744821ad33201252a386191a59872a1d84cf3baa5ad2e2e27690f9c SHA512 38b8cfa20a37f06474978f067fd125aa863d92b1128af685540041d1ae49a6b4702878f5a248cebbe35b387bd8101ec5e23e49a57485f6d42936de80d2ba093b
+EBUILD guake-9999.ebuild 1538 BLAKE2B feb2481be734ddad1ca00b3fadc8424426d52b8e48f9eb03e5563daf79029c9105c8cf43f3848d07f9bd525ba2005aff2c22d2766a586f1ff34e0051a74bb4df SHA512 a84a18ddf1a4b908c4f439e89df8d067d0e8549f454059798ef7c0b5203ef4182060a48c1d19c2f8a5e242151c2414e916027b0df52a9e37e19c7b0573efe987
 MISC metadata.xml 531 BLAKE2B d81956273548043e4d492692ece7db4e273244923c1764704c309be877b39824c0afdf418aeef7f7bb0f5a3ae8547cc158b49dd5d1f2994e42e0526e915aaba9 SHA512 27386a0206791a3e413504dda0eb8d4b78e709b1ec4c16a8db40bb62ce673bca48b84878b42770b02600f2550f591e3d5b8069a73a233c44e0ed218a2458abb7
diff --git a/x11-terms/guake/guake-3.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
index 41b6853d6587..44023bbf3653 100644
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ b/x11-terms/guake/guake-3.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
@@ -29,10 +29,10 @@ RDEPEND="
 	dev-libs/glib
 	dev-libs/keybinder:3[introspection]
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/libnotify[introspection]
 	x11-libs/libwnck:3[introspection]
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 51743bb8c8f5..0c37d44a1ac0 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
@@ -29,10 +29,10 @@ RDEPEND="
 	dev-libs/glib
 	dev-libs/keybinder:3[introspection]
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/libnotify[introspection]
 	x11-libs/libwnck:3[introspection]
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 51b1d80f1f87..633c8ca5cfc2 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -12,9 +12,9 @@ DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09
 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-0.21.2.ebuild 2385 BLAKE2B e3a15649b6306a1f3640a1156bf370c08ebc7067fbfff5ade44edfef4681917e12a18dbd72ae35fa5a5bda78724f02fa6764b720e1e67865abb2b7844d6eb3b5 SHA512 851155bdfc081ec53abe58b45e48939e310447385315c53c629b7efbd8aa8b4fbdcc46cbca96e714af6057c3f3e0ee7865593f2ae608b27038a1260d1cbd2a1c
-EBUILD kitty-9999.ebuild 2193 BLAKE2B c6ca8073d4b7a494de76138d2fa616248709ee63af84d5e73db675c18a31e93dc2b59bd4a5893b8b63b36b94fcf28fd9699fbddbe82e764a43b798a46981689a SHA512 f89506c59ee43361904740007cb859571e5a03259fffa40998f92b805ede9db5dfbf04b0a1c2fb0314347a60199c9d38d4086ee888042c51e5c39fcba498b160
+EBUILD kitty-0.19.3.ebuild 2259 BLAKE2B 2d1cca2f65297e9d90e50b417906ca25a6544aa11417bcbb1ed6fad3f2c23a324fa74248833cf8609812730cc0d30c939aa7468403df516db691b3038bd59af4 SHA512 00e930df5964ac1dc70df020dd8f71c9f43e474813662ff16381f71efd94c25f2bd988dde8fdda0f0db30012f17b7cb26eb771e9288c67482cdb46bd126234cd
+EBUILD kitty-0.20.1.ebuild 2437 BLAKE2B 8a4a8b12230e8bf949d8033f2625eaeac2c9b44cd650808610f7a5e898f8c4b7a0055f07e146fa665c668f606a3114e82f671acc8e851a1686e7f7068a6d943a SHA512 80dfe575df244ac936c2038513f263857b2175fcfed5f0c6b1baf01d080fa25941c6225a6d844ef59b2539822151a4253895bc36a797f5bd7e439cc9caee92a2
+EBUILD kitty-0.20.3.ebuild 2356 BLAKE2B 4c0cf0cda36e73e4127cc40c46a4ff3c56c63929538dd2077364cbfd2ea0e432df7e31528be1cc0600777295ede31e3369f0027a836663a0eff47737c76196dc SHA512 bb4a0e3ed5612ce5f0f7a8abc41b70925584a5d536d8210cae275bd94a16878f55fc8eeb2d91ca020e2974bf044f26b9a5fac6a434595fd6268bec5a9bcb3600
+EBUILD kitty-0.21.2.ebuild 2383 BLAKE2B 6f2831db949398f23a5402d91b6819c12e53c64f87ef2fdd7e855556d7b881a0f4fabc43b0f328025c3742920ca3702ed0c05825f3d9921700e6d14196e641c1 SHA512 4bf9028ca55a0e46b3aae6c35d01f1356fa8ecc3b02d53fe0865ffa69bc2629231243d187bc4a090941809bfb169fc98ec7f68ba7d6aecda72893a8c4fdda526
+EBUILD kitty-9999.ebuild 2185 BLAKE2B c710249d453b9a073b6def40869181f0f371d1355d6907ec2aff08d985eb43cf3df84f0f0410c72999d4e1f4ee4de93599e9ab1c63d2f7ecad0a2a1b9b70c089 SHA512 af0c18f20d11087989cbc40b2b10bfd275d1dfb2610e6c54d5a265e9bea03ac33e178bd16c57df9e9df47f9ddaced3e0f8aac79a7c86bd7282f3a2a94f5cbee5
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty/kitty-0.19.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
index 6fb2b8651431..af521efe1f62 100644
--- a/x11-terms/kitty/kitty-0.19.3.ebuild
+++ b/x11-terms/kitty/kitty-0.19.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
diff --git a/x11-terms/kitty/kitty-0.20.1.ebuild b/x11-terms/kitty/kitty-0.20.1.ebuild
index 242d24ee0709..ec22fd9a7763 100644
--- a/x11-terms/kitty/kitty-0.20.1.ebuild
+++ b/x11-terms/kitty/kitty-0.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
diff --git a/x11-terms/kitty/kitty-0.20.3.ebuild b/x11-terms/kitty/kitty-0.20.3.ebuild
index 35273c44a076..31b802b51d19 100644
--- a/x11-terms/kitty/kitty-0.20.3.ebuild
+++ b/x11-terms/kitty/kitty-0.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
diff --git a/x11-terms/kitty/kitty-0.21.2.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
index b24a298847b8..38d21756bb24 100644
--- a/x11-terms/kitty/kitty-0.21.2.ebuild
+++ b/x11-terms/kitty/kitty-0.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index eee99356183e..eaa36cc37bd5 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 [[ ${PV} == *9999 ]] && BDEPEND+="
-	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
+	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]')"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.21.2-flags.patch
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 454ffa9ca3cd..12da1d621e12 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 1395 BLAKE2B 6e94dcd8ebaad5dd8d0586b7fba47be61b87bc0a65b6e6fc9e96641eee8e47806b219a172d947a096c98e4ca3fd4fd0fa6805ac9d7119af75f2a85dd8ea282ed SHA512 1e7c151f505b8045cf57cca506d6944ccf588184d211b78250a66b7eb4d51e0ae1330a9b3b2e0ae7c4d2c6222f457e3258c2fc6e1e13ffd44d918c3c10dc0117
+EBUILD st-0.8.4.ebuild 1394 BLAKE2B 9b4588d2fe831ac959a352d9afb936132b288eabecfded91bc7f4a2fc604c49d45c45f2bd474e6c888cb86f7a558b1fec96b3bf56eed174d8afc542ce5371e17 SHA512 5924267b6baa857959cf181ccbfd37fbe684424f07bbd80bf5162bd7be61d1d39eb4755b8aeac0413cbf42f99279b73ea26b250289608bb5e18837d833c64b7d
 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 48b193a1e0cd..f1b402b16ebf 100644
--- a/x11-terms/st/st-0.8.4.ebuild
+++ b/x11-terms/st/st-0.8.4.ebuild
@@ -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-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 4de531284349..2eb1e363ac67 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -2,5 +2,5 @@ AUX zutty-0.8-gcc11.patch 517 BLAKE2B 0d8432a219e20b985f13e75814440640c0a83f3a92
 DIST zutty-0.8.tar.gz 307235 BLAKE2B 897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b SHA512 75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317
 DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
 EBUILD zutty-0.8.ebuild 734 BLAKE2B 6a1f930a041b6431556ccc3bdb764dd773a7b1df1c46e1dd6125c8c4cbf4807b59ee081762b277f4f4986394ee0555949ed6c4827b0374904a759eeca58a2dd0 SHA512 7d5de7d3092a84104b49e77908e3475d4316eefbc4f3932334cf3fbc4477524366cfece3f8938633650c6c599904f19d7b19c67c574990ad98d9ed86f4f9315f
-EBUILD zutty-0.9.ebuild 685 BLAKE2B 4253ed0866707f675c29750bfb19b71da0786c976218f99686c9a472708a2b0d562cbc9a197dd470737ddc400a5930c9b3816bbb8ee115d8f25337e427725745 SHA512 7b247ce022fc582d383c3241ef2bf5301a182b5385eac3044ff25c7101b983511d48415b5076d35faebbf56585f6f9cc87d6d65e4f0bb767104dec922b829137
+EBUILD zutty-0.9.ebuild 684 BLAKE2B ebc469725ac2ed634719b3346d533341fc81f71a7435903f1339f73bc84b54e22c702153af170ffb77d42a6b2bf19bef5b18743dbaa8ea0a4969b0736d48d915 SHA512 20f0d3cdb20e309dd39b621a9142444a05c63534b53f2dc03a0d6ae85752449d3383e87d5b34db86b3458dbd4fab28dd80c1456f33dcac55cbf7c3e954c342e8
 MISC metadata.xml 1156 BLAKE2B 86e49541468db22123cd56f6aee08e61e6e79daddb817a11bf549b7c50cbcf5ed165316772c726caf7aaa0dc1321753ec3cd36eb25d88fad4216520827ad59e2 SHA512 3caa4dbda104f1fc1ab8326e40de573d2d8ba445c3a1002dd5c24d64d2bba9c5808addae2508d267497d80d90cd0cf285244a9874f9a31f62175f3c77adfadc5
diff --git a/x11-terms/zutty/zutty-0.9.ebuild b/x11-terms/zutty/zutty-0.9.ebuild
index 6d1da930375a..c8112ba12e48 100644
--- a/x11-terms/zutty/zutty-0.9.ebuild
+++ b/x11-terms/zutty/zutty-0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	media-libs/freetype:2
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7774705b01b3..7a1c4acde85c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 1292b307b6ca..cdfb04f69438 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,12 +1,5 @@
-AUX meson-inkscape.patch 3785 BLAKE2B a83796183a73e9741a6347444ce161c9da89c702fc150e165e27b4658b3c4e41a5bf9b9f1d43575b8407c3263d30979f9de5869d3ec4fa9e070a1ff03dc98e92 SHA512 64cf610ec4ac979623a9eecd17ee47e031375e442ed81c67d9acc8fbfc5e83c389cd510d2ee7f143a7a5ce836453e60f733db82306edfbacafaeb6e2c3c67e48
 AUX pre-rendered.ini 46 BLAKE2B 1ce5b9c6033e544572ddc22f3630fbdf0c7cfcc49bb503c20fbd667c7188640d6f4dbd368f125d22d1c863e7f58c30e2f66341a69ce35b93d0921ab019f26574 SHA512 336de96005c8a0386c2769cd82ad3e70251a7a8810e8685f9835451c1c116fffa56a0cda22989b8a60bef0bb3e067b26938a29b9a6c90f1b2f1ebb7a7448e56f
-DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86
-DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
-DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159
-DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594
 DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
 DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
-EBUILD arc-theme-20201013.ebuild 2290 BLAKE2B b857a0d484003c2a7501059ef894b222b4856e82ef1bab182480b1c9f5a12a003999ca61551bc535c581bf8fc1b214f64ffd611134ed65b475a90df05c54265e SHA512 e17c49db06eab011511bdd5db0105773fcec93dc44816ea2d5cb7bd2f3c7a7cf88c993d271d223d4eb3fc7e3664958b5676abc60b3472afa9ff4622439bb12e6
-EBUILD arc-theme-20210127.ebuild 2406 BLAKE2B e2840a54b0b27a40d4ef6494d737c86c4e479bd3eb15ec44759f78cf58073de4eff6983da4a45a40f9b990265c50ce9e52733b43c61df9acf2e12a204ee94ec8 SHA512 c7008d3816d84dbfa3f49f34ad74f0b379c15cf1edd6ba682f45dc685beba5000d93178d02bf07973ddcf2e681ace76a2530b35010547d26afeb03dbc79dc5bf
-EBUILD arc-theme-20210412.ebuild 2357 BLAKE2B 15748957c04f3fc5391195ce4bfbe1a85e0c48ca484a3e97b3d392d013648475af36f8a0c55df4605d030f9199890fe170cada93944f1822c92a41894d0a44ca SHA512 8caf9443cc0f1a8b52567777f877a161d7b86448de1a6d30940b5040f93c8ed9a51871f0f5d63f95f984a82db03c810480d5280e18a5d922ca7b3a15c5dbfe79
+EBUILD arc-theme-20210412.ebuild 2355 BLAKE2B ad3fef1485f56de1156d71c4c87b0266acc4536a0ddec4e409501513cb6f9cc1972e53c1549551adc1d88173600d685fefd48d79f363f72d68a3e5c9e7638e6b SHA512 9426f4794e66a1f320d71eff4627dbfd6ec4feeb199b1cce4d32b2d411dc00cbafe235040baa3a0fdd86a0bc3e69d38a4d0e15888284f5600d01ec6cda9e1c2f
 MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20201013.ebuild b/x11-themes/arc-theme/arc-theme-20201013.ebuild
deleted file mode 100644
index 640c44b0ebe7..000000000000
--- a/x11-themes/arc-theme/arc-theme-20201013.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd ~portage/x11-themes/${P}/work
-# make -j -C */common/gtk-3.0/3.18
-# find */common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit autotools
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
-HOMEPAGE="https://github.com/jnsh/arc-theme"
-SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
-	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
-	dev-lang/sassc
-"
-
-SVG_DEPEND="
-	!pre-rendered? (
-		media-gfx/inkscape
-		media-gfx/optipng
-	)
-"
-
-# Supports various GTK+3 versions and uses pkg-config to determine which
-# set of files to install. Updates will break it but only this fix will
-# help. See https://github.com/horst3180/arc-theme/pull/436. The same
-# applies to GNOME Shell and Cinnamon but I don't know whether those are
-# fixable.
-BDEPEND="
-	cinnamon? (
-		${SASSC_DEPEND}
-		gnome-extra/cinnamon
-	)
-	gnome-shell? (
-		${SASSC_DEPEND}
-		>=gnome-base/gnome-shell-3.18
-	)
-	gtk2? (
-		${SVG_DEPEND}
-	)
-	gtk3? (
-		${SASSC_DEPEND}
-		${SVG_DEPEND}
-		virtual/pkgconfig
-		>=x11-libs/gtk+-3.18:3
-	)
-	xfce? (
-		${SVG_DEPEND}
-	)
-"
-
-# gnome-themes-standard is only needed by GTK+2 for the Adwaita
-# engine. This engine is built into GTK+3.
-RDEPEND="
-	gtk2? (
-		x11-themes/gnome-themes-standard
-		x11-themes/gtk-engines-murrine
-	)
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use pre-rendered &&
-		export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
-
-	econf \
-		--disable-plank \
-		--disable-unity \
-		$(use_enable cinnamon) \
-		$(use_enable gtk2) \
-		$(use_enable gtk3) \
-		$(use_enable gnome-shell) \
-		$(use_enable mate metacity) \
-		$(use_enable xfce xfwm)
-}
-
-src_compile() {
-	# fontconfig issue?
-	# https://bugs.gentoo.org/666418#c28
-	use pre-rendered ||
-		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
-	default
-}
diff --git a/x11-themes/arc-theme/arc-theme-20210127.ebuild b/x11-themes/arc-theme/arc-theme-20210127.ebuild
deleted file mode 100644
index e7a1d5c3bff4..000000000000
--- a/x11-themes/arc-theme/arc-theme-20210127.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
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work
-# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
-HOMEPAGE="https://github.com/jnsh/arc-theme"
-SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
-	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
-	dev-lang/sassc
-"
-
-SVG_DEPEND="
-	!pre-rendered? (
-		media-gfx/inkscape
-		media-gfx/optipng
-	)
-"
-
-# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses
-# pkg-config to determine which set of files to build. Updates will
-# therefore break existing installs but there's no way around this. At
-# least GTK+3 is unlikely to see a release beyond 3.24.
-BDEPEND="
-	>=dev-util/meson-0.56.0
-	cinnamon? (
-		${SASSC_DEPEND}
-		gnome-extra/cinnamon
-	)
-	gnome-shell? (
-		${SASSC_DEPEND}
-		>=gnome-base/gnome-shell-3.18
-	)
-	gtk2? (
-		${SVG_DEPEND}
-	)
-	gtk3? (
-		${SASSC_DEPEND}
-		${SVG_DEPEND}
-		virtual/pkgconfig
-		=x11-libs/gtk+-3.24*:3
-	)
-	xfce? (
-		${SVG_DEPEND}
-	)
-"
-
-# gnome-themes-standard is only needed by GTK+2 for the Adwaita
-# engine. This engine is built into GTK+3.
-RDEPEND="
-	gtk2? (
-		x11-themes/gnome-themes-standard
-		x11-themes/gtk-engines-murrine
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/meson-inkscape.patch
-)
-
-src_configure() {
-	local themes=$(
-		printf "%s," \
-		$(usev cinnamon) \
-		$(usev gnome-shell) \
-		$(usev gtk2) \
-		$(usev gtk3) \
-		$(usex mate metacity "") \
-		$(usex xfce xfwm "")
-	)
-
-	local emesonargs=(
-		-Dthemes="${themes%,}"
-		-Dgtk3_version=3.24
-	)
-
-	if use pre-rendered; then
-		emesonargs+=(
-			$(if tc-is-cross-compiler; then
-				  echo --cross-file
-			  else
-				  echo --native-file
-			  fi)
-			"${FILESDIR}"/pre-rendered.ini
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	# fontconfig issue?
-	# https://bugs.gentoo.org/666418#c28
-	use pre-rendered ||
-		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
-	meson_src_compile
-}
diff --git a/x11-themes/arc-theme/arc-theme-20210412.ebuild b/x11-themes/arc-theme/arc-theme-20210412.ebuild
index 8d4aefb69e32..606c5e1ed687 100644
--- a/x11-themes/arc-theme/arc-theme-20210412.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20210412.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.t
 	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
 
 SASSC_DEPEND="
diff --git a/x11-themes/arc-theme/files/meson-inkscape.patch b/x11-themes/arc-theme/files/meson-inkscape.patch
deleted file mode 100644
index dfec810aa53d..000000000000
--- a/x11-themes/arc-theme/files/meson-inkscape.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 6c2e91fb79177f64eae875e1091d35ad94a74f5a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 28 Jan 2021 23:14:22 +0000
-Subject: [PATCH] build: Fix building with Inkscape 1.0
-
-This wasn't matching the >1.0.0 version check.
----
- common/gtk-2.0/dark/meson.build  | 2 +-
- common/gtk-2.0/light/meson.build | 2 +-
- common/gtk-3.0/meson.build       | 4 ++--
- common/xfwm4/dark/meson.build    | 2 +-
- common/xfwm4/light/meson.build   | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/gtk-2.0/dark/meson.build b/common/gtk-2.0/dark/meson.build
-index 869beda9..c13608a8 100644
---- a/common/gtk-2.0/dark/meson.build
-+++ b/common/gtk-2.0/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-2.0/light/meson.build b/common/gtk-2.0/light/meson.build
-index 3df389a0..4dd32c63 100644
---- a/common/gtk-2.0/light/meson.build
-+++ b/common/gtk-2.0/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-3.0/meson.build b/common/gtk-3.0/meson.build
-index fcb2e074..085bb739 100644
---- a/common/gtk-3.0/meson.build
-+++ b/common/gtk-3.0/meson.build
-@@ -50,7 +50,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-@@ -65,7 +65,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=192',
-       '@INPUT@'
-diff --git a/common/xfwm4/dark/meson.build b/common/xfwm4/dark/meson.build
-index a2820df2..9bb7d46b 100644
---- a/common/xfwm4/dark/meson.build
-+++ b/common/xfwm4/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/xfwm4/light/meson.build b/common/xfwm4/light/meson.build
-index c65b891b..6ee79fc4 100644
---- a/common/xfwm4/light/meson.build
-+++ b/common/xfwm4/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
--- 
-2.26.2
-
diff --git a/x11-themes/gnome-colors-common/Manifest b/x11-themes/gnome-colors-common/Manifest
index b01c0da399ea..2cc7b65b54fc 100644
--- a/x11-themes/gnome-colors-common/Manifest
+++ b/x11-themes/gnome-colors-common/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-colors-5.5.1.tar.gz 4919865 BLAKE2B 968d649d082154e0f627f58c2fa310fd4768f79276e45cf343146a3027f0c7116e7e532524419ef3e49c15d8e3cb1f9580ffd52342e0de9f117c4333801dd8e2 SHA512 23d1fb9b96cd4287acc0f540c8a7abed1b9f16d7e2bc952beedc365cfd71a3a0134382a7f4bb1c01c62dc376acb6aaf81332167869ec6e8c036679e89d325ff3
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-colors-common-5.5.1-r1.ebuild 1306 BLAKE2B 94549dd27047263fbfe4ca4ad6e8c6dd7ae813a22db18ca6d4268e7b8d0ef2f7972c70032fdc3571c58706efaa51555f2cd498683755c7c2d727d2108cca6b17 SHA512 393bd3478a981818a69c131d4e50c09e06a2c7a9f26fdc7b3c681b28ecd29030dbbafea8ce5f1c56cdaff020b478a49dfcc8eaa369cbd98666e3c6f650305c90
+EBUILD gnome-colors-common-5.5.1-r1.ebuild 1225 BLAKE2B f18dba18234e094cd7999bc2881718a2be3acf608bfcafec08c94f8e503b926ddfc768ef4b079de5dafc275ebcc96eb150eaa4fd7e63d267911f89c0aaa3f0fa SHA512 b0cb7e79b95284d691d720b7411d143e16f9dfa86e4ea00835b70a0ba5243788954d976a7fd36bb91676d83da126a416ba09682f2c8ad2b1d20ca9c940777144
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
index 6d9348d2499c..2370f83c992f 100644
--- a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
+++ b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit gnome2-utils
 
 DESCRIPTION="Colorized icons shared between all gnome-colors iconsets"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/gnome-colors-${PV}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
+S="${WORKDIR}"
 
 LICENSE="
 	GPL-2
@@ -20,33 +20,28 @@ KEYWORDS="amd64 x86"
 IUSE="+branding"
 
 RDEPEND="x11-themes/adwaita-icon-theme"
-DEPEND=""
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
 src_prepare() {
 	default
+
 	if use branding; then
 		for i in 16 22 24 32 ; do
 			cp tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			gnome-colors-common/${i}x${i}/places/start-here.png \
+				gnome-colors-common/${i}x${i}/places/start-here.png \
 			|| die "Copying gentoo logos failed"
 		done
+
 		cp tango-gentoo-v1.1/scalable/gentoo.svg \
-		gnome-colors-common/scalable/places/start-here.svg \
+			gnome-colors-common/scalable/places/start-here.svg \
 		|| die "Copying scalable logo failed"
 	fi
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/icons
 	insinto /usr/share/icons
 	doins -r "${WORKDIR}/${PN}"
+
 	einstalldocs
 }
 
diff --git a/x11-themes/gnome-colors-themes/Manifest b/x11-themes/gnome-colors-themes/Manifest
index cd24f5b7d7cc..4f6333d75b0b 100644
--- a/x11-themes/gnome-colors-themes/Manifest
+++ b/x11-themes/gnome-colors-themes/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-colors-5.5.1.tar.gz 4919865 BLAKE2B 968d649d082154e0f627f58c2fa310fd4768f79276e45cf343146a3027f0c7116e7e532524419ef3e49c15d8e3cb1f9580ffd52342e0de9f117c4333801dd8e2 SHA512 23d1fb9b96cd4287acc0f540c8a7abed1b9f16d7e2bc952beedc365cfd71a3a0134382a7f4bb1c01c62dc376acb6aaf81332167869ec6e8c036679e89d325ff3
 DIST gnome-gentoo-5.5.1.tar.gz 354390 BLAKE2B 591c67d1f96f296a427b6846ab4764bfeca3762690bfc75934c8fae3dbdfa64b55ac94a5788e4ff9b344076e1f6a79c13e1b66538d2b6bdb4d6b67280110b13c SHA512 b6a171bdadfef4e01bd2e96efe91ebfc99cab0f7da3def6dd473857c1e51fc9832cf825949f8a84ee8dc5daf4d19e8bdba114d5a92caeb31a0642d0e954bcf1b
-EBUILD gnome-colors-themes-5.5.1.ebuild 910 BLAKE2B d9be70049657dad927e90317c9523a9f75a7e91f549ed73a7c85e0dcc6abb5c261130cb77d3f326d4a5c4e4bc562d02dfdd5f9fbe01e0d5ddb5a4e18bec581a8 SHA512 7769b0fbf848cb68b484e5cd3445e3770c82a2a0d80ceb8b68288016a51b59ab5cf021696d7b6c7077b04d32abe1574c10a31510122316ee96dd07445b2b0a46
-MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
+EBUILD gnome-colors-themes-5.5.1.ebuild 832 BLAKE2B b0ead8de442463352ad461b8ea9aee7184eb7486ea71287970839a5a8334336af244b7549f89c9c4829f2998870f1ac2783b7f90e51df8198e970a78c79d9cf0 SHA512 e2809171172002177731da59856a688216a61db8895fdb0df9d25cb55f73099957e42122b4090dd331ae19348cd24942bb2d1884c6cde33ec62a94fb837ad848
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
index 5fb52b368dcc..94ffa1b9f6c7 100644
--- a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
+++ b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
@@ -1,39 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit gnome2-utils
 
 DESCRIPTION="Some gnome-colors iconsets including a Gentoo one"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/gnome-colors-${PV}.tar.gz
 	https://dev.gentoo.org/~pacho/gnome-gentoo-${PV}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-themes/gnome-colors-common"
-DEPEND=""
 
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/icons
 	insinto /usr/share/icons
+
+	local i
 	for i in gnome*; do
-		if [ "$i" != "gnome-colors-common" ]; then
+		if [[ "${i}" != "gnome-colors-common" ]]; then
 			doins -r "${i}"
 		fi
 	done
+
 	einstalldocs
 }
 
diff --git a/x11-themes/gnome-colors-themes/metadata.xml b/x11-themes/gnome-colors-themes/metadata.xml
index e945e1307667..2ba8e9e851e4 100644
--- a/x11-themes/gnome-colors-themes/metadata.xml
+++ b/x11-themes/gnome-colors-themes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
diff --git a/x11-themes/murrine-themes/Manifest b/x11-themes/murrine-themes/Manifest
index fe8cda7f0de2..ac28ad6ce2f7 100644
--- a/x11-themes/murrine-themes/Manifest
+++ b/x11-themes/murrine-themes/Manifest
@@ -10,5 +10,5 @@ DIST MurrinaVerdeOlivo.tar.bz2 1320 BLAKE2B cb3401d2617261d4b2bc1f919d13c61e238d
 DIST MurrineThemePack.tar.bz2 3003 BLAKE2B 38c0be6fe48452741ef9fa37634218f2fae912433224030892ad61cb267d085dce3afb43fa123050d3df088d8272ed2a791d42769c81bbfaebd565a3d35caa54 SHA512 d70da08e3dae99255d5fd9217edba6c76b497aea303c1c0b50bc7230861936b0ae51bc2e1e6fbcd645d3759d67878c9dc535f1b13a2d220607331cf38253d0dd
 DIST MurrineXfwm.tar.bz2 6408 BLAKE2B 6f8574a09362d2c2e55023c95c82a9d566a475f13c0fa126080d31bb5ff3c0293bef6afac8636608e7b885681de7ad3fab89d76ddb844f61b8d18a1a9a51c3f7 SHA512 48b8e3fec3f75cf704b0d2e2d43ef1ea6ac1f1c691d7ff84d0551491e6f399d70c0f1958fefd95247a387a69041aae5b7059ea28ded8ecb1ed7dfb67fa4adebe
 DIST NOX-svn-r22.tar.gz 7318 BLAKE2B 481a35d9fb871089af6fee2bccaad5c003a866bae723397f8f6bda16be93235ab3203539d88a431f837794f9513422a25f765d1e2ce9a5736a5655fabbf2dc24 SHA512 25bf7f38a0d2566926f7f708b6bd6b042a7259943f58be4f54f05f7fd553f6974d6532ec5ee5e628afa57401d4ffa1c15ac7e89d9769e79cca95ff7cd1f67af4
-EBUILD murrine-themes-0.98.0-r1.ebuild 1073 BLAKE2B 044ab42dbaecfe38d760db02362f0f2a729b9653219c9ec6e074c1c8bbdc889ef865a0ce2b62e47e76bca7be03f6926eca2099764cdd71d27c8d5efdeace85ad SHA512 1f75cfcedfb1684ee035c6b87fe01b6f5c8a88843e348ad20b677920bc5d8511839a13914aa0cb7656b03d7aa87daae4186a578419882ddb1d4764922eacf6c5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD murrine-themes-0.98.0-r1.ebuild 1036 BLAKE2B 4a557a7d4115c256862ef1e18ae746fb9cacbd87fe3cc49b0770b219d8bea17f178a52ec50beb712fba726e332e53a8bc0d5c582022e636837dec4bdefca98da SHA512 43b26764823f8251efd85b1bbd7c0d5d8bf43362885584588db951b7775e2c62a199f506fdfb935e0a86f0a5e6e86ac46816f942e354c951c33b4e7e8011337d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/murrine-themes/metadata.xml b/x11-themes/murrine-themes/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/x11-themes/murrine-themes/metadata.xml
+++ b/x11-themes/murrine-themes/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild b/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
index 2ed35e061bc2..a15708fed824 100644
--- a/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
+++ b/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
@@ -1,40 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Themes for the Murrine GTK+2 Cairo Engine"
 HOMEPAGE="http://www.cimitan.com/murrine/"
-
 URI_PREFIX="http://www.cimitan.com/murrine/files"
 SRC_URI="${URI_PREFIX}/MurrinaAquaIsh.tar.bz2
-${URI_PREFIX}/MurrinaBlu-0.32.tar.gz
-${URI_PREFIX}/MurrinaCandido.tar.gz
-${URI_PREFIX}/MurrinaGilouche.tar.bz2
-${URI_PREFIX}/MurrinaFancyCandy.tar.bz2
-${URI_PREFIX}/MurrinaLoveGray.tar.bz2
-${URI_PREFIX}/MurrineThemePack.tar.bz2
-${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2
-${URI_PREFIX}/MurrineXfwm.tar.bz2
-${URI_PREFIX}/MurrinaCream.tar.gz
-${URI_PREFIX}/NOX-svn-r22.tar.gz
-http://gnome-look.org/CONTENT/content-files/93558-Murreza.tar.gz
-"
+	${URI_PREFIX}/MurrinaBlu-0.32.tar.gz
+	${URI_PREFIX}/MurrinaCandido.tar.gz
+	${URI_PREFIX}/MurrinaGilouche.tar.bz2
+	${URI_PREFIX}/MurrinaFancyCandy.tar.bz2
+	${URI_PREFIX}/MurrinaLoveGray.tar.bz2
+	${URI_PREFIX}/MurrineThemePack.tar.bz2
+	${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2
+	${URI_PREFIX}/MurrineXfwm.tar.bz2
+	${URI_PREFIX}/MurrinaCream.tar.gz
+	${URI_PREFIX}/NOX-svn-r22.tar.gz
+	http://gnome-look.org/CONTENT/content-files/93558-Murreza.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-themes/gtk-engines-murrine-0.98.0"
-DEPEND=""
-
-S="${WORKDIR}"
 
 src_install() {
-	dodir /usr/share/themes
 	insinto /usr/share/themes
 	doins -r "${WORKDIR}"/Murrin* "${WORKDIR}"/NOX*
+
 	cd "${WORKDIR}"/Murreza || die
 	doins -r Murreza*
 }
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 96f8c1aa9bb1..c73fe05ad5bc 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -4,4 +4,4 @@ DIST papirus-icon-theme-20210701.tar.gz 28129228 BLAKE2B cb4b8891607bfa2b245858c
 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
+MISC metadata.xml 386 BLAKE2B cc6c195fe1437148fa30ceea559ab1a197069cc73f6e95feb5c27972fb258781671e1bf4a4579c59409e6169ced02a297d10fd2b3fc0d36e2328bbd1e29d3ef8 SHA512 9e00224eaf8452d7333ed4e8ec4fc6736fded28dafe29cfc8248e938e3d22ae6bc9ea36156fab0429cd64a05c96a45bdb2331fbfa914827c938034755386b065
diff --git a/x11-themes/papirus-icon-theme/metadata.xml b/x11-themes/papirus-icon-theme/metadata.xml
index 0e70860b1b8b..de18d5b6737c 100644
--- a/x11-themes/papirus-icon-theme/metadata.xml
+++ b/x11-themes/papirus-icon-theme/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
diff --git a/x11-themes/shiki-colors/Manifest b/x11-themes/shiki-colors/Manifest
index a8db37721989..becbaf1bf21f 100644
--- a/x11-themes/shiki-colors/Manifest
+++ b/x11-themes/shiki-colors/Manifest
@@ -1,4 +1,4 @@
 DIST Shiki-Gentoo-4.6.tar.bz2 5725 BLAKE2B 5bf777b55ad393b118a030f77f88f19a2ae73829d7d7a498ae71cc16912e6c95d470ca55e50a801bb4bf7d2778fca0d2a86df55d9aed052954a1c583010f36ef SHA512 5b329973aab7b36d39c1e5397f968a594a998869e4770dab0f9b051d9559f970f81bfb40ed8b91415c39645a78da56bb5842a017866d3d6eaa42b1839e7717ef
 DIST shiki-colors-4.6.tar.gz 254607 BLAKE2B b8ef2276ca010f4c9c25df86f2e36d89a2f440b7e9a13795c09a0753b447383889e57636a421626e9cdbf3cdf6fe207129565a923596dec232d5dbd22e854960 SHA512 862ac3f904b012d602b3ec624563bf57b5622c571819e55b2c37f9708c50e21e5a575d75863d3cc89a69c6594732fac6a961d981c4da8ed8dc1bb46d81313156
-EBUILD shiki-colors-4.6.ebuild 755 BLAKE2B 9524dd2db483b5701d5fe68ec8fa45980b5b5a327f93991b68b016782d16487c48d5c0f9b97a38a993f184c8c4c0ff0cc2ad80339b5447f8cf53fc26a925bca1 SHA512 ea6113ca66edc33edea5a21a4f0d01f348c76dd86690d9de6124e16606ea59ceaeabee54dbea5d82ff2a9a6e774baf8602eaf10997d8dccb19de730716ae1fa1
+EBUILD shiki-colors-4.6.ebuild 659 BLAKE2B 3d40d7783b2870c536e6a98086d36948bae9b4772f002c11a064adea2c39d57fa84304c890dcfff82f890a72174d61f5848fbd71b3bb86a574fac6e390b40e0d SHA512 e43a4c6ada30dc562011726c35fdad411403d79153dc5790900dc8ded8acb5591449a42b1e8437d201ce1f79b5fc8ace33b75a9d96171138f5024dbd3ba1dedf
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-themes/shiki-colors/shiki-colors-4.6.ebuild b/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
index b12471328667..1cba381bd5da 100644
--- a/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
+++ b/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
@@ -1,34 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Mixes the elegance of a dark theme with the usability of a light theme"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/Shiki-Gentoo-${PV}.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	|| ( x11-wm/muffin x11-wm/mutter xfce-base/xfwm4 )
 	x11-themes/gtk-engines:2
 "
-DEPEND=""
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/themes
 	insinto /usr/share/themes
 	doins -r "${WORKDIR}"/Shiki*
 	dodoc AUTHORS ChangeLog README
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index df6b1b05d518..99c252566c9d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index eca4955b2b47..72ff39e1b300 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,6 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
 DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f97fdd00683eb5388b43678df42a76f1710660ee8036b7100d79a54400c13bf9450333d573a78846d2124516e SHA512 9ccb98c4e80635a781b3f889d8c3ae621c0926a79e9607268924b78bd11137caf70ee9a1edf5bc137d362d2acbe2984645f58ba31c586e6b017797758a66f9cf
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
-EBUILD bspwm-0.9.10.ebuild 956 BLAKE2B d2ca8f3e2289b61a6b419fb4662888b9b40d6e6638f1837ec017477954de634d95b2c39b89f59b767dbb9dfa037c039f3e66d52b49c46ec43ea735345c24c8e2 SHA512 cf5c82585bebf09385bbf47bb7b1b11cd875e6b6ffcaa63a912639d4ef203b4e29f2fcc4ebf113aafcbd1181e12ea660ad132ca4938e132352a9eee41f785849
+EBUILD bspwm-0.9.10.ebuild 963 BLAKE2B 63c3c721e8a8fcb374d5d82a37b2415a57fd514601fc1ce02d8a2dfc5d863271ccc378bf8a4cc06601748dfc37a6d610ed770c3e645d709d22565ff5b2b4b5f4 SHA512 de2814bec71e338da2b2cde5f378b51d94ad548bdf60740cefd1e1d27daa6d1d786080e9810f57b4484b3bdc59624c6f0bba068faf17ea059c93f2828c5a703a
 EBUILD bspwm-0.9.9.ebuild 980 BLAKE2B 6334d4ef01fd74ed27c02b016784721c635567bf71c431bac57b02c5b510cb7916c3a6516e36482d84686ccd1f9683dd4365b3a55374a240d3e4970afeb45003 SHA512 674eed848ffd30d8cf299ab7606a2165b35e17e4f2c98aad47c9941edc43ba878b9ef6fcfd3f81e56571fd10591aa832565e66496de35ee8fefa48ef26f48147
 MISC metadata.xml 327 BLAKE2B 0ac0432bb0c38fca77a88690a6d85c1ace3569fc8099ce12551fd1cb4d532b3673e3c85b2655222113c4b24f139902967bfe2ad2ba638d8dfdbe874d1c9a8ff6 SHA512 fcafc9a074be2d2a64c868494a8ddb156cbc763e6d31e6999343e72df2d101469275e39eab02fc98c3ff2118203105f9b63d18277ae70997e85e021c7126293b
diff --git a/x11-wm/bspwm/bspwm-0.9.10.ebuild b/x11-wm/bspwm/bspwm-0.9.10.ebuild
index 84e87f407073..78c44c3c2ea1 100644
--- a/x11-wm/bspwm/bspwm-0.9.10.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index cf2fdc1c6f62..4ab0e935e9c5 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2733 BLAKE2B 5377ed1b8f2f8c7c11af7e03baeab132d7951ab6cd7d694c3ec797cb477f3b04b920e29d32b58956d49f08cbdb1e98e3a7ddaf166dc9578a1b165b0f0b4455de SHA512 06c7cc75ddc95431e0d7b3c56331ca8c3bb08f046b7fa153976c0b3366a1c9c0b7248410b47345d38e0cf3d1303277d966dce17cf10b6c34fbf27d1da33477d1
-EBUILD openbox-9999.ebuild 2733 BLAKE2B 27aa4985831c42d02302b822f5116dfa0c42f052420d858c7c9e469f2228b0f81bae74d3365fc8a1cb88d3cb7bfd39f6e7aa6c8e99046842ffb6f0952ce28e26 SHA512 595f05188de1d3239fcacd4eebcab66bd9fae7f6c322ba1f3ca7e5fca3867735fea6c7a9b6778344c3e52d1cc0845b46c0f936debb9cb3be1ec66eaa1f3e607a
+EBUILD openbox-3.6.1-r3.ebuild 2725 BLAKE2B 2aaac63e7b3ab473d61bda45fe1320704196ef628870ae8d9832ea66c392148b95c75237baeed0ff719030fb6bf1ced566902cddbd0b1ac379c5abd76e20c0fa SHA512 585e0fd7d07792a08a707c90d3bc3d05141302cab9c47a027cbe8a3d4aeea3bab1b93349a37c6174927ab93f59b8b390c0566e37eb88822f931c2563cea33f37
+EBUILD openbox-9999.ebuild 2725 BLAKE2B 9ab0875311bfb8e294ca5884806ab04709d0b003aabff25922800018773f163c438d2d0005ba895b74ce56e842bc3421dc56ea43b45fcc0395c3a8900ba7a0c7 SHA512 2aa0d0d544ceec85efc9ca6c850a02f9148c0dfa851c8a99f602ad374b1da627178e5d0314f2791efbf284c66d49196adce4552d27d282992b03c0eb38a53cf2
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 2e055c88caa3..2288b82914b0 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
@@ -47,7 +47,7 @@ RDEPEND="
 	xdg? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index f608dddb2d71..996da0e28250 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
@@ -47,7 +47,7 @@ RDEPEND="
 	xdg? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 96c44f8cc504..76982e129037 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -3,6 +3,6 @@ AUX ratpoison.desktop 122 BLAKE2B f72c9cfdb0712eef05037b1fdedbc5806f6f4957d2d549
 AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58e27304a38053eaee7de6a025ae872049e6fc75f7480dba3fe31c89d04e537469ff54dbe421cb26b0e9fd228c20 SHA512 c9e0e322b0c632b6bd7cee0c34269accfd0cf2d12751b9f2a65955f5ae5aa72804f819ca0147da5e0ff571357b34460337668adc07ad77afdf7a50b512f6b36f
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.9-r1.ebuild 1864 BLAKE2B a0642c53b08dab4525b9a012d18d01dd6734d055164c689b40b7ff725311e51a348ce222fcc9d0abf6933a137d750fba791d812f250b79298fe9bc549394f564 SHA512 2db87d3e5ea4171ea2493911e2092de7639c9217e7d198e03084e85a50436922376dcb885e2b7c0c703fda9b49227ee00770ee5cf91f26265fdc8b08c619ba5a
-EBUILD ratpoison-9999.ebuild 1875 BLAKE2B 98c9866887a3f81a6f6ef11f5b2252fda5d22f9ce9bc43baa6099d00faecd9c0e8ecab8d8d9573e47dfcb6359499d53302ac82cd4229c762ace384fdc6df326f SHA512 5631ad7c74d54258061b77dc786e367fa77934599dc13884f4bf4d022b433731f0ca602662ae1dcd245eb03c9b7507c578f18a9d0e224f1a38c5d970f425fa01
+EBUILD ratpoison-1.4.9-r2.ebuild 1860 BLAKE2B a33d022808600d55789f2c9b26b95d587b5b0659c7cc0f44bf2476225558e9248d863d1a6a9d9221ed91fc246db97806c4d1d1fb260f71921c8f645fad319f1a SHA512 15556af45ba30d19cf0f5f694a67639bdd616cc22bd34cbc091433244cad4a076b373002bddb0a8a3fb30d8b831d82344127b1fb6e595ee332a60411850f258b
+EBUILD ratpoison-9999.ebuild 1871 BLAKE2B 602d7c558ffba67d7b210ef1a794ca5062728d82b9505768fdadfa0ac4222ea879b1929e1b745bef1d7490595beb04b812b4b9775440ec40411e529e5f3e104f SHA512 a5648cb9bc66de6ee63acb45192148167f616d1e73ddfb61723ec9cc09c415529d5d0cbd48d878a498ff2e7d8a7433e1e6fb286e15046338a99f3fc28070954b
 MISC metadata.xml 994 BLAKE2B da7a977d643d540812fffa082f5cba76cd79728302533e77627825a08fb0bace3a2b3bb917cd8b6cd3cecd2c03182b72ac902909a4c7d575f8e2ea936a510953 SHA512 f64106b49cfcfb17e08d3c897be4de0ef3df083fded72804d9b0e0f4e2eedcc2c8c679dea96c59dcb41937b547497ac1445102c0a63ef965f92b450dda0edec4
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9-r1.ebuild
deleted file mode 100644
index 001e9b843227..000000000000
--- a/x11-wm/ratpoison/ratpoison-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common eutils toolchain-funcs
-
-DESCRIPTION="window manager without mouse dependency"
-HOMEPAGE="http://www.nongnu.org/ratpoison/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug emacs +history sloppy +xft +xrandr"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	history? ( sys-libs/readline:= )
-	xft? ( x11-libs/libXft )
-	xrandr? ( x11-libs/libXrandr )
-	virtual/perl-Pod-Parser
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-SITEFILE=50ratpoison-gentoo.el
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README
-	TODO
-)
-
-PATCHES=(
-	"${FILESDIR}"/ratpoison.el-gentoo.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable history) \
-		$(use_with xft) \
-		$(use_with xrandr) \
-		--without-electric-fence
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-	if use emacs; then
-		elisp-compile contrib/ratpoison.el || die
-	fi
-
-	if use sloppy; then
-		pushd contrib
-		$(tc-getCC) \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-o sloppy{,.c} \
-			$( $(tc-getPKG_CONFIG) --libs x11) \
-			|| die
-	fi
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	use sloppy && dobin contrib/sloppy
-
-	docinto example
-	dodoc contrib/{genrpbindings,split.sh} \
-		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
-
-	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
-
-	if use emacs; then
-		elisp-install ${PN} contrib/ratpoison.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild
new file mode 100644
index 000000000000..8346af3e1dc3
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit elisp-common eutils toolchain-funcs
+
+DESCRIPTION="window manager without mouse dependency"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug emacs +history sloppy +xft +xrandr"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
+	xrandr? ( x11-libs/libXrandr )
+	dev-perl/Pod-Parser
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+SITEFILE=50ratpoison-gentoo.el
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+)
+
+PATCHES=(
+	"${FILESDIR}"/ratpoison.el-gentoo.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable history) \
+		$(use_with xft) \
+		$(use_with xrandr) \
+		--without-electric-fence
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+	if use emacs; then
+		elisp-compile contrib/ratpoison.el || die
+	fi
+
+	if use sloppy; then
+		pushd contrib
+		$(tc-getCC) \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-o sloppy{,.c} \
+			$( $(tc-getPKG_CONFIG) --libs x11) \
+			|| die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	use sloppy && dobin contrib/sloppy
+
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} \
+		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 70a7773144bc..b22f59987d42 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	xrandr? ( x11-libs/libXrandr )
-	virtual/perl-Pod-Parser
+	dev-perl/Pod-Parser
 	x11-libs/libX11
 	x11-libs/libXtst
 "
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index bc16c84b3d91..b86fe3243c25 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,4 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
+EBUILD subtle-0.11.3244-r1.ebuild 1924 BLAKE2B ddaf40394ae07529b812de11215296a60fe776edc6cc667247be915a419bf9c651f6d09d19fa802feeb8070e024b5262dcc7cdc29e7c7ead94cea37d8e89bfe8 SHA512 dce8fa1370489615ec717f64cd735ebc015fd4eb9c4d665176e4c4a374fae4de4ce4ebaaf125f01730e7c5c5ca9d2be8488b3adae708832dc099f8f52e4fc57e
 EBUILD subtle-0.11.3244.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
-EBUILD subtle-9999.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
 MISC metadata.xml 1071 BLAKE2B 174307dc5589d03b7ed88424c575b0f1aa3c88ac4e4c13e05d7cbec349247abb7da98c1b75a86e34e61f1e26a49f0623334383845a1e052f0789484f229e0774 SHA512 43820c6deb320cf15afee6d9e77d24da9f9084c1006b97e6b8a46a0208575af238500c1a635eb44f594498f8c74e3048ee9cd5085a9e1b7566e67c0cf5cf41d2
diff --git a/x11-wm/subtle/subtle-0.11.3244-r1.ebuild b/x11-wm/subtle/subtle-0.11.3244-r1.ebuild
new file mode 100644
index 000000000000..1375736daf48
--- /dev/null
+++ b/x11-wm/subtle/subtle-0.11.3244-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-ng toolchain-funcs
+
+SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A manual tiling window manager"
+HOMEPAGE="https://subforge.org/projects/subtle/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+RESTRICT="!test? ( test )"
+
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+	xtest? ( x11-libs/libXtst )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+ruby_add_rdepend "dev-ruby/minitar"
+ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		mercurial_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_configure() {
+	local myconf
+	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
+	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
+	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
+	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
+	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
+	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
+
+	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake -v build || die
+}
+
+all_ruby_compile() {
+	use doc && { rake rdoc || die ; }
+}
+
+each_ruby_install() {
+	${RUBY} -S rake -v install || die
+}
+
+all_ruby_install() {
+	dodir /etc/X11/Sessions
+	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
+		#!/bin/sh
+		exec /usr/bin/subtle
+	EOF
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins data/${PN}.desktop
+
+	dodoc AUTHORS NEWS
+
+	use doc && dodoc -r html
+}
+
+pkg_postinst() {
+	elog "Note that surserver will currently not work since dev-ruby/datamapper"
+	elog "is not in the tree."
+}
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
deleted file mode 100644
index ef71c3fce45f..000000000000
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="https://hg.subforge.org/subtle"
-	EHG_CHECKOUT_DIR=${S}/all
-	inherit mercurial
-else
-	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A manual tiling window manager"
-HOMEPAGE="https://subforge.org/projects/subtle/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	xtest? ( x11-libs/libXtst )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-ruby_add_rdepend "dev-ruby/archive-tar-minitar"
-ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		mercurial_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_configure() {
-	local myconf
-	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
-	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
-	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
-	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
-	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
-	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
-
-	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake -v build || die
-}
-
-all_ruby_compile() {
-	use doc && { rake rdoc || die ; }
-}
-
-each_ruby_install() {
-	${RUBY} -S rake -v install || die
-}
-
-all_ruby_install() {
-	dodir /etc/X11/Sessions
-	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
-		#!/bin/sh
-		exec /usr/bin/subtle
-	EOF
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins data/${PN}.desktop
-
-	dodoc AUTHORS NEWS
-
-	use doc && dodoc -r html
-}
-
-pkg_postinst() {
-	elog "Note that surserver will currently not work since dev-ruby/datamapper"
-	elog "is not in the tree."
-}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 97a38c35f6ed..a11ea9f6c1d6 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,14 +1,8 @@
-AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
 AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
-AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
 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
+EBUILD xpra-4.2.ebuild 4172 BLAKE2B 0310419a1ce47d0a7b58d141845dbf13609e2633d0fd481e53c091340ec0c643b71095bc39b393a2639a21c61983de03aeb34533b1d8226d35ec6898870f4247 SHA512 54179fbdbfa576c03e0ec1263c453c8f08e0a80d3614cf3b782e2595a8edb4402ee968ffad6d67ba9cd47bdee2bbe172d2860e3a45ace1d2da0b31b9071034ca
 MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204
diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
deleted file mode 100644
index 806694f24312..000000000000
--- a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-2.0/xpra/scripts/config.py
-+++ xpra-2.0/xpra/scripts/config.py
-@@ -127,7 +127,7 @@
-             xorg_stat = os.stat(xorg_bin)
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
--                    warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                    debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
deleted file mode 100644
index ae590110f1c3..000000000000
--- a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py	2020-05-10 19:00:55.000000000 +0200
-+++ b/xpra/scripts/config.py	2020-06-07 18:35:49.361899872 +0200
-@@ -150,7 +150,7 @@
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
-                     if warn:
--                        warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
deleted file mode 100644
index 1371e2b78d86..000000000000
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( client server )
-	cups? ( dbus )
-	opengl? ( client )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${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
-	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
-	pulseaudio? (
-		media-sound/pulseaudio
-		media-plugins/gst-plugins-pulse:1.0
-	)
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx media-video/ffmpeg )
-	webp? ( media-libs/libwebp )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	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}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	mkdir -p "${ED}/usr/share/metainfo" || die
-	mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die
-	rmdir "${ED}/usr/share/appdata" || die
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	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
-
-	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 ffmpeg dec_avcodec2)
-		$(use_with ffmpeg enc_ffmpeg)
-		$(use_with ffmpeg enc_x264)
-		$(use_with ffmpeg enc_x265)
-		--without-gtk2
-		--with-gtk3
-		--without-html5
-		$(use_with jpeg jpeg_encoder)
-		$(use_with jpeg jpeg_decoder)
-		--without-mdns
-		--without-minify
-		$(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
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-4.1.3.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
deleted file mode 100644
index db407cd0db72..000000000000
--- a/x11-wm/xpra/xpra-4.1.3.ebuild
+++ /dev/null
@@ -1,168 +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_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 +lz4 lzo minimal opengl pillow 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
-	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.0.3-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/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 1f8dc0a75fa6..f79d0e144a07 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://xpra.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 68f09be19682..61aac5446899 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index ade129b5d303..dab2e692817e 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,7 @@
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
 DIST libxfce4util-4.17.0.tar.bz2 531849 BLAKE2B 5c5de18703ade8bfa6a6be823144839afc309422131c06679a54b405c8d6aced4f1ccd0b9d0158931b6eed90aa48ab29789d1173c98541f92d3813c197283762 SHA512 4cdca029fb5e8b1cb5b34ca54aa1003918626824ee162adf43cede4c717b5e9705a5c0ff73f1a6348db320c4f3dddf4c9b8c760fba55f00d42bdb8fe7a9d90fa
+DIST libxfce4util-4.17.1.tar.bz2 527366 BLAKE2B 12de2090c0e2f7bb2bdd19ce63988810978f6d5893f866d65348dedfbb260ec11b518f8375ddc19a0a3502b14743878eb731ece79f31edf94d2bd505ea80d9c5 SHA512 49d11b50bbb0f72637bbdb9abba4e526f34814900dae337ad5e53df4514019a9761a89ef65a39e6ad94d633f7617c8466cb3985c5fae5350c45955d36077a0fc
 EBUILD libxfce4util-4.16.0.ebuild 1041 BLAKE2B fc3943cc33715dc765858991b9a42396c377e65d556d0d2fee0c630efd09bb50dbc962aa53007fc0290d0f129af7a71c8f911b4737f564904e80bbd4035ce62d SHA512 b464c87b4a85ec3b45b14e159f4f9f36c5ebe2a3bdefcb21c76a901d4435bda8da287605cc399d88b07062c81dc1982be47663c9e6b9ba9044755c079ab19005
 EBUILD libxfce4util-4.17.0.ebuild 1048 BLAKE2B c1722bf8d881cefcce56d3e32bccc3fbc21a12fa1f3405d92e3fbe06d6841e94c34454a2f8adf2f66a9cdc2f84df1609273243659969bc76fd6df00a683a085d SHA512 47d588765fff62cebf12b6d738057d307740b1cf9e6cb5edde30ff0dbebda75accb89125ab88d530a7bcee4b2425ca734cada1a1cb372de37f731d33512df285
+EBUILD libxfce4util-4.17.1.ebuild 1048 BLAKE2B 400eaa8fd18106a245d1a25d3c6a6b61190930c51d866fa8fa384eab3b14ed43ebf6fc0ccfb894ae83ce5c85613902a0e60f0812ec24bcad6505e4a7a5cb3b48 SHA512 26c1b75e800dac0985748086dfcaa0c0fad08b3418603b73877f2e1a631138355a493a54abe5db359177cc99909f3b046a58e0f8348d0e208a10febf7809fb36
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.17.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.17.1.ebuild
new file mode 100644
index 000000000000..71a581a40f28
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.17.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 4bab80a5bc60..e88297e86a65 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,5 +1,7 @@
 DIST thunar-4.16.8.tar.bz2 2429407 BLAKE2B 0af1c14fff30f276c279ff459e33ff4c23533e1ce494cadba02fca6436c1d1d2a0c8ea302dfb9c7b5ff9b6d7a69a80996afa1274cc9f3c66f112b8230d8b30f3 SHA512 722caeef9a8a074bac705b0108faab418009e61d8e177838b6a63cbf29f7b9c78e3a135b8a59f154e978feb811d5d115810df2b2e9d53d93f1c34e62a2d5f7b8
 DIST thunar-4.17.3.tar.bz2 2427025 BLAKE2B 5fde8faf29f8b8f78a604c12cd0366187865d2c176109a8501500af573e77cfaf53aecc145674f2f49d730f2596c06e3304c4b2e033759430b1d3fd06439310b SHA512 7394121dd995296802b50ae6188a56228dec82f9cb1c29cf8c9bc4db6a69921e78f6a2bfcab459578faf64703eecc59a04ce6f4d623300e54faa2e0b4e261699
+DIST thunar-4.17.4.tar.bz2 2475127 BLAKE2B 1464162544f7d5f646975e9f663db1d4fb14249f87df013f68f04810eb2b961507a9b90b05cfe3dfbe9188c002ccc10143ee77b671e2b196b7ec3df803d05bf7 SHA512 0271d6925955692076168f4227c946479dc17cb8c0bf92d8dca523575f187c481b4c5f876ad13cdeadbdc67a4b773a1b88166a0eddc7b3ff4c8abb40135b84bf
 EBUILD thunar-4.16.8.ebuild 2071 BLAKE2B d015592ff9c4d08936ba5b5c3a44bd74e45bb067000f89cae57a12734a05d18c3adb79e2785076859b8d6d78c9909adabb9ec2c74e10380dbaacababdb145748 SHA512 6f4fcffc0f5f5c48a87a96e971b04a362a119e09a7dad70ee990e3c7c858549d3ca08a3e0d5629e84e10230276c9a6949e5ab2103025bbacffdcee63df2e9b85
 EBUILD thunar-4.17.3.ebuild 2084 BLAKE2B fc0df0f03f031219056e7621f835b6b5c2868f6c30ec4cbc706aba5792854f9193b1c1810a03ae544e6bc1aed024641051b9629749ffcc0cc3df29b394ee854d SHA512 79efbbb6445f6beda503602781855fc7b298024b966dcaaaf8175a3185e1a09a8b05f154601fc74c922d3668fa8c6606899c6955a40ccfd32b844706948a8888
+EBUILD thunar-4.17.4.ebuild 2084 BLAKE2B afca73f4d7c6e83ca317218c6ae85ab74d005df0616fbbc0e2061b1550e7f21ca446bbb0158a3004cf8f181754cb4f2fc6a9730badbb3ef912ad2cddd47dad98 SHA512 bb62e444cf216066b4eb20aeb7ade3fb487eaea5aae8f97d35dbda827009f282a42376ff228526e18dbe9ff1cdccf1aadc5850236968ad73ce587021d1da5dd8
 MISC metadata.xml 372 BLAKE2B 35cec7c8487a748045795a1a2467878a3ba2df30880256a0add3757f2785b01a09f2f30046f5f02b28434ca2c7d683a409e1a6e2461d1671bea8b9198b9e92ff SHA512 0e12c13eeae06f579b45cedd3b61a158958ae3d08f181e289dedaf04e69629de78f9a8baa0c9baa51f66285e8c6c82740dc2453fd655152d049d4412e9883a3a
diff --git a/xfce-base/thunar/thunar-4.17.4.ebuild b/xfce-base/thunar/thunar-4.17.4.ebuild
new file mode 100644
index 000000000000..63884c064f5a
--- /dev/null
+++ b/xfce-base/thunar/thunar-4.17.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg-utils
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+DEPEND=">=dev-libs/glib-2.50
+	>=x11-libs/gdk-pixbuf-2.14
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/exo-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.0:=
+	>=xfce-base/libxfce4util-4.17.0:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( dev-libs/libgudev:= )"
+RDEPEND="${DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "If you were using an older Xfce version and Thunar fails to start"
+	elog "with a message similar to:"
+	elog "  Failed to register: Timeout was reached"
+	elog "you may need to reset your xfce4 session:"
+	elog "  rm ~/.cache/sessions/xfce4-session-*"
+	elog "See https://bugs.gentoo.org/698914."
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 97744e22851a..c4be3d6ba8cb 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index 111c0d40c22a..1f4c9571c70b 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-panel-profiles-1.0.12.tar.bz2 83399 BLAKE2B 82f62b7472ae8e271a8c41151c2153e62f1589b868cd4a682f0e56acfa3aedcb6104b14ef99f776d09fe6ac854420905ce335c9d3d05d524570db70d847731d8 SHA512 cf308a1a9d68832a3b907787754791d6e8b227400d21a0bde2ed99d7afbb64c6137bbe4b7ab6ceb4c896a67ecbac29d41089c857d432467cbaba631a7ef77505
 DIST xfce4-panel-profiles-1.0.13.tar.bz2 86671 BLAKE2B 0bf2d39aa2d7d21a99a9a7245e5de9e717b628f0eded2736db70cc87c4f6e1e1d10aecdc6586c43c6355747e68a2ceb1920d5309bf38ede07c1167c590dc116f SHA512 648324e5dd95ab0a513829d7d816e2113ae677d9ad6ac9b01d73c6b4105b54d5e773150d5440ad35a37b4dc75478f40a24e0223decf940f3cf658241547ce75a
-EBUILD xfce4-panel-profiles-1.0.12.ebuild 1010 BLAKE2B 926a69171925d0e35c8adcda9ecbb828e98d00561a6cc5e3776b522a149e8de950413c3058d2ff20991bce0a2e024e5c02b4d57f859888bcb766900b7202e23a SHA512 f001516b2c340c17dc2738b0e4e710085c19aa0c557276f182e81feae1bd3aa8386cb63961da2fb9d9972ba1ce8d31ea262452ffbac7217b8624257e8964291e
-EBUILD xfce4-panel-profiles-1.0.13.ebuild 1010 BLAKE2B 4443279f9e2abcdcf063206fc654db39e35bec1b89583e36a6fcf0b5f66a3224d6c4d22ec1a2c076278b7e41855c22c3a89b0bea52e5709c5b0cb7324ac3c687 SHA512 b444db0333f4acea6a32ee570f80b16b27650bfbbca71b92f8d341a616be894e94d2213ff5c994c22cea1bb254ed396dd001d04a91c30ead3afc2eaf193817b3
+EBUILD xfce4-panel-profiles-1.0.12.ebuild 1004 BLAKE2B baf8e9f213165438ca15a57a63d92d54bb89b2e971c1d36d3ea767d267ad9916cecc68ad19a209b3ccb15f36d4dab139bacc28125f1226c0925b617828b334a7 SHA512 8a543a80192d0a31d455979be4bf150872e2ba8c467a1d0afe80ee6ec5c3b63cf4d2cf516bef4a3b9893af04d483f736e59f4b111fbb63475cb66537a69eec96
+EBUILD xfce4-panel-profiles-1.0.13.ebuild 1004 BLAKE2B baf8e9f213165438ca15a57a63d92d54bb89b2e971c1d36d3ea767d267ad9916cecc68ad19a209b3ccb15f36d4dab139bacc28125f1226c0925b617828b334a7 SHA512 8a543a80192d0a31d455979be4bf150872e2ba8c467a1d0afe80ee6ec5c3b63cf4d2cf516bef4a3b9893af04d483f736e59f4b111fbb63475cb66537a69eec96
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.12.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.12.ebuild
index 73f296cb6e74..83e3e3bc88c9 100644
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.12.ebuild
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Simple application to manage Xfce panel layouts"
@@ -20,7 +20,7 @@ BDEPEND="${PYTHON_DEPS}"
 RDEPEND="${BDEPEND}
 	dev-libs/gobject-introspection
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	xfce-base/libxfce4ui[introspection]
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
index 27462fad6085..83e3e3bc88c9 100644
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Simple application to manage Xfce panel layouts"
@@ -20,7 +20,7 @@ BDEPEND="${PYTHON_DEPS}"
 RDEPEND="${BDEPEND}
 	dev-libs/gobject-introspection
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	xfce-base/libxfce4ui[introspection]